diff --git a/.eslintrc.js b/.eslintrc.js index f088cf8c0..ba10fd132 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -10,6 +10,8 @@ module.exports = { plugins: ['jsdoc', 'import'], extends: [ 'eslint:recommended', + 'plugin:import/recommended', + 'plugin:import/typescript', 'plugin:vue/vue3-recommended', '@vue/eslint-config-typescript/recommended', '@vue/eslint-config-prettier', @@ -22,6 +24,18 @@ module.exports = { tsx: true, }, }, + settings: { + 'import/resolver': { + 'eslint-import-resolver-custom-alias': { + alias: { + '@idux': './packages', + '@tests': './tests', + }, + extensions: ['.js', '.jsx', '.mjs', '.ts', '.tsx', '.vue', '.md'], + packages: ['packages/*'], + }, + }, + }, globals: { defineProps: 'readonly', defineEmits: 'readonly', diff --git a/package.json b/package.json index 63369d3b6..896d73b27 100644 --- a/package.json +++ b/package.json @@ -94,6 +94,7 @@ "cz-conventional-changelog": "^3.3.0", "esbuild": "^0.14.38", "eslint": "^8.14.0", + "eslint-import-resolver-custom-alias": "^1.3.0", "eslint-plugin-header": "^3.1.1", "eslint-plugin-import": "^2.26.0", "eslint-plugin-jsdoc": "^37.9.7", diff --git a/packages/cdk/index.ts b/packages/cdk/index.ts index 55ebb8dbe..41a518ce6 100644 --- a/packages/cdk/index.ts +++ b/packages/cdk/index.ts @@ -32,7 +32,7 @@ const install = (app: App): void => { const installer = { install, version } export default installer -export { install, version } +export { install } export * from '@idux/cdk/a11y' export * from '@idux/cdk/breakpoint' diff --git a/packages/components/card/style/index.ts b/packages/components/card/style/index.ts deleted file mode 100644 index 0a49222b4..000000000 --- a/packages/components/card/style/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import '../../style/index.less' -import './index.less' - -// style dependencies -import '../../button/style' -import '../../grid/style' -import '../../header/style' diff --git a/packages/components/date-picker/style/themes/default.ts b/packages/components/date-picker/style/themes/default.ts index 0f840c2f1..5fe0979a8 100644 --- a/packages/components/date-picker/style/themes/default.ts +++ b/packages/components/date-picker/style/themes/default.ts @@ -2,6 +2,6 @@ import '@idux/components/style/core/default' import '@idux/components/_private/overlay/style/themes/default' import '@idux/components/icon/style/themes/default' -import '@idux-vue2/components/input/style/themes/default' +import '@idux/components/input/style/themes/default' import './default.less' diff --git a/packages/components/index.ts b/packages/components/index.ts index 46ab3dcab..9009d8326 100644 --- a/packages/components/index.ts +++ b/packages/components/index.ts @@ -180,7 +180,7 @@ const install = (app: App): void => { const installer = { install, version } export default installer -export { install, version } +export { install } export * from '@idux/components/affix' export * from '@idux/components/alert' diff --git a/packages/components/transfer/style/themes/default.ts b/packages/components/transfer/style/themes/default.ts index c051ab970..f3f00abfd 100644 --- a/packages/components/transfer/style/themes/default.ts +++ b/packages/components/transfer/style/themes/default.ts @@ -1,5 +1,5 @@ // style dependencies -import '@idux/components/_private/checkable-list/style/default' +import '@idux/components/_private/checkable-list/style/themes/default' import '@idux/components/style/core/default' import '@idux/components/checkbox/style/themes/default' import '@idux/components/empty/style/themes/default' diff --git a/packages/components/transfer/style/themes/seer.ts b/packages/components/transfer/style/themes/seer.ts index f466705ca..80634d76c 100644 --- a/packages/components/transfer/style/themes/seer.ts +++ b/packages/components/transfer/style/themes/seer.ts @@ -1,5 +1,5 @@ // style dependencies -import '@idux/components/_private/checkable-list/style/seer' +import '@idux/components/_private/checkable-list/style/themes/seer' import '@idux/components/style/core/seer' import '@idux/components/checkbox/style/themes/seer' import '@idux/components/empty/style/themes/seer' diff --git a/packages/components/upload/style/index.ts b/packages/components/upload/style/index.ts deleted file mode 100644 index 9b1835dc1..000000000 --- a/packages/components/upload/style/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import '../../style/index.less' -import './index.less' - -// style dependencies diff --git a/packages/pro/index.ts b/packages/pro/index.ts index ac18df904..b4049e3fe 100644 --- a/packages/pro/index.ts +++ b/packages/pro/index.ts @@ -29,7 +29,7 @@ const install = (app: App): void => { const installer = { install, version } export default installer -export { install, version } +export { install } export * from '@idux/pro/layout' export * from '@idux/pro/transfer' diff --git a/packages/pro/tree/style/themes/default.ts b/packages/pro/tree/style/themes/default.ts index e93db1f65..8f3ebc42e 100644 --- a/packages/pro/tree/style/themes/default.ts +++ b/packages/pro/tree/style/themes/default.ts @@ -1,7 +1,7 @@ // style dependencies import '@idux/pro/style/core/default' -import '@idux-vue2/components/icon/style/themes/default' -import '@idux-vue2/components/button/style/themes/default' -import '@idux-vue2/components/divider/style/themes/default' +import '@idux/components/icon/style/themes/default' +import '@idux/components/button/style/themes/default' +import '@idux/components/divider/style/themes/default' import './default.less' diff --git a/packages/pro/tree/style/themes/seer.ts b/packages/pro/tree/style/themes/seer.ts index 9d737d967..566288a51 100644 --- a/packages/pro/tree/style/themes/seer.ts +++ b/packages/pro/tree/style/themes/seer.ts @@ -1,7 +1,7 @@ // style dependencies import '@idux/pro/style/core/seer' -import '@idux-vue2/components/icon/style/themes/seer' -import '@idux-vue2/components/button/style/themes/seer' -import '@idux-vue2/components/divider/style/themes/seer' +import '@idux/components/icon/style/themes/seer' +import '@idux/components/button/style/themes/seer' +import '@idux/components/divider/style/themes/seer' import './seer.less' diff --git a/packages/site/vite.config.ts b/packages/site/vite.config.ts index 085b625ec..d2506a7af 100644 --- a/packages/site/vite.config.ts +++ b/packages/site/vite.config.ts @@ -2,6 +2,7 @@ import { resolve } from 'path' import vuePlugin from '@vitejs/plugin-vue' import vueJsxPlugin from '@vitejs/plugin-vue-jsx' +// eslint-disable-next-line import/no-unresolved import Components from 'unplugin-vue-components/vite' import { defineConfig } from 'vite'