@mpxjs/webpack-plugin 2.10.3 → 2.10.4

package/lib/config.js

@@ -554,5 +554,6 @@ module.exports = {
     }
   },
   ios: reactConfig,
-  android: reactConfig
+  android: reactConfig,
+  harmony: reactConfig
 }

package/lib/index.js

@@ -131,7 +131,7 @@ class MpxWebpackPlugin {
       errors.push('MpxWebpackPlugin supports mode to be "web" only when srcMode is set to "wx"!')
     }
     if (isReact(options.mode) && options.srcMode !== 'wx') {
-      errors.push('MpxWebpackPlugin supports mode to be "ios" or "android" only when srcMode is set to "wx"!')
+      errors.push('MpxWebpackPlugin supports mode to be "ios" | "android" | "harmony" only when srcMode is set to "wx"!')
     }
     if (options.dynamicComponentRules && !options.dynamicRuntime) {
       errors.push('Please make sure you have set dynamicRuntime true in mpx webpack plugin config because you have use the dynamic runtime feature.')

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

@@ -158,7 +158,8 @@ module.exports = function getSpec ({ warn, error }) {
       test: 'usingComponents',
       web: fixComponentName('usingComponents'),
       ios: fixComponentName('usingComponents'),
-      android: fixComponentName('usingComponents')
+      android: fixComponentName('usingComponents'),
+      harmony: fixComponentName('usingComponents')
     },
     {
       test: 'usingComponents',
@@ -268,7 +269,8 @@ module.exports = function getSpec ({ warn, error }) {
       'dd',
       'web',
       'ios',
-      'android'
+      'android',
+      'harmony'
     ],
 
     normalizeTest,
@@ -374,7 +376,8 @@ module.exports = function getSpec ({ warn, error }) {
         test: 'usingComponents',
         web: fixComponentName('usingComponents'),
         ios: fixComponentName('usingComponents'),
-        android: fixComponentName('usingComponents')
+        android: fixComponentName('usingComponents'),
+        harmony: fixComponentName('usingComponents')
       },
       {
         test: 'usingComponents',

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

@@ -7,7 +7,9 @@ module.exports = function getSpec ({ warn, error }) {
     // React Native ios 不支持的 CSS property
     ios: /^(vertical-align)$/,
     // React Native android 不支持的 CSS property
-    android: /^(text-decoration-style|text-decoration-color|shadow-offset|shadow-opacity|shadow-radius)$/
+    android: /^(text-decoration-style|text-decoration-color|shadow-offset|shadow-opacity|shadow-radius)$/,
+    // TODO: rnoh 文档暂未找到 css 属性支持说明，暂时同步 android，同时需要注意此处校验是否有缺失，类似 will-change 之类属性
+    harmony: /^(text-decoration-style|text-decoration-color|shadow-offset|shadow-opacity|shadow-radius)$/
   }
   // var(xx)
   const cssVariableExp = /var\(/
@@ -529,7 +531,7 @@ module.exports = function getSpec ({ warn, error }) {
       return false
     }
     const cssMap = formatAbbreviation({ prop, value, selector }, { mode })
-    if (mode === 'android') return cssMap
+    if (mode === 'android' || mode === 'harmony') return cssMap
     // ios 阴影需要额外设置 shadowOpacity=1
     cssMap.push({
       prop: 'shadowOpacity',
@@ -539,54 +541,63 @@ module.exports = function getSpec ({ warn, error }) {
   }
 
   return {
-    supportedModes: ['ios', 'android'],
+    supportedModes: ['ios', 'android', 'harmony'],
     rules: [
       { // 背景相关属性的处理
         test: /^(background|background-image|background-size|background-position)$/,
         ios: checkBackgroundImage,
-        android: checkBackgroundImage
+        android: checkBackgroundImage,
+        harmony: checkBackgroundImage
       },
       { // margin padding 内外边距的处理
         test: /^(margin|padding|border-radius|border-width|border-color)$/,
         ios: formatCompositeVal,
-        android: formatCompositeVal
+        android: formatCompositeVal,
+        harmony: formatCompositeVal
       },
       { // line-height 换算
         test: 'line-height',
         ios: formatLineHeight,
-        android: formatLineHeight
+        android: formatLineHeight,
+        harmony: formatLineHeight
       },
       {
         test: 'transform',
         ios: formatTransform,
-        android: formatTransform
+        android: formatTransform,
+        harmony: formatTransform
       },
       {
         test: 'flex',
         ios: formatFlex,
-        android: formatFlex
+        android: formatFlex,
+        harmony: formatFlex
       },
       {
         test: 'font-family',
         ios: formatFontFamily,
-        android: formatFontFamily
+        android: formatFontFamily,
+        harmony: formatFontFamily
       },
       {
         test: 'box-shadow',
         ios: formatBoxShadow,
-        android: formatBoxShadow
+        android: formatBoxShadow,
+        harmony: formatBoxShadow
       },
       // 通用的简写格式匹配
       {
         test: new RegExp('^(' + Object.keys(AbbreviationMap).join('|') + ')$'),
         ios: formatAbbreviation,
-        android: formatAbbreviation
+        android: formatAbbreviation,
+        harmony: formatAbbreviation
       },
       // 属性&属性值校验
       {
         test: () => true,
         ios: verification,
-        android: verification
+        android: verification,
+        harmony: verification
       }
     ]
   }

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

@@ -37,6 +37,10 @@ module.exports = function ({ print }) {
   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,
     web (tag, { el }) {
@@ -51,6 +55,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-button'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-button'
+    },
     props: [
       {
         test: 'open-type',
@@ -123,6 +131,7 @@ module.exports = function ({ print }) {
           }
         },
         ios ({ name, value }) {
+          // TODO 此处open-type无其他属性支持了？
           const supported = ['share']
           if (!supported.includes(value)) {
             iosValueLogError({ name, value })
@@ -133,6 +142,12 @@ module.exports = function ({ print }) {
           if (!supported.includes(value)) {
             androidValueLogError({ name, value })
           }
+        },
+        harmony ({ name, value }) {
+          const supported = ['share']
+          if (!supported.includes(value)) {
+            harmonyValueLogError({ name, value })
+          }
         }
       },
       {
@@ -173,7 +188,8 @@ module.exports = function ({ print }) {
       {
         test: /^(lang|from-type|hover-class|send-message-title|send-message-path|send-message-img|app-parameter|show-message-card|phone-number-no-quota-toast|bindgetuserinfo|bindcontact|createliveactivity|bindgetphonenumber|bindgetrealtimephonenumber|binderror|bindopensetting|bindlaunchapp|bindchooseavatar|bindagreeprivacyauthorization)$/,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ],
     event: [
@@ -210,7 +226,8 @@ module.exports = function ({ print }) {
       {
         test: /^(getuserinfo|contact|getphonenumber|bindgetrealtimephonenumber|error|opensetting|launchapp|chooseavatar|agreeprivacyauthorization)$/,
         ios: iosEventLog,
-        android: androidEventLog
+        android: androidEventLog,
+        harmony: harmonyEventLog
       }
     ]
   }

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

@@ -12,6 +12,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-canvas'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-canvas'
+    },
     ios (tag, { el }) {
       el.isBuiltIn = true
       return 'mpx-canvas'

package/lib/platform/template/wx/component-config/checkbox-group.js

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

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

@@ -15,6 +15,10 @@ module.exports = function () {
       el.isBuiltIn = true
       return 'mpx-checkbox'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-checkbox'
+    },
     event: [
       {
         test: 'tap',

package/lib/platform/template/wx/component-config/cover-image.js

@@ -4,6 +4,7 @@ module.exports = function ({ print }) {
   const aliEventLog = print({ platform: 'ali', 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 {
     test: TAG_NAME,
     web (tag, { el }) {
@@ -21,6 +22,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-image'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-image'
+    },
     props: [
       {
         test: 'use-built-in',
@@ -31,7 +36,8 @@ module.exports = function ({ print }) {
       {
         test: /^(referrer-policy)$/,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ],
     event: [

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

@@ -28,6 +28,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-view'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-view'
+    },
     props: [
       {
         test: 'scroll-top',

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

@@ -15,10 +15,11 @@ module.exports = function () {
   return {
     waterfall: true,
     skipNormalize: true,
-    supportedModes: ['web', 'ios', 'android'],
+    supportedModes: ['web', 'ios', 'android', 'harmony'],
     test: (input) => isOriginTag(input) || isBuildInTag(input),
     web: handleComponentTag,
     ios: handleComponentTag,
-    android: handleComponentTag
+    android: handleComponentTag,
+    harmony: handleComponentTag
   }
 }

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

@@ -9,6 +9,7 @@ module.exports = function ({ print }) {
   const qaPropLog = print({ platform: 'qa', 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,
@@ -25,6 +26,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-form'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-form'
+    },
     props: [
       {
         test: /^(report-submit-timeout)$/,
@@ -38,7 +43,8 @@ module.exports = function ({ print }) {
         web: webPropLog,
         qa: qaPropLog,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ]
   }

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

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

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

@@ -8,6 +8,7 @@ module.exports = function ({ print }) {
   const qaPropLog = print({ platform: 'qa', 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,6 +24,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-image'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-image'
+    },
     props: [
       {
         test: /^show-menu-by-longpress$/,
@@ -48,7 +53,8 @@ module.exports = function ({ print }) {
       {
         test: /^(show-menu-by-longpress|fade-in)$/,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ]
   }

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

@@ -19,6 +19,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,
@@ -34,6 +37,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-input'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-input'
+    },
     props: [
       {
         test: /^(cursor-spacing|auto-focus|adjust-position|hold-keyboard)$/,
@@ -55,7 +62,7 @@ module.exports = function ({ print }) {
         test: 'type',
         web (prop) {
           let { name, value } = prop
-          if (value === 'idcard' || value === 'digit') {
+          if (value === 'idcard') {
             webValueLog(prop)
             value = 'text'
           }
@@ -75,6 +82,12 @@ module.exports = function ({ print }) {
           if (notSupported.includes(value)) {
             androidValueLogError({ name, value })
           }
+        },
+        harmony ({ name, value }) {
+          const notSupported = ['safe-password', 'nickname']
+          if (notSupported.includes(value)) {
+            harmonyValueLogError({ name, value })
+          }
         }
       },
       {
@@ -94,7 +107,8 @@ module.exports = function ({ print }) {
       {
         test: /^(always-embed|hold-keyboard|safe-password-.+)$/,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ],
     event: [
@@ -113,7 +127,8 @@ module.exports = function ({ print }) {
       {
         test: /^(nicknamereview|onkeyboardheightchange|keyboard.+)$/,
         ios: iosEventLog,
-        android: androidEventLog
+        android: androidEventLog,
+        harmony: harmonyEventLog
       }
     ]
   }

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

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

package/lib/platform/template/wx/component-config/movable-area.js

@@ -2,6 +2,7 @@ const TAG_NAME = 'movable-area'
 
 module.exports = function ({ print }) {
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
+  const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
   const iosPropLog = print({ platform: 'ios', tag: TAG_NAME, isError: false })
   return {
     test: TAG_NAME,
@@ -13,6 +14,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-movable-area'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-movable-area'
+    },
     ios (tag, { el }) {
       el.isBuiltIn = true
       return 'mpx-movable-area'
@@ -21,7 +26,8 @@ module.exports = function ({ print }) {
       {
         test: /^(scale-area)$/,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ]
   }

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

@@ -3,9 +3,11 @@ const TAG_NAME = 'movable-view'
 module.exports = function ({ print }) {
   const aliEventLog = print({ platform: 'ali', tag: TAG_NAME, isError: false, type: 'event' })
   const androidEventLog = print({ platform: 'android', tag: TAG_NAME, isError: false, type: 'event' })
+  const harmonyEventLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false, type: 'event' })
   const iosEventLog = print({ platform: 'ios', tag: TAG_NAME, isError: false, type: 'event' })
   const qaPropLog = print({ platform: 'qa', 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 })
   const iosPropLog = print({ platform: 'ios', tag: TAG_NAME, isError: false })
   return {
     test: TAG_NAME,
@@ -17,6 +19,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-movable-view'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-movable-view'
+    },
     ios (tag, { el }) {
       el.isBuiltIn = true
       return 'mpx-movable-view'
@@ -26,12 +32,14 @@ module.exports = function ({ print }) {
         test: /^(out-of-bounds)$/,
         ali: qaPropLog,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       },
       {
         test: /^(damping|friction|scale|scale-min|scale-max|scale-value)$/,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ],
     event: [
@@ -42,7 +50,8 @@ module.exports = function ({ print }) {
       {
         test: /^(bindscale)$/,
         ios: iosEventLog,
-        android: androidEventLog
+        android: androidEventLog,
+        harmony: harmonyEventLog
       }
     ]
   }

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

@@ -36,6 +36,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-navigator'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-navigator'
+    },
     props: [
       {
         test: /^(target|delta|app-id|path|extra-data|version|hover-stop-propagation)$/,

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

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

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

@@ -8,6 +8,7 @@ module.exports = function ({ print }) {
   const jdEventLog = print({ platform: 'jd', tag: TAG_NAME, isError: false, type: 'event' })
   const iosEventLog = print({ platform: 'ios', tag: TAG_NAME, isError: false, type: 'event' })
   const androidEventLog = print({ platform: 'android', tag: TAG_NAME, isError: false, type: 'event' })
+  const harmonyEventLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false, type: 'event' })
 
   return {
     test: TAG_NAME,
@@ -23,6 +24,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-picker-view'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-picker-view'
+    },
     props: [
       {
         test: /^(indicator-class|mask-class)$/,
@@ -37,7 +42,8 @@ module.exports = function ({ print }) {
         tt: ttEventLog,
         jd: jdEventLog,
         ios: iosEventLog,
-        android: androidEventLog
+        android: androidEventLog,
+        harmony: harmonyEventLog
       }
     ]
   }

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

@@ -10,6 +10,7 @@ module.exports = function ({ print }) {
   const qaPropLog = print({ platform: 'qa', 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,
@@ -25,6 +26,10 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-picker'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-picker'
+    },
     props: [
       {
         test: 'mode',
@@ -43,7 +48,8 @@ module.exports = function ({ print }) {
         jd: jdPropLog,
         qa: qaPropLog,
         ios: iosPropLog,
-        android: androidPropLog
+        android: androidPropLog,
+        harmony: harmonyPropLog
       }
     ],
     event: [

package/lib/platform/template/wx/component-config/radio-group.js

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

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

@@ -15,6 +15,10 @@ module.exports = function () {
       el.isBuiltIn = true
       return 'mpx-radio'
     },
+    harmony (tag, { el }) {
+      el.isBuiltIn = true
+      return 'mpx-radio'
+    },
     event: [
       {
         test: 'tap',

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

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

package/lib/platform/template/wx/component-config/root-portal.js

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