From 71a1f94eb7836512d98c334108d759075f435867 Mon Sep 17 00:00:00 2001 From: Sendya <18x@loacg.com> Date: Wed, 6 Apr 2022 10:54:37 +0800 Subject: [PATCH] fix: tsconfig move --- .eslintrc.cjs | 6 ++-- env.d.ts | 1 + pnpm-lock.yaml | 65 +++++++++++++++++++++++++++++++-------- tsconfig.vite-config.json | 8 +++++ tsconfig.vitest.json | 9 ++++++ 5 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 env.d.ts create mode 100644 tsconfig.vite-config.json create mode 100644 tsconfig.vitest.json diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 2b44ef66..a00b2225 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -1,5 +1,5 @@ /* eslint-env node */ -require('@rushstack/eslint-patch/modern-module-resolution') +require('@rushstack/eslint-patch/modern-module-resolution'); module.exports = { root: true, @@ -13,8 +13,8 @@ module.exports = { 'vue/setup-compiler-macros': true, }, rules: { - 'prettier/prettier': ['error', { semi: false, singleQuote: true, printWidth: 120 }], + 'prettier/prettier': ['error', { semi: true, singleQuote: true, printWidth: 120 }], // 临时关掉 '@typescript-eslint/no-explicit-any': 'off', }, -} +}; diff --git a/env.d.ts b/env.d.ts new file mode 100644 index 00000000..11f02fe2 --- /dev/null +++ b/env.d.ts @@ -0,0 +1 @@ +/// diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c11c58b9..f2f542fd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,6 +40,46 @@ importers: vitest: 0.5.8_jsdom@19.0.0 vue-tsc: 0.31.4_typescript@4.5.5 + packages/pro-field: + specifiers: + '@rushstack/eslint-patch': ^1.1.0 + '@types/jsdom': ^16.2.14 + '@types/node': ^16.11.25 + '@vitejs/plugin-vue': ^2.2.2 + '@vitejs/plugin-vue-jsx': ^1.3.7 + '@vue/eslint-config-prettier': ^7.0.0 + '@vue/eslint-config-typescript': ^10.0.0 + '@vue/test-utils': ^2.0.0-rc.18 + '@vue/tsconfig': ^0.1.3 + eslint: ^8.5.0 + eslint-plugin-vue: ^8.2.0 + jsdom: ^19.0.0 + prettier: ^2.5.1 + typescript: ~4.5.5 + vite: ^2.8.4 + vitest: ^0.5.0 + vue: ^3.2.31 + vue-tsc: ^0.31.4 + devDependencies: + '@rushstack/eslint-patch': 1.1.0 + '@types/jsdom': 16.2.14 + '@types/node': 16.11.26 + '@vitejs/plugin-vue': 2.2.2_vite@2.8.6+vue@3.2.31 + '@vitejs/plugin-vue-jsx': 1.3.8 + '@vue/eslint-config-prettier': 7.0.0_eslint@8.9.0+prettier@2.5.1 + '@vue/eslint-config-typescript': 10.0.0_cd100ca74b8c3cfb64acbb3ff997764b + '@vue/test-utils': 2.0.0-rc.18_vue@3.2.31 + '@vue/tsconfig': 0.1.3_@types+node@16.11.26 + eslint: 8.9.0 + eslint-plugin-vue: 8.4.1_eslint@8.9.0 + jsdom: 19.0.0 + prettier: 2.5.1 + typescript: 4.5.5 + vite: 2.8.6 + vitest: 0.5.8_jsdom@19.0.0 + vue: 3.2.31 + vue-tsc: 0.31.4_typescript@4.5.5 + packages/pro-layout: specifiers: '@ant-design/icons-vue': ^6.0.1 @@ -54,7 +94,7 @@ importers: '@vue/eslint-config-typescript': ^10.0.0 '@vue/test-utils': ^2.0.0-rc.18 '@vue/tsconfig': ^0.1.3 - ant-design-vue: ^3.1.0-rc.4 + ant-design-vue: ^3.1.0 eslint: ^8.5.0 eslint-plugin-prettier: ^4.0.0 eslint-plugin-vue: ^8.2.0 @@ -70,7 +110,7 @@ importers: vue-tsc: ^0.31.4 dependencies: '@ant-design/icons-vue': 6.0.1_vue@3.2.31 - ant-design-vue: 3.1.0-rc.4_vue@3.2.31 + ant-design-vue: 3.1.0_vue@3.2.31 omit.js: 2.0.2 vue: 3.2.31 vue-router: 4.0.12_vue@3.2.31 @@ -1002,14 +1042,12 @@ packages: magic-string: 0.25.7 postcss: 8.4.6 source-map: 0.6.1 - dev: false /@vue/compiler-ssr/3.2.31: resolution: {integrity: sha512-mjN0rqig+A8TVDnsGPYJM5dpbjlXeHUm2oZHZwGyMYiGT/F4fhJf/cXy8QpjnLQK4Y9Et4GWzHn9PS8AHUnSkw==} dependencies: '@vue/compiler-dom': 3.2.31 '@vue/shared': 3.2.31 - dev: false /@vue/devtools-api/6.0.11: resolution: {integrity: sha512-0X7/3plmtdBFAG0dS5u1utBsA2++E/TJxWQlnlUydP/21q71CCn/F4b0ir49us/Cn8mzemednIL8ZMjX/boiQw==} @@ -1052,7 +1090,6 @@ packages: '@vue/shared': 3.2.31 estree-walker: 2.0.2 magic-string: 0.25.7 - dev: false /@vue/reactivity/3.2.31: resolution: {integrity: sha512-HVr0l211gbhpEKYr2hYe7hRsV91uIVGFYNHj73njbARVGHQvIojkImKMaZNDdoDZOIkMsBc9a1sMqR+WZwfSCw==} @@ -1064,7 +1101,6 @@ packages: dependencies: '@vue/reactivity': 3.2.31 '@vue/shared': 3.2.31 - dev: false /@vue/runtime-dom/3.2.31: resolution: {integrity: sha512-N+o0sICVLScUjfLG7u9u5XCjvmsexAiPt17GNnaWHJUfsKed5e85/A3SWgKxzlxx2SW/Hw7RQxzxbXez9PtY3g==} @@ -1072,7 +1108,6 @@ packages: '@vue/runtime-core': 3.2.31 '@vue/shared': 3.2.31 csstype: 2.6.19 - dev: false /@vue/server-renderer/3.2.31_vue@3.2.31: resolution: {integrity: sha512-8CN3Zj2HyR2LQQBHZ61HexF5NReqngLT3oahyiVRfSSvak+oAvVmu8iNLSu6XR77Ili2AOpnAt1y8ywjjqtmkg==} @@ -1082,7 +1117,6 @@ packages: '@vue/compiler-ssr': 3.2.31 '@vue/shared': 3.2.31 vue: 3.2.31 - dev: false /@vue/shared/3.2.31: resolution: {integrity: sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==} @@ -1196,8 +1230,8 @@ packages: color-convert: 2.0.1 dev: true - /ant-design-vue/3.1.0-rc.4_vue@3.2.31: - resolution: {integrity: sha512-OfXiLF5yshdwJcAiW3rIYg49SwDL9B74GHo0+yqrqW+sZkVbezUy5wNAWlqywCvhT9exE8eclgCSlPJGmvyv2w==} + /ant-design-vue/3.1.0_vue@3.2.31: + resolution: {integrity: sha512-PmfR0kkbdq8pmz9U7AriYjYmn7VvIk/RCFowwmiqdsGmYfGnOkEbAA6uOM/9DzTxuVoqmff+AZyHPhs8ZTBk7w==} peerDependencies: vue: '>=3.2.0' dependencies: @@ -1451,7 +1485,6 @@ packages: /csstype/2.6.19: resolution: {integrity: sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==} - dev: false /data-urls/3.0.1: resolution: {integrity: sha512-Ds554NeT5Gennfoo9KN50Vh6tpgtvYEwraYjejXnyTpu1C7oXKxdFk75REooENHE8ndTVOJuv+BEs4/J/xcozw==} @@ -2176,9 +2209,16 @@ packages: slash: 3.0.0 dev: true + /graceful-fs/4.2.10: + resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} + requiresBuild: true + dev: true + optional: true + /graceful-fs/4.2.9: resolution: {integrity: sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==} requiresBuild: true + dev: false /has-flag/3.0.0: resolution: {integrity: sha1-tdRU3CGZriJWmfNGfloH87lVuv0=} @@ -2492,7 +2532,7 @@ packages: tslib: 2.3.1 optionalDependencies: errno: 0.1.8 - graceful-fs: 4.2.9 + graceful-fs: 4.2.10 image-size: 0.5.5 make-dir: 2.1.0 mime: 1.6.0 @@ -3464,7 +3504,6 @@ packages: '@vue/runtime-dom': 3.2.31 '@vue/server-renderer': 3.2.31_vue@3.2.31 '@vue/shared': 3.2.31 - dev: false /w3c-hr-time/1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} diff --git a/tsconfig.vite-config.json b/tsconfig.vite-config.json new file mode 100644 index 00000000..d20d8726 --- /dev/null +++ b/tsconfig.vite-config.json @@ -0,0 +1,8 @@ +{ + "extends": "@vue/tsconfig/tsconfig.node.json", + "include": ["vite.config.*"], + "compilerOptions": { + "composite": true, + "types": ["node", "vitest"] + } +} diff --git a/tsconfig.vitest.json b/tsconfig.vitest.json new file mode 100644 index 00000000..d080d611 --- /dev/null +++ b/tsconfig.vitest.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.app.json", + "exclude": [], + "compilerOptions": { + "composite": true, + "lib": [], + "types": ["node", "jsdom"] + } +}