@mpxjs/webpack-plugin 2.9.0 → 2.9.3

package/lib/platform/index.js

@@ -1,15 +1,26 @@
 const runRules = require('./run-rules')
-
-module.exports = function getRulesRunner ({ type, mode, srcMode, data, meta, testKey, mainKey, waterfall, warn, error }) {
-  const specMap = {
-    template: {
-      wx: require('./template/wx')({ warn, error })
-    },
-    json: {
-      wx: require('./json/wx')({ warn, error })
-    }
+const specMap = {
+  template: {
+    wx: require('./template/wx')
+  },
+  json: {
+    wx: require('./json/wx')
   }
-  const spec = specMap[type] && specMap[type][srcMode]
+}
+
+module.exports = function getRulesRunner ({
+  type,
+  mode,
+  srcMode,
+  data,
+  meta,
+  testKey,
+  mainKey,
+  waterfall,
+  warn,
+  error
+}) {
+  const spec = specMap[type] && specMap[type][srcMode] && specMap[type][srcMode]({ warn, error })
   if (spec && spec.supportedModes.indexOf(mode) > -1) {
     const normalizeTest = spec.normalizeTest
     const mainRules = mainKey ? spec[mainKey] : spec

package/lib/platform/json/wx/index.js

@@ -128,10 +128,8 @@ module.exports = function getSpec ({ warn, error }) {
 
   /**
    * 将小程序代码中使用的与原生 HTML tag 或 内建组件 同名的组件进行转化，以解决与原生tag命名冲突问题。
-   * @param {string} type usingComponents
-   * @returns input
    */
-  function webHTMLTagProcesser (type) {
+  function fixComponentName (type) {
     return function (input) {
       const usingComponents = input[type]
       if (usingComponents) {
@@ -160,7 +158,7 @@ module.exports = function getSpec ({ warn, error }) {
     },
     {
       test: 'usingComponents',
-      web: webHTMLTagProcesser('usingComponents')
+      web: fixComponentName('usingComponents')
     },
     {
       test: 'usingComponents',
@@ -365,7 +363,7 @@ module.exports = function getSpec ({ warn, error }) {
       },
       {
         test: 'usingComponents',
-        web: webHTMLTagProcesser('usingComponents')
+        web: fixComponentName('usingComponents')
       },
       {
         test: 'usingComponents',

package/lib/platform/run-rules.js

@@ -32,8 +32,7 @@ module.exports = function runRules (rules = [], input, options = {}) {
       if (result !== undefined) {
         input = result
       }
-      // rule 内外 waterfall 均为 false 时跳过
-      if (!rule.waterfall && !waterfall) break
+      if (!(rule.waterfall || waterfall)) break
     }
   }
   return input

package/lib/platform/template/normalize-component-rules.js

@@ -8,58 +8,57 @@ const runRules = require('../run-rules')
 module.exports = function normalizeComponentRules (cfgs, spec) {
   return cfgs.map((cfg) => {
     const result = {}
-    if (cfg.test) {
-      result.test = cfg.test
-    }
-    // 透传 waterfall 信息
+    if (cfg.test) result.test = cfg.test
     if (cfg.waterfall) result.waterfall = cfg.waterfall
     const supportedModes = cfg.supportedModes || spec.supportedModes
     // 合并component-config中组件的event 与index中公共的event规则
     const eventRules = (cfg.event || []).concat(spec.event.rules)
     supportedModes.forEach((mode) => {
-      result[mode] = function (el, data) {
-        data = Object.assign({}, data, { el, eventRules })
-        const testKey = 'name'
-        let rAttrsList = []
-        const options = {
-          mode,
-          testKey,
-          data
-        }
-        el.attrsList.forEach((attr) => {
-          const meta = {}
-          let rAttr = runRules(spec.directive, attr, {
-            ...options,
-            meta
-          })
-          // 指令未匹配到时说明为props，因为目前所有的指令都需要转换
-          if (!meta.processed) {
-            rAttr = runRules(spec.preProps, rAttr, options)
-            rAttr = runRules(cfg.props, rAttr, options)
+      result[mode] = cfg.skipNormalize
+        ? cfg[mode]
+        : function (el, data) {
+          data = Object.assign({}, data, { el, eventRules })
+          const testKey = 'name'
+          let rAttrsList = []
+          const options = {
+            mode,
+            testKey,
+            data
+          }
+          el.attrsList.forEach((attr) => {
+            const meta = {}
+            let rAttr = runRules(spec.directive, attr, {
+              ...options,
+              meta
+            })
+            // 指令未匹配到时说明为props，因为目前所有的指令都需要转换
+            if (!meta.processed) {
+              rAttr = runRules(spec.preProps, rAttr, options)
+              rAttr = runRules(cfg.props, rAttr, options)
+              if (Array.isArray(rAttr)) {
+                rAttr = rAttr.map((attr) => {
+                  return runRules(spec.postProps, attr, options)
+                })
+              } else if (rAttr !== false) {
+                rAttr = runRules(spec.postProps, rAttr, options)
+              }
+            }
+            // 生成目标attrsList
             if (Array.isArray(rAttr)) {
-              rAttr = rAttr.map((attr) => {
-                return runRules(spec.postProps, attr, options)
-              })
+              rAttrsList = rAttrsList.concat(rAttr)
             } else if (rAttr !== false) {
-              rAttr = runRules(spec.postProps, rAttr, options)
+              rAttrsList.push(rAttr)
             }
+          })
+          el.attrsList = rAttrsList
+          el.attrsMap = require('../../template-compiler/compiler').makeAttrsMap(rAttrsList)
+          // 前置处理attrs,便于携带信息用于tag的处理
+          const rTag = cfg[mode] && cfg[mode].call(this, el.tag, data)
+          if (rTag) {
+            el.tag = rTag
           }
-          // 生成目标attrsList
-          if (Array.isArray(rAttr)) {
-            rAttrsList = rAttrsList.concat(rAttr)
-          } else if (rAttr !== false) {
-            rAttrsList.push(rAttr)
-          }
-        })
-        el.attrsList = rAttrsList
-        el.attrsMap = require('../../template-compiler/compiler').makeAttrsMap(rAttrsList)
-        // 前置处理attrs,便于携带信息用于tag的处理
-        const rTag = cfg[mode] && cfg[mode].call(this, el.tag, data)
-        if (rTag) {
-          el.tag = rTag
+          return el
         }
-        return el
-      }
     })
     return result
   })

package/lib/platform/template/wx/component-config/fix-component-name.js

@@ -0,0 +1,21 @@
+const { isOriginTag, isBuildInTag } = require('../../../../utils/dom-tag-config')
+
+module.exports = function () {
+  return {
+    waterfall: true,
+    skipNormalize: true,
+    supportedModes: ['web'],
+    test: (input) => isOriginTag(input) || isBuildInTag(input),
+    // 输出web时对组件名进行转义避免与原生tag和内建tag冲突
+    web (el, data) {
+      const newTag = `mpx-com-${el.tag}`
+      const usingComponents = data.usingComponents || []
+      // 当前组件名与原生tag或内建tag同名，对组件名进行转义
+      // json转义见：platform/json/wx/index.js fixComponentName
+      if (usingComponents.includes(newTag)) {
+        el.tag = newTag
+      }
+      return el
+    }
+  }
+}

package/lib/platform/template/wx/component-config/index.js

@@ -33,13 +33,13 @@ const switchComponent = require('./switch')
 const template = require('./template')
 const text = require('./text')
 const textarea = require('./textarea')
-const Nonsupport = require('./unsupported')
+const unsupported = require('./unsupported')
 const video = require('./video')
 const view = require('./view')
 const webView = require('./web-view')
 const wxs = require('./wxs')
 const component = require('./component')
-const fixHTMLTag = require('./fix-html-tag')
+const fixComponentName = require('./fix-component-name')
 
 module.exports = function getComponentConfigs ({ warn, error }) {
   /**
@@ -80,8 +80,8 @@ module.exports = function getComponentConfigs ({ warn, error }) {
 
   // 转换规则只需以微信为基准配置微信和支付宝的差异部分，比如微信和支付宝都支持但是写法不一致，或者微信支持而支付宝不支持的部分(抛出错误或警告)
   return [
-    fixHTMLTag(),
-    ...Nonsupport({ print }),
+    ...unsupported({ print }),
+    fixComponentName({ print }),
     ad({ print }),
     view({ print }),
     scrollView({ print }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.9.0",
+  "version": "2.9.3",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "91ac258dbf1d0a324a74cac606e2cc10ef557823"
+  "gitHead": "d0b4819fb5896f9796417f608eb06277dc5bdfaa"
 }

package/lib/platform/template/wx/component-config/fix-html-tag.js

@@ -1,17 +0,0 @@
-const { isOriginTag, isBuildInTag } = require('../../../../utils/dom-tag-config')
-
-module.exports = function () {
-  return {
-    waterfall: true,
-    test: (input) => isOriginTag(input) || isBuildInTag(input),
-    // 处理原生tag
-    web (tag, data = {}) {
-      // @see packages/webpack-plugin/lib/platform/json/wx/index.js webHTMLTagProcesser
-      const newTag = `mpx-com-${tag}`
-      const usingComponents = data.usingComponents || []
-      // 存在同名组件，则返回新tag
-      if (usingComponents.includes(newTag)) return newTag
-      return tag
-    }
-  }
-}