@mpxjs/webpack-plugin 2.9.43 → 2.9.50

package/lib/platform/template/wx/index.js

@@ -19,7 +19,7 @@ module.exports = function getSpec ({ warn, error }) {
           if (name.startsWith('data-')) {
             return {
               name: ':' + name,
-              value: `JSON.stringify(${parsed.result})`
+              value: `__ensureString(${parsed.result})`
             }
           } else if (parsed.hasBinding) {
             return {

package/lib/react/index.js

@@ -25,7 +25,7 @@ module.exports = function ({
   callback
 }) {
   if (ctorType === 'app' && !queryObj.isApp) {
-    return processMainScript(parts.script, {
+    return processMainScript({
       loaderContext
     }, (err, scriptRes) => {
       if (err) return callback(err)

package/lib/react/processMainScript.js

@@ -1,16 +1,20 @@
 // 该文件下的字符串语句需要使用 es5 语法
 const addQuery = require('../utils/add-query')
-
 const {
-  stringifyRequest
+  stringifyRequest,
+  buildI18n
 } = require('./script-helper')
 
-module.exports = function (script, {
+module.exports = function ({
   loaderContext
 }, callback) {
-  const { projectName } = loaderContext.getMpx()
+  const { i18n, projectName } = loaderContext.getMpx()
 
   let output = 'import { AppRegistry } from \'react-native\'\n'
+
+  if (i18n) {
+    output += buildI18n({ loaderContext })
+  }
   // 此处可添加前置于App执行的语句
   output += `var App = require(${stringifyRequest(loaderContext, addQuery(loaderContext.resource, { isApp: true }))}).default\n`
   output += `AppRegistry.registerComponent(${JSON.stringify(projectName)}, () => App)\n`

package/lib/react/processTemplate.js

@@ -77,6 +77,7 @@ module.exports = function (template, {
         hasScoped: false,
         moduleId,
         filePath: resourcePath,
+        // react中模版i18n不需要特殊处理
         i18n: null,
         checkUsingComponents,
         // web模式下全局组件不会被合入usingComponents中，故globalComponents可以传空

package/lib/react/script-helper.js

@@ -2,6 +2,7 @@ const loaderUtils = require('loader-utils')
 const createHelpers = require('../helpers')
 const parseRequest = require('../utils/parse-request')
 const shallowStringify = require('../utils/shallow-stringify')
+const normalize = require('../utils/normalize')
 
 function stringifyRequest (loaderContext, request) {
   return loaderUtils.stringifyRequest(loaderContext, request)
@@ -125,10 +126,18 @@ global.currentInject.firstPage = ${JSON.stringify(firstPage)}\n`
   return content
 }
 
+function buildI18n ({ loaderContext }) {
+  const i18nWxsPath = normalize.lib('runtime/i18n.wxs')
+  const i18nWxsLoaderPath = normalize.lib('wxs/i18n-loader.js')
+  const i18nWxsRequest = i18nWxsLoaderPath + '!' + i18nWxsPath
+  return `require(${stringifyRequest(loaderContext, i18nWxsRequest)})\n`
+}
+
 module.exports = {
   buildPagesMap,
   buildComponentsMap,
   getRequireScript,
   buildGlobalParams,
-  stringifyRequest
+  stringifyRequest,
+  buildI18n
 }

package/lib/web/index.js

@@ -35,13 +35,9 @@ module.exports = function ({
         }, callback)
       },
       (jsonRes, callback) => {
-        processMainScript(parts.script, {
+        processMainScript({
           loaderContext,
-          srcMode,
-          moduleId,
-          isProduction,
           jsonConfig: jsonRes.jsonObj,
-          outputPath: queryObj.outputPath || '',
           localComponentsMap: jsonRes.localComponentsMap,
           tabBar: jsonRes.jsonObj.tabBar,
           tabBarMap: jsonRes.tabBarMap,

package/lib/web/processMainScript.js

@@ -12,11 +12,8 @@ const {
   buildI18n
 } = require('./script-helper')
 
-module.exports = function (script, {
+module.exports = function ({
   loaderContext,
-  srcMode,
-  moduleId,
-  isProduction,
   jsonConfig,
   localComponentsMap,
   tabBar,
@@ -40,8 +37,6 @@ module.exports = function (script, {
     jsonConfig
   })
 
-  const scriptSrcMode = script ? script.mode || srcMode : srcMode
-
   let output = 'import \'@mpxjs/webpack-plugin/lib/runtime/base.styl\'\n'
   // hasUnoCSS由@mpxjs/unocss-plugin注入
   if (hasUnoCSS) {
@@ -58,10 +53,7 @@ Vue.use(VueRouter)\n`
   }
 
   output += buildGlobalParams({
-    moduleId,
-    scriptSrcMode,
     loaderContext,
-    isProduction,
     jsonConfig,
     webConfig,
     isMain: true,

package/lib/web/script-helper.js

@@ -170,17 +170,18 @@ function buildGlobalParams ({
     if (globalTabBar) {
       content += globalTabBar
     }
-  } else if (!hasApp) {
-    content += `
-  global.__mpxGenericsMap = global.__mpxGenericsMap || {}
-  global.__mpxOptionsMap = global.__mpxOptionsMap || {}
-  global.__mpxTransRpxFn = ${webConfig.transRpxFn} \n`
-  }
-  content += `  global.currentModuleId = ${JSON.stringify(moduleId)}\n`
-  content += `  global.currentSrcMode = ${JSON.stringify(scriptSrcMode)}\n`
-  content += `  global.currentInject = ${JSON.stringify({ moduleId })}\n`
-  if (!isProduction) {
-    content += `  global.currentResource = ${JSON.stringify(loaderContext.resourcePath)}\n`
+  } else {
+    if (!hasApp) {
+      content += '  global.__mpxGenericsMap = global.__mpxGenericsMap || {}\n'
+      content += '  global.__mpxOptionsMap = global.__mpxOptionsMap || {}\n'
+      content += `  global.__mpxTransRpxFn = ${webConfig.transRpxFn}\n`
+    }
+    content += `  global.currentModuleId = ${JSON.stringify(moduleId)}\n`
+    content += `  global.currentSrcMode = ${JSON.stringify(scriptSrcMode)}\n`
+    content += `  global.currentInject = ${JSON.stringify({ moduleId })}\n`
+    if (!isProduction) {
+      content += `  global.currentResource = ${JSON.stringify(loaderContext.resourcePath)}\n`
+    }
   }
   return content
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.9.43",
+  "version": "2.9.50",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -85,5 +85,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "92a347518d15400f87c380bc7248b8b6254631cf"
+  "gitHead": "d8b89e0ba1f29a16244b247f6c7a8d8197e0d732"
 }