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

package/lib/independent-loader.js

@@ -40,16 +40,7 @@ module.exports = function (content) {
     const i18nWxsPath = normalize.lib('runtime/i18n.wxs')
     const i18nWxsLoaderPath = normalize.lib('wxs/i18n-loader.js')
     const i18nWxsRequest = i18nWxsLoaderPath + '!' + i18nWxsPath
-    const i18nMethodsVar = 'i18nMethods'
-    this._module.addDependency(new CommonJsVariableDependency(i18nWxsRequest, i18nMethodsVar))
-
-    output += `if (!global.i18n) {
-  global.i18n = ${JSON.stringify({
-    locale: i18n.locale,
-    version: 0
-  })}
-  global.i18nMethods = ${i18nMethodsVar}
-}\n`
+    this._module.addDependency(new CommonJsVariableDependency(i18nWxsRequest))
   }
   output += content
   output += '\n'

package/lib/index.js

@@ -487,13 +487,13 @@ class MpxWebpackPlugin {
           exportModules: new Set(),
           // 记录entryModule与entryNode的对应关系，用于体积分析
           entryNodeModulesMap: new Map(),
-          extractedMap: {},
+          // 记录与asset相关联的modules，用于体积分析
+          assetModulesMap: new Map(),
           usingComponents: {},
           // todo es6 map读写性能高于object，之后会逐步替换
           vueContentCache: new Map(),
           currentPackageRoot: '',
           wxsContentMap: {},
-          assetsInfo: new Map(),
           forceUsePageCtor: this.options.forceUsePageCtor,
           resolveMode: this.options.resolveMode,
           mode: this.options.mode,
@@ -792,6 +792,12 @@ class MpxWebpackPlugin {
         return source
       })
 
+      compilation.hooks.moduleAsset.tap('MpxWebpackPlugin', (module, filename) => {
+        const modules = mpx.assetModulesMap.get(filename) || new Set()
+        modules.add(module)
+        mpx.assetModulesMap.set(filename, modules)
+      })
+
       compilation.hooks.beforeModuleAssets.tap('MpxWebpackPlugin', () => {
         const extractedAssetsMap = new Map()
         for (const module of compilation.modules) {
@@ -804,8 +810,7 @@ class MpxWebpackPlugin {
                 extractedAssetsMap.set(filename, extractedAssets)
               }
               extractedAssets.push(extractedInfo)
-              // todo 后续计算体积时可以通过这个钩子关联静态assets和module
-              // compilation.hooks.moduleAsset.call(module, filename)
+              compilation.hooks.moduleAsset.call(module, filename)
             }
           }
         }
@@ -1032,7 +1037,6 @@ class MpxWebpackPlugin {
         }
 
         const processedChunk = new Set()
-        // const rootName = compilation.entries.keys().next().value
         const appName = mpx.appInfo.name
 
         function processChunk (chunk, isRuntime, relativeChunks) {
@@ -1300,13 +1304,45 @@ try {
       const fs = compiler.intermediateFileSystem
       const cacheLocation = compiler.options.cache.cacheLocation
       return new Promise((resolve, reject) => {
-        fs.rm(cacheLocation, {
-          recursive: true,
-          force: true
-        }, (err) => {
-          if (err) return reject(err)
-          resolve()
-        })
+        if (fs.rm) {
+          fs.rm(cacheLocation, {
+            recursive: true,
+            force: true
+          }, (err) => {
+            if (err) return reject(err)
+            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)
+              })
+            })
+          }
+
+          rmdir(cacheLocation, (err) => {
+            if (err) return reject(err)
+            resolve()
+          })
+        }
       })
     }
 

package/lib/json-compiler/index.js

@@ -272,9 +272,7 @@ module.exports = function (content) {
                   env
                 })
                 // 对于通过.mpx文件声明的独立分包，默认将其自身的script block视为init module
-                if (parts.script && queryObj.independent === true) {
-                  queryObj.independent = result
-                }
+                if (queryObj.independent === true) queryObj.independent = result
                 getJSONContent(parts.json || {}, this, (err, content) => {
                   callback(err, result, content)
                 })

package/lib/loader.js

