@mpxjs/webpack-plugin 2.7.43 → 2.7.46

package/lib/helpers.js

@@ -16,6 +16,8 @@ module.exports = function createHelpers (loaderContext) {
   const rawRequest = loaderUtils.getRemainingRequest(loaderContext)
   const { resourcePath, queryObj } = parseRequest(loaderContext.resource)
 
+  const { mode, env } = loaderContext.getMpx() || {}
+
   function getRequire (type, part, extraOptions, index) {
     return 'require(' + getRequestString(type, part, extraOptions, index) + ')'
   }
@@ -66,7 +68,7 @@ module.exports = function createHelpers (loaderContext) {
       return loaderUtils.stringifyRequest(loaderContext, addQuery(src, options, true))
     } else {
       const fakeRequest = getFakeRequest(type, part)
-      const request = `${selectorPath}!${addQuery(rawRequest, options, true)}`
+      const request = `${selectorPath}?mode=${mode}&env=${env}!${addQuery(rawRequest, options, true)}`
       return loaderUtils.stringifyRequest(loaderContext, `${fakeRequest}!=!${request}`)
     }
   }

package/lib/index.js

@@ -812,12 +812,24 @@ class MpxWebpackPlugin {
             // 因为文件缓存的存在，前面hack identifier的行为对于从文件缓存中创建得到的module并不生效，因此需要在回调中进行二次hack处理
             if (err) return rawCallback(err)
             hackModuleIdentifier(module)
-            rawCallback(null, module)
+            return rawCallback(null, module)
           }
         }
         return rawAddModule.call(compilation, module, callback)
       }
 
+      // hack process https://github.com/webpack/webpack/issues/16045
+      const _handleModuleBuildAndDependenciesRaw = compilation._handleModuleBuildAndDependencies
+
+      compilation._handleModuleBuildAndDependencies = (originModule, module, recursive, callback) => {
+        const rawCallback = callback
+        callback = (err) => {
+          if (err) return rawCallback(err)
+          return rawCallback(null, module)
+        }
+        return _handleModuleBuildAndDependenciesRaw.call(compilation, originModule, module, recursive, callback)
+      }
+
       const rawEmitAsset = compilation.emitAsset
 
       compilation.emitAsset = (file, source, assetInfo) => {
@@ -929,7 +941,7 @@ class MpxWebpackPlugin {
         }
       })
 
