@mpxjs/webpack-plugin 2.7.27 → 2.7.33

package/lib/index.js

@@ -958,6 +958,8 @@ class MpxWebpackPlugin {
               if (mpx.mode === 'wx') {
                 const dep = new DynamicEntryDependency(request, 'export', '', queryObj.root, MPX_CURRENT_CHUNK, context, range)
                 parser.state.current.addPresentationalDependency(dep)
+                // 包含require.async的模块不能被concatenate，避免DynamicEntryDependency中无法获取模块chunk以计算相对路径
+                parser.state.module.buildInfo.moduleConcatenationBailout = 'require async'
               } else {
                 const range = expr.range
                 const dep = new CommonJsAsyncDependency(request, range)

package/lib/json-compiler/helper.js

@@ -60,7 +60,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
       const resourceName = path.join(parsed.dir, parsed.name)
 
       if (!outputPath) {
-        if (ext === '.js' && resourceName.includes('node_modules')) {
+        if (ext === '.js' && resourceName.includes('node_modules') && mode !== 'web') {
           let root = info.descriptionFileRoot
           let name = 'nativeComponent'
           if (info.descriptionFileData) {
@@ -78,7 +78,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
           outputPath = getOutputPath(resourcePath, 'component')
         }
       }
-      if (ext === '.js') {
+      if (ext === '.js' && mode !== 'web') {
         resource = `!!${nativeLoaderPath}!${resource}`
       }
 
@@ -116,7 +116,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
           outputPath = /^(.*?)(\.[^.]*)?$/.exec(relative)[1]
         }
       }
-      if (ext === '.js') {
+      if (ext === '.js' && mode !== 'web') {
         resource = `!!${nativeLoaderPath}!${resource}`
       }
       const entry = getDynamicEntry(resource, 'page', outputPath, tarRoot, publicPath + tarRoot)

package/lib/style-compiler/index.js

@@ -14,8 +14,8 @@ module.exports = function (css, map) {
   this.cacheable()
   const cb = this.async()
   const { resourcePath, queryObj } = parseRequest(this.resource)
-  const id = queryObj.moduleId || queryObj.mid
   const mpx = this.getMpx()
+  const id = queryObj.moduleId || queryObj.mid || 'm' + mpx.pathHash(resourcePath)
   const appInfo = mpx.appInfo
   const defs = mpx.defs
   const mode = mpx.mode

package/lib/template-compiler/index.js

@@ -24,7 +24,7 @@ module.exports = function (raw) {
   const hasComment = queryObj.hasComment
   const isNative = queryObj.isNative
   const hasScoped = queryObj.hasScoped
-  const moduleId = queryObj.moduleId
+  const moduleId = queryObj.moduleId || 'm' + mpx.pathHash(resourcePath)
 
   const warn = (msg) => {
     this.emitWarning(

package/lib/web/processScript.js

@@ -119,6 +119,7 @@ module.exports = function (script, {
         content += `  import '@mpxjs/webpack-plugin/lib/runtime/base.styl'
   import Vue from 'vue'
   import VueRouter from 'vue-router'
+  import Mpx from '@mpxjs/core'
   Vue.use(VueRouter)
   global.getApp = function(){}
   global.getCurrentPages = function(){
@@ -160,9 +161,8 @@ module.exports = function (script, {
       i18n.mergeLocaleMessage(locale, newMessages[locale])
     })
   }
-  if(global.__mpx) {
-    global.__mpx.i18n = i18n
-  }\n`
+  Mpx.i18n = i18n
+  \n`
         }
       }
       // 注入wxs模块

package/lib/wxml/loader.js

@@ -17,13 +17,10 @@ module.exports = function (content) {
   const externals = mpx.externals
 
   const { queryObj } = parseRequest(this.resource)
-  const moduleId = queryObj.moduleId
   const hasScoped = false
   const hasComment = false
   const isNative = true
 
-  const usingComponents = []
-
   const mode = mpx.mode
   const localSrcMode = queryObj.mode
   const customAttributes = options.attributes || mpx.attributes || []
@@ -90,8 +87,6 @@ module.exports = function (content) {
           hasScoped,
           hasComment,
           isNative,
-          moduleId,
-          usingComponents,
           isStatic: true
         }
         requestString = getRequestString('template', { src, mode: localSrcMode }, extraOptions)

package/lib/wxs/loader.js

@@ -22,7 +22,7 @@ module.exports.pitch = function (remainingRequest) {
   let { resourcePath, queryObj } = parseRequest(this.resource)
   const issuer = moduleGraph.getIssuer(this._module)
   const { resourcePath: issuerResourcePath, queryObj: issuerQueryObj } = parseRequest(queryObj.issuerResource || issuer.resource)
-  const issuerPackageName = issuerQueryObj.packageRoot || mpx.currentPackageRoot || 'main'
+  const issuerPackageName = issuerQueryObj.packageRoot || 'main'
   const pagesMap = mpx.pagesMap
   const componentsMap = mpx.componentsMap[issuerPackageName]
   const staticResourcesMap = mpx.staticResourcesMap[issuerPackageName]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.27",
+  "version": "2.7.33",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "8404ec35695a6260eee41bfa80f4655dc1ce948b"
+  "gitHead": "c1d2e39bcfef9bf20484dcbb301381b86a5939e6"
 }