diff --git a/docs/rules/comment-directive.md b/docs/rules/comment-directive.md
index 9db00825f..7ff91450c 100644
--- a/docs/rules/comment-directive.md
+++ b/docs/rules/comment-directive.md
@@ -7,7 +7,7 @@ description: support comment-directives in `<template>`
 # vue/comment-directive
 > support comment-directives in `<template>`
 
-- :gear: This rule is included in all of `"plugin:vue/base"`, `"plugin:vue/essential"`, `"plugin:vue/strongly-recommended"` and `"plugin:vue/recommended"`.
+- :gear: This rule is included in all of `"plugin:vue/base"`, `"plugin:vue/essential"`, `"plugin:vue/vue3-essential"`, `"plugin:vue/strongly-recommended"`, `"plugin:vue/vue3-strongly-recommended"`, `"plugin:vue/recommended"` and `"plugin:vue/vue3-recommended"`.
 
 Sole purpose of this rule is to provide `eslint-disable` functionality in `<template>`.
 It supports usage of the following comments:
diff --git a/docs/rules/jsx-uses-vars.md b/docs/rules/jsx-uses-vars.md
index 3569bc008..d4af01828 100644
--- a/docs/rules/jsx-uses-vars.md
+++ b/docs/rules/jsx-uses-vars.md
@@ -7,7 +7,7 @@ description: prevent variables used in JSX to be marked as unused
 # vue/jsx-uses-vars
 > prevent variables used in JSX to be marked as unused
 
-- :gear: This rule is included in all of `"plugin:vue/base"`, `"plugin:vue/essential"`, `"plugin:vue/strongly-recommended"` and `"plugin:vue/recommended"`.
+- :gear: This rule is included in all of `"plugin:vue/base"`, `"plugin:vue/essential"`, `"plugin:vue/vue3-essential"`, `"plugin:vue/strongly-recommended"`, `"plugin:vue/vue3-strongly-recommended"`, `"plugin:vue/recommended"` and `"plugin:vue/vue3-recommended"`.
 
 Since 0.17.0 the ESLint `no-unused-vars` rule does not detect variables used in JSX ([see details](https://eslint.org/blog/2015/03/eslint-0.17.0-released#changes-to-jsxreact-handling)).
 This rule will find variables used in JSX and mark them as used.
diff --git a/package.json b/package.json
index c7dee9a4b..c6bde732b 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,8 @@
   ],
   "author": "Toru Nagashima (https://github.com/mysticatea)",
   "contributors": [
-    "Michał Sajnóg <msajnog93@gmail.com> (https://github.com/michalsnik)"
+    "Michał Sajnóg <msajnog93@gmail.com> (https://github.com/michalsnik)",
+    "Yosuke Ota (https://github.com/ota-meshi)"
   ],
   "license": "MIT",
   "repository": {
diff --git a/tools/update-docs.js b/tools/update-docs.js
index c978680d4..144acdc45 100644
--- a/tools/update-docs.js
+++ b/tools/update-docs.js
@@ -45,16 +45,14 @@ function formatItems (items) {
 }
 
 function getPresetIds (categoryIds) {
-  const subsetCategoryIds = categoryIds
-    .map(categoryId => {
-      for (const subsetCategoryId in presetCategories) {
-        if (presetCategories[subsetCategoryId] === categoryId) {
-          return subsetCategoryId
-        }
+  const subsetCategoryIds = []
+  for (const categoryId of categoryIds) {
+    for (const subsetCategoryId in presetCategories) {
+      if (presetCategories[subsetCategoryId] === categoryId) {
+        subsetCategoryIds.push(subsetCategoryId)
       }
-      return null
-    })
-    .filter(subsetCategoryId => !!subsetCategoryId)
+    }
+  }
   if (subsetCategoryIds.length === 0) {
     return categoryIds
   }