Merge branch 'master' into fix-swiper-nocircular

hiyuki · web-flow · commit a54e0f483d1d · 2025-08-01T13:00:14.000+08:00
diff --git a/lerna.json b/lerna.json
@@ -1,3 +1,3 @@
 {
-  "version": "2.10.12"
+  "version": "2.10.13"
 }
diff --git a/packages/api-proxy/package.json b/packages/api-proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.8",
+  "version": "2.10.13",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/didi/mpx#readme",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.8",
+    "@mpxjs/utils": "^2.10.13",
     "axios": "^1.7.3"
   },
   "peerDependencies": {
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.12",
+  "version": "2.10.13",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.8",
+    "@mpxjs/utils": "^2.10.13",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
diff --git a/packages/fetch/package.json b/packages/fetch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/fetch",
-  "version": "2.10.8",
+  "version": "2.10.13",
   "description": "mpx fetch lib",
   "author": "donghongping",
   "license": "Apache-2.0",
@@ -29,8 +29,8 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@mpxjs/api-proxy": "^2.10.8",
-    "@mpxjs/utils": "^2.10.8",
+    "@mpxjs/api-proxy": "^2.10.13",
+    "@mpxjs/utils": "^2.10.13",
     "path-to-regexp": "^6.2.0"
   },
   "gitHead": "2d37697869b9bdda3efab92dda8c910b68fd05c0"
