@mpxjs/webpack-plugin 2.7.0-beta.8 → 2.7.0-beta.9

package/lib/dependencies/DynamicEntryDependency.js

@@ -21,7 +21,7 @@ class DynamicEntryDependency extends NullDependency {
 
   get key () {
     const { resource, entryType, outputPath, packageRoot, relativePath, range } = this
-    return [resource, entryType, outputPath, packageRoot, relativePath, ...range].join('|')
+    return toPosix([resource, entryType, outputPath, packageRoot, relativePath, ...range].join('|'))
   }
 
   addEntry (compilation, callback) {

package/lib/index.js

@@ -80,6 +80,11 @@ const isChunkInPackage = (chunkName, packageName) => {
 const getPackageCacheGroup = packageName => {
   if (packageName === 'main') {
     return {
+      // 对于独立分包模块不应用该cacheGroup
+      test: (module) => {
+        const { queryObj } = parseRequest(module.resource)
+        return !queryObj.isIndependent
+      },
       name: 'bundle',
       minChunks: 2,
       chunks: 'all'
@@ -691,10 +696,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)
           }
         }
 

package/lib/loader.js

@@ -217,14 +217,16 @@ module.exports = function (content) {
       if (!isProduction) {
         output += `global.currentResource = ${JSON.stringify(filePath)}\n`
       }
-      if (ctorType === 'app' && i18n) {
-        output += `global.i18n = ${JSON.stringify({ locale: i18n.locale, version: 0 })}\n`
-
+      // 为app或独立分包页面注入i18n
+      if (i18n && (ctorType === 'app' || (ctorType === 'page' && queryObj.isIndependent))) {
         const i18nWxsPath = normalize.lib('runtime/i18n.wxs')
         const i18nWxsLoaderPath = normalize.lib('wxs/i18n-loader.js')
         const i18nWxsRequest = i18nWxsLoaderPath + '!' + i18nWxsPath
 
-        output += `global.i18nMethods = require(${loaderUtils.stringifyRequest(loaderContext, i18nWxsRequest)})\n`
+        output += `if (!global.i18n) {
+  global.i18n = ${JSON.stringify({ locale: i18n.locale, version: 0 })}
+  global.i18nMethods = require(${loaderUtils.stringifyRequest(loaderContext, i18nWxsRequest)})
+}\n`
       }
       // 注入构造函数
       let ctor = 'App'
@@ -303,6 +305,7 @@ module.exports = function (content) {
         if (script.src) extraOptions.resourcePath = resourcePath
         output += getRequire('script', script, extraOptions) + '\n'
       } else {
+        // todo 依然创建request在selector中进行补全或者将i18n通过CommonJsVariableDependency改造为initFragments的方式进行注入，否则在app.mpx中没有script区块的情况下无法保证i18n注入代码在@mpxjs/core之前执行
         switch (ctorType) {
           case 'app':
             output += 'import {createApp} from "@mpxjs/core"\n' +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.0-beta.8",
+  "version": "2.7.0-beta.9",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -77,5 +77,5 @@
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4"
   },
-  "gitHead": "73247d266ae7380b88295208d645f85b9dd72398"
+  "gitHead": "368e40835a53b627170f59e8fbe827b457bb2654"
 }