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

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

@@ -40,16 +40,9 @@ 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))
+    // 避免该模块被concatenate导致注入的i18n没有最先执行
+    this._module.buildInfo.moduleConcatenationBailout = 'i18n'
   }
   output += content
   output += '\n'

package/lib/index.js

@@ -219,6 +219,24 @@ class MpxWebpackPlugin {
     }
   }
 
+  static getPageEntry (request) {
+    return addQuery(request, { isPage: true })
+  }
+
+  static getComponentEntry (request) {
+    return addQuery(request, { isComponent: true })
+  }
+
+  static getPluginEntry (request) {
+    return addQuery(request, {
+      mpx: true,
+      extract: true,
+      isPlugin: true,
+      asScript: true,
+      type: 'json'
+    })
+  }
+
   runModeRules (data) {
     const { resourcePath, queryObj } = parseRequest(data.resource)
     if (queryObj.mode) {
@@ -487,13 +505,15 @@ class MpxWebpackPlugin {
           exportModules: new Set(),
           // 记录entryModule与entryNode的对应关系，用于体积分析
           entryNodeModulesMap: new Map(),
-          extractedMap: {},
+          // 记录与asset相关联的modules，用于体积分析
+          assetsModulesMap: new Map(),
+          // 记录与asset相关联的ast，用于体积分析和esCheck，避免重复parse
+          assetsASTsMap: 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,
@@ -577,15 +597,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 +641,6 @@ class MpxWebpackPlugin {
             const resourceMap = mpx[`${resourceType}sMap`] || mpx.otherResourcesMap
 
             if (!resourceMap.main) {
-              currentResourceMap = resourceMap
               packageRoot = currentPackageRoot
               packageName = currentPackageName
             } else {
@@ -625,36 +671,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
             }
           }
         }
@@ -729,12 +763,13 @@ class MpxWebpackPlugin {
             }
           }
         } else if (independent) {
-          // ContextModule和RawModule只在独立分包的情况下添加分包标记，其余默认不添加
+          // ContextModule/RawModule和ExternalModule等只在独立分包的情况下添加分包标记，其余默认不添加
           const postfix = `|independent=${independent}|${currentPackageRoot}`
-          if (module._identifier) {
-            module._identifier += postfix
-          } else if (module.identifierStr) {
-            module.identifierStr += postfix
+          const rawIdentifier = module.identifier
+          if (rawIdentifier) {
+            module.identifier = () => {
+              return rawIdentifier.call(module) + postfix
+            }
           }
         }
         return rawAddModule.call(compilation, module, callback)
@@ -792,6 +827,12 @@ class MpxWebpackPlugin {
         return source
       })
 
