chore: restrict duplicated imports, support Vue SFC for eslint

diff --git a/eslint.config.js b/eslint.config.js
index 334787fd9886a367ff9b6ef2a7d7e19b19a30f69..2969bd18236ef568a36ff27644be716a1c68b944 100644 (file)
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -2,6 +2,7 @@ import importX from 'eslint-plugin-import-x'
 import tseslint from 'typescript-eslint'
 import vitest from 'eslint-plugin-vitest'
 import { builtinModules } from 'node:module'
+import vueParser from 'vue-eslint-parser'
 
 const DOMGlobals = ['window', 'document']
 const NodeGlobals = ['module', 'require']
@@ -14,7 +15,7 @@ const banConstEnum = {
 
 export default tseslint.config(
   {
-    files: ['**/*.js', '**/*.ts', '**/*.tsx'],
+    files: ['**/*.js', '**/*.ts', '**/*.tsx', '**/*.vue'],
     extends: [tseslint.configs.base],
     plugins: {
       'import-x': importX,
@@ -54,6 +55,7 @@ export default tseslint.config(
       ],
       'sort-imports': ['error', { ignoreDeclarationSort: true }],
 
+      'import-x/no-duplicates': 'error',
       'import-x/no-nodejs-modules': [
         'error',
         { allow: builtinModules.map(mod => `node:${mod}`) },
@@ -74,6 +76,16 @@ export default tseslint.config(
     },
   },
 
+  {
+    files: ['**/*.vue'],
+    languageOptions: {
+      parser: vueParser,
+      parserOptions: {
+        parser: '@typescript-eslint/parser',
+      },
+    },
+  },
+
   // tests, no restrictions (runs in Node / Vitest with jsdom)
   {
     files: ['**/__tests__/**', 'packages/dts-test/**'],

diff --git a/package.json b/package.json
index c89e2ff2821b2ac703ada36f2efef047f82350c0..aee9b37dd42dacad9106a42e1424bc9995c3a51e 100644 (file)
--- a/package.json
+++ b/package.json
@@ -111,7 +111,8 @@
     "typescript": "~5.4.5",
     "typescript-eslint": "^7.10.0",
     "vite": "^5.2.12",
-    "vitest": "^1.5.2"
+    "vitest": "^1.5.2",
+    "vue-eslint-parser": "^9.4.2"
   },
   "pnpm": {
     "peerDependencyRules": {

diff --git a/packages/dts-test/defineComponent.test-d.tsx b/packages/dts-test/defineComponent.test-d.tsx
index d2a39be2621370ea94263170c3273db96ec2a415..617182fc44f726f313d8d6c2bccf74d48e0cfc97 100644 (file)
--- a/packages/dts-test/defineComponent.test-d.tsx
+++ b/packages/dts-test/defineComponent.test-d.tsx
@@ -1,12 +1,19 @@
 import {
+  type AllowedComponentProps,
   type Component,
+  type ComponentCustomProps,
   type ComponentOptions,
+  type ComponentOptionsMixin,
   type ComponentPublicInstance,
+  type DefineComponent,
+  type EmitsOptions,
+  type ExtractPropTypes,
   type PropType,
   type SetupContext,
   type Slots,
   type SlotsType,
   type VNode,
+  type VNodeProps,
   createApp,
   defineComponent,
   h,
@@ -1505,16 +1512,6 @@ describe('withKeys and withModifiers as pro', () => {
   ;<input onKeydown={onKeydown} onClick={onClick} />
 })
 
-import type {
-  AllowedComponentProps,
-  ComponentCustomProps,
-  ComponentOptionsMixin,
-  DefineComponent,
-  EmitsOptions,
-  ExtractPropTypes,
-  VNodeProps,
-} from 'vue'
-
 // code generated by tsc / vue-tsc, make sure this continues to work
 // so we don't accidentally change the args order of DefineComponent
 declare const MyButton: DefineComponent<

diff --git a/packages/runtime-core/src/apiWatch.ts b/packages/runtime-core/src/apiWatch.ts
index bab9e0764f5b05f939d1f372c18b33adde11c8bf..5cd6e5c0fa4999815011e32bd86c5d9453c7e04a 100644 (file)
--- a/packages/runtime-core/src/apiWatch.ts
+++ b/packages/runtime-core/src/apiWatch.ts
@@ -38,8 +38,11 @@ import {
 } from './errorHandling'
 import { queuePostRenderEffect } from './renderer'
 import { warn } from './warning'
-import { DeprecationTypes } from './compat/compatConfig'
-import { checkCompatEnabled, isCompatEnabled } from './compat/compatConfig'
+import {
+  DeprecationTypes,
+  checkCompatEnabled,
+  isCompatEnabled,
+} from './compat/compatConfig'
 import type { ObjectWatchOptionItem } from './componentOptions'
 import { useSSRContext } from './helpers/useSsrContext'
 

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 65b952b0b51ea84c9dc6739b2edb086e684b840a..a4b19f2d2a9f4209113174212b3b8cd90bc56035 100644 (file)
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -18,7 +18,13 @@ import {
   isPromise,
   isString,
 } from '@vue/shared'
-import { type Ref, isRef } from '@vue/reactivity'
+import {
+  type ComputedGetter,
+  type Ref,
+  type WritableComputedOptions,
+  isRef,
+  reactive,
+} from '@vue/reactivity'
 import { computed } from './apiComputed'
 import {
   type WatchCallback,
@@ -43,11 +49,6 @@ import {
   onUnmounted,
   onUpdated,
 } from './apiLifecycle'
-import {
-  type ComputedGetter,
-  type WritableComputedOptions,
-  reactive,
-} from '@vue/reactivity'
 import type {
   ComponentObjectPropsOptions,
   ComponentPropsOptions,

diff --git a/packages/runtime-core/src/componentProps.ts b/packages/runtime-core/src/componentProps.ts
index 5a4292b6f36d8630f0b23bf23c2399ac8ad52677..1b6fc2e74ea8be40afbf828a70246bf57e4f655b 100644 (file)
--- a/packages/runtime-core/src/componentProps.ts
+++ b/packages/runtime-core/src/componentProps.ts
@@ -35,8 +35,11 @@ import {
 import { isEmitListener } from './componentEmits'
 import type { AppContext } from './apiCreateApp'
 import { createPropsDefaultThis } from './compat/props'
-import { isCompatEnabled, softAssertCompatEnabled } from './compat/compatConfig'
-import { DeprecationTypes } from './compat/compatConfig'
+import {
+  DeprecationTypes,
+  isCompatEnabled,
+  softAssertCompatEnabled,
+} from './compat/compatConfig'
 import { shouldSkipAttr } from './compat/attrsFallthrough'
 import { createInternalObject } from './internalObject'
 

diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index 94b2985040acfeadf07ce890e0de470b2d5f5d3d..1e58ffae207b0ad276968b557a5704c6254a5384 100644 (file)
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -384,17 +384,17 @@ export const ssrUtils = (__SSR__ ? _ssrUtils : null) as typeof _ssrUtils
 
 // 2.x COMPAT ------------------------------------------------------------------
 
-import { DeprecationTypes as _DeprecationTypes } from './compat/compatConfig'
-export type { CompatVue } from './compat/global'
-export type { LegacyConfig } from './compat/globalConfig'
-
-import { warnDeprecation } from './compat/compatConfig'
-import { createCompatVue } from './compat/global'
 import {
+  DeprecationTypes as _DeprecationTypes,
   checkCompatEnabled,
   isCompatEnabled,
   softAssertCompatEnabled,
+  warnDeprecation,
 } from './compat/compatConfig'
+export type { CompatVue } from './compat/global'
+export type { LegacyConfig } from './compat/globalConfig'
+
+import { createCompatVue } from './compat/global'
 import { resolveFilter as _resolveFilter } from './helpers/resolveAssets'
 import { NOOP } from '@vue/shared'
 

diff --git a/packages/runtime-core/src/renderer.ts b/packages/runtime-core/src/renderer.ts
index 542341b13e8f5add69e47f976aea54aecad20475..9a79b007210a285661b4d3b24e2120e9a8122a71 100644 (file)
--- a/packages/runtime-core/src/renderer.ts
+++ b/packages/runtime-core/src/renderer.ts
@@ -70,8 +70,7 @@ import {
 } from './devtools'
 import { initFeatureFlags } from './featureFlags'
 import { isAsyncWrapper } from './apiAsyncComponent'
-import { isCompatEnabled } from './compat/compatConfig'
-import { DeprecationTypes } from './compat/compatConfig'
+import { DeprecationTypes, isCompatEnabled } from './compat/compatConfig'
 import type { TransitionHooks } from './components/BaseTransition'
 
 export interface Renderer<HostElement = RendererElement> {

diff --git a/packages/server-renderer/src/helpers/ssrRenderAttrs.ts b/packages/server-renderer/src/helpers/ssrRenderAttrs.ts
index 5a7baaac3a2013b8e5b52899e8c48f53938bba35..94070f31685d0e3e6d99cb00fde3fd84ab670b8c 100644 (file)
--- a/packages/server-renderer/src/helpers/ssrRenderAttrs.ts
+++ b/packages/server-renderer/src/helpers/ssrRenderAttrs.ts
@@ -1,19 +1,17 @@
 import {
   escapeHtml,
-  isRenderableAttrValue,
-  isSVGTag,
-  stringifyStyle,
-} from '@vue/shared'
-import {
   includeBooleanAttr,
   isBooleanAttr,
   isOn,
+  isRenderableAttrValue,
   isSSRSafeAttrName,
+  isSVGTag,
   isString,
   makeMap,
   normalizeClass,
   normalizeStyle,
   propsToAttrMap,
+  stringifyStyle,
 } from '@vue/shared'
 
 // leading comma for empty string ""

diff --git a/packages/sfc-playground/src/App.vue b/packages/sfc-playground/src/App.vue
index 4b62519ce6ecf1cb9d06dc37302155ed44129409..83eae6d599884c479eb84f6970cf771d98c2c1d3 100644 (file)
--- a/packages/sfc-playground/src/App.vue
+++ b/packages/sfc-playground/src/App.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import Header from './Header.vue'
-import { Repl, useStore, SFCOptions, useVueImportMap } from '@vue/repl'
+import { Repl, type SFCOptions, useStore, useVueImportMap } from '@vue/repl'
 import Monaco from '@vue/repl/monaco-editor'
-import { ref, watchEffect, onMounted, computed } from 'vue'
+import { computed, onMounted, ref, watchEffect } from 'vue'
 
 const replRef = ref<InstanceType<typeof Repl>>()
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0b5c87a9860986128977f03d5f9da2accb269208..8eb861aecf18d98471ee92fe4bc22465349a4f5f 100644 (file)
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -167,6 +167,9 @@ importers:
       vitest:
         specifier: ^1.5.2
         version: 1.5.2(@types/node@20.14.0)(jsdom@24.0.0)(sass@1.77.4)(terser@5.31.0)
+      vue-eslint-parser:
+        specifier: ^9.4.2
+        version: 9.4.2(eslint@9.3.0)
 
   packages/compiler-core:
     dependencies:
@@ -1798,6 +1801,10 @@ packages:
       vitest:
         optional: true
 
+  eslint-scope@7.2.2:
+    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
   eslint-scope@8.0.1:
     resolution: {integrity: sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1819,6 +1826,10 @@ packages:
     resolution: {integrity: sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  espree@9.6.1:
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
   esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
@@ -3440,6 +3451,12 @@ packages:
     resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
     engines: {node: '>=0.10.0'}
 
+  vue-eslint-parser@9.4.2:
+    resolution: {integrity: sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==}
+    engines: {node: ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '>=6.0.0'
+
   w3c-xmlserializer@5.0.0:
     resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
     engines: {node: '>=18'}
@@ -4904,7 +4921,7 @@ snapshots:
 
   eslint-plugin-vitest@0.5.4(eslint@9.3.0)(typescript@5.4.5)(vitest@1.5.2(@types/node@20.14.0)(jsdom@24.0.0)(sass@1.77.4)(terser@5.31.0)):
     dependencies:
-      '@typescript-eslint/utils': 7.8.0(eslint@9.3.0)(typescript@5.4.5)
+      '@typescript-eslint/utils': 7.10.0(eslint@9.3.0)(typescript@5.4.5)
       eslint: 9.3.0
     optionalDependencies:
       vitest: 1.5.2(@types/node@20.14.0)(jsdom@24.0.0)(sass@1.77.4)(terser@5.31.0)
@@ -4912,6 +4929,11 @@ snapshots:
       - supports-color
       - typescript
 
+  eslint-scope@7.2.2:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
   eslint-scope@8.0.1:
     dependencies:
       esrecurse: 4.3.0
@@ -4966,6 +4988,12 @@ snapshots:
       acorn-jsx: 5.3.2(acorn@8.11.3)
       eslint-visitor-keys: 4.0.0
 
+  espree@9.6.1:
+    dependencies:
+      acorn: 8.11.3
+      acorn-jsx: 5.3.2(acorn@8.11.3)
+      eslint-visitor-keys: 3.4.3
+
   esprima@4.0.1: {}
 
   esquery@1.5.0:
@@ -6643,6 +6671,19 @@ snapshots:
 
   void-elements@3.1.0: {}
 
+  vue-eslint-parser@9.4.2(eslint@9.3.0):
+    dependencies:
+      debug: 4.3.4
+      eslint: 9.3.0
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.3
+      espree: 9.6.1
+      esquery: 1.5.0
+      lodash: 4.17.21
+      semver: 7.6.2
+    transitivePeerDependencies:
+      - supports-color
+
   w3c-xmlserializer@5.0.0:
     dependencies:
       xml-name-validator: 5.0.0