@mpxjs/webpack-plugin 2.8.59 → 2.8.60

package/lib/index.js

@@ -125,7 +125,6 @@ class MpxWebpackPlugin {
     options.resolveMode = options.resolveMode || 'webpack'
     options.writeMode = options.writeMode || 'changed'
     options.autoScopeRules = options.autoScopeRules || {}
-    options.renderOptimizeRules = options.renderOptimizeRules || {}
     options.autoVirtualHostRules = options.autoVirtualHostRules || {}
     options.forceDisableProxyCtor = options.forceDisableProxyCtor || false
     options.transMpxRules = options.transMpxRules || {
@@ -169,7 +168,8 @@ class MpxWebpackPlugin {
     }, options.nativeConfig)
     options.webConfig = options.webConfig || {}
     options.partialCompile = options.mode !== 'web' && options.partialCompile
-    options.asyncSubpackageRules = options.asyncSubpackageRules || null
+    options.asyncSubpackageRules = options.asyncSubpackageRules || []
+    options.optimizeRenderRules = options.optimizeRenderRules || {}
     options.retryRequireAsync = options.retryRequireAsync || false
     options.enableAliRequireAsync = options.enableAliRequireAsync || false
     options.optimizeSize = options.optimizeSize || false
@@ -633,13 +633,13 @@ class MpxWebpackPlugin {
           appTitle: 'Mpx homepage',
           attributes: this.options.attributes,
           externals: this.options.externals,
-          renderOptimizeRules: this.options.renderOptimizeRules,
           useRelativePath: this.options.useRelativePath,
           removedChunks: [],
           forceProxyEventRules: this.options.forceProxyEventRules,
           enableRequireAsync: this.options.mode === 'wx' || (this.options.mode === 'ali' && this.options.enableAliRequireAsync),
           partialCompile: this.options.partialCompile,
           asyncSubpackageRules: this.options.asyncSubpackageRules,
+          optimizeRenderRules: this.options.optimizeRenderRules,
           pathHash: (resourcePath) => {
             if (this.options.pathHashMode === 'relative' && this.options.projectRoot) {
               return hash(path.relative(this.options.projectRoot, resourcePath))

package/lib/template-compiler/bind-this.js

@@ -85,7 +85,7 @@ function checkDelAndGetPath (path) {
       if (args.length === 1) {
         delPath = current.parentPath
       } else {
-        // case: this._i(a, function() {})
+        // case: _i(a, function() {})
         canDel = false
         break
       }
@@ -169,7 +169,10 @@ function dealRemove (path, replace) {
       t.validate(path, path.key, null)
       path.remove()
     }
-  } catch (e) {}
+    delete path.needBind
+    delete path.collectPath
+  } catch (e) {
+  }
 }
 
 module.exports = {
@@ -305,14 +308,12 @@ module.exports = {
             // 优先判断前缀，再判断全等
             if (checkPrefix(Object.keys(allBindings), keyPath) || pBindings[keyPath]) {
               dealRemove(path, replace)
-              return
             } else {
               const currentBlockVars = bindings[keyPath]
               if (currentBlockVars.length > 1) {
                 const index = currentBlockVars.findIndex(item => !item.canDel)
                 if (index !== -1 || currentBlockVars[0].path !== path) { // 当前block中存在不可删除的变量 || 不是第一个可删除变量，即可删除该变量
                   dealRemove(path, replace)
-                  return
                 }
               }
             }
@@ -334,7 +335,10 @@ module.exports = {
       MemberExpression: {
         exit (path) {
           if (path.collectPath) {
-            path.node && path.replaceWith(t.callExpression(t.memberExpression(t.thisExpression(), t.identifier('_c')), [path.collectPath, path.node]))
+            const replaceNode = renderReduce
+              ? t.callExpression(t.identifier('_c'), [path.collectPath])
+              : t.callExpression(t.identifier('_c'), [path.collectPath, path.node])
+            path.node && path.replaceWith(replaceNode)
             delete path.collectPath
           }
         }

package/lib/template-compiler/compiler.js

@@ -1091,6 +1091,7 @@ function processBindEvent (el, options) {
   for (const type in eventConfigMap) {
     let needBind = false
     let { configs, rawName, proxy } = eventConfigMap[type]
+    delete eventConfigMap[type]
     if (proxy) {
       needBind = true
     } else if (configs.length > 1) {
@@ -1098,11 +1099,14 @@ function processBindEvent (el, options) {
     } else if (configs.length === 1) {
       needBind = !!configs[0].hasArgs
     }
+
+    const escapedType = dash2hump(type)
     // 排除特殊情况
-    if (needBind && !isValidIdentifierStr(type)) {
+    if (!isValidIdentifierStr(escapedType)) {
       warn$1(`EventName ${type} which need be framework proxy processed must be a valid identifier!`)
       needBind = false
     }
+
     if (needBind) {
       if (rawName) {
         // 清空原始事件绑定
@@ -1120,11 +1124,9 @@ function processBindEvent (el, options) {
           value: '__invoke'
         }
       ])
-      eventConfigMap[type] = configs.map((item) => {
+      eventConfigMap[escapedType] = configs.map((item) => {
         return item.expStr
       })
-    } else {
-      delete eventConfigMap[type]
     }
   }
 
@@ -2321,7 +2323,7 @@ function genFor (node) {
   node.forProcessed = true
   const index = node.for.index || 'index'
   const item = node.for.item || 'item'
-  return `this._i(${node.for.exp}, function(${item},${index}){\n${genNode(node)}});\n`
+  return `_i(${node.for.exp}, function(${item},${index}){\n${genNode(node)}});\n`
 }
 
 function genNode (node) {

package/lib/template-compiler/index.js

@@ -21,7 +21,7 @@ module.exports = function (raw) {
   const componentsMap = mpx.componentsMap[packageName]
   const pagesMap = mpx.pagesMap
   const wxsContentMap = mpx.wxsContentMap
-  const renderOptimizeRules = mpx.renderOptimizeRules
+  const optimizeRenderRules = mpx.optimizeRenderRules
   const usingComponents = queryObj.usingComponents || []
   const componentPlaceholder = queryObj.componentPlaceholder || []
   const hasComment = queryObj.hasComment
@@ -86,39 +86,43 @@ module.exports = function (raw) {
     return result
   }
 
-  const rawCode = `
+  resultSource += `
 global.currentInject = {
-  moduleId: ${JSON.stringify(moduleId)},
-  render: function () {
-    ${compiler.genNode(ast)}
-    this._r();
-  }
+  moduleId: ${JSON.stringify(moduleId)}
 };\n`
 
-  let bindResult
-
-  try {
-    bindResult = bindThis(rawCode, {
-      needCollect: true,
-      renderReduce: matchCondition(resourcePath, renderOptimizeRules),
-      ignoreMap: meta.wxsModuleMap
-    })
-  } catch (e) {
-    error(`
+  const rawCode = compiler.genNode(ast)
+  if (rawCode) {
+    const renderCode = `
+global.currentInject.render = function (_i, _c, _r) {
+${rawCode}
+_r();
+};\n`
+    try {
+      const bindResult = bindThis(renderCode, {
+        needCollect: true,
+        renderReduce: matchCondition(resourcePath, optimizeRenderRules),
+        ignoreMap: Object.assign({
+          _i: true,
+          _c: true,
+          _r: true
+        }, meta.wxsModuleMap)
+      })
+      resultSource += bindResult.code
+      if ((mode === 'tt' || mode === 'swan') && bindResult.propKeys) {
+        resultSource += `global.currentInject.propKeys = ${JSON.stringify(bindResult.propKeys)};\n`
+      }
+    } catch (e) {
+      error(`
 Invalid render function generated by the template, please check!\n
 Template result:
 ${result}\n
 Error code:
-${rawCode}
+${renderCode}
 Error Detail:
 ${e.stack}`)
-    return result
-  }
-
-  resultSource += bindResult.code + '\n'
-
-  if ((mode === 'tt' || mode === 'swan') && bindResult.propKeys) {
-    resultSource += `global.currentInject.propKeys = ${JSON.stringify(bindResult.propKeys)};\n`
+      return result
+    }
   }
 
   if (meta.computed) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.59",
+  "version": "2.8.60",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "4e014ea355bb2d659c6fd6a3040b6b88245da9e5"
+  "gitHead": "02a77bf602744c35703b2fdc27171edbec09edcb"
 }