@mpxjs/webpack-plugin 2.7.45 → 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

@@ -941,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
@@ -1152,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

@@ -35,7 +35,7 @@ class CompatGetDefaultExportRuntimeModule extends HelperRuntimeModule {
       `${fn} = ${runtimeTemplate.basicFunction('module', [
         'var getter = module && module.__esModule ?',
         Template.indent([
-          `${runtimeTemplate.returningFunction('module.default')} :`,
+          `${runtimeTemplate.returningFunction('module["default"]')} :`,
           `${runtimeTemplate.returningFunction('module')};`
         ]),
         'getter.a = getter();',

package/package.json

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