From 2a44e0c784aaa7ce53ab8611482f0608975b6d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sajn=C3=B3g?= <msajnog93@gmail.com>
Date: Wed, 25 Jul 2018 00:28:03 +0200
Subject: [PATCH 1/2] (Chore) Update configs

---
 README.md                                     | 20 +++++++++++++------
 docs/rules/html-closing-bracket-newline.md    |  1 +
 docs/rules/html-closing-bracket-spacing.md    |  1 +
 docs/rules/no-confusing-v-for-v-if.md         |  1 +
 docs/rules/no-use-v-if-with-v-for.md          |  2 ++
 docs/rules/no-v-html.md                       |  2 ++
 docs/rules/prop-name-casing.md                |  1 +
 .../require-meta-docs-url.js                  |  2 +-
 lib/configs/recommended.js                    |  3 ++-
 lib/configs/strongly-recommended.js           |  3 +++
 lib/rules/attributes-order.js                 |  2 +-
 lib/rules/html-closing-bracket-newline.js     |  2 +-
 lib/rules/html-closing-bracket-spacing.js     |  2 +-
 lib/rules/no-confusing-v-for-v-if.js          |  4 +++-
 lib/rules/no-use-v-if-with-v-for.js           |  2 +-
 lib/rules/no-v-html.js                        |  2 +-
 lib/rules/prop-name-casing.js                 |  5 ++---
 17 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index f0798eb06..ff2fad9ce 100644
--- a/README.md
+++ b/README.md
@@ -190,6 +190,8 @@ Enforce all the rules in this category, as well as all higher priority rules, wi
 |    | Rule ID | Description |
 |:---|:--------|:------------|
 | :wrench: | [vue/attribute-hyphenation](./docs/rules/attribute-hyphenation.md) | enforce attribute naming style on custom components in template |
+| :wrench: | [vue/html-closing-bracket-newline](./docs/rules/html-closing-bracket-newline.md) | require or disallow a line break before tag's closing brackets |
+| :wrench: | [vue/html-closing-bracket-spacing](./docs/rules/html-closing-bracket-spacing.md) | require or disallow a space before tag's closing brackets |
 | :wrench: | [vue/html-end-tags](./docs/rules/html-end-tags.md) | enforce end tag style |
 | :wrench: | [vue/html-indent](./docs/rules/html-indent.md) | enforce consistent indentation in `<template>` |
 | :wrench: | [vue/html-self-closing](./docs/rules/html-self-closing.md) | enforce self-closing style |
@@ -197,6 +199,7 @@ Enforce all the rules in this category, as well as all higher priority rules, wi
 | :wrench: | [vue/mustache-interpolation-spacing](./docs/rules/mustache-interpolation-spacing.md) | enforce unified spacing in mustache interpolations |
 | :wrench: | [vue/name-property-casing](./docs/rules/name-property-casing.md) | enforce specific casing for the name property in Vue components |
 | :wrench: | [vue/no-multi-spaces](./docs/rules/no-multi-spaces.md) | disallow multiple spaces |
+| :wrench: | [vue/prop-name-casing](./docs/rules/prop-name-casing.md) | enforce specific casing for the Prop name in Vue components |
 |  | [vue/require-default-prop](./docs/rules/require-default-prop.md) | require default value for props |
 |  | [vue/require-prop-types](./docs/rules/require-prop-types.md) | require type definitions in props |
 | :wrench: | [vue/v-bind-style](./docs/rules/v-bind-style.md) | enforce `v-bind` directive style |
@@ -216,7 +219,8 @@ Enforce all the rules in this category, as well as all higher priority rules, wi
 |:---|:--------|:------------|
 | :wrench: | [vue/attributes-order](./docs/rules/attributes-order.md) | enforce order of attributes |
 | :wrench: | [vue/html-quotes](./docs/rules/html-quotes.md) | enforce quotes style of HTML attributes |