+      compilation.hooks.moduleAsset.tap('MpxWebpackPlugin', (module, filename) => {
+        const modules = mpx.assetsModulesMap.get(filename) || new Set()
+        modules.add(module)
+        mpx.assetsModulesMap.set(filename, modules)
+      })
+
       compilation.hooks.beforeModuleAssets.tap('MpxWebpackPlugin', () => {
         const extractedAssetsMap = new Map()
         for (const module of compilation.modules) {
@@ -804,8 +845,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 +1072,6 @@ class MpxWebpackPlugin {
         }
 
         const processedChunk = new Set()
-        // const rootName = compilation.entries.keys().next().value
         const appName = mpx.appInfo.name
 
         function processChunk (chunk, isRuntime, relativeChunks) {
@@ -1299,14 +1338,40 @@ try {
     const clearFileCache = () => {
       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()
-        })
+      return new Promise((resolve) => {
+        if (typeof fs.rm === 'function') {
+          fs.rm(cacheLocation, {
+            recursive: true,
+            force: true
+          }, resolve)
+        } else {
+          // polyfill fs.rm
+          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)
+          }
+          rm(cacheLocation, 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

@@ -51,7 +51,7 @@ module.exports = function (content) {
   }
 
   // 支持资源query传入isPage或isComponent支持页面/组件单独编译
-  if (queryObj.isComponent || queryObj.isPage) {
+  if (ctorType === 'app' && (queryObj.isComponent || queryObj.isPage)) {
     const entryName = getEntryName(this) || (queryObj.isComponent ? 'noEntryComponent' : 'noEntryPage')
     ctorType = queryObj.isComponent ? 'component' : 'page'
     this._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, ctorType, entryName, packageRoot))
@@ -224,16 +224,9 @@ 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))
+        // 避免该模块被concatenate导致注入的i18n没有最先执行
+        this._module.buildInfo.moduleConcatenationBailout = 'i18n'
       }
 
       // 为独立分包注入init module
@@ -241,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'
       }
 
       // 注入构造函数
@@ -267,6 +262,10 @@ module.exports = function (content) {
 
       if (template) {
         const extraOptions = {
+          ...template.src ? {
+            ...queryObj,
+            resourcePath
+          } : null,
           hasScoped,
           hasComment,
           isNative,
@@ -287,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') {
@@ -307,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'
@@ -319,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/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/runtime/stringify.wxs

@@ -120,6 +120,8 @@ function stringifyArray (value) {
 }
 
 var mpxDashReg = genRegExp('(.+)MpxDash$')
+// 转义字符在wxs正则中存在平台兼容性问题，用[$]规避使用转义字符
+var mpxDashReplaceReg = genRegExp('[$]', 'g')
 
 function stringifyObject (value) {
   var res = ''
@@ -129,7 +131,7 @@ function stringifyObject (value) {
     if (value[key]) {
       if (res) res += ' '
       if (mpxDashReg.test(key)) {
-        key = hump2dash(mpxDashReg.exec(key)[1])
+        key = mpxDashReg.exec(key)[1].replace(mpxDashReplaceReg, '-')
       }
       res += key
     }

package/lib/template-compiler/compiler.js

@@ -1619,7 +1619,9 @@ function processClass (el, meta) {
   staticClass = staticClass.replace(/\s+/g, ' ')
   if (dynamicClass) {
     let staticClassExp = parseMustache(staticClass).result
-    let dynamicClassExp = transDynamicClassExpr(parseMustache(dynamicClass).result)
+    let dynamicClassExp = transDynamicClassExpr(parseMustache(dynamicClass).result, {
+      error: error$1
+    })
     addAttrs(el, [{
       name: targetType,
       // swan中externalClass是通过编译时静态实现，因此需要保留原有的staticClass形式避免externalClass失效

package/lib/template-compiler/index.js

@@ -53,7 +53,8 @@ module.exports = function (raw) {
     externalClasses,
     hasScoped,
     moduleId,
-    filePath: this.resourcePath,
+    // 这里需传递resourcePath和wxsContentMap保持一致
+    filePath: resourcePath,
     i18n,
     checkUsingComponents: mpx.checkUsingComponents,
     globalComponents: Object.keys(mpx.usingComponents),

package/lib/template-compiler/trans-dynamic-class-expr.js

@@ -1,27 +1,32 @@
 const babylon = require('@babel/parser')
 const t = require('@babel/types')
 const generate = require('@babel/generator').default
-const dash2hump = require('../utils/hump-dash').dash2hump
 
-module.exports = function transDynamicClassExpr (expr) {
-  expr = babylon.parseExpression(expr, {
-    plugins: [
-      'objectRestSpread'
-    ]
-  })
-  if (t.isObjectExpression(expr)) {
-    expr.properties.forEach((property) => {
-      if (t.isObjectProperty(property) && !property.computed) {
-        const propertyName = property.key.name || property.key.value
-        if (/-/.test(propertyName)) {
-          property.key = t.identifier(dash2hump(propertyName) + 'MpxDash')
-        } else {
-          property.key = t.identifier(propertyName)
-        }
-      }
+module.exports = function transDynamicClassExpr (expr, { error } = {}) {
+  try {
+    const ast = babylon.parseExpression(expr, {
+      plugins: [
+        'objectRestSpread'
+      ]
     })
+    if (t.isObjectExpression(ast)) {
+      ast.properties.forEach((property) => {
+        if (t.isObjectProperty(property) && !property.computed) {
+          const propertyName = property.key.name || property.key.value
+          if (/-/.test(propertyName)) {
+            if (/\$/.test(propertyName)) {
+              error(`Dynamic classname [${propertyName}] is not supported, which includes [-] char and [$] char at the same time.`)
+            } else {
+              property.key = t.identifier(propertyName.replace(/-/g, '$$') + 'MpxDash')
+            }
+          }
+        }
+      })
+    }
+    return generate(ast, {
+      compact: true
+    }).code
+  } catch (e) {
+    return expr
   }
-  return generate(expr, {
-    compact: true
-  }).code
 }

package/lib/web/processTemplate.js

@@ -96,7 +96,7 @@ module.exports = function (template, {
           // todo 后续输出web也采用mpx的scoped处理
           hasScoped: false,
           moduleId,
-          filePath: loaderContext.resourcePath,
+          filePath: resourcePath,
           i18n: null,
           checkUsingComponents,
           // web模式下全局组件不会被合入usingComponents中，故globalComponents可以传空

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.10",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "0ea8bcfff2ccfc433cb2ce43275b7e2af2bc8a61"
+  "gitHead": "7c4e400e01958c74f15ec45a09dd43c2c1069435"
 }