Merge pull request #2113 from didi/feat-rn-async-names-0714

feat: trans async sub name rules

Author: hiyuki

packages/webpack-plugin/lib/index.js

@@ -48,6 +48,7 @@ const RequireExternalDependency = require('./dependencies/RequireExternalDepende
 const SplitChunksPlugin = require('webpack/lib/optimize/SplitChunksPlugin')
 const fixRelative = require('./utils/fix-relative')
 const parseRequest = require('./utils/parse-request')
+const { transSubpackage } = require('./utils/trans-async-sub-rules')
 const { matchCondition } = require('./utils/match-condition')
 const processDefs = require('./utils/process-defs')
 const config = require('./config')
@@ -142,6 +143,9 @@ class MpxWebpackPlugin {
     if (options.dynamicComponentRules && !options.dynamicRuntime) {
       errors.push('Please make sure you have set dynamicRuntime true in mpx webpack plugin config because you have use the dynamic runtime feature.')
     }
+    if (options.transSubpackageRules && !isReact(options.mode)) {
+      warnings.push('MpxWebpackPlugin transSubpackageRules option only supports "ios", "android", or "harmony" mode')
+    }
     options.externalClasses = options.externalClasses || ['custom-class', 'i-class']
     options.resolveMode = options.resolveMode || 'webpack'
     options.writeMode = options.writeMode || 'changed'
@@ -781,6 +785,7 @@ class MpxWebpackPlugin {
             })
           },
           asyncSubpackageRules: this.options.asyncSubpackageRules,
+          transSubpackageRules: this.options.transSubpackageRules,
           optimizeRenderRules: this.options.optimizeRenderRules,
           pathHash: (resourcePath) => {
             if (this.options.pathHashMode === 'relative' && this.options.projectRoot) {
@@ -1428,6 +1433,7 @@ class MpxWebpackPlugin {
               // wx、ali和web平台支持require.async，其余平台使用CommonJsAsyncDependency进行模拟抹平
               if (mpx.supportRequireAsync) {
                 if (isWeb(mpx.mode) || isReact(mpx.mode)) {
+                  if (isReact(mpx.mode)) tarRoot = transSubpackage(mpx.transSubpackageRules, tarRoot)
                   const depBlock = new AsyncDependenciesBlock(
                     {
                       name: tarRoot + '/index'

packages/webpack-plugin/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 { transSubpackage } = require('../utils/trans-async-sub-rules')
 const createJSONHelper = require('../json-compiler/helper')
 const getRulesRunner = require('../platform/index')
 const { RESOLVE_IGNORED_ERR } = require('../utils/const')
@@ -146,15 +147,16 @@ module.exports = function (jsonContent, {
 
   const fillInComponentsMap = (name, entry, tarRoot) => {
     const { resource, outputPath } = entry
-    const { resourcePath, queryObj } = parseRequest(resource)
+    const { resourcePath } = parseRequest(resource)
+    tarRoot = transSubpackage(mpx.transSubpackageRules, tarRoot)
     componentsMap[resourcePath] = outputPath
     loaderContext._module && loaderContext._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'component', outputPath))
     localComponentsMap[name] = {
       resource: addQuery(resource, {
         isComponent: true,
         outputPath
       }),
-      async: queryObj.async || tarRoot
+      async: tarRoot
     }
   }
 
@@ -288,7 +290,7 @@ module.exports = function (jsonContent, {
           if (err) return callback(err === RESOLVE_IGNORED_ERR ? null : err)
           if (pageKeySet.has(key)) return callback()
           pageKeySet.add(key)
-          const { resourcePath, queryObj } = parseRequest(resource)
+          const { resourcePath } = parseRequest(resource)
           if (localPagesMap[outputPath]) {
             const { resourcePath: oldResourcePath } = parseRequest(localPagesMap[outputPath].resource)
             if (oldResourcePath !== resourcePath) {
@@ -300,9 +302,11 @@ module.exports = function (jsonContent, {
 
           pagesMap[resourcePath] = outputPath
           loaderContext._module && loaderContext._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'page', outputPath))
+          // 通过asyncSubPackagesNameRules对tarRoot进行修改，仅修改tarRoot，不修改outputPath页面路径
+          tarRoot = transSubpackage(mpx.transSubpackageRules, tarRoot)
           localPagesMap[outputPath] = {
             resource: addQuery(resource, { isPage: true }),
-            async: queryObj.async || tarRoot,
+            async: tarRoot,
             isFirst
           }
           callback()

packages/webpack-plugin/lib/utils/trans-async-sub-rules.js

@@ -0,0 +1,19 @@
+function transSubpackage (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
+}
+
+module.exports = {
+  transSubpackage
+}