@mpxjs/webpack-plugin 2.7.24 → 2.7.31

package/lib/json-compiler/helper.js

@@ -12,7 +12,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
   const resolveMode = mpx.resolveMode
   const externals = mpx.externals
   const root = mpx.projectRoot
-  const publicPath = loaderContext._compilation?.outputOptions.publicPath || ''
+  const publicPath = (loaderContext._compilation && loaderContext._compilation.outputOptions.publicPath) || ''
   const pathHash = mpx.pathHash
   const getOutputPath = mpx.getOutputPath
   const mode = mpx.mode

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/utils/eval-json-js.js

@@ -22,6 +22,7 @@ module.exports = function evalJSONJS (source, filename, loaderContext) {
       request = path.join(dirname, request)
     }
     const filename = require.resolve(request)
+    loaderContext.addDependency(filename)
     const source = fs.readFileSync(filename).toString('utf-8')
     return evalJSONJS(source, filename, loaderContext)
   }, filename, dirname, ...defValues)

package/lib/web/processJSON.js

@@ -222,7 +222,7 @@ module.exports = function (json, {
           loaderContext._module && loaderContext._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'page', outputPath))
           localPagesMap[outputPath] = {
             resource: addQuery(resource, { isPage: true }),
-            async: tarRoot || queryObj.async,
+            async: queryObj.async || tarRoot,
             isFirst
           }
           callback()

package/lib/web/processScript.js

@@ -20,6 +20,13 @@ function shallowStringify (obj) {
   return `{${arr.join(',')}}`
 }
 
+function getAsyncChunkName (chunkName) {
+  if (chunkName && typeof chunkName !== 'boolean') {
+    return `/* webpackChunkName: "${chunkName}" */`
+  }
+  return ''
+}
+
 module.exports = function (script, {
   loaderContext,
   ctorType,
@@ -62,7 +69,7 @@ module.exports = function (script, {
       if (pageCfg) {
         const pageRequest = stringifyRequest(pageCfg.resource)
         if (pageCfg.async) {
-          tabBarPagesMap[pagePath] = `()=>import(${pageRequest}).then(res => getComponent(res, { __mpxPageRoute: ${JSON.stringify(pagePath)} }))`
+          tabBarPagesMap[pagePath] = `()=>import(${getAsyncChunkName(pageCfg.async)}${pageRequest}).then(res => getComponent(res, { __mpxPageRoute: ${JSON.stringify(pagePath)} }))`
         } else {
           tabBarPagesMap[pagePath] = `getComponent(require(${pageRequest}), { __mpxPageRoute: ${JSON.stringify(pagePath)} })`
         }
@@ -177,7 +184,7 @@ module.exports = function (script, {
           pagesMap[pagePath] = `getComponent(require(${stringifyRequest(tabBarContainerPath)}), { __mpxBuiltIn: true })`
         } else {
           if (pageCfg.async) {
-            pagesMap[pagePath] = `()=>import(${pageRequest}).then(res => getComponent(res, { __mpxPageRoute: ${JSON.stringify(pagePath)} }))`
+            pagesMap[pagePath] = `()=>import(${getAsyncChunkName(pageCfg.async)} ${pageRequest}).then(res => getComponent(res, { __mpxPageRoute: ${JSON.stringify(pagePath)} }))`
           } else {
             // 为了保持小程序中app->page->component的js执行顺序，所有的page和component都改为require引入
             pagesMap[pagePath] = `getComponent(require(${pageRequest}), { __mpxPageRoute: ${JSON.stringify(pagePath)} })`
@@ -193,7 +200,7 @@ module.exports = function (script, {
         const componentCfg = localComponentsMap[componentName]
         const componentRequest = stringifyRequest(componentCfg.resource)
         if (componentCfg.async) {
-          componentsMap[componentName] = `()=>import(${componentRequest}).then(res => getComponent(res))`
+          componentsMap[componentName] = `()=>import(${getAsyncChunkName(componentCfg.async)}${componentRequest}).then(res => getComponent(res))`
         } else {
           componentsMap[componentName] = `getComponent(require(${componentRequest}))`
         }

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.24",
+  "version": "2.7.31",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "1764785d4da33a7ea9004edc7ea18596262c7969"
+  "gitHead": "c9cfb014d084999cc30890231dc10b8a1f4771a9"
 }