@mpxjs/webpack-plugin 2.7.20 → 2.7.27

package/lib/index.js

@@ -22,6 +22,7 @@ const ExternalsPlugin = require('webpack/lib/ExternalsPlugin')
 const AddModePlugin = require('./resolver/AddModePlugin')
 const AddEnvPlugin = require('./resolver/AddEnvPlugin')
 const PackageEntryPlugin = require('./resolver/PackageEntryPlugin')
+const FixDescriptionInfoPlugin = require('./resolver/FixDescriptionInfoPlugin')
 // const CommonJsRequireDependency = require('webpack/lib/dependencies/CommonJsRequireDependency')
 // const HarmonyImportSideEffectDependency = require('webpack/lib/dependencies/HarmonyImportSideEffectDependency')
 // const RequireHeaderDependency = require('webpack/lib/dependencies/RequireHeaderDependency')
@@ -302,6 +303,7 @@ class MpxWebpackPlugin {
       compiler.options.resolve.plugins.push(addEnvPlugin)
     }
     compiler.options.resolve.plugins.push(packageEntryPlugin)
+    compiler.options.resolve.plugins.push(new FixDescriptionInfoPlugin())
 
     let splitChunksPlugin
     let splitChunksOptions
@@ -789,14 +791,25 @@ class MpxWebpackPlugin {
             }
           }
         } else if (independent) {
-          // ContextModule/RawModule和ExternalModule等只在独立分包的情况下添加分包标记，其余默认不添加
-          const postfix = `|independent=${independent}|${currentPackageRoot}`
-          const rawIdentifier = module.identifier
-          if (rawIdentifier) {
-            module.identifier = () => {
-              return rawIdentifier.call(module) + postfix
+          // ContextModule/RawModule/ExternalModule等只在独立分包的情况下添加分包标记，其余默认不添加
+          const hackModuleIdentifier = (module) => {
+            const postfix = `|independent=${independent}|${currentPackageRoot}`
+            const rawIdentifier = module.identifier
+            if (rawIdentifier && !rawIdentifier.__mpxHacked) {
+              module.identifier = () => {
+                return rawIdentifier.call(module) + postfix
+              }
+              module.identifier.__mpxHacked = true
             }
           }
+          hackModuleIdentifier(module)
+          const rawCallback = callback
+          callback = (err, module) => {
+            // 因为文件缓存的存在，前面hack identifier的行为对于从文件缓存中创建得到的module并不生效，因此需要在回调中进行二次hack处理
+            if (err) return rawCallback(err)
+            hackModuleIdentifier(module)
+            rawCallback(null, module)
+          }
         }
         return rawAddModule.call(compilation, module, callback)
       }

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/resolver/FixDescriptionInfoPlugin.js

@@ -0,0 +1,28 @@
+const path = require('path')
+
+module.exports = class FixDescriptionInfoPlugin {
+  apply (resolver) {
+    resolver.hooks.result.tap('FixDescriptionInfoPlugin', (request) => {
+      const { path: resourcePath } = request
+      const segments = resourcePath.split(path.sep)
+      let rootIndex = -1
+      for (let i = segments.length - 1; i >= 0; i--) {
+        const segment = segments[i]
+        if (segment === 'node_modules') {
+          rootIndex = segments[i + 1].startsWith('@') ? i + 2 : i + 1
+          break
+        }
+      }
+      if (rootIndex !== -1) {
+        const descriptionFileRoot = segments.slice(0, rootIndex + 1).join(path.sep)
+        const descriptionFilePath = path.join(descriptionFileRoot, 'package.json')
+        if (descriptionFilePath !== request.descriptionFilePath) {
+          Object.assign(request, {
+            descriptionFileRoot,
+            descriptionFilePath
+          })
+        }
+      }
+    })
+  }
+}

package/lib/resolver/PackageEntryPlugin.js

@@ -16,7 +16,7 @@ module.exports = class PackageEntryPlugin {
    */
   apply (resolver) {
     const target = resolver.ensureHook(this.target)
-    resolver.getHook(this.source).tapAsync('PackagePlugin', (request, resolveContext, callback) => {
+    resolver.getHook(this.source).tapAsync('PackageEntryPlugin', (request, resolveContext, callback) => {
       if (request.miniprogram) return callback()
       let { path: resourcePath, descriptionFileData, descriptionFileRoot } = request
       if (request.miniprogram || !descriptionFileData) return callback()

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/package.json

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