@mpxjs/webpack-plugin 2.7.1-beta.2 → 2.7.1-beta.7

package/lib/dependencies/DynamicEntryDependency.js

@@ -29,7 +29,7 @@ class DynamicEntryDependency extends NullDependency {
     const publicPath = compilation.outputOptions.publicPath || ''
     let { resource, entryType, outputPath, relativePath, originEntryNode } = this
 
-    const { packageRoot, outputPath: filename, alreadyOutputed } = mpx.getPackageInfo({
+    const { packageRoot, outputPath: filename, alreadyOutputted } = mpx.getPackageInfo({
       resource,
       outputPath,
       resourceType: entryType,
@@ -49,7 +49,7 @@ class DynamicEntryDependency extends NullDependency {
     // export类型的resultPath需要添加.js后缀
     if (entryType === 'export') resultPath += '.js'
 
-    if (alreadyOutputed) return callback(null, { resultPath })
+    if (alreadyOutputted) return callback(null, { resultPath })
 
     if (packageRoot) {
       resource = addQuery(resource, { packageRoot })

package/lib/dependencies/RecordResourceMapDependency.js

@@ -16,10 +16,19 @@ class RecordResourceMapDependency extends NullDependency {
 
   mpxAction (module, compilation, callback) {
     const mpx = compilation.__mpx__
-    const packageName = this.packageRoot || 'main'
-    const resourceMap = mpx[`${this.resourceType}sMap`] || mpx.otherResourcesMap
-    const subResourceMap = resourceMap.main ? resourceMap[packageName] : resourceMap
-    subResourceMap[this.resourcePath] = this.outputPath
+    const { resourcePath, resourceType, outputPath, packageRoot } = this
+    mpx.recordResourceMap({
+      resourcePath,
+      resourceType,
+      outputPath,
+      packageRoot,
+      warn (e) {
+        compilation.warnings.push(e)
+      },
+      error (e) {
+        compilation.errors.push(e)
+      }
+    })
     return callback()
   }
 

package/lib/helpers.js

@@ -14,6 +14,7 @@ const defaultLang = {
 
 module.exports = function createHelpers (loaderContext) {
   const rawRequest = loaderUtils.getRemainingRequest(loaderContext)
+  const { resourcePath, queryObj } = parseRequest(loaderContext.resource)
 
   function getRequire (type, part, extraOptions, index) {
     return 'require(' + getRequestString(type, part, extraOptions, index) + ')'
@@ -35,9 +36,9 @@ module.exports = function createHelpers (loaderContext) {
 
   function getFakeRequest (type, part) {
     const lang = part.lang || defaultLang[type] || type
-    const { resourcePath, queryObj } = parseRequest(loaderContext.resource)
-    if (lang === 'json') queryObj.asScript = true
-    return addQuery(`${resourcePath}.${lang}`, queryObj)
+    const options = { ...queryObj }
+    if (lang === 'json') options.asScript = true
+    return addQuery(`${resourcePath}.${lang}`, options)
   }
 
   function getRequestString (type, part, extraOptions = {}, index = 0) {

package/lib/independent-loader.js

@@ -41,6 +41,8 @@ module.exports = function (content) {
     const i18nWxsLoaderPath = normalize.lib('wxs/i18n-loader.js')
     const i18nWxsRequest = i18nWxsLoaderPath + '!' + i18nWxsPath
     this._module.addDependency(new CommonJsVariableDependency(i18nWxsRequest))
+    // 避免该模块被concatenate导致注入的i18n没有最先执行
+    this._module.buildInfo.moduleConcatenationBailout = 'i18n'
   }
   output += content
   output += '\n'

package/lib/index.js

@@ -488,7 +488,9 @@ class MpxWebpackPlugin {
           // 记录entryModule与entryNode的对应关系，用于体积分析
           entryNodeModulesMap: new Map(),
           // 记录与asset相关联的modules，用于体积分析
-          assetModulesMap: new Map(),
+          assetsModulesMap: new Map(),
+          // 记录与asset相关联的ast，用于体积分析和esCheck，避免重复parse
+          assetsASTsMap: new Map(),
           usingComponents: {},
           // todo es6 map读写性能高于object，之后会逐步替换
           vueContentCache: new Map(),
@@ -577,15 +579,42 @@ class MpxWebpackPlugin {
             mpx.extractedFilesCache.set(resource, file)
             return file
           },
+          recordResourceMap: ({ resourcePath, resourceType, outputPath, packageRoot = '', warn, error }) => {
+            const packageName = packageRoot || 'main'
+            const resourceMap = mpx[`${resourceType}sMap`] || mpx.otherResourcesMap
+            const currentResourceMap = resourceMap.main ? resourceMap[packageName] = resourceMap[packageName] || {} : resourceMap
+            if (outputPath) {
+              if (!currentResourceMap[resourcePath] || currentResourceMap[resourcePath] === true) {
+                // 输出路径冲突检测，如果存在输出路径冲突，对输出路径进行重命名
+                // todo 用outputPathMap来检测输出路径冲突
+                for (let key in currentResourceMap) {
+                  if (currentResourceMap[key] === outputPath && key !== resourcePath) {
+                    outputPath = mpx.getOutputPath(resourcePath, resourceType, { conflictPath: outputPath })
+                    warn && warn(new Error(`Current ${resourceType} [${resourcePath}] is registered with conflicted outputPath [${currentResourceMap[key]}] which is already existed in system, will be renamed with [${outputPath}], use ?resolve to get the real outputPath!`))
+                    break
+                  }
+                }
+                currentResourceMap[resourcePath] = outputPath
+              } else {
+                if (currentResourceMap[resourcePath] === outputPath) {
+                  return true
+                } else {
+                  error && error(new Error(`Current ${resourceType} [${resourcePath}] is already registered with outputPath [${currentResourceMap[resourcePath]}], you can not register it with another outputPath [${outputPath}]!`))
+                }
+              }
+            } else if (!currentResourceMap[resourcePath]) {
+              currentResourceMap[resourcePath] = true
+            }
+            return false
+          },
           // 组件和静态资源的输出规则如下：
           // 1. 主包引用的资源输出至主包
           // 2. 分包引用且主包引用过的资源输出至主包，不在当前分包重复输出
           // 3. 分包引用且无其他包引用的资源输出至当前分包
           // 4. 分包引用且其他分包也引用过的资源，重复输出至当前分包
-          getPackageInfo: ({ resource, outputPath, resourceType, issuerResource, warn, error }) => {
+          getPackageInfo: ({ resource, resourceType, outputPath, issuerResource, warn, error }) => {
             let packageRoot = ''
             let packageName = 'main'
-            let currentResourceMap = {}
 
             const { resourcePath } = parseRequest(resource)
             const currentPackageRoot = mpx.currentPackageRoot
@@ -594,7 +623,6 @@ class MpxWebpackPlugin {
             const resourceMap = mpx[`${resourceType}sMap`] || mpx.otherResourcesMap
 
             if (!resourceMap.main) {
-              currentResourceMap = resourceMap
               packageRoot = currentPackageRoot
               packageName = currentPackageName
             } else {
@@ -625,36 +653,24 @@ class MpxWebpackPlugin {
                 }
               }
               resourceMap[packageName] = resourceMap[packageName] || {}
-              currentResourceMap = resourceMap[packageName]
             }
 
-            let alreadyOutputed = false
-            if (outputPath) {
-              outputPath = toPosix(path.join(packageRoot, outputPath))
-              // 如果之前已经进行过输出，则不需要重复进行
-              if (currentResourceMap[resourcePath] === outputPath) {
-                alreadyOutputed = true
-              } else {
-                // todo 用outputPathMap来检测冲突
-                // 输出冲突检测，如果存在输出路径冲突，对输出路径进行重命名
-                for (let key in currentResourceMap) {
-                  if (currentResourceMap[key] === outputPath && key !== resourcePath) {
-                    outputPath = toPosix(path.join(packageRoot, mpx.getOutputPath(resourcePath, resourceType, { conflictPath: outputPath })))
-                    warn && warn(new Error(`Current ${resourceType} [${resourcePath}] is registered with a conflict outputPath [${currentResourceMap[key]}] which is already existed in system, will be renamed with [${outputPath}], use ?resolve to get the real outputPath!`))
-                    break
-                  }
-                }
-                currentResourceMap[resourcePath] = outputPath
-              }
-            } else if (!currentResourceMap[resourcePath]) {
-              currentResourceMap[resourcePath] = true
-            }
+            if (outputPath) outputPath = toPosix(path.join(packageRoot, outputPath))
+
+            const alreadyOutputted = mpx.recordResourceMap({
+              resourcePath,
+              resourceType,
+              outputPath,
+              packageRoot,
+              warn,
+              error
+            })
 
             return {
               packageName,
               packageRoot,
               outputPath,
-              alreadyOutputed
+              alreadyOutputted
             }
           }
         }
@@ -793,9 +809,9 @@ class MpxWebpackPlugin {
       })
 
       compilation.hooks.moduleAsset.tap('MpxWebpackPlugin', (module, filename) => {
-        const modules = mpx.assetModulesMap.get(filename) || new Set()
+        const modules = mpx.assetsModulesMap.get(filename) || new Set()
         modules.add(module)
-        mpx.assetModulesMap.set(filename, modules)
+        mpx.assetsModulesMap.set(filename, modules)
       })
 
       compilation.hooks.beforeModuleAssets.tap('MpxWebpackPlugin', () => {
@@ -1303,45 +1319,39 @@ try {
     const clearFileCache = () => {
       const fs = compiler.intermediateFileSystem
       const cacheLocation = compiler.options.cache.cacheLocation
-      return new Promise((resolve, reject) => {
-        if (fs.rm) {
+      return new Promise((resolve) => {
+        if (typeof fs.rm === 'function') {
           fs.rm(cacheLocation, {
             recursive: true,
             force: true
-          }, (err) => {
-            if (err) return reject(err)
-            resolve()
-          })
+          }, resolve)
         } else {
           // polyfill fs.rm
-          const rmdir = (dir, callback) => {
-            fs.readdir(dir, (err, files) => {
-              if (err) return callback(err)
-              async.each(files, (file, callback) => {
-                file = path.join(dir, file)
-                async.waterfall([
-                  (callback) => {
-                    fs.stat(file, callback)
-                  },
-                  (stats, callback) => {
-                    if (stats.isDirectory()) {
-                      rmdir(file, callback)
-                    } else {
-                      fs.unlink(file, callback)
-                    }
-                  }
-                ], callback)
-              }, (err) => {
-                if (err) return callback(err)
-                fs.rmdir(dir, callback)
-              })
-            })
+          const rm = (file, callback) => {
+            async.waterfall([
+              (callback) => {
+                fs.stat(file, callback)
+              },
+              (stats, callback) => {
+                if (stats.isDirectory()) {
+                  const dir = file
+                  fs.readdir(dir, (err, files) => {
+                    if (err) return callback(err)
+                    async.each(files, (file, callback) => {
+                      file = path.join(dir, file)
+                      rm(file, callback)
+                    }, (err) => {
+                      if (err) return callback(err)
+                      fs.rmdir(dir, callback)
+                    })
+                  })
+                } else {
+                  fs.unlink(file, callback)
+                }
+              }
+            ], callback)
           }
-
-          rmdir(cacheLocation, (err) => {
-            if (err) return reject(err)
-            resolve()
-          })
+          rm(cacheLocation, resolve)
         }
       })
     }

package/lib/loader.js

@@ -225,6 +225,8 @@ module.exports = function (content) {
         const i18nWxsLoaderPath = normalize.lib('wxs/i18n-loader.js')
         const i18nWxsRequest = i18nWxsLoaderPath + '!' + i18nWxsPath
         this._module.addDependency(new CommonJsVariableDependency(i18nWxsRequest))
+        // 避免该模块被concatenate导致注入的i18n没有最先执行
+        this._module.buildInfo.moduleConcatenationBailout = 'i18n'
       }
 
       // 为独立分包注入init module
@@ -232,6 +234,8 @@ module.exports = function (content) {
         const independentLoader = normalize.lib('independent-loader.js')
         const independentInitRequest = `!!${independentLoader}!${independent}`
         this._module.addDependency(new CommonJsVariableDependency(independentInitRequest))
+        // 避免该模块被concatenate导致注入的independent init没有最先执行
+        this._module.buildInfo.moduleConcatenationBailout = 'independent init'
       }
 
       // 注入构造函数
@@ -258,6 +262,10 @@ module.exports = function (content) {
 
       if (template) {
         const extraOptions = {
+          ...template.src ? {
+            ...queryObj,
+            resourcePath
+          } : null,
           hasScoped,
           hasComment,
           isNative,
@@ -278,16 +286,16 @@ module.exports = function (content) {
         parts.styles.forEach((style, i) => {
           const scoped = style.scoped || autoScope
           const extraOptions = {
+            // style src会被特殊处理为全局复用样式，不添加resourcePath，添加isStatic及issuerFile
+            ...style.src ? {
+              ...queryObj,
+              isStatic: true,
+              issuerFile: mpx.getExtractedFile(addQuery(this.resource, { type: 'styles' }, true))
+            } : null,
             moduleId,
             scoped
           }
           // require style
-          if (style.src) {
-            // style src会被特殊处理为全局复用样式，不添加resourcePath，添加isStatic及issuerFile
-            extraOptions.isStatic = true
-            const issuerResource = addQuery(this.resource, { type: 'styles' }, true)
-            extraOptions.issuerFile = mpx.getExtractedFile(issuerResource)
-          }
           output += getRequire('styles', style, extraOptions, i) + '\n'
         })
       } else if (ctorType === 'app' && mode === 'ali') {
@@ -298,7 +306,10 @@ module.exports = function (content) {
       output += '/* json */\n'
       // 给予json默认值, 确保生成json request以自动补全json
       const json = parts.json || {}
-      output += getRequire('json', json, json.src && { resourcePath }) + '\n'
+      output += getRequire('json', json, json.src && {
+        ...queryObj,
+        resourcePath
+      }) + '\n'
 
       // script
       output += '/* script */\n'
@@ -310,9 +321,12 @@ module.exports = function (content) {
         if (scriptSrcMode) output += `global.currentSrcMode = ${JSON.stringify(scriptSrcMode)}\n`
         // 传递ctorType以补全js内容
         const extraOptions = {
+          ...script.src ? {
+            ...queryObj,
+            resourcePath
+          } : null,
           ctorType
         }
-        if (script.src) extraOptions.resourcePath = resourcePath
         output += getRequire('script', script, extraOptions) + '\n'
       }
       callback(null, output)

package/lib/native-loader.js

@@ -137,9 +137,10 @@ module.exports = function (content) {
       const getRequireByType = (type) => {
         const src = typeResourceMap[type]
         const part = { src }
-        const extraOptions = Object.assign({}, queryObj, {
+        const extraOptions = {
+          ...queryObj,
           resourcePath
-        })
+        }
 
         switch (type) {
           case 'template':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.1-beta.2",
+  "version": "2.7.1-beta.7",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "63d16469fdb25698f7d5fb6585300530f0ae5381"
+  "gitHead": "f626eb6d103d6d9685e1743500f87db46412df42"
 }