Merge branch 'next' into refactor/template

# Conflicts: # packages/shared/src/components.ts # packages/taro-mini-runner/__tests__/__snapshots__/alipay.spec.ts.snap # packages/taro-mini-runner/__tests__/__snapshots__/bytedance.spec.ts.snap # packages/taro-mini-runner/__tests__/__snapshots__/custom-tabbar.spec.ts.snap # packages/taro-mini-runner/__tests__/__snapshots__/jd.spec.ts.snap # packages/taro-mini-runner/__tests__/__snapshots__/qq.spec.ts.snap # packages/taro-mini-runner/__tests__/__snapshots__/swan.spec.ts.snap # packages/taro-mini-runner/__tests__/__snapshots__/tabbar.spec.ts.snap # packages/taro-mini-runner/package.json
NervJS · Aug 16, 2020 · 3ca4131 · 3ca4131
2 parents 70c0089 + 4e019d4
commit 3ca4131
Show file tree

Hide file tree

Showing 65 changed files with 3,894 additions and 572 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: 新建一个新的 Issue
-    url: https://nervjs.github.io/taro-issue-helper/
+    url: https://tls.jd.com/taro-issue-helper
     about: 请点击 「Open」 按钮打开新链接创建 Issue
diff --git a/lerna.json b/lerna.json
@@ -35,6 +35,6 @@
       "license": "MIT"
     }
   },
-  "version": "3.0.6",
+  "version": "3.0.7",
   "npmClient": "yarn"
 }
diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-taroapi",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc"

diff --git a/packages/babel-preset-taro/index.js b/packages/babel-preset-taro/index.js
@@ -116,6 +116,8 @@ module.exports = (_, options = {}) => {
       packageName: '@tarojs/taro',
       apis
     }])
+  } else {
+    plugins.push([require('babel-plugin-dynamic-import-node')])
   }
 
   return {

diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-taro",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "> TODO: description",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/babel-preset-taro#readme",
@@ -33,8 +33,9 @@
     "@babel/preset-react": "^7.7.4",
     "@babel/preset-typescript": "^7.8.0",
     "@babel/runtime": "^7.7.4",
-    "@tarojs/taro-h5": "3.0.6",
-    "babel-plugin-transform-taroapi": "3.0.6",
+    "@tarojs/taro-h5": "3.0.7",
+    "babel-plugin-dynamic-import-node": "^2.3.3",
+    "babel-plugin-transform-taroapi": "3.0.7",
     "core-js": "^3.6.3"
   }
 }