-|  | [vue/no-confusing-v-for-v-if](./docs/rules/no-confusing-v-for-v-if.md) | disallow confusing `v-for` and `v-if` on the same element |
+|  | [vue/no-use-v-if-with-v-for](./docs/rules/no-use-v-if-with-v-for.md) | disallow use v-if on the same element as v-for |
+|  | [vue/no-v-html](./docs/rules/no-v-html.md) | disallow use of v-html to prevent XSS attack |
 | :wrench: | [vue/order-in-components](./docs/rules/order-in-components.md) | enforce order of properties in components |
 |  | [vue/this-in-template](./docs/rules/this-in-template.md) | enforce usage of `this` in template |
 
@@ -224,13 +228,17 @@ Enforce all the rules in this category, as well as all higher priority rules, wi
 
 |    | Rule ID | Description |
 |:---|:--------|:------------|
-| :wrench: | [vue/html-closing-bracket-newline](./docs/rules/html-closing-bracket-newline.md) | require or disallow a line break before tag's closing brackets |
-| :wrench: | [vue/html-closing-bracket-spacing](./docs/rules/html-closing-bracket-spacing.md) | require or disallow a space before tag's closing brackets |
-|  | [vue/no-use-v-if-with-v-for](./docs/rules/no-use-v-if-with-v-for.md) | disallow use v-if on the same element as v-for |
-|  | [vue/no-v-html](./docs/rules/no-v-html.md) | disallow use of v-html to prevent XSS attack |
-| :wrench: | [vue/prop-name-casing](./docs/rules/prop-name-casing.md) | enforce specific casing for the Prop name in Vue components |
 | :wrench: | [vue/script-indent](./docs/rules/script-indent.md) | enforce consistent indentation in `<script>` |
 
+### Deprecated
+
+> - :warning: We're going to remove deprecated rules in the next major release. Please migrate to successor/new rules.
+> - :innocent: We don't fix bugs which are in deprecated rules since we don't have enough resources.
+
+| Rule ID | Replaced by |
+|:--------|:------------|
+| [vue/no-confusing-v-for-v-if](./docs/rules/no-confusing-v-for-v-if.md) | [vue/no-use-v-if-with-v-for](./docs/rules/no-use-v-if-with-v-for.md) |
+
 <!--RULES_TABLE_END-->
 
 ## :couple: FAQ
diff --git a/docs/rules/html-closing-bracket-newline.md b/docs/rules/html-closing-bracket-newline.md
index 4658611e0..1fad0fea9 100644
--- a/docs/rules/html-closing-bracket-newline.md
+++ b/docs/rules/html-closing-bracket-newline.md
@@ -1,5 +1,6 @@
 # require or disallow a line break before tag's closing brackets (vue/html-closing-bracket-newline)
 
+- :gear: This rule is included in `"plugin:vue/strongly-recommended"` and `"plugin:vue/recommended"`.
 - :wrench: The `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the problems reported by this rule.
 
 People have own preference about the location of closing brackets.
diff --git a/docs/rules/html-closing-bracket-spacing.md b/docs/rules/html-closing-bracket-spacing.md
index ee3be2837..96720b62f 100644
--- a/docs/rules/html-closing-bracket-spacing.md
+++ b/docs/rules/html-closing-bracket-spacing.md
@@ -1,5 +1,6 @@
 # require or disallow a space before tag's closing brackets (vue/html-closing-bracket-spacing)
 
+- :gear: This rule is included in `"plugin:vue/strongly-recommended"` and `"plugin:vue/recommended"`.
 - :wrench: The `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the problems reported by this rule.
 
 This rule enforces consistent spacing style before closing brackets `>` of tags.
diff --git a/docs/rules/no-confusing-v-for-v-if.md b/docs/rules/no-confusing-v-for-v-if.md
index 282306a05..edb561291 100644
--- a/docs/rules/no-confusing-v-for-v-if.md
+++ b/docs/rules/no-confusing-v-for-v-if.md
@@ -1,6 +1,7 @@
 # disallow confusing `v-for` and `v-if` on the same element (vue/no-confusing-v-for-v-if)
 
 - :gear: This rule is included in `"plugin:vue/recommended"`.
