@mpxjs/webpack-plugin 2.9.31 → 2.9.33

package/lib/loader.js

@@ -83,7 +83,7 @@ module.exports = function (content) {
   const loaderContext = this
   const isProduction = this.minimize || process.env.NODE_ENV === 'production'
   const filePath = this.resourcePath
-  const moduleId = ctorType === 'app' ? MPX_APP_MODULE_ID : mpx.pathHash(filePath)
+  const moduleId = ctorType === 'app' ? MPX_APP_MODULE_ID : '_' + mpx.pathHash(filePath)
 
   const parts = parseComponent(content, {
     filePath,

package/lib/native-loader.js

@@ -188,7 +188,7 @@ module.exports = function (content) {
         if (appName) this._module.addPresentationalDependency(new AppEntryDependency(resourcePath, appName))
       }
 
-      const moduleId = ctorType === 'app' ? MPX_APP_MODULE_ID : mpx.pathHash(filePath)
+      const moduleId = ctorType === 'app' ? MPX_APP_MODULE_ID : '_' + mpx.pathHash(filePath)
 
       if (ctorType !== 'app') {
         rulesRunnerOptions.mainKey = pagesMap[resourcePath] ? 'page' : 'component'

package/lib/style-compiler/index.js

@@ -15,7 +15,7 @@ module.exports = function (css, map) {
   const cb = this.async()
   const { resourcePath, queryObj } = parseRequest(this.resource)
   const mpx = this.getMpx()
-  const id = queryObj.moduleId || queryObj.mid || mpx.pathHash(resourcePath)
+  const id = queryObj.moduleId || queryObj.mid || '_' + mpx.pathHash(resourcePath)
   const appInfo = mpx.appInfo
   const defs = mpx.defs
   const mode = mpx.mode

package/lib/template-compiler/compiler.js

@@ -104,7 +104,7 @@ let env
 let platformGetTagNamespace
 let filePath
 let refId
-let haveOptionChain = false
+let hasOptionalChain = false
 
 function updateForScopesMap () {
   forScopes.forEach((scope) => {
@@ -165,8 +165,8 @@ const i18nWxsRequest = '~' + i18nWxsLoaderPath + '!' + i18nWxsPath
 const i18nModuleName = '__i18n__'
 const stringifyWxsPath = '~' + normalize.lib('runtime/stringify.wxs')
 const stringifyModuleName = '__stringify__'
-const optionsChainWxsPath = '~' + normalize.lib('runtime/oc.wxs')
-const optionsChainWxsName = '__oc__'
+const optionalChainWxsPath = '~' + normalize.lib('runtime/oc.wxs')
+const optionalChainWxsName = '__oc__'
 
 const tagRES = /(\{\{(?:.|\n|\r)+?\}\})(?!})/
 const tagRE = /\{\{((?:.|\n|\r)+?)\}\}(?!})/
@@ -640,7 +640,7 @@ function parse (template, options) {
   forScopes = []
   forScopesMap = {}
   hasI18n = false
-  haveOptionChain = false
+  hasOptionalChain = false
 
   platformGetTagNamespace = options.getTagNamespace || no
 
@@ -765,8 +765,8 @@ function parse (template, options) {
     }
   }
 
-  if (haveOptionChain) {
-    injectWxs(meta, optionsChainWxsName, optionsChainWxsPath)
+  if (hasOptionalChain) {
+    injectWxs(meta, optionalChainWxsName, optionalChainWxsPath)
   }
 
   injectNodes.forEach((node) => {
@@ -1406,6 +1406,8 @@ function postProcessWxs (el, meta) {
   }
 }
 
+const spreadREG = /\{\s*\.\.\.\s*([^,{]+?)\s*\}/g
+
 function processAttrs (el, options) {
   el.attrsList.forEach((attr) => {
     const isTemplateData = el.tag === 'template' && attr.name === 'data'
@@ -1415,7 +1417,11 @@ function processAttrs (el, options) {
     if (parsed.hasBinding) {
       // 该属性判断用于提供给运行时对于计算属性作为props传递时提出警告
       const isProps = isComponentNode(el, options) && !(attr.name === 'class' || attr.name === 'style')
-      addExp(el, parsed.result, isProps)
+      let result = parsed.result
+      if (isTemplateData) {
+        result = result.replace(spreadREG, '$1')
+      }
+      addExp(el, result, isProps)
       if (parsed.replaced) {
         modifyAttr(el, attr.name, needWrap ? parsed.val.slice(1, -1) : parsed.val)
       }
@@ -1878,9 +1884,11 @@ function getVirtualHostRoot (options, meta) {
 function processShow (el, options, root) {
   // 开启 virtualhost 全部走 props 传递处理
   // 未开启 virtualhost 直接绑定 display:none 到节点上
-  let show = getAndRemoveAttr(el, config[mode].directive.show).val
+  let { val: show, has } = getAndRemoveAttr(el, config[mode].directive.show)
   if (mode === 'swan') show = wrapMustache(show)
-
+  if (has && show === undefined) {
+    error$1(`Attrs ${config[mode].directive.show} should have a value `)
+  }
   if (options.hasVirtualHost) {
     if (options.isComponent && el.parent === root && isRealNode(el)) {
       if (show !== undefined) {
@@ -1911,7 +1919,7 @@ function processShow (el, options, root) {
       oldStyle = oldStyle ? oldStyle + ';' : ''
       addAttrs(el, [{
         name: 'style',
-        value: `${oldStyle}{{${showExp}||${showExp}===undefined?'':'display:none;'}}`
+        value: `${oldStyle}{{${showExp}?'':'display:none;'}}`
       }])
     }
   }
@@ -2106,15 +2114,12 @@ function processElement (el, root, options, meta) {
   processIf(el)
   processFor(el)
   processRef(el, options, meta)
+  processClass(el, meta)
+  processStyle(el, meta)
+  processBindEvent(el, options)
 
   if (!pass) {
-    processClass(el, meta)
-    processStyle(el, meta)
     processShow(el, options, root)
-  }
-
-  if (!pass) {
-    processBindEvent(el, options)
     processComponentIs(el, options)
   }
 
@@ -2400,7 +2405,7 @@ function genNode (node) {
  * @returns
  */
 function parseOptionChain (str) {
-  const wxsName = `${optionsChainWxsName}.g`
+  const wxsName = `${optionalChainWxsName}.g`
   let optionsRes
   while (optionsRes = /\?\./.exec(str)) {
     const strLength = str.length
@@ -2550,8 +2555,8 @@ function parseOptionChain (str) {
       chainKey += `,'${keyValue}'`
     }
     str = str.slice(0, leftIndex) + `${wxsName}(${chainValue},[${chainKey.slice(1)}])` + str.slice(rightIndex)
-    if (!haveOptionChain) {
-      haveOptionChain = true
+    if (!hasOptionalChain) {
+      hasOptionalChain = true
     }
   }
   return str

package/lib/template-compiler/index.js

@@ -27,7 +27,7 @@ module.exports = function (raw) {
   const hasComment = queryObj.hasComment
   const isNative = queryObj.isNative
   const hasScoped = queryObj.hasScoped
-  const moduleId = queryObj.moduleId || mpx.pathHash(resourcePath)
+  const moduleId = queryObj.moduleId || '_' + mpx.pathHash(resourcePath)
 
   let optimizeRenderLevel = 0
   for (const rule of optimizeRenderRules) {
@@ -80,6 +80,12 @@ module.exports = function (raw) {
     }
   }
 
+  const result = compiler.serialize(ast)
+
+  if (isNative) {
+    return result
+  }
+
   let resultSource = ''
 
   for (const module in meta.wxsModuleMap) {
@@ -87,12 +93,6 @@ module.exports = function (raw) {
     resultSource += `var ${module} = require(${loaderUtils.stringifyRequest(this, src)});\n`
   }
 
-  const result = compiler.serialize(ast)
-
-  if (isNative) {
-    return result
-  }
-
   resultSource += `
 global.currentInject = {
   moduleId: ${JSON.stringify(moduleId)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.9.31",
+  "version": "2.9.33",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "f0fba8b8505519b4c877d9171cd2496da2c97d2d"
+  "gitHead": "5a8b6accc9462d4c9a35e06689a6a84903d47c52"
 }