@mpxjs/webpack-plugin 2.7.0-beta.11 → 2.7.0-beta.12

package/lib/dependencies/CommonJsVariableDependency.js

@@ -1,6 +1,6 @@
 const ModuleDependency = require('webpack/lib/dependencies/ModuleDependency')
 const makeSerializable = require('webpack/lib/util/makeSerializable')
-const InitFragment = require("webpack/lib//InitFragment");
+const InitFragment = require('webpack/lib//InitFragment')
 
 class CommonJsVariableDependency extends ModuleDependency {
   constructor (request, name) {

package/lib/extractor.js

@@ -51,6 +51,10 @@ module.exports.pitch = async function (remainingRequest) {
     }).join('\n')
   }
 
+  let resultSource = DEFAULT_RESULT_SOURCE
+
+  if (typeof content !== 'string') return resultSource
+
   const extractedInfo = {
     content,
     index
@@ -61,8 +65,6 @@ module.exports.pitch = async function (remainingRequest) {
     extractedInfo
   })
 
-  let resultSource = DEFAULT_RESULT_SOURCE
-
   const { buildInfo } = this._module
 
   // 如果importModule子模块中包含动态特性，比如动态添加入口和静态资源输出路径，则当前extractor模块不可缓存

package/lib/index.js

@@ -345,8 +345,9 @@ class MpxWebpackPlugin {
             if (module.resource) {
               const { queryObj } = parseRequest(module.resource)
               isIndependent = queryObj.isIndependent
-            } else if (module._identifier && /\|isIndependent\|/.test(module._identifier)) {
-              isIndependent = true
+            } else {
+              const identifier = module.identifier()
+              isIndependent = /\|isIndependent\|/.test(identifier)
             }
             return !isIndependent
           },
@@ -723,9 +724,14 @@ class MpxWebpackPlugin {
               module.resource = addQuery(module.resource, queryObj)
             }
           }
-        } else if (module._identifier && isIndependent) {
-          // ContextModule只在独立分包的情况下添加分包标记，其余默认不添加
-          module._identifier += `|isIndependent|${currentPackageRoot}`
+        } else if (isIndependent) {
+          // ContextModule和RawModule只在独立分包的情况下添加分包标记，其余默认不添加
+          const postfix = `|isIndependent|${currentPackageRoot}`
+          if (module._identifier) {
+            module._identifier += postfix
+          } else if (module.identifierStr) {
+            module.identifierStr += postfix
+          }
         }
         return rawAddModule.call(compilation, module, callback)
       }

package/lib/loader.js

@@ -228,9 +228,9 @@ module.exports = function (content) {
 
         output += `if (!global.i18n) {
   global.i18n = ${JSON.stringify({
-          locale: i18n.locale,
-          version: 0
-        })}
+    locale: i18n.locale,
+    version: 0
+  })}
   global.i18nMethods = ${i18nMethodsVar}
 }\n`
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.0-beta.11",
+  "version": "2.7.0-beta.12",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -77,5 +77,5 @@
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4"
   },
-  "gitHead": "136ce251b0e3763197707e64a25306dc1532db1b"
+  "gitHead": "d112dccb287436f8719007884cf90610ab5569ff"
 }