-      normalModuleFactory.hooks.parser.for('javascript/auto').tap('MpxWebpackPlugin', (parser) => {
+      const normalModuleFactoryParserCallback = (parser) => {
         parser.hooks.call.for('__mpx_resolve_path__').tap('MpxWebpackPlugin', (expr) => {
           if (expr.arguments[0]) {
             const resource = expr.arguments[0].value
@@ -950,7 +962,7 @@ class MpxWebpackPlugin {
           return true
         })
 
-        const requireAsyncHandler = (expr, members) => {
+        const requireAsyncHandler = (expr, members, args) => {
           if (members[0] === 'async') {
             let request = expr.arguments[0].value
             const range = expr.arguments[0].range
@@ -970,10 +982,10 @@ class MpxWebpackPlugin {
                 const dep = new CommonJsAsyncDependency(request, range)
                 parser.state.current.addDependency(dep)
               }
+              if (args) parser.walkExpressions(args)
               return true
             } else {
               compilation.errors.push(new Error(`The require async JS [${request}] need to declare subpackage name by root`))
-              return true
             }
           }
         }
@@ -990,7 +1002,7 @@ class MpxWebpackPlugin {
           .tap({
             name: 'MpxWebpackPlugin',
             stage: -1000
-          }, (expr, calleeMembers, callExpr) => requireAsyncHandler(callExpr, calleeMembers))
+          }, (expr, calleeMembers, callExpr) => requireAsyncHandler(callExpr, calleeMembers, expr.arguments))
 
         // hack babel polyfill global
         parser.hooks.statementIf.tap('MpxWebpackPlugin', (expr) => {
@@ -1140,7 +1152,10 @@ class MpxWebpackPlugin {
           parser.hooks.callMemberChain.for('mpx').tap('MpxWebpackPlugin', injectSrcModeForTransApi)
           parser.hooks.callMemberChain.for('wx').tap('MpxWebpackPlugin', injectSrcModeForTransApi)
         }
-      })
+      }
+      normalModuleFactory.hooks.parser.for('javascript/auto').tap('MpxWebpackPlugin', normalModuleFactoryParserCallback)
+      normalModuleFactory.hooks.parser.for('javascript/dynamic').tap('MpxWebpackPlugin', normalModuleFactoryParserCallback)
+      normalModuleFactory.hooks.parser.for('javascript/esm').tap('MpxWebpackPlugin', normalModuleFactoryParserCallback)
 
       // 为了正确生成sourceMap，将该步骤由原来的compile.hooks.emit迁移到compilation.hooks.processAssets
       compilation.hooks.processAssets.tap({

package/lib/selector.js

@@ -3,17 +3,17 @@ const parseRequest = require('./utils/parse-request')
 
 module.exports = function (content) {
   this.cacheable()
-  // todo 移除mpx访问依赖，支持thread-loader
-  const mpx = this.getMpx()
-  if (!mpx) {
+
+  // 移除mpx访问依赖，支持 thread-loader
+  const { mode, env } = this.getOptions() || {}
+  if (!mode && !env) {
     return content
   }
+
   const { queryObj } = parseRequest(this.resource)
   const ctorType = queryObj.ctorType
   const type = queryObj.type
   const index = queryObj.index || 0
-  const mode = mpx.mode
-  const env = mpx.env
   const filePath = this.resourcePath
   const parts = parseComponent(content, {
     filePath,

package/lib/wxs/WxsPlugin.js

@@ -23,6 +23,14 @@ class WxsPlugin {
       normalModuleFactory.hooks.parser
         .for('javascript/auto')
         .tap('WxsPlugin', handler)
+
+      normalModuleFactory.hooks.parser
+        .for('javascript/dynamic')
+        .tap('WxsPlugin', handler)
+
+      normalModuleFactory.hooks.parser
+        .for('javascript/esm')
+        .tap('WxsPlugin', handler)
     })
   }
 }

package/lib/wxs/WxsTemplatePlugin.js

@@ -1,6 +1,49 @@
 const config = require('../config')
 const { ConcatSource } = require('webpack').sources
 const JavascriptModulesPlugin = require('webpack/lib/javascript/JavascriptModulesPlugin')
+const RuntimeGlobals = require('webpack/lib/RuntimeGlobals')
+const HelperRuntimeModule = require('webpack/lib/runtime/HelperRuntimeModule')
+const Template = require('webpack/lib/Template')
+
+class MakeNamespaceObjectRuntimeModule extends HelperRuntimeModule {
+  constructor () {
+    super('make namespace object')
+  }
+
+  generate () {
+    const { runtimeTemplate } = this.compilation
+    const fn = RuntimeGlobals.makeNamespaceObject
+    return Template.asString([
+      '// define __esModule on exports',
+      `${fn} = ${runtimeTemplate.basicFunction('exports', [
+        'exports.__esModule = true;'
+      ])};`
+    ])
+  }
+}
+
+class CompatGetDefaultExportRuntimeModule extends HelperRuntimeModule {
+  constructor () {
+    super('compat get default export')
+  }
+
+  generate () {
+    const { runtimeTemplate } = this.compilation
+    const fn = RuntimeGlobals.compatGetDefaultExport
+    return Template.asString([
+      '// getDefaultExport function for compatibility with non-harmony modules',
+      `${fn} = ${runtimeTemplate.basicFunction('module', [
+        'var getter = module && module.__esModule ?',
+        Template.indent([
+          `${runtimeTemplate.returningFunction('module["default"]')} :`,
+          `${runtimeTemplate.returningFunction('module')};`
+        ]),
+        'getter.a = getter();',
+        'return getter;'
+      ])};`
+    ])
+  }
+}
 
 module.exports = class WxsTemplatePlugin {
   constructor (options = { mode: 'wx' }) {
@@ -20,7 +63,34 @@ module.exports = class WxsTemplatePlugin {
       return new ConcatSource(prefix, source)
     })
 
-    // todo webpack5的新的代码生成模式下完美支持.d.r.n的成本较高，暂不处理，wxs暂时只支持wx源码形式
+    // __webpack_require__.r
+    compilation.hooks.runtimeRequirementInTree
+      .for(RuntimeGlobals.makeNamespaceObject)
+      .tap({
+        name: 'WxsTemplatePlugin',
+        stage: -1000
+      }, chunk => {
+        compilation.addRuntimeModule(
+          chunk,
+          new MakeNamespaceObjectRuntimeModule()
+        )
+        return true
+      })
+
+    // __webpack_require__.n
+    compilation.hooks.runtimeRequirementInTree
+      .for(RuntimeGlobals.compatGetDefaultExport)
+      .tap({
+        name: 'WxsTemplatePlugin',
+        stage: -1000
+      }, chunk => {
+        compilation.addRuntimeModule(
+          chunk,
+          new CompatGetDefaultExportRuntimeModule()
+        )
+        return true
+      })
+
     // mainTemplate.hooks.requireExtensions.tap(
     //   'WxsMainTemplatePlugin',
     //   () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.43",
+  "version": "2.7.46",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "9ba777d5b52c8a2f802c47c2dc10c6984deff1d8"
+  "gitHead": "5c8b46722d862bba145badd164c4675a43a577c3"
 }