diff --git a/packages/pinia/package.json b/packages/pinia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/pinia",
-  "version": "2.10.8",
+  "version": "2.10.13",
   "description": "A pinia style store in miniprogram",
   "types": "@types/index.d.ts",
   "main": "src/index.js",
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mpxjs/utils": "^2.10.8"
+    "@mpxjs/utils": "^2.10.13"
   },
   "peerDependencies": {
     "@mpxjs/core": "^2.9.0",
diff --git a/packages/store/package.json b/packages/store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/store",
-  "version": "2.10.8",
+  "version": "2.10.13",
   "description": "A store for mpx framework",
   "main": "src/index.js",
   "types": "@types/index.d.ts",
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/didi/mpx#readme",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.8"
+    "@mpxjs/utils": "^2.10.13"
   },
   "peerDependencies": {
     "@mpxjs/core": "^2.9.0"
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/utils",
-  "version": "2.10.8",
+  "version": "2.10.13",
   "description": "A toolkit for mpx framework",
   "main": "src/index.js",
   "scripts": {
diff --git a/packages/webpack-plugin/lib/react/processScript.js b/packages/webpack-plugin/lib/react/processScript.js
@@ -1,6 +1,6 @@
 const normalize = require('../utils/normalize')
 const optionProcessorPath = normalize.lib('runtime/optionProcessorReact')
-const { buildPagesMap, buildComponentsMap, getRequireScript, buildGlobalParams, stringifyRequest } = require('./script-helper')
+const { buildPagesMap, buildComponentsMap, getRequireScript, buildGlobalParams, stringifyRequest, buildI18n } = require('./script-helper')
 
 module.exports = function (script, {
   loaderContext,
@@ -17,7 +17,7 @@ module.exports = function (script, {
   componentGenerics,
   genericsInfo
 }, callback) {
-  const { appInfo } = loaderContext.getMpx()
+  const { appInfo, i18n } = loaderContext.getMpx()
 
   let scriptSrcMode = srcMode
   if (script) {
@@ -62,6 +62,9 @@ import { getComponent, getAsyncSuspense } from ${stringifyRequest(loaderContext,
     })
 
     output += buildGlobalParams({ moduleId, scriptSrcMode, loaderContext, isProduction, ctorType, jsonConfig, componentsMap, outputPath, genericsInfo, componentGenerics, hasApp })
+    if (!hasApp && i18n) {
+      output += buildI18n({ loaderContext })
+    }
     output += getRequireScript({ ctorType, script, loaderContext })
     output += `export default global.__mpxOptionsMap[${JSON.stringify(moduleId)}]\n`
   }
diff --git a/packages/webpack-plugin/lib/web/processMainScript.js b/packages/webpack-plugin/lib/web/processMainScript.js
@@ -49,7 +49,7 @@ import { processAppOption, getComponent } from ${stringifyRequest(loaderContext,
 Vue.use(VueRouter)\n`
 
   if (i18n) {
-    output += buildI18n({ i18n, loaderContext })
+    output += buildI18n({ i18n, isMain: true, loaderContext })
   }
 
   output += buildGlobalParams({
diff --git a/packages/webpack-plugin/lib/web/processScript.js b/packages/webpack-plugin/lib/web/processScript.js
@@ -7,7 +7,8 @@ const {
   buildComponentsMap,
   getRequireScript,
   buildGlobalParams,
-  stringifyRequest
+  stringifyRequest,
+  buildI18n
 } = require('./script-helper')
 
 module.exports = function (script, {
@@ -24,7 +25,7 @@ module.exports = function (script, {
   wxsModuleMap,
   localComponentsMap
 }, callback) {
-  const { projectRoot, appInfo, webConfig } = loaderContext.getMpx()
+  const { projectRoot, appInfo, webConfig, i18n } = loaderContext.getMpx()
 
   let output = '/* script */\n'
 
@@ -70,6 +71,9 @@ module.exports = function (script, {
       }
 
       content += buildGlobalParams({ moduleId, scriptSrcMode, loaderContext, isProduction, webConfig, hasApp })
+      if (!hasApp && i18n) {
+        content += buildI18n({ i18n, loaderContext })
+      }
       content += getRequireScript({ ctorType, script, loaderContext })
       content += `
   export default processComponentOption({
diff --git a/packages/webpack-plugin/lib/web/script-helper.js b/packages/webpack-plugin/lib/web/script-helper.js
@@ -186,13 +186,17 @@ function buildGlobalParams ({
   return content
 }
 
-function buildI18n ({ i18n, loaderContext }) {
+function buildI18n ({ i18n, isMain, loaderContext }) {
   let i18nContent = ''
   const i18nObj = Object.assign({}, i18n)
-  i18nContent += `
-  import VueI18n from 'vue-i18n'
+  if (!isMain) {
+    i18nContent += `import Vue from 'vue'
+    import Mpx from '@mpxjs/core'\n`
+  }
+  i18nContent += `import VueI18n from 'vue-i18n'
   import { createI18n } from 'vue-i18n-bridge'
-  Vue.use(VueI18n , { bridge: true })\n`
+  if (!Mpx.i18n) {
+    Vue.use(VueI18n , { bridge: true })\n`
   const requestObj = {}
   const i18nKeys = ['messages', 'dateTimeFormats', 'numberFormats']
   i18nKeys.forEach((key) => {
@@ -201,15 +205,16 @@ function buildI18n ({ i18n, loaderContext }) {
       delete i18nObj[`${key}Path`]
     }
   })
-  i18nContent += `  var i18nCfg = ${JSON.stringify(i18nObj)}\n`
+  i18nContent += `    var i18nCfg = ${JSON.stringify(i18nObj)}\n`
   Object.keys(requestObj).forEach((key) => {
-    i18nContent += `  i18nCfg.${key} = require(${requestObj[key]})\n`
+    i18nContent += `    i18nCfg.${key} = require(${requestObj[key]})\n`
   })
   i18nContent += `
-  i18nCfg.legacy = false
-  var i18n = createI18n(i18nCfg, VueI18n)
-  Vue.use(i18n)
-  Mpx.i18n = i18n\n`
+    i18nCfg.legacy = false
+    var i18n = createI18n(i18nCfg, VueI18n)
+    Vue.use(i18n)
+    Mpx.i18n = i18n
+  }\n`
   return i18nContent
 }
 
diff --git a/packages/webpack-plugin/package.json b/packages/webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.12",
+  "version": "2.10.13",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -28,7 +28,7 @@
     "@better-scroll/wheel": "^2.5.1",
     "@better-scroll/zoom": "^2.5.1",
     "@mpxjs/template-engine": "^2.8.7",
-    "@mpxjs/utils": "^2.10.8",
+    "@mpxjs/utils": "^2.10.13",
     "acorn": "^8.11.3",
     "acorn-walk": "^7.2.0",
     "async": "^2.6.0",
@@ -83,7 +83,7 @@
   },
   "devDependencies": {
     "@d11/react-native-fast-image": "^8.6.12",
-    "@mpxjs/api-proxy": "^2.10.8",
+    "@mpxjs/api-proxy": "^2.10.13",
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4",
     "@types/react": "^18.2.79",

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "version": "2.10.12"`
	`2`	`+ "version": "2.10.13"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@mpxjs/utils",`
`3`		`- "version": "2.10.8",`
	`3`	`+ "version": "2.10.13",`
`4`	`4`	`"description": "A toolkit for mpx framework",`
`5`	`5`	`"main": "src/index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ import { processAppOption, getComponent } from ${stringifyRequest(loaderContext,`
`49`	`49`	Vue.use(VueRouter)\n`
`50`	`50`
`51`	`51`	`if (i18n) {`
`52`		`- output += buildI18n({ i18n, loaderContext })`
	`52`	`+ output += buildI18n({ i18n, isMain: true, loaderContext })`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`output += buildGlobalParams({`