@@ -224,16 +224,7 @@ module.exports = function (content) {
         const i18nWxsPath = normalize.lib('runtime/i18n.wxs')
         const i18nWxsLoaderPath = normalize.lib('wxs/i18n-loader.js')
         const i18nWxsRequest = i18nWxsLoaderPath + '!' + i18nWxsPath
-        const i18nMethodsVar = 'i18nMethods'
-        this._module.addDependency(new CommonJsVariableDependency(i18nWxsRequest, i18nMethodsVar))
-
-        output += `if (!global.i18n) {
-  global.i18n = ${JSON.stringify({
-    locale: i18n.locale,
-    version: 0
-  })}
-  global.i18nMethods = ${i18nMethodsVar}
-}\n`
+        this._module.addDependency(new CommonJsVariableDependency(i18nWxsRequest))
       }
 
       // 为独立分包注入init module

package/lib/runtime/i18n.wxs

@@ -6,7 +6,6 @@ function genRegExp (str, flags) {
   }
 }
 
-
 function likeArray (arr) {
   if (!__mpx_wxs__) {
     return Array.isArray(arr)
@@ -23,7 +22,6 @@ function isDef (v) {
   return v !== undefined && v !== null
 }
 
-
 var RE_TOKEN_LIST_VALUE = genRegExp('^[0-9]+')
 var RE_TOKEN_NAMED_VALUE = genRegExp('^[A-Za-z0-9_]+')
 
@@ -40,7 +38,10 @@ function parseMessage (format) {
     var char = format[position++]
     if (char === '{') {
       if (text) {
-        tokens.push({ type: 'text', value: text })
+        tokens.push({
+          type: 'text',
+          value: text
+        })
       }
 
       text = ''
@@ -56,7 +57,10 @@ function parseMessage (format) {
         : isClosed && RE_TOKEN_NAMED_VALUE.test(sub)
           ? 'named'
           : 'unknown'
-      tokens.push({ value: sub, type: type })
+      tokens.push({
+        value: sub,
+        type: type
+      })
     } else if (char === '%') {
       // when found rails i18n syntax, skip text capture
       if (format[(position)] !== '{') {
@@ -67,7 +71,10 @@ function parseMessage (format) {
     }
   }
 
-  text && tokens.push({ type: 'text', value: text })
+  text && tokens.push({
+    type: 'text',
+    value: text
+  })
 
   return tokens
 }
@@ -263,6 +270,11 @@ function exist (messages, locale, key) {
 var messages = {}
 var dateTimeFormats = {}
 var numberFormats = {}
+var locale = 'zh-CN'
+
+function getLocale () {
+  return __mpx_locale__ || locale
+}
 
 function getMessages () {
   // __mpx_messages__会在编译时通过lib/wxs/i18n-loader注入
@@ -339,7 +351,15 @@ module.exports = {
 }
 
 if (!__mpx_wxs__) {
-  module.exports.__getMessages = getMessages
-  module.exports.__getDateTimeFormats = getDateTimeFormats
-  module.exports.__getNumberFormats = getNumberFormats
+  if (!global.i18n) {
+    global.i18n = {
+      locale: getLocale(),
+      version: 0
+    }
+    global.i18nMethods = Object.assign(module.exports, {
+      __getMessages: getMessages,
+      __getDateTimeFormats: getDateTimeFormats,
+      __getNumberFormats: getNumberFormats
+    })
+  }
 }

package/lib/wxs/i18n-loader.js

@@ -3,7 +3,7 @@ const loaderUtils = require('loader-utils')
 
 module.exports = function (content) {
   const i18n = this.getMpx().i18n
-  let prefix = 'var __mpx_messages__, __mpx_datetime_formats__, __mpx_number_formats__\n'
+  let prefix = 'var __mpx_messages__, __mpx_datetime_formats__, __mpx_number_formats__, __mpx_locale__\n'
   if (i18n) {
     if (i18n.messages) {
       prefix += `__mpx_messages__ = ${JSON.stringify(i18n.messages)}\n`
@@ -20,6 +20,9 @@ module.exports = function (content) {
     } else if (i18n.numberFormatsPath) {
       prefix += `__mpx_number_formats__ = require(${loaderUtils.stringifyRequest(this, i18n.numberFormatsPath)})\n`
     }
+    if (i18n.locale) {
+      prefix += `__mpx_locale__ = ${JSON.stringify(i18n.locale)}\n`
+    }
   }
   content = prefix + content
   return content

package/package.json

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