@mpxjs/webpack-plugin 2.10.6-beta.5 → 2.10.6-beta.6

package/lib/index.js

@@ -48,6 +48,7 @@ const RecordFileUrlDependency = require('./dependencies/RecordFileUrlDependency'
 const SplitChunksPlugin = require('webpack/lib/optimize/SplitChunksPlugin')
 const fixRelative = require('./utils/fix-relative')
 const parseRequest = require('./utils/parse-request')
+const { transAsyncSubNameRules, transAsyncSubRules } = require('./utils/trans-async-sub-rules')
 const { matchCondition } = require('./utils/match-condition')
 const processDefs = require('./utils/process-defs')
 const config = require('./config')
@@ -778,6 +779,7 @@ class MpxWebpackPlugin {
             })
           },
           asyncSubpackageRules: this.options.asyncSubpackageRules,
+          asyncSubpackageNameMap: this.options.asyncSubpackageNameMap,
           optimizeRenderRules: this.options.optimizeRenderRules,
           pathHash: (resourcePath) => {
             if (this.options.pathHashMode === 'relative' && this.options.projectRoot) {
@@ -1406,21 +1408,14 @@ class MpxWebpackPlugin {
             const range = expr.arguments[0].range
             const context = parser.state.module.context
             const { queryObj, resourcePath } = parseRequest(request)
-            let tarRoot = queryObj.root
-            if (!tarRoot && mpx.asyncSubpackageRules) {
-              for (const item of mpx.asyncSubpackageRules) {
-                if (matchCondition(resourcePath, item)) {
-                  tarRoot = item.root
-                  break
-                }
-              }
-            }
+            let tarRoot = transAsyncSubRules(resourcePath, mpx.asyncSubpackageRules, queryObj.root)
             if (tarRoot) {
               // 删除root query
               if (queryObj.root) request = addQuery(request, {}, false, ['root'])
               // wx、ali和web平台支持require.async，其余平台使用CommonJsAsyncDependency进行模拟抹平
               if (mpx.supportRequireAsync) {
                 if (isWeb(mpx.mode) || isReact(mpx.mode)) {
+                  tarRoot = transAsyncSubNameRules(mpx.asyncSubpackageNameMap, tarRoot)
                   const depBlock = new AsyncDependenciesBlock(
                     {
                       name: tarRoot + '/index'

package/lib/react/processJSON.js

@@ -8,6 +8,7 @@ const addQuery = require('../utils/add-query')
 const parseComponent = require('../parser')
 const getJSONContent = require('../utils/get-json-content')
 const resolve = require('../utils/resolve')
+const { transAsyncSubNameRules } = require('../utils/trans-async-sub-rules')
 const createJSONHelper = require('../json-compiler/helper')
 const getRulesRunner = require('../platform/index')
 const { RESOLVE_IGNORED_ERR } = require('../utils/const')
@@ -285,6 +286,8 @@ module.exports = function (jsonContent, {
 
           pagesMap[resourcePath] = outputPath
           loaderContext._module && loaderContext._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'page', outputPath))
+          // 通过asyncSubPackagesNameRules对tarRoot进行修改，仅修改tarRoot，不修改outputPath页面路径
+          tarRoot = transAsyncSubNameRules(mpx.asyncSubpackageNameMap, tarRoot)
           localPagesMap[outputPath] = {
             resource: addQuery(resource, { isPage: true }),
             async: queryObj.async || tarRoot,
@@ -332,6 +335,7 @@ module.exports = function (jsonContent, {
           const fillComponentsMap = (name, entry, tarRoot) => {
             const { resource, outputPath } = entry
             const { resourcePath, queryObj } = parseRequest(resource)
+            tarRoot = transAsyncSubNameRules(mpx.asyncSubpackageNameMap, tarRoot)
             componentsMap[resourcePath] = outputPath
             loaderContext._module && loaderContext._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'component', outputPath))
             localComponentsMap[name] = {

package/lib/utils/trans-async-sub-rules.js

@@ -0,0 +1,34 @@
+const { matchCondition } = require('./match-condition')
+
+function transAsyncSubNameRules (asyncSubpackageNameRules, tarRoot) {
+  // 如果没有tarRoot，则无需进行tarRoot的修改，因此
+  if (tarRoot && Array.isArray(asyncSubpackageNameRules) && asyncSubpackageNameRules.length >= 1) {
+    for (const item of asyncSubpackageNameRules) {
+      if (item?.from) {
+        const fromPaths = Array.isArray(item.from) ? item.from : [item.from];
+        if (fromPaths.includes(tarRoot)) {
+          tarRoot = item.to
+          break
+        }
+      }
+    }
+  }
+  return tarRoot
+}
+
+function transAsyncSubRules (resourcePath, asyncSubpackageRules, tarRoot) {
+  if (!tarRoot && Array.isArray(asyncSubpackageRules) && asyncSubpackageRules.length >= 1) {
+    for (const item of asyncSubpackageRules) {
+      if (matchCondition(resourcePath, item)) {
+        tarRoot = item.root
+        break
+      }
+    }
+  }
+  return tarRoot
+}
+
+module.exports = {
+  transAsyncSubNameRules,
+  transAsyncSubRules
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.6-beta.5",
+  "version": "2.10.6-beta.6",
   "description": "mpx compile core",
   "keywords": [
     "mpx"