From 1ca3ddc0dad8a7e20d2ac4c5969eb5cb4c809d53 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Mon, 19 Dec 2022 18:28:39 +0800
Subject: [PATCH] fix(mp): regeneratorRuntime remove global define

---
 .../lib/configure-webpack.js                  | 37 ++++++++++++-------
 .../@babel/runtime/regenerator/index.js       |  4 ++
 2 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 packages/vue-cli-plugin-uni/packages/@babel/runtime/regenerator/index.js

diff --git a/packages/vue-cli-plugin-uni/lib/configure-webpack.js b/packages/vue-cli-plugin-uni/lib/configure-webpack.js
index dea056fec..b0669de5b 100644
--- a/packages/vue-cli-plugin-uni/lib/configure-webpack.js
+++ b/packages/vue-cli-plugin-uni/lib/configure-webpack.js
@@ -398,23 +398,32 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       })
     })
 
+    const alias = {
+      '@': path.resolve(process.env.UNI_INPUT_DIR),
+      './@': path.resolve(process.env
+        .UNI_INPUT_DIR), // css中的'@/static/logo.png'会被转换成'./@/static/logo.png'加载
+      vue$: getPlatformVue(vueOptions),
+      'uni-pages': path.resolve(process.env.UNI_INPUT_DIR, 'pages.json'),
+      'uni-stat-config': path.resolve(process.env.UNI_INPUT_DIR, 'pages.json') +
+        '?' +
+        JSON.stringify({
+          type: 'stat'
+        }),
+      vuex: require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vuex3'),
+      '@vue/composition-api': require.resolve('@dcloudio/vue-cli-plugin-uni/packages/@vue/composition-api')
+    }
+
+    if (process.env.UNI_PLATFORM.startsWith('mp')) {
+      const BabelRuntimeVersions = require('@babel/runtime/package.json').version.split('.')
+      if (BabelRuntimeVersions[0] === '7' && Number(BabelRuntimeVersions[1]) >= 18) {
+        alias['@babel/runtime/regenerator'] = require.resolve('@dcloudio/vue-cli-plugin-uni/packages/@babel/runtime/regenerator')
+      }
+    }
+
     return merge({
       devtool: false,
       resolve: {
-        alias: {
-          '@': path.resolve(process.env.UNI_INPUT_DIR),
-          './@': path.resolve(process.env
-            .UNI_INPUT_DIR), // css中的'@/static/logo.png'会被转换成'./@/static/logo.png'加载
-          vue$: getPlatformVue(vueOptions),
-          'uni-pages': path.resolve(process.env.UNI_INPUT_DIR, 'pages.json'),
-          'uni-stat-config': path.resolve(process.env.UNI_INPUT_DIR, 'pages.json') +
-            '?' +
-            JSON.stringify({
-              type: 'stat'
-            }),
-          vuex: require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vuex3'),
-          '@vue/composition-api': require.resolve('@dcloudio/vue-cli-plugin-uni/packages/@vue/composition-api')
-        },
+        alias,
         modules: [
           process.env.UNI_INPUT_DIR,
           path.resolve(process.env.UNI_INPUT_DIR, 'node_modules')
diff --git a/packages/vue-cli-plugin-uni/packages/@babel/runtime/regenerator/index.js b/packages/vue-cli-plugin-uni/packages/@babel/runtime/regenerator/index.js
new file mode 100644
index 000000000..b678a9773
--- /dev/null
+++ b/packages/vue-cli-plugin-uni/packages/@babel/runtime/regenerator/index.js
@@ -0,0 +1,4 @@
+// TODO(Babel 8): Remove this file.
+
+var runtime = require('@babel/runtime/helpers/regeneratorRuntime')()
+module.exports = runtime
-- 
GitLab