@mpxjs/webpack-plugin 2.7.52 → 2.8.0-beta.2

package/lib/template-compiler/index.js

@@ -63,19 +63,19 @@ module.exports = function (raw) {
   })
 
   if (meta.wxsContentMap) {
-    for (let module in meta.wxsContentMap) {
+    for (const module in meta.wxsContentMap) {
       wxsContentMap[`${resourcePath}~${module}`] = meta.wxsContentMap[module]
     }
   }
 
   let resultSource = ''
 
-  for (let module in meta.wxsModuleMap) {
+  for (const module in meta.wxsModuleMap) {
     const src = loaderUtils.urlToRequest(meta.wxsModuleMap[module], root)
     resultSource += `var ${module} = require(${loaderUtils.stringifyRequest(this, src)});\n`
   }
 
-  let result = compiler.serialize(ast)
+  const result = compiler.serialize(ast)
 
   if (isNative) {
     return result

package/lib/utils/add-query.js

@@ -1,6 +1,7 @@
 const parseRequest = require('./parse-request')
 const stringifyQuery = require('./stringify-query')
 const type = require('./type')
+const hasOwn = require('./has-own')
 
 // 默认为非强行覆盖原query，如需强行覆盖传递force为true
 module.exports = function addQuery (request, data = {}, force, removeKeys) {
@@ -10,7 +11,7 @@ module.exports = function addQuery (request, data = {}, force, removeKeys) {
     Object.assign(queryObj, data)
   } else {
     Object.keys(data).forEach((key) => {
-      if (!queryObj.hasOwnProperty(key)) {
+      if (!hasOwn(queryObj, key)) {
         queryObj[key] = data[key]
       }
     })

package/lib/utils/gen-component-tag.js

@@ -5,7 +5,7 @@ function stringifyAttrs (attrs) {
   let result = ''
   Object.keys(attrs).forEach(function (name) {
     result += ' ' + name
-    let value = attrs[name]
+    const value = attrs[name]
     if (value != null && value !== true) {
       result += '=' + stringifyAttr(value)
     }

package/lib/utils/has-own.js

@@ -0,0 +1,5 @@
+const hasOwnProperty = Object.prototype.hasOwnProperty
+
+module.exports = function hasOwn (obj, key) {
+  return hasOwnProperty.call(obj, key)
+}

package/lib/utils/is-empty-object.js

@@ -2,7 +2,8 @@ module.exports = function isEmptyObject (obj) {
   if (!obj) {
     return true
   }
-  for (let key in obj) {
+  /* eslint-disable  no-unreachable-loop */
+  for (const key in obj) {
     return false
   }
   return true

package/lib/utils/parse-request.js

@@ -12,9 +12,9 @@ module.exports = function parseRequest (request) {
   if (seen.has(request)) {
     return genQueryObj(seen.get(request))
   }
-  let elements = request.split('!')
-  let resource = elements.pop()
-  let loaderString = elements.join('!')
+  const elements = request.split('!')
+  const resource = elements.pop()
+  const loaderString = elements.join('!')
   let resourcePath = resource
   let resourceQuery = ''
   const queryIndex = resource.indexOf('?')

package/lib/utils/{index.js → process-defs.js}

@@ -1,15 +1,12 @@
-/**
- * @file common util methods
- */
-
 /**
  * 预处理一次常量对象，处理掉不符合标识符规则的变量，目前只处理'.'，用于在JSON/style中使用的场景
  * @param {object} defs 待处理的常量
  * @returns {object} 处理完毕的常量对象
  */
-function preProcessDefs (defs) {
+
+module.exports = function processDefs (defs) {
   const newDefs = {}
-  Object.keys(defs).map(key => {
+  Object.keys(defs).forEach(key => {
     if (typeof key === 'string' && key.indexOf('.') !== -1) {
       key.split('.').reduce((prev, curr, index, arr) => {
         if (index === arr.length - 1) {
@@ -25,7 +22,3 @@ function preProcessDefs (defs) {
   })
   return newDefs
 }
-
-module.exports = {
-  preProcessDefs
-}

package/lib/utils/stringify-query.js

@@ -9,31 +9,33 @@ const JSON5 = require('json5')
 function stringifyQuery (obj, useJSON) {
   if (useJSON) return `?${JSON5.stringify(obj)}`
 
-  const res = obj ? Object.keys(obj).sort().map(key => {
-    const val = obj[key]
+  const res = obj
+    ? Object.keys(obj).sort().map(key => {
+      const val = obj[key]
 
-    if (val === undefined) {
-      return
-    }
+      if (val === undefined) {
+        return val
+      }
 
-    if (val === true) {
-      return key
-    }
+      if (val === true) {
+        return key
+      }
 
-    if (Array.isArray(val)) {
-      const key2 = `${key}[]`
-      const result = []
-      val.slice().forEach(val2 => {
-        if (val2 === undefined) {
-          return
-        }
-        result.push(`${key2}=${encodeURIComponent(val2)}`)
-      })
-      return result.join('&')
-    }
+      if (Array.isArray(val)) {
+        const key2 = `${key}[]`
+        const result = []
+        val.slice().forEach(val2 => {
+          if (val2 === undefined) {
+            return
+          }
+          result.push(`${key2}=${encodeURIComponent(val2)}`)
+        })
+        return result.join('&')
+      }
 
-    return `${key}=${encodeURIComponent(val)}`
-  }).filter(x => x).join('&') : null
+      return `${key}=${encodeURIComponent(val)}`
+    }).filter(x => x).join('&')
+    : null
   return res ? `?${res}` : ''
 }
 

package/lib/web/processJSON.js

@@ -19,7 +19,7 @@ module.exports = function (json, {
 }, rawCallback) {
   const localPagesMap = {}
   const localComponentsMap = {}
-  let output = '/* json */\n'
+  const output = '/* json */\n'
   let jsonObj = {}
   let tabBarMap
   let tabBarStr
@@ -157,10 +157,10 @@ module.exports = function (json, {
             const context = path.dirname(result)
 
             if (content.pages) {
-              let tarRoot = queryObj.root
+              const tarRoot = queryObj.root
               if (tarRoot) {
                 delete queryObj.root
-                let subPackage = {
+                const subPackage = {
                   tarRoot,
                   pages: content.pages,
                   ...queryObj
@@ -239,8 +239,8 @@ module.exports = function (json, {
         emitError(`Current subpackage root [${subPackage.root}] is not allow starts with '.'`)
         return callback()
       }
-      let tarRoot = subPackage.tarRoot || subPackage.root || ''
-      let srcRoot = subPackage.srcRoot || subPackage.root || ''
+      const tarRoot = subPackage.tarRoot || subPackage.root || ''
+      const srcRoot = subPackage.srcRoot || subPackage.root || ''
       if (!tarRoot) return callback()
       context = path.join(context, srcRoot)
       processPages(subPackage.pages, context, tarRoot, callback)

package/lib/web/processScript.js

@@ -2,15 +2,16 @@ const genComponentTag = require('../utils/gen-component-tag')
 const loaderUtils = require('loader-utils')
 const addQuery = require('../utils/add-query')
 const normalize = require('../utils/normalize')
+const hasOwn = require('../utils/has-own')
 const createHelpers = require('../helpers')
 const optionProcessorPath = normalize.lib('runtime/optionProcessor')
 const tabBarContainerPath = normalize.lib('runtime/components/web/mpx-tab-bar-container.vue')
 const tabBarPath = normalize.lib('runtime/components/web/mpx-tab-bar.vue')
 
 function shallowStringify (obj) {
-  let arr = []
-  for (let key in obj) {
-    if (obj.hasOwnProperty(key)) {
+  const arr = []
+  for (const key in obj) {
+    if (hasOwn(obj, key)) {
       let value = obj[key]
       if (Array.isArray(value)) {
         value = `[${value.join(',')}]`
@@ -61,7 +62,7 @@ module.exports = function (script, {
   }
 
   const stringifyRequest = r => loaderUtils.stringifyRequest(loaderContext, r)
-  let tabBarPagesMap = {}
+  const tabBarPagesMap = {}
   if (tabBar && tabBarMap) {
     // 挂载tabBar组件
     const tabBarRequest = stringifyRequest(addQuery(tabBar.custom ? './custom-tab-bar/index' : tabBarPath, { isComponent: true }))
@@ -95,8 +96,8 @@ module.exports = function (script, {
       const attrs = Object.assign({}, script.attrs)
       // src改为内联require，删除
       delete attrs.src
-      // 目前ts模式都建议使用src来引ts，不支持使用lang内联编写ts
-      // delete attrs.lang
+      // script setup通过mpx处理，删除该属性避免vue报错
+      delete attrs.setup
       return attrs
     },
     content (script) {
@@ -130,7 +131,9 @@ module.exports = function (script, {
         if (i18n) {
           const i18nObj = Object.assign({}, i18n)
           content += `  import VueI18n from 'vue-i18n'
-  Vue.use(VueI18n)\n`
+  import { createI18n } from 'vue-i18n-bridge'
+  
+  Vue.use(VueI18n , { bridge: true })\n`
           const requestObj = {}
           const i18nKeys = ['messages', 'dateTimeFormats', 'numberFormats']
           i18nKeys.forEach((key) => {
@@ -143,12 +146,9 @@ module.exports = function (script, {
           Object.keys(requestObj).forEach((key) => {
             content += `  i18nCfg.${key} = require(${requestObj[key]})\n`
           })
-          content += `  const i18n = new VueI18n(i18nCfg)
-  i18n.mergeMessages = (newMessages) => {
-    Object.keys(newMessages).forEach((locale) => {
-      i18n.mergeLocaleMessage(locale, newMessages[locale])
-    })
-  }
+          content += '  i18nCfg.legacy = false\n'
+          content += `  const i18n = createI18n(i18nCfg, VueI18n)
+  Vue.use(i18n)
   Mpx.i18n = i18n
   \n`
         }
@@ -210,7 +210,8 @@ module.exports = function (script, {
 
       // 传递ctorType以补全js内容
       const extraOptions = {
-        ctorType
+        ctorType,
+        lang: script.lang || 'js'
       }
       // todo 仅靠vueContentCache保障模块唯一性还是不够严谨，后续需要考虑去除原始query后构建request
       content += `  ${getRequire('script', script, extraOptions)}\n`
@@ -259,12 +260,8 @@ module.exports = function (script, {
         content += `,
     Vue,
     VueRouter`
-        if (i18n) {
-          content += `,
-    i18n`
-        }
       }
-      content += `\n  )\n`
+      content += '\n  )\n'
       return content
     }
   })

package/lib/web/processTemplate.js

@@ -109,7 +109,7 @@ module.exports = function (template, {
           wxsModuleMap = meta.wxsModuleMap
         }
         if (meta.wxsContentMap) {
-          for (let module in meta.wxsContentMap) {
+          for (const module in meta.wxsContentMap) {
             wxsContentMap[`${resourcePath}~${module}`] = meta.wxsContentMap[module]
           }
         }

package/lib/wxml/loader.js

@@ -48,7 +48,7 @@ module.exports = function (content) {
     if (link.value.indexOf('mailto:') > -1) return
 
     // eslint-disable-next-line node/no-deprecated-api
-    let uri = url.parse(link.value)
+    const uri = url.parse(link.value)
     if (uri.hash !== null && uri.hash !== undefined) {
       uri.hash = null
       link.value = uri.format()
@@ -60,7 +60,7 @@ module.exports = function (content) {
       ident = randomIdent()
     } while (data[ident])
     data[ident] = link
-    let x = content.pop()
+    const x = content.pop()
     content.push(x.substr(link.start + link.length))
     content.push(ident)
     content.push(x.substr(0, link.start))
@@ -76,7 +76,7 @@ module.exports = function (content) {
 
     const link = data[match]
 
-    let src = loaderUtils.urlToRequest(link.value, root)
+    const src = loaderUtils.urlToRequest(link.value, root)
 
     let requestString, extraOptions
 

package/lib/wxs/i18n-loader.js

@@ -3,26 +3,19 @@ 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__, __mpx_locale__\n'
+  let prefix = 'var __mpx_messages__, __mpx_locale__, __mpx_fallback_locale__\n'
   if (i18n) {
     if (i18n.messages) {
       prefix += `__mpx_messages__ = ${JSON.stringify(i18n.messages)}\n`
     } else if (i18n.messagesPath) {
       prefix += `__mpx_messages__ = require(${loaderUtils.stringifyRequest(this, i18n.messagesPath)})\n`
     }
-    if (i18n.dateTimeFormats) {
-      prefix += `__mpx_datetime_formats__ = ${JSON.stringify(i18n.dateTimeFormats)}\n`
-    } else if (i18n.dateTimeFormatsPath) {
-      prefix += `__mpx_datetime_formats__ = require(${loaderUtils.stringifyRequest(this, i18n.dateTimeFormatsPath)})\n`
-    }
-    if (i18n.numberFormats) {
-      prefix += `__mpx_number_formats__ = ${JSON.stringify(i18n.numberFormats)}\n`
-    } 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`
     }
+    if (i18n.fallbackLocale) {
+      prefix += `__mpx_fallback_locale__ = ${JSON.stringify(i18n.fallbackLocale)}\n`
+    }
   }
   content = prefix + content
   return content

package/lib/wxs/pre-loader.js

@@ -22,54 +22,61 @@ module.exports = function (content) {
 
   const visitor = {}
 
-  if (module.wxs && mode === 'ali') {
-    let insertNodes = babylon.parse(
-      'var __mpx_args__ = [];\n' +
-      'for (var i = 0; i < arguments.length; i++) {\n' +
-      '  __mpx_args__[i] = arguments[i];\n' +
-      '}'
-    ).program.body
-    // todo Object.assign可能会覆盖，未来存在非预期的覆盖case时需要改进处理
-    Object.assign(visitor, {
-      Identifier (path) {
-        if (path.node.name === 'arguments') {
-          path.node.name = '__mpx_args__'
-          const targetPath = path.getFunctionParent().get('body')
-          if (!targetPath.inserted) {
-            let results = targetPath.unshiftContainer('body', insertNodes) || []
-            targetPath.inserted = true
-            results.forEach((item) => {
-              item.shouldStopTraverse = true
-            })
+  if (module.wxs) {
+    if (mode === 'ali') {
+      const insertNodes = babylon.parse(
+        'var __mpx_args__ = [];\n' +
+        'for (var i = 0; i < arguments.length; i++) {\n' +
+        '  __mpx_args__[i] = arguments[i];\n' +
+        '}'
+      ).program.body
+      // todo Object.assign可能会覆盖，未来存在非预期的覆盖case时需要改进处理
+      Object.assign(visitor, {
+        Identifier (path) {
+          if (path.node.name === 'arguments') {
+            path.node.name = '__mpx_args__'
+            const targetPath = path.getFunctionParent().get('body')
+            if (!targetPath.inserted) {
+              const results = targetPath.unshiftContainer('body', insertNodes) || []
+              targetPath.inserted = true
+              results.forEach((item) => {
+                item.shouldStopTraverse = true
+              })
+            }
           }
-        }
-      },
-      CallExpression (path) {
-        const callee = path.node.callee
-        if (t.isIdentifier(callee) && callee.name === 'getRegExp') {
-          const argPath = path.get('arguments')[0]
-          if (argPath.isStringLiteral()) {
-            argPath.replaceWith(t.stringLiteral(argPath.node.extra.raw.slice(1, -1)))
+        },
+        ForStatement (path) {
+          if (path.shouldStopTraverse) {
+            path.stop()
+          }
+        },
+        // 处理vant-aliapp中export var bem = bem;这种不被acorn支持的2b语法
+        ExportNamedDeclaration (path) {
+          if (
+            path.node.declaration &&
+            path.node.declaration.declarations.length === 1 &&
+            path.node.declaration.declarations[0].id.name === path.node.declaration.declarations[0].init.name
+          ) {
+            const name = path.node.declaration.declarations[0].id.name
+            path.replaceWith(t.exportNamedDeclaration(undefined, [t.exportSpecifier(t.identifier(name), t.identifier(name))]))
           }
         }
-      },
-      ForStatement (path) {
-        if (path.shouldStopTraverse) {
-          path.stop()
-        }
-      },
-      // 处理vant-aliapp中export var bem = bem;这种不被acorn支持的2b语法
-      ExportNamedDeclaration (path) {
-        if (
-          path.node.declaration &&
-          path.node.declaration.declarations.length === 1 &&
-          path.node.declaration.declarations[0].id.name === path.node.declaration.declarations[0].init.name
-        ) {
-          const name = path.node.declaration.declarations[0].id.name
-          path.replaceWith(t.exportNamedDeclaration(undefined, [t.exportSpecifier(t.identifier(name), t.identifier(name))]))
+      })
+    }
+
+    if (mode !== 'wx') {
+      Object.assign(visitor, {
+        CallExpression (path) {
+          const callee = path.node.callee
+          if (t.isIdentifier(callee) && callee.name === 'getRegExp') {
+            const argPath = path.get('arguments')[0]
+            if (argPath.isStringLiteral()) {
+              argPath.replaceWith(t.stringLiteral(argPath.node.extra.raw.slice(1, -1)))
+            }
+          }
         }
-      }
-    })
+      })
+    }
   }
 
   if (mode === 'dd') {

package/lib/wxss/compile-exports.js

@@ -1,4 +1,4 @@
-var camelCase = require('lodash.camelcase')
+const camelCase = require('lodash.camelcase')
 
 function dashesCamelCase (str) {
   return str.replace(/-+(\w)/g, function (match, firstLetter) {
@@ -11,15 +11,15 @@ module.exports = function compileExports (result, importItemMatcher, camelCaseKe
     return ''
   }
 
-  var exportJs = Object.keys(result.exports).reduce(function (res, key) {
-    var valueAsString = JSON.stringify(result.exports[key])
+  const exportJs = Object.keys(result.exports).reduce(function (res, key) {
+    let valueAsString = JSON.stringify(result.exports[key])
     valueAsString = valueAsString.replace(result.importItemRegExpG, importItemMatcher)
 
     function addEntry (k) {
       res.push('\t' + JSON.stringify(k) + ': ' + valueAsString)
     }
 
-    var targetKey
+    let targetKey
     switch (camelCaseKeys) {
       case true:
         addEntry(key)

package/lib/wxss/createResolver.js

@@ -6,8 +6,8 @@ module.exports = function createResolver (alias) {
   }
 
   alias = Object.keys(alias).map(function (key) {
-    var onlyModule = false
-    var obj = alias[key]
+    let onlyModule = false
+    let obj = alias[key]
     if (/\$$/.test(key)) {
       onlyModule = true
       key = key.substr(0, key.length - 1)
@@ -26,7 +26,7 @@ module.exports = function createResolver (alias) {
 
   return function (url) {
     alias.forEach(function (obj) {
-      var name = obj.name
+      const name = obj.name
       if (url === name || (!obj.onlyModule && url.startsWith(name + '/'))) {
         url = obj.alias + url.substr(name.length)
       }

package/lib/wxss/css-base.js

@@ -5,12 +5,12 @@
 */
 // css base code, injected by the css-loader
 module.exports = function (useSourceMap) {
-  var list = []
+  const list = []
 
   // return the list of modules as css string
   list.toString = function toString () {
     return this.map(function (item) {
-      var content = cssWithMappingToString(item, useSourceMap)
+      const content = cssWithMappingToString(item, useSourceMap)
       if (item[2]) {
         return '@media ' + item[2] + '{' + content + '}'
       } else {
@@ -24,15 +24,15 @@ module.exports = function (useSourceMap) {
     if (typeof modules === 'string') {
       modules = [[null, modules, '']]
     }
-    var alreadyImportedModules = {}
-    for (var i = 0; i < this.length; i++) {
-      var id = this[i][0]
+    const alreadyImportedModules = {}
+    for (let i = 0; i < this.length; i++) {
+      const id = this[i][0]
       if (typeof id === 'number') {
         alreadyImportedModules[id] = true
       }
     }
-    for (i = 0; i < modules.length; i++) {
-      var item = modules[i]
+    for (let i = 0; i < modules.length; i++) {
+      const item = modules[i]
       // skip already imported module
       // this implementation is not 100% perfect for weird media query combinations
       //  when a module is imported multiple times with different media queries.
@@ -51,15 +51,15 @@ module.exports = function (useSourceMap) {
 }
 
 function cssWithMappingToString (item, useSourceMap) {
-  var content = item[1] || ''
-  var cssMapping = item[3]
+  const content = item[1] || ''
+  const cssMapping = item[3]
   if (!cssMapping) {
     return content
   }
 
   if (useSourceMap && typeof btoa === 'function') {
-    var sourceMapping = toComment(cssMapping)
-    var sourceURLs = cssMapping.sources.map(function (source) {
+    const sourceMapping = toComment(cssMapping)
+    const sourceURLs = cssMapping.sources.map(function (source) {
       return '/*# sourceURL=' + cssMapping.sourceRoot + source + ' */'
     })
 
@@ -72,8 +72,8 @@ function cssWithMappingToString (item, useSourceMap) {
 // Adapted from convert-source-map (MIT)
 function toComment (sourceMap) {
   // eslint-disable-next-line no-undef
-  var base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))))
-  var data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64
+  const base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))))
+  const data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64
 
   return '/*# ' + data + ' */'
 }

package/lib/wxss/getLocalIdent.js

@@ -3,8 +3,8 @@
   Author Tobias Koppers @sokra
   Modified by @hiyuki
 */
-var loaderUtils = require('loader-utils')
-var path = require('path')
+const loaderUtils = require('loader-utils')
+const path = require('path')
 
 module.exports = function getLocalIdent (loaderContext, localIdentName, localName, options) {
   if (!options.context) {
@@ -16,9 +16,10 @@ module.exports = function getLocalIdent (loaderContext, localIdentName, localNam
       options.context = loaderContext.context
     }
   }
-  var request = path.relative(options.context, loaderContext.resourcePath)
+  const request = path.relative(options.context, loaderContext.resourcePath)
   options.content = options.hashPrefix + request + '+' + localName
   localIdentName = localIdentName.replace(/\[local\]/gi, localName)
-  var hash = loaderUtils.interpolateName(loaderContext, localIdentName, options)
+  const hash = loaderUtils.interpolateName(loaderContext, localIdentName, options)
+  /* eslint-disable prefer-regex-literals */
   return hash.replace(new RegExp('[^a-zA-Z0-9\\-_\u00A0-\uFFFF]', 'g'), '-').replace(/^((-?[0-9])|--)/, '_$1')
 }

package/lib/wxss/loader.js

@@ -108,7 +108,7 @@ module.exports = function (content, map) {
         const url = resolve(urlItem.url)
         idx = url.indexOf('?#')
         if (idx < 0) idx = url.indexOf('#')
-        var urlRequest
+        let urlRequest
         if (idx > 0) { // idx === 0 is catched by isUrlRequest
           // in cases like url('webfont.eot?#iefix')
           urlRequest = url.substr(0, idx)