Update eslint and eslint-plugin-vue

vuejs · Feb 18, 2023 · 77ac337 · 77ac337
1 parent 18b4322
commit 77ac337
Show file tree

Hide file tree

Showing 14 changed files with 333 additions and 422 deletions.
diff --git a/server/package.json b/server/package.json
@@ -22,22 +22,25 @@
   },
   "homepage": "https://github.com/vuejs/vetur/tree/master/server",
   "dependencies": {
-    "eslint": "^7.32.0",
-    "eslint-plugin-vue": "^7.19.1",
+    "eslint": "^8.34.0",
+    "eslint-plugin-vue": "^9.9.0",
     "prettier": "^2.8.4",
     "pug-lexer": "^5.0.1",
     "tslint": "6.1.3",
     "typescript": "^4.9.5"
   },
   "resolutions": {
-    "typescript": "^4.9.5"
+    "typescript": "^4.9.5",
+    "@types/eslint": "8.21.1",
+    "@types/estree": "1.0.0"
   },
   "devDependencies": {
     "@prettier/plugin-pug": "^2.4.1",
     "@starptech/prettyhtml": "^0.10.0",
-    "@types/eslint": "7.2.2",
-    "@types/eslint-scope": "^3.7.1",
-    "@types/eslint-visitor-keys": "^1.0.0",
+    "@types/eslint": "8.21.1",
+    "@types/eslint-scope": "^3.7.4",
+    "@types/eslint-visitor-keys": "^3.3.0",
+    "@types/estree": "1.0.0",
     "@types/glob": "^8.0.1",
     "@types/js-beautify": "1.13.3",
     "@types/lodash": "^4.14.176",
@@ -59,7 +62,7 @@
     "nuxt-helper-json": "^1.0.0",
     "nyc": "^15.1.0",
     "parse-gitignore": "^2.0.0",
-    "prettier-eslint": "^13.0.0",
+    "prettier-eslint": "^15.0.1",
     "prettier-tslint": "^0.4.2",
     "rollup": "^3.17.0",
     "sass-formatter": "^0.7.6",
@@ -73,7 +76,7 @@
     "vscode-languageserver-types": "3.16.0",
     "vscode-uri": "^3.0.7",
     "vscode-web-custom-data": "^0.3.6",
-    "vue-eslint-parser": "^8.0.1",
+    "vue-eslint-parser": "^9.1.0",
     "vue-onsenui-helper-json": "^1.0.2"
   },
   "scripts": {

diff --git a/server/src/modes/plugins/autoImportSfcPlugin.ts b/server/src/modes/plugins/autoImportSfcPlugin.ts
@@ -82,7 +82,13 @@ export function createAutoImportSfcPlugin(
 
   function getNoDuplicateComponentName(childComponents: ChildComponent[], componentCompletionName: string) {
     let index = 1;
-    while (childComponents.some(el => el.name.toLowerCase() === componentCompletionName.toLowerCase())) {
+    while (
+      childComponents.some(el =>
+        [componentCompletionName, componentCompletionName.toLowerCase(), kebabCase(componentCompletionName)].includes(
+          el.name
+        )
+      )
+    ) {
       componentCompletionName = `${componentCompletionName}${index++}`;
     }
     return upperFirst(componentCompletionName);

diff --git a/server/yarn.lock b/server/yarn.lock
diff --git a/test/interpolation/features/diagnostics/basic.test.ts b/test/interpolation/features/diagnostics/basic.test.ts
@@ -255,8 +255,8 @@ describe('Should find template-diagnostics in <template> region', () => {
   });
 
   const noErrorTests: string[] = [
-    'class.vue',
-    'style.vue',
+    'class-in-template.vue',
+    'style-in-template.vue',
     'hyphen-attrs.vue',
     'template-literal.vue',
     'no-implicit-any-parameters.vue',

diff --git a/...terpolation/fixture/diagnostics/class.vue → ...fixture/diagnostics/class-in-template.vue b/...terpolation/fixture/diagnostics/class.vue → ...fixture/diagnostics/class-in-template.vue
diff --git a/...terpolation/fixture/diagnostics/style.vue → ...fixture/diagnostics/style-in-template.vue b/...terpolation/fixture/diagnostics/style.vue → ...fixture/diagnostics/style-in-template.vue
diff --git a/test/lsp/features/completion/autoImport.test.ts b/test/lsp/features/completion/autoImport.test.ts
@@ -17,12 +17,12 @@ describe('Should import vue component to script in template', () => {
       position(3, 5),
       [
         {
-          label: 'child',
+          label: 'child-comp',
           documentationStart: 'child component description'
         },
         {
-          label: 'child',
-          documentationStart: '\n```typescript\nimport Child from'
+          label: 'child-comp',
+          documentationStart: '\n```typescript\nimport ChildComp from'
         }
       ],
       ei => result => {
@@ -75,10 +75,13 @@ describe('Should import vue component to script in template', () => {
       position(2, 5),
       [
         {
-          label: 'child',
+          label: 'child-comp',
           additionalTextEdits: [
-            textEdit(sameLineRange(7, 0, 0), `import Child from '../template/childComponent/Child.vue'${NEW_LINE}`),
-            textEdit(sameLineRange(7, 16, 16), `${NEW_LINE}  components: { Child },`)
+            textEdit(
+              sameLineRange(7, 0, 0),
+              `import ChildComp from '../template/childComponent/ChildComp.vue'${NEW_LINE}`
+            ),
+            textEdit(sameLineRange(7, 16, 16), `${NEW_LINE}  components: { ChildComp },`)
           ]
         }
       ],
@@ -92,13 +95,13 @@ describe('Should import vue component to script in template', () => {
       position(3, 5),
       [
         {
-          label: 'child',
+          label: 'child-comp',
           additionalTextEdits: [
             textEdit(
               sameLineRange(8, 0, 0),
-              `import Child1 from '../../diagnostics/noScriptRegion/Child.vue'${NEW_LINE}`
+              `import ChildComp1 from '../../diagnostics/noScriptRegion/ChildComp.vue'${NEW_LINE}`
             ),
-            textEdit(sameLineRange(12, 9, 9), `,${NEW_LINE}    Child1`)
+            textEdit(sameLineRange(12, 13, 13), `,${NEW_LINE}    ChildComp1`)
           ]
         }
       ],
@@ -118,7 +121,7 @@ describe('Should import vue component to script in template', () => {
           label: 'es-lint',
           additionalTextEdits: [
             textEdit(sameLineRange(8, 0, 0), `import ESLint from '../../diagnostics/ESLint.vue'${NEW_LINE}`),
-            textEdit(sameLineRange(12, 9, 9), `,${NEW_LINE}    ESLint`)
+            textEdit(sameLineRange(12, 13, 13), `,${NEW_LINE}    ESLint`)
           ]
         }
       ],
@@ -138,7 +141,7 @@ describe('Should import vue component to script in template', () => {
           label: 'kebab-case',
           additionalTextEdits: [
             textEdit(sameLineRange(9, 0, 0), `import KebabCase from './kebab-case.vue'${NEW_LINE}`),
-            textEdit(sameLineRange(12, 9, 9), `,${NEW_LINE}    KebabCase`)
+            textEdit(sameLineRange(12, 13, 13), `,${NEW_LINE}    KebabCase`)
           ]
         }
       ],

diff --git a/test/lsp/features/diagnostics/noScriptRegion.test.ts b/test/lsp/features/diagnostics/noScriptRegion.test.ts
@@ -2,8 +2,8 @@ import { testNoDiagnostics } from '../../../diagnosticHelper';
 import { getDocUri } from '../../path';
 
 describe('Should find no error when <script> is not present', () => {
-  const childUri = getDocUri('diagnostics/noScriptRegion/Child.vue');
-  const parentUri = getDocUri('diagnostics/noScriptRegion/Parent.vue');
+  const childUri = getDocUri('diagnostics/noScriptRegion/ChildComp.vue');
+  const parentUri = getDocUri('diagnostics/noScriptRegion/ParentComp.vue');
 
   it('shows no diagnostics error for component without <script> region', async () => {
     await testNoDiagnostics(childUri);

diff --git a/test/lsp/fixture/completion/autoImport/defineInOneLine.vue b/test/lsp/fixture/completion/autoImport/defineInOneLine.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import Child from '../template/childComponent/Child.vue'
+import Child from '../template/childComponent/ChildComp.vue'
 export default {
   components: {Child},
   data () {

diff --git a/test/lsp/fixture/completion/autoImport/sameComponentName.vue b/test/lsp/fixture/completion/autoImport/sameComponentName.vue
@@ -1,16 +1,16 @@
 <template>
   <div>
-    <child />
+    <child-comp />
     <
   </div>
 </template>
 
 <script>
-import Child from '../template/childComponent/Child.vue'
+import ChildComp from '../template/childComponent/ChildComp.vue'
 
 export default {
   components: {
-    Child,
+    ChildComp,
     
   }
 }

diff --git a/...pletion/template/childComponent/Child.vue → ...ion/template/childComponent/ChildComp.vue b/...pletion/template/childComponent/Child.vue → ...ion/template/childComponent/ChildComp.vue
@@ -7,7 +7,7 @@
  * child component description
  */
 export default {
-  name: 'child',
+  name: 'childComp',
   props: {
     /**
      * First attr
@@ -17,4 +17,4 @@ export default {
     }
   }
 };
-</script>
+</script>
diff --git a/test/lsp/fixture/completion/template/childComponent/Parent.vue b/test/lsp/fixture/completion/template/childComponent/Parent.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import ChildComp from './Child.vue'
+import ChildComp from './ChildComp.vue'
 
 export default {
   components: {

diff --git a/...ture/diagnostics/noScriptRegion/Child.vue → .../diagnostics/noScriptRegion/ChildComp.vue b/...ture/diagnostics/noScriptRegion/Child.vue → .../diagnostics/noScriptRegion/ChildComp.vue
diff --git a/...ure/diagnostics/noScriptRegion/Parent.vue → ...diagnostics/noScriptRegion/ParentComp.vue b/...ure/diagnostics/noScriptRegion/Parent.vue → ...diagnostics/noScriptRegion/ParentComp.vue
@@ -3,11 +3,11 @@
 </template>
 
 <script>
-import Child from './Child.vue'
+import ChildComp from './ChildComp.vue'
 
 export default {
   components: {
-    Child
+    ChildComp
   }
 }
 </script>