Merge branch 'master' into script-indent/new

# Conflicts:
#	lib/rules/html-indent.js
#	tests/lib/rules/html-indent.js

Author: mysticatea

Diff for: README.md

@@ -6,14 +6,6 @@
 
 > Official ESLint plugin for Vue.js
 
-## :exclamation: Attention - this is documentation for version `4.x` :exclamation:
-
-This branch contains `eslint-plugin-vue@next` which is a pre-released `4.0`, but it's not the default version that you get with `npm install eslint-plugin-vue`. In order to install this you need to specify either `"eslint-plugin-vue": "next"` in `package.json` or do `npm install eslint-plugin-vue@next`.
-
-Please try it and report any issues that you might have encountered.
-
-If you want to check previous releases [go here](https://github.com/vuejs/eslint-plugin-vue/releases).
-
 ## :art: Playground on the Web
 
 You can try this plugin on the Web.
@@ -28,7 +20,7 @@ You can try this plugin on the Web.
 ## :cd: Installation
 
 ```bash
-npm install --save-dev eslint eslint-plugin-vue@next
+npm install --save-dev eslint eslint-plugin-vue
 ```
 
 ## :rocket: Usage

Diff for: lib/rules/no-side-effects-in-computed-properties.js

@@ -27,7 +27,7 @@ function create (context) {
       // this.xxx.func()
       'CallExpression' (node) {
         const code = context.getSourceCode().getText(node)
-        const MUTATION_REGEX = /(this.)((?!(concat|slice|map|filter)\().)*((push|pop|shift|unshift|reverse|splice|sort|copyWithin|fill)\()/g
+        const MUTATION_REGEX = /(this.)((?!(concat|slice|map|filter)\().)[^\)]*((push|pop|shift|unshift|reverse|splice|sort|copyWithin|fill)\()/g
 
         if (MUTATION_REGEX.test(code)) {
           forbiddenNodes.push(node)

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-vue",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0",
   "description": "Official ESLint plugin for Vue.js",
   "main": "lib/index.js",
   "scripts": {
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "require-all": "^2.2.0",
-    "vue-eslint-parser": "^2.0.1-beta.1"
+    "vue-eslint-parser": "^2.0.1"
   },
   "devDependencies": {
     "@types/node": "^4.2.16",

Diff for: tests/lib/rules/no-side-effects-in-computed-properties.js

@@ -73,6 +73,14 @@ ruleTester.run('no-side-effects-in-computed-properties', rule, {
                 test: 'example'
               }
             }
+          },
+          test9() {
+            return Object.keys(this.a).sort()
+          },
+          test10: {
+            get() {
+              return Object.keys(this.a).sort()
+            }
           }
         }
       })`,
@@ -144,6 +152,9 @@ ruleTester.run('no-side-effects-in-computed-properties', rule, {
             this.something[index] = thing[index]
             return this.something
           },
+          test6() {
+            return this.something.keys.sort()
+          }
         }
       })`,
       parserOptions,
@@ -165,6 +176,9 @@ ruleTester.run('no-side-effects-in-computed-properties', rule, {
       }, {
         line: 21,
         message: 'Unexpected side effect in "test5" computed property.'
+      }, {
+        line: 25,
+        message: 'Unexpected side effect in "test6" computed property.'
       }]
     },
     {