@mpxjs/webpack-plugin 2.10.1-beta.1 → 2.10.1-beta.3

package/lib/platform/template/wx/component-config/swiper-item.js

@@ -8,6 +8,7 @@ module.exports = function ({ print }) {
   const qqPropLog = print({ platform: 'qq', tag: TAG_NAME, isError: false })
   const iosPropLog = print({ platform: 'ios', tag: TAG_NAME, isError: false })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
 
   return {
     test: TAG_NAME,
@@ -23,12 +24,17 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-swiper-item'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-swiper-item'
+    },
     props: [
       {
         test: /^(item-id)$/,
         ali: aliPropLog,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       },
       {
         test: /^(skip-hidden-item-layout)$/,

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

@@ -14,6 +14,8 @@ module.exports = function ({ print }) {
   const iosEventLog = print({ platform: 'ios', tag: TAG_NAME, isError: false, type: 'event' })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
   const androidEventLog = print({ platform: 'android', tag: TAG_NAME, isError: false, type: 'event' })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
+  const harmonyEventLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false, type: 'event' })
 
   return {
     test: TAG_NAME,
@@ -29,6 +31,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-swiper'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-swiper'
+    },
     props: [
       {
         test: /^(display-multiple-items|skip-hidden-item-layout)$/,
@@ -61,7 +67,8 @@ module.exports = function ({ print }) {
       {
         test: /^(display-multiple-items|snap-to-edge|easing-function)$/,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ],
     event: [
@@ -80,12 +87,14 @@ module.exports = function ({ print }) {
         swan: baiduEventLog,
         jd: jdEventLog,
         ios: iosEventLog,
-        android: androidEventLog
+        android: androidEventLog,
+        harmony: harmonyEventLog
       },
       {
         test: /^(animationfinish)$/,
         ios: iosEventLog,
-        android: androidEventLog
+        android: androidEventLog,
+        harmony: harmonyEventLog
       }
     ]
   }

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

@@ -18,6 +18,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-switch'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-switch'
+    },
     props: [
       {
         test: /^type$/,

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

@@ -8,6 +8,7 @@ module.exports = function ({ print }) {
   const qqPropLog = print({ platform: 'qq', tag: TAG_NAME, isError: false })
   const iosPropLog = print({ platform: 'ios', tag: TAG_NAME, isError: false })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
 
   return {
     test: TAG_NAME,
@@ -30,6 +31,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-text'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-text'
+    },
     props: [
       {
         test: /^(decode|user-select)$/,
@@ -45,7 +50,8 @@ module.exports = function ({ print }) {
       {
         test: /^(space|decode)$/,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       },
       {
         test: /^(selectable|space|decode|use-built-in)$/,

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

@@ -20,6 +20,9 @@ module.exports = function ({ print }) {
   const androidValueLogError = print({ platform: 'android', tag: TAG_NAME, isError: true, type: 'value' })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
   const androidEventLog = print({ platform: 'android', tag: TAG_NAME, isError: false, type: 'event' })
+  const harmonyValueLogError = print({ platform: 'harmony', tag: TAG_NAME, isError: true, type: 'value' })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
+  const harmonyEventLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false, type: 'event' })
 
   return {
     test: TAG_NAME,
@@ -36,6 +39,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-textarea'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-textarea'
+    },
     props: [
       {
         test: /^(auto-focus|fixed|cursor-spacing|cursor|show-confirm-bar|selection-start|selection-end|adjust-position|hold-keyboard|disable-default-padding|confirm-type)$/,
@@ -75,12 +82,19 @@ module.exports = function ({ print }) {
           if (notSupported.includes(value)) {
             androidValueLogError({ name, value })
           }
+        },
+        harmony ({ name, value }) {
+          const notSupported = ['return']
+          if (notSupported.includes(value)) {
+            harmonyValueLogError({ name, value })
+          }
         }
       },
       {
         test: /^(placeholder-style|placeholder-class|always-embed|hold-keyboard|disable-default-padding|adjust-keyboard-to|fixed|show-confirm-bar)$/,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ],
     event: [
@@ -109,7 +123,8 @@ module.exports = function ({ print }) {
       {
         test: /^keyboard.+$/,
         ios: iosEventLog,
-        android: androidEventLog
+        android: androidEventLog,
+        harmony: harmonyEventLog
       }
     ]
   }

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

@@ -26,6 +26,7 @@ module.exports = function ({ print }) {
   const qaUnsupportedTagError = print({ platform: 'qa', isError: true, type: 'tag' })
   const iosUnsupportedTagError = print({ platform: 'ios', isError: true, type: 'tag' })
   const androidUnsupportedTagError = print({ platform: 'android', isError: true, type: 'tag' })
+  const harmonyUnsupportedTagError = print({ platform: 'harmony', isError: true, type: 'tag' })
 
   const aliUnsupportedExp = new RegExp('^(' + ALI_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
   const baiduUnsupportedExp = new RegExp('^(' + BAIDU_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
@@ -35,6 +36,7 @@ module.exports = function ({ print }) {
   const qaUnsupportedExp = new RegExp('^(' + QA_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
   const iosUnsupportedExp = new RegExp('^(' + RN_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
   const androidUnsupportedExp = new RegExp('^(' + RN_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
+  const harmonyUnsupportedExp = new RegExp('^(' + RN_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
 
   return [
     {
@@ -76,6 +78,11 @@ module.exports = function ({ print }) {
       supportedModes: ['android'],
       test: androidUnsupportedExp,
       android: androidUnsupportedTagError
+    },
+    {
+      supportedModes: ['harmony'],
+      test: harmonyUnsupportedExp,
+      harmony: harmonyUnsupportedTagError
     }
   ]
 }

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

@@ -15,6 +15,8 @@ module.exports = function ({ print }) {
   const iosEventLogError = print({ platform: 'ios', tag: TAG_NAME, isError: false, type: 'event' })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
   const androidEventLogError = print({ platform: 'android', tag: TAG_NAME, isError: false, type: 'event' })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
+  const harmonyEventLogError = print({ platform: 'harmony', tag: TAG_NAME, isError: false, type: 'event' })
   return {
     test: TAG_NAME,
     web (tag, { el }) {
@@ -25,6 +27,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-video'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-video'
+    },
     ios (tag, { el }) {
       el.isBuiltIn = true
       return 'mpx-video'
@@ -66,7 +72,8 @@ module.exports = function ({ print }) {
       },
       {
         test: /^(duration|enable-danmu|danmu-btn|page-gesture|direction|show-progress|show-fullscreen-btn|show-center-play-btn|enable-progress-gesture|show-mute-btn|title|play-btn-position|enable-play-gesture|auto-pause-if-navigate|auto-pause-if-open-native|vslide-gesture|vslide-gesture-in-fullscreen|show-bottom-progress|ad-unit-id|poster-for-crawler|show-casting-button|picture-in-picture-mode|picture-in-picture-show-progress| picture-in-picture-init-position|enable-auto-rotation|show-snapshot-button|show-screen-lock-button|show-background-playback-button|background-poster|referrer-policy|is-live)$/,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ],
     event: [
@@ -108,7 +115,8 @@ module.exports = function ({ print }) {
       },
       {
         test: /^(progress|enterpictureinpicture|leavepictureinpicture|castinguserselect|castingstatechange|castinginterrupt)$/,
-        android: androidEventLogError
+        android: androidEventLogError,
+        harmony: harmonyEventLogError
       }
     ]
   }

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

@@ -5,6 +5,7 @@ module.exports = function ({ print }) {
   const qaEventLogError = print({ platform: 'qa', tag: TAG_NAME, isError: false, type: 'event' })
   const iosPropLog = print({ platform: 'ios', tag: TAG_NAME, isError: false })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
 
   return {
     // 匹配标签名，可传递正则
@@ -31,6 +32,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-view'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-view'
+    },
     qa (tag) {
       return 'div'
     },
@@ -46,7 +51,8 @@ module.exports = function ({ print }) {
       }, {
         test: /^(hover-stop-propagation)$/,
         android: androidPropLog,
-        ios: iosPropLog
+        ios: iosPropLog,
+        harmony: harmonyPropLog
       }
     ],
     // 组件事件中的差异部分

package/lib/platform/template/wx/component-config/web-view.js

@@ -14,6 +14,10 @@ module.exports = function () {
     android (tag, { el }) {
       el.isBuiltIn = true
       return 'mpx-web-view'
+    },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-web-view'
     }
   }
 }

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

@@ -9,7 +9,7 @@ const { dash2hump } = require('../../../utils/hump-dash')
 
 module.exports = function getSpec ({ warn, error }) {
   const spec = {
-    supportedModes: ['ali', 'swan', 'qq', 'tt', 'web', 'qa', 'jd', 'dd', 'ios', 'android'],
+    supportedModes: ['ali', 'swan', 'qq', 'tt', 'web', 'qa', 'jd', 'dd', 'ios', 'android', 'harmony'],
     // props预处理
     preProps: [],
     // props后处理
@@ -347,18 +347,6 @@ module.exports = function getSpec ({ warn, error }) {
             value
           }
         },
-        // tt ({ name, value }, { eventRules }) {
-        //   const match = this.test.exec(name)
-        //   const prefix = match[1]
-        //   const eventName = match[2]
-        //   const modifierStr = match[3] || ''
-        //   const rEventName = runRules(eventRules, eventName, { mode: 'tt' })
-        //   return {
-        //     // 字节将所有事件转为小写
-        //     name: prefix + rEventName.toLowerCase() + modifierStr,
-        //     value
-        //   }
-        // },
         tt ({ name, value }, { eventRules }) {
           const match = this.test.exec(name)
           const prefix = match[1]
@@ -430,6 +418,21 @@ module.exports = function getSpec ({ warn, error }) {
             name: rPrefix + rEventName + meta.modifierStr,
             value
           }
+        },
+        harmony ({ name, value }, { eventRules, el }) {
+          const match = this.test.exec(name)
+          const prefix = match[1]
+          const eventName = match[2]
+          const modifierStr = match[3] || ''
+          const meta = {
+            modifierStr
+          }
+          const rPrefix = runRules(spec.event.prefix, prefix, { mode: 'harmony' })
+          const rEventName = runRules(eventRules, eventName, { mode: 'harmony', data: { el } })
+          return {
+            name: rPrefix + rEventName + meta.modifierStr,
+            value
+          }
         }
       },
       // 无障碍
@@ -565,6 +568,22 @@ module.exports = function getSpec ({ warn, error }) {
             } else {
               error(`React native environment does not support [${eventName}] event!`)
             }
+          },
+          harmony (eventName) {
+            const eventMap = {
+              tap: 'tap',
+              longtap: 'longpress',
+              longpress: 'longpress',
+              touchstart: 'touchstart',
+              touchmove: 'touchmove',
+              touchend: 'touchend',
+              touchcancel: 'touchcancel'
+            }
+            if (eventMap[eventName]) {
+              return eventMap[eventName]
+            } else {
+              error(`React native environment does not support [${eventName}] event!`)
+            }
           }
         },
         // web event escape