diff --git a/build/vite/cdn.ts b/build/vite/cdn.ts deleted file mode 100644 index 0538e1a4e286646d73c023c0500bca4b0e23e0ef..0000000000000000000000000000000000000000 --- a/build/vite/cdn.ts +++ /dev/null @@ -1,21 +0,0 @@ -const css = ['//cdn.bootcdn.net/ajax/libs/nprogress/0.2.0/nprogress.min.css']; - -// TODO use esm? -const js = [ - '//cdn.bootcdn.net/ajax/libs/vue/3.0.0/vue.global.prod.js', - '//cdn.bootcdn.net/ajax/libs/vue-router/4.0.0-beta.13/vue-router.global.min.js', - '//cdn.bootcdn.net/ajax/libs/vuex/4.0.0-beta.4/vuex.global.prod.js', - '//cdn.bootcdn.net/ajax/libs/axios/0.19.2/axios.min.js', - '//cdn.bootcdn.net/ajax/libs/qs/6.9.4/qs.min.js', - '//cdn.bootcdn.net/ajax/libs/nprogress/0.2.0/nprogress.min.js', - // '//cdn.bootcdn.net/ajax/libs/lodash.js/4.17.15/lodash.min.js', - // '//cdn.bootcdn.net/ajax/libs/crypto-js/3.3.0/crypto-js.min.js', - // '//cdn.bootcdn.net/ajax/libs/vue-i18n/8.18.1/vue-i18n.min.js', -]; - -export const externals = ['vue', 'vuex', 'vue-router', 'axios', 'qs', 'nprogress']; - -export const cdnConf = { - css, - js, -}; diff --git a/build/vite/plugin/dynamicImport/index.ts b/build/vite/plugin/dynamicImport/index.ts index 6be898291bf4d4307558f3824f3ceea3166e3d22..2f179ad7ee872b17342468568be572fbeacc07bf 100644 --- a/build/vite/plugin/dynamicImport/index.ts +++ b/build/vite/plugin/dynamicImport/index.ts @@ -17,7 +17,10 @@ const dynamicImportTransform = function (env: any = {}): Transform { return { test({ path }) { // Only convert the file - return path.includes('/src/utils/helper/dynamicImport.ts'); + return ( + path.includes('/src/utils/helper/dynamicImport.ts') || + path.includes(`\\src\\utils\\helper\\dynamicImport.ts`) + ); }, transform({ code }) { const { VITE_DYNAMIC_IMPORT } = env; diff --git a/src/utils/helper/dynamicImport.ts b/src/utils/helper/dynamicImport.ts index 34e5b08af83d4a3e6c616d182247eae2e8d7ba15..a1738a7226c72a077a73ff5c0ed8431057d19e21 100644 --- a/src/utils/helper/dynamicImport.ts +++ b/src/utils/helper/dynamicImport.ts @@ -1,3 +1,4 @@ +// The content here is just for type approval. The actual file content is overwritten by transform export default function (id: string) { const dynamicImportModule: any = id; return dynamicImportModule; diff --git a/src/utils/helper/routeHelper.ts b/src/utils/helper/routeHelper.ts index d06ed0b3fdcc2b18f9309d7ef9a8881afde0fab4..05abb69378d85ad0d6ab78104ddba4f09d563566 100644 --- a/src/utils/helper/routeHelper.ts +++ b/src/utils/helper/routeHelper.ts @@ -53,7 +53,6 @@ export function genRouteModule(moduleList: AppRouteModule[]) { } // 动态引入 -// TODO 错误写法 function asyncImportRoute(routes: AppRouteRecordRaw[] | undefined) { if (!routes) return; routes.forEach((item) => { diff --git a/yarn.lock b/yarn.lock index f784858f67afe5baa96881d2916992ef82dde57d..451468cae033b2c841726a2066f21fde04e09616 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6944,7 +6944,7 @@ rollup@^1.31.1: "@types/node" "*" acorn "^7.1.0" -rollup@^2.32.1: +rollup@^2.32.1, rollup@^2.33.1: version "2.33.1" resolved "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz#802795164164ee63cd47769d8879c33ec8ae0c40" integrity sha512-uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w== @@ -8162,6 +8162,14 @@ vfile@^4.0.0: unist-util-stringify-position "^2.0.0" vfile-message "^2.0.0" +vite-plugin-cdn@^1.0.0-beta.3: + version "1.0.0-beta.3" + resolved "https://registry.npmjs.org/vite-plugin-cdn/-/vite-plugin-cdn-1.0.0-beta.3.tgz#5846e80debba5e3968169931f5cba86aea5701cd" + integrity sha512-1oepxSSr8rROFhyP93EWVasKHAAbGfp3QyUrUmJW/zU80CvFPyHATckk8vy08pMiulErSqATjfofTJ+TxP4wkw== + dependencies: + lodash "^4.17.20" + rollup "^2.33.1" + vite-plugin-html@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.npmjs.org/vite-plugin-html/-/vite-plugin-html-1.0.0-beta.2.tgz#f30cdba4ca70469e62b770e32c407ce5d7f9b544"