+- :warning: This rule was **deprecated** and replaced by [vue/no-use-v-if-with-v-for](no-use-v-if-with-v-for.md) rule.
 
 > When they exist on the same node, `v-for` has a higher priority than `v-if`. That means the `v-if` will be run on each iteration of the loop separately.
 >
diff --git a/docs/rules/no-use-v-if-with-v-for.md b/docs/rules/no-use-v-if-with-v-for.md
index e8987af74..04845a07e 100644
--- a/docs/rules/no-use-v-if-with-v-for.md
+++ b/docs/rules/no-use-v-if-with-v-for.md
@@ -1,5 +1,7 @@
 # disallow use v-if on the same element as v-for (vue/no-use-v-if-with-v-for)
 
+- :gear: This rule is included in `"plugin:vue/recommended"`.
+
 > Never use `v-if` on the same element as `v-for`.
 >
 > There are two common cases where this can be tempting:
diff --git a/docs/rules/no-v-html.md b/docs/rules/no-v-html.md
index 84df87342..a5494a2fc 100644
--- a/docs/rules/no-v-html.md
+++ b/docs/rules/no-v-html.md
@@ -1,5 +1,7 @@
 # disallow use of v-html to prevent XSS attack (vue/no-v-html)
 
+- :gear: This rule is included in `"plugin:vue/recommended"`.
+
 This rule reports use of `v-html` directive in order to reduce the risk of injecting potentially unsafe / unescaped html into the browser leading to Cross Side Scripting (XSS) attacks.
 
 ## :book: Rule Details
diff --git a/docs/rules/prop-name-casing.md b/docs/rules/prop-name-casing.md
index b02473529..848850631 100644
--- a/docs/rules/prop-name-casing.md
+++ b/docs/rules/prop-name-casing.md
@@ -1,5 +1,6 @@
 # enforce specific casing for the Prop name in Vue components (vue/prop-name-casing)
 
