@mpxjs/webpack-plugin 2.7.47 → 2.7.50-alpha.0

package/lib/dependencies/DynamicEntryDependency.js

@@ -5,10 +5,9 @@ const addQuery = require('../utils/add-query')
 const toPosix = require('../utils/to-posix')
 const async = require('async')
 const parseRequest = require('../utils/parse-request')
-const { MPX_CURRENT_CHUNK } = require('../utils/const')
 
 class DynamicEntryDependency extends NullDependency {
-  constructor (request, entryType, outputPath = '', packageRoot = '', relativePath = '', context = '', range) {
+  constructor (request, entryType, outputPath = '', packageRoot = '', relativePath = '', context = '', range, extraOptions = {}) {
     super()
     this.request = request
     this.entryType = entryType
@@ -17,6 +16,7 @@ class DynamicEntryDependency extends NullDependency {
     this.relativePath = relativePath
     this.context = context
     this.range = range
+    this.extraOptions = extraOptions
   }
 
   get type () {
@@ -61,7 +61,7 @@ class DynamicEntryDependency extends NullDependency {
         })
 
         let resultPath = publicPath + filename
-        if (relativePath && relativePath !== MPX_CURRENT_CHUNK) {
+        if (relativePath) {
           resultPath = toPosix(path.relative(relativePath, resultPath))
         }
 
@@ -91,10 +91,16 @@ class DynamicEntryDependency extends NullDependency {
   }
 
   mpxAction (module, compilation, callback) {
-    const mpx = compilation.__mpx__
-    const { packageRoot, context } = this
-    this.originEntryNode = mpx.getEntryNode(module)
+    const { __mpx__: mpx, moduleGraph } = compilation
+    let entryModule = module
+    while (true) {
+      const issuer = moduleGraph.getIssuer(entryModule)
+      if (issuer) entryModule = issuer
+      else break
+    }
+    this.originEntryNode = mpx.getEntryNode(entryModule)
     this.publicPath = compilation.outputOptions.publicPath || ''
+    const { packageRoot, context } = this
     if (context) this.resolver = compilation.resolverFactory.get('normal', module.resolveOptions)
     // 分包构建在需要在主包构建完成后在finishMake中处理，返回的资源路径先用key来占位，在合成extractedAssets时再进行最终替换
     if (packageRoot && mpx.currentPackageRoot !== packageRoot) {
@@ -112,10 +118,10 @@ class DynamicEntryDependency extends NullDependency {
 
   // hash会影响最终的codeGenerateResult是否走缓存，由于该dep中resultPath是动态变更的，需要将其更新到hash中，避免错误使用缓存
   updateHash (hash, context) {
-    const { resultPath, relativePath } = this
+    const { resultPath, extraOptions } = this
     if (resultPath) hash.update(resultPath)
-    // relativePath为MPX_CURRENT_CHUNK时，插入随机hash使当前module的codeGeneration cache失效，从而执行dep.apply动态获取当前module所属的chunk路径
-    if (relativePath === MPX_CURRENT_CHUNK) hash.update('' + (+new Date()) + Math.random())
+    // 当处理require.async时，插入随机hash使当前module的codeGeneration cache失效，从而执行dep.apply动态获取当前module所属的chunk路径
+    if (extraOptions.isRequireAsync) hash.update('' + (+new Date()) + Math.random())
     super.updateHash(hash, context)
   }
 
@@ -128,6 +134,7 @@ class DynamicEntryDependency extends NullDependency {
     write(this.relativePath)
     write(this.context)
     write(this.range)
+    write(this.extraOptions)
     super.serialize(context)
   }
 
@@ -140,6 +147,7 @@ class DynamicEntryDependency extends NullDependency {
     this.relativePath = read()
     this.context = read()
     this.range = read()
+    this.extraOptions = read()
     super.deserialize(context)
   }
 }
@@ -149,20 +157,30 @@ DynamicEntryDependency.Template = class DynamicEntryDependencyTemplate {
     module,
     chunkGraph
   }) {
-    let { resultPath, range, key, outputPath, relativePath, publicPath } = dep
+    const { resultPath, range, key, outputPath, publicPath, extraOptions } = dep
+
+    let replaceContent = ''
+
     if (outputPath === 'custom-tab-bar/index') {
       // replace with true for custom-tab-bar
-      source.replace(range[0], range[1] - 1, 'true')
+      replaceContent = JSON.stringify(true)
     } else if (resultPath) {
-      if (relativePath === MPX_CURRENT_CHUNK) {
-        relativePath = publicPath + path.dirname(chunkGraph.getModuleChunks(module)[0].name)
-        resultPath = toPosix(path.relative(relativePath, resultPath))
+      if (extraOptions.isRequireAsync) {
+        const relativePath = toPosix(path.relative(publicPath + path.dirname(chunkGraph.getModuleChunks(module)[0].name), resultPath))
+        replaceContent = JSON.stringify(relativePath)
+        if (extraOptions.retryRequireAsync) {
+          replaceContent += `).catch(function (e) {
+  return require.async(${JSON.stringify(relativePath)});
+}`
+        }
+      } else {
+        replaceContent = JSON.stringify(resultPath)
       }
-      source.replace(range[0], range[1] - 1, JSON.stringify(resultPath))
     } else {
-      const replaceRange = `mpx_replace_path_${key}`
-      source.replace(range[0], range[1] - 1, JSON.stringify(replaceRange))
+      replaceContent = JSON.stringify(`mpx_replace_path_${key}`)
     }
+
+    if (replaceContent) source.replace(range[0], range[1] - 1, replaceContent)
   }
 }
 

package/lib/index.js

@@ -55,7 +55,7 @@ const extractorPath = normalize.lib('extractor')
 const async = require('async')
 const stringifyLoadersAndResource = require('./utils/stringify-loaders-resource')
 const emitFile = require('./utils/emit-file')
-const { MPX_PROCESSED_FLAG, MPX_DISABLE_EXTRACTOR_CACHE, MPX_CURRENT_CHUNK } = require('./utils/const')
+const { MPX_PROCESSED_FLAG, MPX_DISABLE_EXTRACTOR_CACHE } = require('./utils/const')
 const isEmptyObject = require('./utils/is-empty-object')
 
 const isProductionLikeMode = options => {
@@ -164,6 +164,7 @@ class MpxWebpackPlugin {
     }, options.nativeConfig)
     options.webConfig = options.webConfig || {}
     options.partialCompile = options.mode !== 'web' && options.partialCompile
+    options.retryRequireAsync = options.retryRequireAsync || false
     this.options = options
     // Hack for buildDependencies
     const rawResolveBuildDependencies = FileSystemInfo.prototype.resolveBuildDependencies
@@ -584,6 +585,11 @@ class MpxWebpackPlugin {
             if (!entryNode) {
               entryNode = new EntryNode(module, type)
               entryNodeModulesMap.set(module, entryNode)
+            } else if (type) {
+              if (entryNode.type && entryNode.type !== type) {
+                compilation.errors.push(`获取request为${module.request}的entryNode时类型与已有节点冲突, 当前注册的type为${type}, 已有节点的type为${entryNode.type}!`)
+              }
+              entryNode.type = type
             }
             return entryNode
           },
@@ -956,6 +962,7 @@ class MpxWebpackPlugin {
         parser.hooks.call.for('__mpx_dynamic_entry__').tap('MpxWebpackPlugin', (expr) => {
           const args = expr.arguments.map((i) => i.value)
           args.push(expr.range)
+
           const dep = new DynamicEntryDependency(...args)
           parser.state.current.addPresentationalDependency(dep)
           return true
@@ -972,7 +979,11 @@ class MpxWebpackPlugin {
               request = addQuery(request, {}, false, ['root'])
               // 目前仅wx支持require.async，其余平台使用CommonJsAsyncDependency进行模拟抹平
               if (mpx.mode === 'wx') {
-                const dep = new DynamicEntryDependency(request, 'export', '', queryObj.root, MPX_CURRENT_CHUNK, context, range)
+                const dep = new DynamicEntryDependency(request, 'export', '', queryObj.root, '', context, range, {
+                  isRequireAsync: true,
+                  retryRequireAsync: !!this.options.retryRequireAsync
+                })
+
                 parser.state.current.addPresentationalDependency(dep)
                 // 包含require.async的模块不能被concatenate，避免DynamicEntryDependency中无法获取模块chunk以计算相对路径
                 parser.state.module.buildInfo.moduleConcatenationBailout = 'require async'

package/lib/template-compiler/compiler.js

@@ -1989,12 +1989,11 @@ function processAtMode (el) {
       return
     }
 
-    const conditionMap = {}
-
+    const conditionMap = new Map()
     modeStr.split('|').forEach(item => {
       const arr = item.split(':')
-      const key = arr[0] || mode
-      conditionMap[key] = arr.slice(1)
+      const key = arr[0] || 'noMode'
+      conditionMap.set(key, arr.slice(1))
     })
 
     const modeArr = Object.keys(conditionMap)
@@ -2002,19 +2001,30 @@ function processAtMode (el) {
     if (modeArr.every(i => isValidMode(i))) {
       const attrValue = getAndRemoveAttr(el, attrName).val
       const replacedAttrName = attrArr.join('@')
-
       const processedAttr = { name: replacedAttrName, value: attrValue }
-      if (modeArr.includes(mode) && (!conditionMap[mode].length || conditionMap[mode].includes(env))) {
-        if (!replacedAttrName) {
-          el._atModeStatus = 'match'
+
+      for (let [defineMode, defineEnvArr] of conditionMap.entries()) {
+        if (defineMode === 'noMode' || defineMode === mode) {
+          // 命中 env 规则(没有定义env 或者定义的envArr包含当前env)
+          if (!defineEnvArr.length || defineEnvArr.includes(env)) {
+            // 若defineMode 为 noMode，则不论是element，还是attr，都需要经过规则转换
+            if (defineMode !== 'noMode') {
+              if (!replacedAttrName) {
+                el._atModeStatus = 'match'
+              } else {
+                // 如果命中了指定的mode，则先存在el上，等跑完转换后再挂回去
+                el.noTransAttrs ? el.noTransAttrs.push(processedAttr) : el.noTransAttrs = [processedAttr]
+              }
+            }
+            // 完成匹配，直接退出
+            break
+          }
+        } else if (!replacedAttrName) {
+          // 没有命中当前规则，设置为 'mismatch'
+          el._atModeStatus = 'mismatch'
         } else {
-          // 如果命中了指定的mode，则先存在el上，等跑完转换后再挂回去
-          el.noTransAttrs ? el.noTransAttrs.push(processedAttr) : el.noTransAttrs = [processedAttr]
+          // 如果没命中指定的mode，则该属性删除
         }
-      } else if (!replacedAttrName) {
-        el._atModeStatus = 'mismatch'
-      } else {
-        // 如果没命中指定的mode，则该属性删除
       }
     }
   })

package/lib/utils/const.js

@@ -5,6 +5,5 @@ module.exports = {
   RESOLVE_IGNORED_ERR: new Error('Resolve ignored!'),
   JSON_JS_EXT: '.json.js',
   MPX_ROOT_VIEW: 'mpx-root-view', // 根节点类名
-  MPX_APP_MODULE_ID: 'mpx-app-scope', // app文件moduleId
-  MPX_CURRENT_CHUNK: 'mpx_current_chunk'
+  MPX_APP_MODULE_ID: 'mpx-app-scope' // app文件moduleId
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.47",
+  "version": "2.7.50-alpha.0",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "05354d5750021d76f4bf0ae2a4ab73fb2f8ef83b"
+  "gitHead": "650b251d6ece1efc1b518af84f4347718ff8104f"
 }