Browse Source

fix: fix win system dynamicImport error

vben 4 years ago
parent
commit
a90d93fc4d

+ 0 - 21
build/vite/cdn.ts

@@ -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,
-};

+ 4 - 1
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;

+ 1 - 0
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;

+ 0 - 1
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) => {

+ 9 - 1
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"