diff --git a/packages/eslint-config-taro/package.json b/packages/eslint-config-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-taro",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Taro specific linting rules for ESLint",
   "main": "index.js",
   "files": [

diff --git a/packages/eslint-plugin-taro/package.json b/packages/eslint-plugin-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-taro",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Taro specific linting plugin for ESLint",
   "main": "index.js",
   "files": [

diff --git a/packages/postcss-plugin-constparse/package.json b/packages/postcss-plugin-constparse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-plugin-constparse",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "parse constants defined in config",
   "main": "index.js",
   "author": "Simba",

diff --git a/packages/postcss-pxtransform/package.json b/packages/postcss-pxtransform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-pxtransform",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
   "keywords": [
     "postcss",

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/shared",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "> TODO: description",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/shared#readme",

diff --git a/packages/shared/src/components.ts b/packages/shared/src/components.ts
@@ -57,12 +57,12 @@ const Map = {
   longitude: '',
   latitude: '',
   scale: '16',
-  markers: '',
+  markers: '[]',
   covers: '',
-  polyline: '',
-  circles: '',
+  polyline: '[]',
+  circles: '[]',
   controls: '',
-  'include-point': 'false',
+  'include-points': '[]',
   'show-location': '',
   polygons: '',
   subkey: '',
@@ -381,6 +381,11 @@ const ScrollView = {
   bindScrolltoUpper: '',
   bindScrolltoLower: '',
   bindScroll: '',
+  animation: '',
+  bindTransitionEnd: '',
+  bindAnimationStart: '',
+  bindAnimationIteration: '',
+  bindAnimationEnd: '',
   ...touchEvents
 }
 
@@ -485,9 +490,13 @@ const LivePlayer = {
   'sound-mode': singleQuote('speaker'),
   'auto-pause-if-navigate': 'true',
   'auto-pause-if-open-native': 'true',
+  'picture-in-picture-mode': '[]',
   bindStateChange: '',
   bindFullScreenChange: '',
-  bindNetStatus: ''
+  bindNetStatus: '',
+  bindAudioVolumeNotify: '',
+  bindEnterPictureInPicture: '',
+  bindLeavePictureInPicture: ''
 }
 
 const LivePusher = {
@@ -555,6 +564,16 @@ const Video = {
   'vslide-gesture': 'false',
   'vslide-gesture-in-fullscreen': 'true',
   'ad-unit-id': '',
+  'poster-for-crawler': '',
+  'show-casting-button': 'false',
+  'picture-in-picture-mode': '[]',
+  // picture-in-picture-show-progress 属性先注释掉的原因如下：
+  // 该属性超过了 wxml 属性的长度限制，实际无法使用且导致编译报错。可等微信官方修复后再放开。
+  // 参考1：https://developers.weixin.qq.com/community/develop/doc/000a429beb87f0eac07acc0fc5b400
+  // 参考2: https://developers.weixin.qq.com/community/develop/doc/0006883619c48054286a4308258c00?_at=vyxqpllafi
+  // 'picture-in-picture-show-progress': 'false',
+  'enable-auto-rotation': 'false',
+  'show-screen-lock-button': 'false',
   bindPlay: '',
   bindPause: '',
   bindEnded: '',
@@ -563,11 +582,15 @@ const Video = {
   bindWaiting: '',
   bindError: '',
   bindProgress: '',
-  bindLoadedMetadata: ''
+  bindLoadedMetadata: '',
+  bindControlsToggle: '',
+  bindEnterPictureInPicture: '',
+  bindLeavePictureInPicture: '',
+  bindSeekComplete: ''
 }
 
 const Canvas = {
-  type: '',
+  type: singleQuote('2d'),
   'canvas-id': '',
   'disable-scroll': 'false',
   bindTouchStart: '',
@@ -581,6 +604,8 @@ const Canvas = {
 const Ad = {
   'unit-id': '',
   'ad-intervals': '',
+  'ad-type': singleQuote('banner'),
+  'ad-theme': singleQuote('white'),
   bindLoad: '',
   bindError: '',
   bindClose: ''

diff --git a/packages/shared/src/template.ts b/packages/shared/src/template.ts
@@ -132,6 +132,10 @@ export class BaseTemplate {
           Object.assign(newComp, styles, this.getEvents())
         }
 
+        if (compName === 'swiper-item') {
+          delete newComp.style
+        }
+
         if (compName === 'slot' || compName === 'slot-view') {
           result[compName] = {
             slot: 'i.name'

diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/api",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Taro common API",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/api#readme",
@@ -29,6 +29,6 @@
     "url": "https://github.com/NervJS/taro/issues"
   },
   "dependencies": {
-    "@tarojs/runtime": "3.0.6"
+    "@tarojs/runtime": "3.0.7"
   }
 }
diff --git a/packages/taro-cli/package.json b/packages/taro-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "cli tool for taro",
   "main": "index.js",
   "scripts": {
@@ -44,11 +44,11 @@
   "license": "MIT",
   "dependencies": {
     "@hapi/joi": "17.1.1",
-    "@tarojs/helper": "3.0.6",
-    "@tarojs/service": "3.0.6",
-    "@tarojs/shared": "3.0.6",
-    "@tarojs/taro": "3.0.6",
-    "@tarojs/taroize": "3.0.6",
+    "@tarojs/helper": "3.0.7",
+    "@tarojs/service": "3.0.7",
+    "@tarojs/shared": "3.0.7",
+    "@tarojs/taro": "3.0.7",
+    "@tarojs/taroize": "3.0.7",
     "@tarojs/transformer-wx": "^2.0.4",
     "@types/request": "^2.48.1",
     "@typescript-eslint/parser": "^2.0.0",
@@ -76,11 +76,11 @@
     "ejs": "^2.6.1",
     "envinfo": "^6.0.1",
     "eslint": "^6.1.0",
-    "eslint-config-taro": "3.0.6",
+    "eslint-config-taro": "3.0.7",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-react": "^7.4.0",
     "eslint-plugin-react-hooks": "^1.6.1",
-    "eslint-plugin-taro": "3.0.6",
+    "eslint-plugin-taro": "3.0.7",
     "eslint-plugin-vue": "^6.2.2",
     "fbjs": "^1.0.0",
     "find-yarn-workspace-root": "1.2.1",
@@ -103,7 +103,7 @@
     "postcss-modules-resolve-imports": "^1.3.0",
     "postcss-modules-scope": "^1.1.0",
     "postcss-modules-values": "^1.3.0",
-    "postcss-pxtransform": "3.0.6",
+    "postcss-pxtransform": "3.0.7",
     "postcss-reporter": "^6.0.1",
     "postcss-taro-unit-transform": "1.2.15",
     "postcss-url": "^7.3.2",
@@ -124,7 +124,7 @@
     "xxhashjs": "^0.2.2"
   },
   "devDependencies": {
-    "@tarojs/mini-runner": "3.0.6",
-    "@tarojs/webpack-runner": "3.0.6"
+    "@tarojs/mini-runner": "3.0.7",
+    "@tarojs/webpack-runner": "3.0.7"
   }
 }