@mpxjs/webpack-plugin 2.6.109 → 2.6.110

package/lib/index.js

@@ -363,10 +363,12 @@ class MpxWebpackPlugin {
                 compilation.errors.push(e)
               }
             })
-            if (packageRoot) {
-              module.request = addQuery(module.request, { packageRoot })
-              module.resource = addQuery(module.resource, { packageRoot })
-            }
+            const queryObj = {}
+            if (packageRoot) queryObj.packageRoot = packageRoot
+            // todo 后续可以考虑用module.layer来隔离独立分包的模块
+            if (isIndependent) queryObj.isIndependent = true
+            module.request = addQuery(module.request, queryObj)
+            module.resource = addQuery(module.resource, queryObj)
           }
         }
 
@@ -413,6 +415,7 @@ class MpxWebpackPlugin {
           // 当前机制下分包处理队列在app.json的json-compiler中进行，由于addEntry回调特性，无法保障app.js中引用的模块都被标记为主包，故重写processModuleDependencies获取app.js及其所有依赖处理完成的时机，在这之后再执行分包处理队列
           appScriptRawRequest: '',
           appScriptPromise: null,
+          appScriptPromiseResolve: null,
           // 记录entry依赖关系，用于体积分析
           entryNodesMap: {},
           // 记录entryModule与entryNode的对应关系，用于体积分析
@@ -590,12 +593,10 @@ class MpxWebpackPlugin {
         if (module.rawRequest === mpx.appScriptRawRequest) {
           // 避免模块request重名，只对第一次匹配到的模块进行代理
           mpx.appScriptRawRequest = ''
-          mpx.appScriptPromise = new Promise((resolve) => {
-            proxyedCallback = (err) => {
-              resolve()
-              return callback(err)
-            }
-          })
+          proxyedCallback = (err) => {
+            mpx.appScriptPromiseResolve()
+            return callback(err)
+          }
         }
         return rawProcessModuleDependencies.apply(compilation, [module, proxyedCallback])
       }

package/lib/loader.js

@@ -273,9 +273,8 @@ module.exports = function (content) {
       if (!isProduction) {
         globalInjectCode += `global.currentResource = ${JSON.stringify(filePath)}\n`
       }
-      if (ctorType === 'app' && i18n && !mpx.forceDisableInject) {
-        globalInjectCode += `global.i18n = ${JSON.stringify({ locale: i18n.locale, version: 0 })}\n`
 
+      if (i18n && (ctorType === 'app' || (ctorType === 'page' && queryObj.isIndependent)) && !mpx.forceDisableInject) {
         const i18nMethodsVar = 'i18nMethods'
         const i18nWxsPath = normalize.lib('runtime/i18n.wxs')
         const i18nWxsLoaderPath = normalize.lib('wxs/wxs-i18n-loader.js')
@@ -293,7 +292,10 @@ module.exports = function (content) {
         })
         this._module.addVariable(i18nMethodsVar, expression, deps)
 
-        globalInjectCode += `global.i18nMethods = ${i18nMethodsVar}\n`
+        globalInjectCode += `if (!global.i18n) {
+  global.i18n = ${JSON.stringify({ locale: i18n.locale, version: 0 })}
+  global.i18nMethods = ${i18nMethodsVar}
+}\n`
       }
       // 注入构造函数
       let ctor = 'App'
@@ -329,7 +331,12 @@ module.exports = function (content) {
         }
         if (scriptRequestString) {
           output += 'export * from ' + scriptRequestString + '\n\n'
-          if (ctorType === 'app') mpx.appScriptRawRequest = JSON.parse(scriptRequestString)
+          if (ctorType === 'app') {
+            mpx.appScriptRawRequest = JSON.parse(scriptRequestString)
+            mpx.appScriptPromise = new Promise((resolve) => {
+              mpx.appScriptPromiseResolve = resolve
+            })
+          }
         }
       } else {
         switch (ctorType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.6.109",
+  "version": "2.6.110",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -81,5 +81,5 @@
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4"
   },
-  "gitHead": "1531292ee192d1af4d84e8aac8fa02afe5d92e24"
+  "gitHead": "a772b52decbf4a3bdc3b5b608a18327bce453b6c"
 }