@dcloudio/uni-template-compiler 2.0.2-alpha-4080720251125002 → 2.0.2-alpha-5000020260203001

package/lib/auto-components.js

@@ -105,7 +105,9 @@ function compileTemplate (source, options, compile) {
 
 const compilerModule = {
   preTransformNode (el, options) {
-    if (el.tag === 'match-media' && process.env.UNI_PLATFORM !== 'mp-weixin') {
+    const supportedPlatforms = ['mp-weixin', 'mp-jd']
+    const unsupportedPlatforms = ['mp-xhs', 'mp-kuaishou'] // 小红书和快手无原生 match-media 组件，使用 uni-match-media 组件会报错 uni.createMediaQueryObserver is not a function
+    if (el.tag === 'match-media' && ![...supportedPlatforms, ...unsupportedPlatforms].includes(process.env.UNI_PLATFORM)) {
       el.tag = 'uni-match-media'
     }
     if (process.env.UNI_PLATFORM === 'quickapp-native') {

package/lib/mp.js

@@ -1,186 +1,8 @@
 const uniI18n = require('@dcloudio/uni-cli-i18n')
-const { getManifestJson } = require('@dcloudio/uni-cli-shared/lib/manifest')
-
+const { tags } = require('./native-tags')
 const EVENTS = {
   click: 'tap'
 }
-// UNI_INPUT_DIR 在 test 环境下不存在
-const manifestJson = process.env.UNI_INPUT_DIR ? getManifestJson() : {}
-const nativeTags = (manifestJson[process.env.UNI_PLATFORM] || {}).nativeTags || []
-const tags = {
-  // 小程序平台通用组件
-  base: [
-    'slot',
-    'block',
-    'component',
-    'template',
-
-    'ad',
-    'audio',
-    'button',
-    'camera',
-    'canvas',
-    'checkbox',
-    'checkbox-group',
-    'cover-image',
-    'cover-view',
-    'form',
-    'functional-page-navigator',
-    'icon',
-    'image',
-    'input',
-    'label',
-    'live-player',
-    'live-pusher',
-    'map',
-    'movable-area',
-    'movable-view',
-    'navigator',
-    'official-account',
-    'open-data',
-    'picker',
-    'picker-view',
-    'picker-view-column',
-    'progress',
-    'radio',
-    'radio-group',
-    'rich-text',
-    'scroll-view',
-    'slider',
-    'swiper',
-    'swiper-item',
-    'switch',
-    'text',
-    'textarea',
-    'video',
-    'view',
-    'web-view',
-    'editor'
-  ],
-  'mp-baidu': [
-    'animation-video',
-    'animation-view',
-    'ar-camera',
-    'rtc-room',
-    'rtc-room-item',
-    'tabs',
-    'tab-item',
-    'follow-swan',
-    'login',
-    'inline-payment-panel',
-    'talos-linear-gradient',
-    'talos-rc-view',
-    'talos-nested-scroll-view',
-    'talos-nested-scroll-top-container',
-    'talos-nested-scroll-bottom-container',
-    'talos-waterfall-view',
-    'talos-waterfall-item',
-    'talos-waterfall-header',
-    'talos-waterfall-footer',
-    'talos-pull-refresh',
-    'talos-control-container',
-    'talos-na-refresh-control',
-    'talos-modal',
-    'talos-svg',
-    ...nativeTags
-  ],
-  'mp-weixin': [
-    'page-container',
-    'page-meta',
-    'navigation-bar',
-    'match-media',
-    'share-element',
-    'channel-live',
-    'channel-video',
-    'voip-room',
-    'root-portal',
-    'subscribe',
-    // 手势组件
-    'tap-gesture-handler',
-    'double-tap-gesture-handler',
-    'scale-gesture-handler',
-    'force-press-gesture-handler',
-    'pan-gesture-handler',
-    'vertical-drag-gesture-handler',
-    'horizontal-drag-gesture-handler',
-    'long-press-gesture-handler',
-    // 其他
-    'draggable-sheet',
-    'grid-builder',
-    'grid-view',
-    'list-view',
-    'list-builder',
-    'nested-scroll-body',
-    'nested-scroll-header',
-    'open-container',
-    'share-element',
-    'snapshot',
-    // 'span', // todo: 临时移除 span 的支持，后续判断 skyline 环境进行区分 ask 190418
-    'sticky-header',
-    'sticky-section',
-    'store-product',
-    'store-home',
-    'store-gift',
-    'store-coupon',
-    'open-data-list',
-    'open-data-item',
-    'selection',
-    ...nativeTags
-  ],
-  // 支付宝小程序平台独有组件
-  'mp-alipay': [
-    'lifestyle',
-    'life-follow',
-    'contact-button',
-    'spread',
-    'error-view',
-    'poster',
-    'cashier',
-    'ix-grid',
-    'ix-native-grid',
-    'ix-native-list',
-    'mkt',
-    'page-container',
-    'page-meta',
-    'root-portal',
-    'share-element',
-    'lottie',
-    'join-group-chat',
-    'subscribe-message',
-    'mpass-component',
-    ...nativeTags
-  ],
-  // 抖音小程序平台独有组件
-  'mp-toutiao': [
-    'draw-ad',
-    'aweme-data',
-    'consume-card',
-    'pay-button',
-    'rate-button',
-    'member-button',
-    'confirm-receipt-button',
-    'live-preview',
-    'aweme-live-book',
-    'aweme-user-card',
-    'rtc-room',
-    'clue-order-form',
-    'shop-follow-card',
-    ...nativeTags
-  ],
-  'mp-kuaishou': [
-    'follow-service',
-    'payment-list',
-    'playlet',
-    'address',
-    'page-meta',
-    'navigation-bar',
-    ...nativeTags
-  ],
-  'mp-xhs': ['post-note-button', 'group-chat-card', ...nativeTags],
-  'mp-jd': ['root-portal', 'page-container', ...nativeTags],
-  'mp-qq': [...nativeTags],
-  'mp-harmony': [...nativeTags]
-}
 
 const baseCompiler = {
   ref: 'data-ref',

package/lib/native-tags.js

@@ -0,0 +1,187 @@
+const { getManifestJson } = require('@dcloudio/uni-cli-shared/lib/manifest')
+
+// UNI_INPUT_DIR 在 test 环境下不存在
+const manifestJson = process.env.UNI_INPUT_DIR ? getManifestJson() : {}
+const nativeTags = (manifestJson[process.env.UNI_PLATFORM] || {}).nativeTags || []
+const tags = {
+  // 小程序平台通用组件
+  base: [
+    'slot',
+    'block',
+    'component',
+    'template',
+
+    'ad',
+    'audio',
+    'button',
+    'camera',
+    'canvas',
+    'checkbox',
+    'checkbox-group',
+    'cover-image',
+    'cover-view',
+    'form',
+    'functional-page-navigator',
+    'icon',
+    'image',
+    'input',
+    'label',
+    'live-player',
+    'live-pusher',
+    'map',
+    'movable-area',
+    'movable-view',
+    'navigator',
+    'official-account',
+    'open-data',
+    'picker',
+    'picker-view',
+    'picker-view-column',
+    'progress',
+    'radio',
+    'radio-group',
+    'rich-text',
+    'scroll-view',
+    'slider',
+    'swiper',
+    'swiper-item',
+    'switch',
+    'text',
+    'textarea',
+    'video',
+    'view',
+    'web-view',
+    'editor'
+  ],
+  'mp-baidu': [
+    'animation-video',
+    'animation-view',
+    'ar-camera',
+    'rtc-room',
+    'rtc-room-item',
+    'tabs',
+    'tab-item',
+    'follow-swan',
+    'login',
+    'inline-payment-panel',
+    'talos-linear-gradient',
+    'talos-rc-view',
+    'talos-nested-scroll-view',
+    'talos-nested-scroll-top-container',
+    'talos-nested-scroll-bottom-container',
+    'talos-waterfall-view',
+    'talos-waterfall-item',
+    'talos-waterfall-header',
+    'talos-waterfall-footer',
+    'talos-pull-refresh',
+    'talos-control-container',
+    'talos-na-refresh-control',
+    'talos-modal',
+    'talos-svg',
+    ...nativeTags
+  ],
+  'mp-weixin': [
+    'channel-live',
+    'channel-video',
+    'double-tap-gesture-handler',
+    'draggable-sheet',
+    'editor-portal',
+    'force-press-gesture-handler',
+    'grid-builder',
+    'grid-view',
+    'horizontal-drag-gesture-handler',
+    'keyboard-accessory',
+    'list-builder',
+    'list-view',
+    'long-press-gesture-handler',
+    'match-media',
+    'navigation-bar',
+    'nested-scroll-body',
+    'nested-scroll-header',
+    'official-account-publish',
+    'open-container',
+    'open-data-list',
+    'open-data-item',
+    'page-container',
+    'page-meta',
+    'pan-gesture-handler',
+    'root-portal',
+    'scale-gesture-handler',
+    'selection',
+    'share-element',
+    'snapshot',
+    'sticky-header',
+    'sticky-section',
+    'store-coupon',
+    'store-gift',
+    'store-home',
+    'store-product',
+    'subscribe',
+    'tap-gesture-handler',
+    'vertical-drag-gesture-handler',
+    'voip-room',
+
+    // 'span', // todo: 临时移除 span 的支持，后续判断 skyline 环境进行区分 ask 190418
+    ...nativeTags
+  ],
+  // 支付宝小程序平台独有组件
+  'mp-alipay': [
+    'lifestyle',
+    'life-follow',
+    'contact-button',
+    'spread',
+    'error-view',
+    'poster',
+    'cashier',
+    'ix-grid',
+    'ix-native-grid',
+    'ix-native-list',
+    'mkt',
+    'page-container',
+    'page-meta',
+    'root-portal',
+    'share-element',
+    'lottie',
+    'join-group-chat',
+    'subscribe-message',
+    'mpass-component',
+    'ad-feeds',
+    ...nativeTags
+  ],
+  // 抖音小程序平台独有组件
+  'mp-toutiao': [
+    'draw-ad',
+    'aweme-data',
+    'consume-card',
+    'pay-button',
+    'rate-button',
+    'member-button',
+    'confirm-receipt-button',
+    'live-preview',
+    'aweme-live-book',
+    'aweme-user-card',
+    'rtc-room',
+    'clue-order-form',
+    'shop-follow-card',
+    'mask',
+    'video-player',
+    ...nativeTags
+  ],
+  'mp-kuaishou': [
+    'follow-service',
+    'payment-list',
+    'playlet',
+    'address',
+    'page-meta',
+    'navigation-bar',
+    ...nativeTags
+  ],
+  'mp-xhs': ['post-note-button', 'group-chat-card', 'video-player', ...nativeTags],
+  'mp-jd': ['root-portal', 'page-container', 'match-media', ...nativeTags],
+  'mp-qq': [...nativeTags],
+  'mp-harmony': [...nativeTags]
+}
+
+module.exports = {
+  tags
+}

package/lib/script/traverse/data/class.js

@@ -11,6 +11,8 @@ const {
   isVForElement
 } = require('../../../util')
 
+const transPlatform = ['mp-toutiao', 'mp-alipay', 'mp-lark']
+
 function processClassArrayExpressionElements (classArrayExpression) {
   let binaryExpression
 
@@ -45,7 +47,6 @@ function processStaticClass (classArrayExpression, staticClassPath, state) {
     staticClassPath.remove()
   }
 
-  const transPlatform = ['mp-toutiao', 'mp-alipay', 'mp-lark']
   if (transPlatform.includes(state.options.platform.name)) {
     // classArrayExpression => binaryExpression
     return processClassArrayExpressionElements(classArrayExpression)
@@ -126,7 +127,7 @@ module.exports = function processClass (paths, path, state) {
     }
   }
   if (mergeVirtualHostAttributes && isRootElement(path.parentPath) && !isVForElement(path.parentPath)) {
-    const virtualHostClass = t.identifier(VIRTUAL_HOST_CLASS)
+    const virtualHostClass = transPlatform.includes(state.options.platform.name) ? t.logicalExpression('||', t.identifier(VIRTUAL_HOST_CLASS), t.stringLiteral('')) : t.identifier(VIRTUAL_HOST_CLASS)
     if (classArrayExpression) {
       classArrayExpression.elements.push(virtualHostClass)
     } else {

package/lib/script/traverse/data/style.js

@@ -86,7 +86,7 @@ function processStyleObjectExpression (styleValuePath) {
         '+',
         t.binaryExpression(
           '+',
-          t.stringLiteral(hyphenate(key.name || key.value) + ':'),
+          propertyPath.node.computed ? t.binaryExpression('+', t.parenthesizedExpression(key), t.stringLiteral(':')) : t.stringLiteral(hyphenate(key.name || key.value) + ':'),
           t.parenthesizedExpression(propertyPath.node.value)
         ),
         t.stringLiteral(';')

package/lib/template/generate.js

@@ -44,7 +44,7 @@ function processElement (ast, state, isRoot) {
   if (platform.isComponent(ast.type)) {
     if (platformName === 'mp-alipay') {
       ast.attr.onVueInit = INTERNAL_EVENT_LINK
-    } else if (platformName !== 'mp-baidu') {
+    } else if (platformName !== 'mp-baidu' && platformName !== 'mp-harmony') {
       ast.attr['bind:' + INTERNAL_EVENT_LINK] = INTERNAL_EVENT_LINK
     }
     // TODO 过滤小程序原生组件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-template-compiler",
-  "version": "2.0.2-alpha-4080720251125002",
+  "version": "2.0.2-alpha-5000020260203001",
   "description": "uni-template-compiler",
   "main": "lib/index.js",
   "repository": {
@@ -23,5 +23,5 @@
     "@babel/types": "^7.3.3",
     "vue-template-compiler": "^2.6.10"
   },
-  "gitHead": "abe3548d6bfc9b9a218507d32ab77e699d8382d7"
+  "gitHead": "87ec9e5606a61868b10428184badb099ac9bffd6"
 }