docs/rules/script-indent.md

@@ -115,6 +115,7 @@ This rule only checks `.vue` files and does not interfere with other `.js` files
 
 - [indent](https://eslint.org/docs/rules/indent)
 - [vue/html-indent](./html-indent.md)
+- [@typescript-eslint/indent](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/indent.md). The `vue/script-indent` rule does not understand TypeScript AST. Please use `@typescript-eslint/indent` rule instead of this one inside of `<script lang="ts"`
 
 ## :mag: Implementation
 

lib/rules/no-async-in-computed-properties.js

@@ -73,7 +73,7 @@ module.exports = {
 
   create (context) {
     const forbiddenNodes = []
-    const allowedScopes = []
+    let scopeStack = { upper: null, body: null }
 
     const expressionTypes = {
       promise: 'asynchronous action',
@@ -87,65 +87,54 @@ module.exports = {
       if (node.async) {
         forbiddenNodes.push({
           node: node,
-          type: 'async'
+          type: 'async',
+          targetBody: node.body
         })
-      } else if (node.parent.type === 'ReturnStatement') {
-        allowedScopes.push(node)
       }
+
+      scopeStack = { upper: scopeStack, body: node.body }
     }
 
+    function onFunctionExit () {
+      scopeStack = scopeStack.upper
+    }
     return Object.assign({},
       {
-        FunctionDeclaration: onFunctionEnter,
-
-        FunctionExpression: onFunctionEnter,
-
-        ArrowFunctionExpression: onFunctionEnter,
+        ':function': onFunctionEnter,
+        ':function:exit': onFunctionExit,
 
         NewExpression (node) {
           if (node.callee.name === 'Promise') {
             forbiddenNodes.push({
               node: node,
-              type: 'new'
+              type: 'new',
+              targetBody: scopeStack.body
             })
-          } else if (node.parent.type === 'ReturnStatement') {
-            allowedScopes.push(node)
           }
         },
 
         CallExpression (node) {
           if (isPromise(node)) {
             forbiddenNodes.push({
               node: node,
-              type: 'promise'
+              type: 'promise',
+              targetBody: scopeStack.body
             })
           } else if (isTimedFunction(node)) {
             forbiddenNodes.push({
               node: node,
-              type: 'timed'
+              type: 'timed',
+              targetBody: scopeStack.body
             })
-          } else if (node.parent.type === 'ReturnStatement') {
-            allowedScopes.push(node)
           }
         },
 
         AwaitExpression (node) {
           forbiddenNodes.push({
             node: node,
-            type: 'await'
+            type: 'await',
+            targetBody: scopeStack.body
           })
-        },
-
-        'ReturnStatement' (node) {
-          if (
-            node.argument &&
-            (
-              node.argument.type === 'ObjectExpression' ||
-              node.argument.type === 'ArrayExpression'
-            )
-          ) {
-            allowedScopes.push(node.argument)
-          }
         }
       },
       utils.executeOnVue(context, (obj) => {
@@ -157,10 +146,7 @@ module.exports = {
               cp.value &&
               el.node.loc.start.line >= cp.value.loc.start.line &&
               el.node.loc.end.line <= cp.value.loc.end.line &&
-              !allowedScopes.some(scope =>
-                scope.range[0] < el.node.range[0] &&
-                scope.range[1] > el.node.range[1]
-              )
+              el.targetBody === cp.value
             ) {
               context.report({
                 node: el.node,

lib/rules/no-multi-spaces.js

@@ -46,7 +46,7 @@ module.exports = {
         if (context.parserServices.getTemplateBodyTokenStore == null) {
           context.report({
             loc: { line: 1, column: 0 },
-            message: 'Use the latest vue-eslint-parser. See also https://vuejs.github.io/eslint-plugin-vue/user-guide/#what-is-the-use-the-latest-vue-eslint-parser-error.'
+            message: 'Use the latest vue-eslint-parser. See also https://eslint.vuejs.org/user-guide/#what-is-the-use-the-latest-vue-eslint-parser-error.'
           })
           return
         }

lib/rules/require-prop-type-constructor.js

@@ -35,14 +35,23 @@ module.exports = {
 
   create (context) {
     const fix = node => fixer => {
+      let newText
       if (node.type === 'Literal') {
-        return fixer.replaceText(node, node.value)
+        if (typeof node.value !== 'string') {
+          return undefined
+        }
+        newText = node.value
       } else if (
         node.type === 'TemplateLiteral' &&
         node.expressions.length === 0 &&
         node.quasis.length === 1
       ) {
-        return fixer.replaceText(node, node.quasis[0].value.cooked)
+        newText = node.quasis[0].value.cooked
+      } else {
+        return undefined
+      }
+      if (newText) {
+        return fixer.replaceText(node, newText)
       }
     }
 
@@ -58,7 +67,7 @@ module.exports = {
         })
       } else if (node.type === 'ArrayExpression') {
         node.elements
-          .filter(prop => isForbiddenType(prop))
+          .filter(prop => prop && isForbiddenType(prop))
           .forEach(prop => context.report({
             node: prop,
             message,

lib/utils/index.js

@@ -55,7 +55,7 @@ module.exports = {
     if (context.parserServices.defineTemplateBodyVisitor == null) {
       context.report({
         loc: { line: 1, column: 0 },
-        message: 'Use the latest vue-eslint-parser. See also https://vuejs.github.io/eslint-plugin-vue/user-guide/#what-is-the-use-the-latest-vue-eslint-parser-error'
+        message: 'Use the latest vue-eslint-parser. See also https://eslint.vuejs.org/user-guide/#what-is-the-use-the-latest-vue-eslint-parser-error'
       })
       return {}
     }
@@ -115,7 +115,7 @@ module.exports = {
       meta: Object.assign({}, coreRule.meta, {
         docs: Object.assign({}, coreRule.meta.docs, {
           category,
-          url: `https://vuejs.github.io/eslint-plugin-vue/rules/${path.basename(coreRule.meta.docs.url || '')}.html`
+          url: `https://eslint.vuejs.org/rules/${path.basename(coreRule.meta.docs.url || '')}.html`
         })
       })
     }
@@ -453,6 +453,7 @@ module.exports = {
         })
     } else {
       props = propsNode.value.elements
+        .filter(prop => prop)
         .map(prop => {
           const key = prop.type === 'Literal' && typeof prop.value === 'string' ? prop : null
           return { key, value: null, node: prop, propName: key != null ? prop.value : null }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-vue",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Official ESLint plugin for Vue.js",
   "main": "lib/index.js",
   "scripts": {
@@ -56,8 +56,9 @@
     "chai": "^4.1.0",
     "eslint": "^6.0.0",
     "eslint-plugin-eslint-plugin": "^2.0.1",
-    "eslint-plugin-vue-libs": "^4.0.0",
+    "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-vue": "file:.",
+    "eslint-plugin-vue-libs": "^4.0.0",
     "eslint4b": "^6.6.0",
     "lodash": "^4.17.4",
     "mocha": "^5.2.0",

tests/lib/rules/no-async-in-computed-properties.js

@@ -181,6 +181,49 @@ ruleTester.run('no-async-in-computed-properties', rule, {
         }
       `,
       parserOptions
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        export default {
+            computed: {
+                foo() {
+                    return this.bar
+                      ? {
+                          baz:() => Promise.resolve(1)
+                        }
+                      : {}
+                }
+            }
+        }
+      `,
+      parserOptions
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        export default {
+            computed: {
+                foo() {
+                    return this.bar ? () => Promise.resolve(1) : null
+                }
+            }
+        }
+      `,
+      parserOptions
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        export default {
+            computed: {
+                foo() {
+                    return this.bar ? async () => 1 : null
+                }
+            }
+        }
+      `,
+      parserOptions
     }
   ],