+- :gear: This rule is included in `"plugin:vue/strongly-recommended"` and `"plugin:vue/recommended"`.
 - :wrench: The `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the problems reported by this rule.
 
 This rule would enforce proper casing of props in vue components(camelCase).
diff --git a/eslint-internal-rules/require-meta-docs-url.js b/eslint-internal-rules/require-meta-docs-url.js
index 1eb9d9ffb..14a4a9f1a 100644
--- a/eslint-internal-rules/require-meta-docs-url.js
+++ b/eslint-internal-rules/require-meta-docs-url.js
@@ -112,7 +112,7 @@ function getRuleInfo (ast) {
       return currentExports
     }, {})
 
-  return Object.prototype.hasOwnProperty.call(exportNodes, 'create') && isNormalFunctionExpression(exportNodes.create)
+  return Object.prototype.hasOwnProperty.call(exportNodes, 'create')
     ? Object.assign({ isNewStyle: !exportsIsFunction, meta: null }, exportNodes)
     : null
 }
diff --git a/lib/configs/recommended.js b/lib/configs/recommended.js
index aad9a5405..50541d0c1 100644
--- a/lib/configs/recommended.js
+++ b/lib/configs/recommended.js
@@ -8,7 +8,8 @@ module.exports = {
   rules: {
     'vue/attributes-order': 'error',
     'vue/html-quotes': 'error',
-    'vue/no-confusing-v-for-v-if': 'error',
+    'vue/no-use-v-if-with-v-for': 'error',
+    'vue/no-v-html': 'error',
     'vue/order-in-components': 'error',
     'vue/this-in-template': 'error'
   }
diff --git a/lib/configs/strongly-recommended.js b/lib/configs/strongly-recommended.js
index 993c78d31..53acc859f 100644
--- a/lib/configs/strongly-recommended.js
+++ b/lib/configs/strongly-recommended.js
@@ -7,6 +7,8 @@ module.exports = {
   extends: require.resolve('./essential'),
   rules: {
     'vue/attribute-hyphenation': 'error',
+    'vue/html-closing-bracket-newline': 'error',
+    'vue/html-closing-bracket-spacing': 'error',
     'vue/html-end-tags': 'error',
     'vue/html-indent': 'error',
     'vue/html-self-closing': 'error',
@@ -14,6 +16,7 @@ module.exports = {
     'vue/mustache-interpolation-spacing': 'error',
     'vue/name-property-casing': 'error',
     'vue/no-multi-spaces': 'error',
+    'vue/prop-name-casing': 'error',
     'vue/require-default-prop': 'error',
     'vue/require-prop-types': 'error',
     'vue/v-bind-style': 'error',
diff --git a/lib/rules/attributes-order.js b/lib/rules/attributes-order.js
index 6faa60502..18bdc7b6a 100644
--- a/lib/rules/attributes-order.js
+++ b/lib/rules/attributes-order.js
@@ -116,7 +116,7 @@ module.exports = {
     docs: {
       description: 'enforce order of attributes',
       category: 'recommended',
-      url: 'https://github.com/vuejs/eslint-plugin-vue/blob/v4.5.0/docs/rules/attributes-order.md'
+      url: 'https://github.com/vuejs/eslint-plugin-vue/blob/v5.0.0-beta.0/docs/rules/attributes-order.md'
     },
     fixable: 'code',
     schema: {
diff --git a/lib/rules/html-closing-bracket-newline.js b/lib/rules/html-closing-bracket-newline.js
index 554acc753..cac03a5ba 100644
--- a/lib/rules/html-closing-bracket-newline.js
+++ b/lib/rules/html-closing-bracket-newline.js
@@ -31,7 +31,7 @@ module.exports = {
   meta: {
     docs: {
       description: "require or disallow a line break before tag's closing brackets",
-      category: undefined,
+      category: 'strongly-recommended',
       url: 'https://github.com/vuejs/eslint-plugin-vue/blob/v5.0.0-beta.0/docs/rules/html-closing-bracket-newline.md'
     },
     fixable: 'whitespace',
diff --git a/lib/rules/html-closing-bracket-spacing.js b/lib/rules/html-closing-bracket-spacing.js
index b3c56a0f0..c50488b31 100644
--- a/lib/rules/html-closing-bracket-spacing.js
+++ b/lib/rules/html-closing-bracket-spacing.js
@@ -52,7 +52,7 @@ module.exports = {
   meta: {
     docs: {
       description: 'require or disallow a space before tag\'s closing brackets',
-      category: undefined,
+      category: 'strongly-recommended',
       url: 'https://github.com/vuejs/eslint-plugin-vue/blob/v5.0.0-beta.0/docs/rules/html-closing-bracket-spacing.md'
     },
     schema: [{
diff --git a/lib/rules/no-confusing-v-for-v-if.js b/lib/rules/no-confusing-v-for-v-if.js
index 4d2d98f53..6a25a6e7c 100644
--- a/lib/rules/no-confusing-v-for-v-if.js
+++ b/lib/rules/no-confusing-v-for-v-if.js
@@ -39,8 +39,10 @@ module.exports = {
     docs: {
       description: 'disallow confusing `v-for` and `v-if` on the same element',
       category: 'recommended',
-      url: 'https://github.com/vuejs/eslint-plugin-vue/blob/v5.0.0-beta.0/docs/rules/no-confusing-v-for-v-if.md'
+      url: 'https://github.com/vuejs/eslint-plugin-vue/blob/v5.0.0-beta.0/docs/rules/no-confusing-v-for-v-if.md',
+      replacedBy: ['no-use-v-if-with-v-for']
     },
+    deprecated: true,
     fixable: null,
     schema: []
   },
diff --git a/lib/rules/no-use-v-if-with-v-for.js b/lib/rules/no-use-v-if-with-v-for.js
index a4937e974..4f1b517d5 100644
--- a/lib/rules/no-use-v-if-with-v-for.js
+++ b/lib/rules/no-use-v-if-with-v-for.js
@@ -51,7 +51,7 @@ module.exports = {
   meta: {
     docs: {
       description: 'disallow use v-if on the same element as v-for',
-      category: undefined,
+      category: 'recommended',
       url: 'https://github.com/vuejs/eslint-plugin-vue/blob/v5.0.0-beta.0/docs/rules/no-use-v-if-with-v-for.md'
     },
     fixable: null,
diff --git a/lib/rules/no-v-html.js b/lib/rules/no-v-html.js
index 3c81eb8de..9bbd8ec56 100644
--- a/lib/rules/no-v-html.js
+++ b/lib/rules/no-v-html.js
@@ -13,7 +13,7 @@ module.exports = {
   meta: {
     docs: {
       description: 'disallow use of v-html to prevent XSS attack',
-      category: undefined,
+      category: 'recommended',
       url: 'https://github.com/vuejs/eslint-plugin-vue/blob/v5.0.0-beta.0/docs/rules/no-v-html.md'
     },
     fixable: null,
diff --git a/lib/rules/prop-name-casing.js b/lib/rules/prop-name-casing.js
index a728a6cf4..adf49af1d 100644
--- a/lib/rules/prop-name-casing.js
+++ b/lib/rules/prop-name-casing.js
@@ -90,8 +90,8 @@ module.exports = {
   meta: {
     docs: {
       description: 'enforce specific casing for the Prop name in Vue components',
-      category: undefined, // 'strongly-recommended'
-      url: 'https://github.com/vuejs/eslint-plugin-vue/blob/v4.5.0/docs/rules/prop-name-casing.md'
+      category: 'strongly-recommended',
+      url: 'https://github.com/vuejs/eslint-plugin-vue/blob/v5.0.0-beta.0/docs/rules/prop-name-casing.md'
     },
     fixable: 'code',  // null or "code" or "whitespace"
     schema: [
@@ -100,6 +100,5 @@ module.exports = {
       }
     ]
   },
-
   create
 }

From 221ee055ee85e2b31e096e28a644efd282c76ddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sajn=C3=B3g?= <msajnog93@gmail.com>
Date: Wed, 25 Jul 2018 00:36:21 +0200
Subject: [PATCH 2/2] (Chore) Update base config, remove root

---
 lib/configs/base.js         | 6 ++----
 tools/update-lib-configs.js | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/configs/base.js b/lib/configs/base.js
index 54e002758..81789e991 100644
--- a/lib/configs/base.js
+++ b/lib/configs/base.js
@@ -4,14 +4,12 @@
  * in order to update it's content execute "npm run update"
  */
 module.exports = {
-  root: true,
   parser: require.resolve('vue-eslint-parser'),
   parserOptions: {
-    ecmaVersion: 2015,
+    ecmaVersion: 2018,
     sourceType: 'module',
     ecmaFeatures: {
-      jsx: true,
-      experimentalObjectRestSpread: true
+      jsx: true
     }
   },
   env: {
diff --git a/tools/update-lib-configs.js b/tools/update-lib-configs.js
index 2eb90c514..2d7e2a685 100644
--- a/tools/update-lib-configs.js
+++ b/tools/update-lib-configs.js
@@ -30,14 +30,12 @@ function formatCategory (category, prevCategory) {
  * in order to update it's content execute "npm run update"
  */
 module.exports = {
-  root: true,
   parser: require.resolve('vue-eslint-parser'),
   parserOptions: {
-    ecmaVersion: 2015,
+    ecmaVersion: 2018,
     sourceType: 'module',
     ecmaFeatures: {
       jsx: true,
-      experimentalObjectRestSpread: true
     }
   },
   env: {