feat: uni-use and uni-promises clash

uni-helper · Feb 1, 2024 · a078f83 · a078f83
1 parent 2100f73
commit a078f83
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 29 deletions.
diff --git a/template/config/jsconfig.json.data.mjs → template/base/jsconfig.json.data.mjs b/template/config/jsconfig.json.data.mjs → template/base/jsconfig.json.data.mjs
diff --git a/template/config/jsconfig.json.ejs → template/base/jsconfig.json.ejs b/template/config/jsconfig.json.ejs → template/base/jsconfig.json.ejs
diff --git a/template/base/vite.config.js.data.mjs b/template/base/vite.config.js.data.mjs
@@ -5,5 +5,6 @@ export default function getData() {
       importer: 'import uni from \'@dcloudio/vite-plugin-uni\'',
       initializer: 'uni()',
     }],
+    extraConfig: null,
   }
 }
diff --git a/template/base/vite.config.js.ejs b/template/base/vite.config.js.ejs
@@ -19,6 +19,6 @@ export default defineConfig({
   <%_ } _%>
   ],
   <%_ if (extraConfig) { _%>
-  <%- extraConfig _%>,
+  <%- extraConfig.data _%>,
   <%_ } _%>
 })
diff --git a/template/model/uniPromises/src/main.js.data.mjs b/template/model/uniPromises/src/main.js.data.mjs
@@ -1,15 +1,17 @@
 export default function getData({ oldData }) {
-  const uniUsePlugin = {
-    id: 'uniUse',
+  const uniPromisesPlugin = {
+    id: 'uniPromises',
     importer: `import 'core-js/actual/array/iterator';
 import 'core-js/actual/promise';
 import 'core-js/actual/object/assign';
 import 'core-js/actual/promise/finally';`,
   }
   return {
     ...oldData,
-    plugins: oldData.plugins.flatMap(plugin =>
-      plugin.id === 'vue' ? [uniUsePlugin, plugin] : plugin,
-    ),
+    plugins: oldData.plugins.some(item => item.id === 'uniUse')
+      ? oldData.plugins
+      : oldData.plugins.flatMap(plugin =>
+        plugin.id === 'vue' ? [plugin, uniPromisesPlugin] : plugin,
+      ),
   }
 }
diff --git a/template/model/uniPromises/vite.config.js.data.mjs b/template/model/uniPromises/vite.config.js.data.mjs
@@ -1,18 +1,16 @@
 export default function getData({ oldData }) {
   const promisesextraConfig = {
     id: 'uniPromises',
-    extraConfig: `build: {
-      target: 'es6',
-      cssTarget: 'chrome61', // https://cn.vitejs.dev/config/build-options.html#build-csstarget
-    },
-    optimizeDeps: {
-      exclude: ['vue-demi'],
-    }`,
+    data: `build: {
+    target: 'es6',
+    cssTarget: 'chrome61', // https://cn.vitejs.dev/config/build-options.html#build-csstarget
+  },
+  optimizeDeps: {
+    exclude: ['vue-demi'],
+  }`,
   }
   return {
     ...oldData,
-    extraConfig: oldData.extraConfig.flatMap(config =>
-      config.id === 'uniUse' ? [...config, ...promisesextraConfig] : config,
-    ),
+    extraConfig: oldData?.extraConfig?.id === 'uniUse' ? oldData.extraConfig : promisesextraConfig,
   }
 }
diff --git a/template/model/uniUse/src/main.js.data.mjs b/template/model/uniUse/src/main.js.data.mjs
@@ -8,8 +8,10 @@ import 'core-js/actual/promise/finally';`,
   }
   return {
     ...oldData,
-    plugins: oldData.plugins.flatMap(plugin =>
-      plugin.id === 'vue' ? [uniUsePlugin, plugin] : plugin,
-    ),
+    plugins: oldData.plugins.some(item => item.id === 'uniPromises')
+      ? oldData.plugins
+      : oldData.plugins.flatMap(plugin =>
+        plugin.id === 'vue' ? [plugin, uniUsePlugin] : plugin,
+      ),
   }
 }
diff --git a/template/model/uniUse/vite.config.js.data.mjs b/template/model/uniUse/vite.config.js.data.mjs
@@ -1,18 +1,16 @@
 export default function getData({ oldData }) {
   const uniUseextraConfig = {
     id: 'uniUse',
-    extraConfig: `build: {
-      target: 'es6',
-      cssTarget: 'chrome61', // https://cn.vitejs.dev/config/build-options.html#build-csstarget
-    },
-    optimizeDeps: {
-      exclude: ['vue-demi'],
-    }`,
+    data: `build: {
+    target: 'es6',
+    cssTarget: 'chrome61', // https://cn.vitejs.dev/config/build-options.html#build-csstarget
+  },
+  optimizeDeps: {
+    exclude: ['vue-demi'],
+  }`,
   }
   return {
     ...oldData,
-    extraConfig: oldData.extraConfig.flatMap(config =>
-      config.id === 'uniPromises' ? [...config, ...uniUseextraConfig] : config,
-    ),
+    extraConfig: uniUseextraConfig,
   }
 }