@mpxjs/webpack-plugin 2.9.50 → 2.9.55

package/lib/index.js

@@ -67,6 +67,7 @@ const { MPX_PROCESSED_FLAG, MPX_DISABLE_EXTRACTOR_CACHE } = require('./utils/con
 const isEmptyObject = require('./utils/is-empty-object')
 const DynamicPlugin = require('./resolver/DynamicPlugin')
 const { isReact, isWeb } = require('./utils/env')
+const VirtualModulesPlugin = require('webpack-virtual-modules')
 require('./utils/check-core-version-match')
 
 const isProductionLikeMode = options => {
@@ -306,6 +307,20 @@ class MpxWebpackPlugin {
     // 将entry export标记为used且不可mangle，避免require.async生成的js chunk在生产环境下报错
     new FlagEntryExportAsUsedPlugin(true, 'entry').apply(compiler)
 
+    let __vfs = null
+    if (isWeb(this.options.mode)) {
+      for (const plugin of compiler.options.plugins) {
+        if (plugin instanceof VirtualModulesPlugin) {
+          __vfs = plugin
+          break
+        }
+      }
+      if (!__vfs) {
+        __vfs = new VirtualModulesPlugin()
+        compiler.options.plugins.push(__vfs)
+      }
+    }
+
     if (!isWeb(this.options.mode) && !isReact(this.options.mode)) {
       // 强制设置publicPath为'/'
       if (compiler.options.output.publicPath && compiler.options.output.publicPath !== publicPath) {
@@ -520,6 +535,16 @@ class MpxWebpackPlugin {
       }
     }
 
+    const checkDynamicEntryInfo = (compilation) => {
+      for (const packageName in mpx.dynamicEntryInfo) {
+        const entryMap = mpx.dynamicEntryInfo[packageName]
+        if (packageName !== 'main' && !entryMap.hasPage) {
+          // 引用未注册分包的所有资源
+          const resources = entryMap.entries.map(info => info.resource).join(',')
+          compilation.errors.push(new Error(`资源${resources}通过分包异步声明为${packageName}分包, 但${packageName}分包未注册或不存在相关页面！`))
+        }
+      }
+    }
     // 构建分包队列，在finishMake钩子当中最先执行，stage传递-1000
     compiler.hooks.finishMake.tapAsync({
       name: 'MpxWebpackPlugin',
@@ -534,17 +559,10 @@ class MpxWebpackPlugin {
         }
       ], (err) => {
         if (err) return callback(err)
-        const checkDynamicEntryInfo = () => {
-          for (const packageName in mpx.dynamicEntryInfo) {
-            const entryMap = mpx.dynamicEntryInfo[packageName]
-            if (packageName !== 'main' && !entryMap.hasPage) {
-              // 引用未注册分包的所有资源
-              const resources = entryMap.entries.map(info => info.resource).join(',')
-              compilation.errors.push(new Error(`资源${resources}通过分包异步声明为${packageName}分包, 但${packageName}分包未注册或不存在相关页面！`))
-            }
-          }
+        if (mpx.supportRequireAsync && mpx.mode !== 'tt') {
+          // 字节小程序异步分包中不能包含page，忽略该检查
+          checkDynamicEntryInfo(compilation)
         }
-        checkDynamicEntryInfo()
         callback()
       })
     })
@@ -619,6 +637,8 @@ class MpxWebpackPlugin {
       if (!compilation.__mpx__) {
         // init mpx
         mpx = compilation.__mpx__ = {
+          // 用于使用webpack-virtual-modules功能，目前仅输出web时下支持使用
+          __vfs,
           // app信息，便于获取appName
           appInfo: {},
           // pages全局记录，无需区分主包分包
@@ -688,7 +708,7 @@ class MpxWebpackPlugin {
           useRelativePath: this.options.useRelativePath,
           removedChunks: [],
           forceProxyEventRules: this.options.forceProxyEventRules,
-          supportRequireAsync: this.options.mode === 'wx' || this.options.mode === 'ali' || isWeb(this.options.mode),
+          supportRequireAsync: this.options.mode === 'wx' || this.options.mode === 'ali' || this.options.mode === 'tt' || isWeb(this.options.mode),
           partialCompileRules: this.options.partialCompileRules,
           collectDynamicEntryInfo: ({ resource, packageName, filename, entryType, hasAsync }) => {
             const curInfo = mpx.dynamicEntryInfo[packageName] = mpx.dynamicEntryInfo[packageName] || {

package/lib/json-compiler/helper.js

@@ -56,7 +56,6 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
       if (queryObj.root) {
         // 删除root query
         resource = addQuery(resource, {}, false, ['root'])
-        // 目前只有微信支持分包异步化
         if (supportRequireAsync) {
           tarRoot = queryObj.root
           extraOptions.isAsync = true

package/lib/template-compiler/compiler.js

@@ -2545,18 +2545,18 @@ function processElement (el, root, options, meta) {
 
   processIf(el)
   processFor(el)
-  processRef(el, options, meta)
-  if (runtimeCompile) {
-    processClassDynamic(el, meta)
-    processStyleDynamic(el, meta)
-  } else {
-    processClass(el, meta)
-    processStyle(el, meta)
-  }
-  processEvent(el, options)
 
   if (!pass) {
+    processRef(el, options, meta)
+    if (runtimeCompile) {
+      processClassDynamic(el, meta)
+      processStyleDynamic(el, meta)
+    } else {
+      processClass(el, meta)
+      processStyle(el, meta)
+    }
     processShow(el, options, root)
+    processEvent(el, options)
     processComponentIs(el, options)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.9.50",
+  "version": "2.9.55",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -57,7 +57,8 @@
     "postcss-selector-parser": "^6.0.8",
     "postcss-value-parser": "^4.0.2",
     "semver": "^7.5.4",
-    "source-list-map": "^2.0.0"
+    "source-list-map": "^2.0.0",
+    "webpack-virtual-modules": "^0.6.0"
   },
   "peerDependencies": {
     "webpack": "^5.75.0"
@@ -85,5 +86,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "d8b89e0ba1f29a16244b247f6c7a8d8197e0d732"
+  "gitHead": "8e2e9dace226d48a91ff2a6dc2175c0a3be11d55"
 }