From bc3e18d8cca16cc1d6d6d6e9d8ce1860861b8897 Mon Sep 17 00:00:00 2001 From: wuchangming Date: Thu, 30 Jul 2020 12:39:08 +0800 Subject: [PATCH 01/23] =?UTF-8?q?feat(babel-preset-taro):=20=E9=9D=9E=20h5?= =?UTF-8?q?=20=E7=AB=AF=E4=B9=9F=E6=94=AF=E6=8C=81=E5=BC=82=E6=AD=A5=20imp?= =?UTF-8?q?ort()=20=E8=AF=AD=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/babel-preset-taro/index.js | 2 ++ packages/babel-preset-taro/package.json | 1 + 2 files changed, 3 insertions(+) diff --git a/packages/babel-preset-taro/index.js b/packages/babel-preset-taro/index.js index 7f69ae1d581e..9a38fadb4996 100644 --- 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 index b66554eeeb47..c0edf04707ab 100644 --- a/packages/babel-preset-taro/package.json +++ b/packages/babel-preset-taro/package.json @@ -34,6 +34,7 @@ "@babel/preset-typescript": "^7.8.0", "@babel/runtime": "^7.7.4", "@tarojs/taro-h5": "3.0.6", + "babel-plugin-dynamic-import-node": "^2.3.3", "babel-plugin-transform-taroapi": "3.0.6", "core-js": "^3.6.3" } From f7102101c61fde57923ff60a2080b41608f766c4 Mon Sep 17 00:00:00 2001 From: colder Date: Sun, 2 Aug 2020 10:45:13 +0800 Subject: [PATCH 02/23] =?UTF-8?q?fix(types):=20=E5=A2=9E=E5=8A=A0=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=A0=87=E5=87=86=E5=B1=9E=E6=80=A7=20dangerouslySetI?= =?UTF-8?q?nnerHTML?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-components/types/common.d.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/taro-components/types/common.d.ts b/packages/taro-components/types/common.d.ts index fba2afecc4f4..d5af4ec79608 100644 --- a/packages/taro-components/types/common.d.ts +++ b/packages/taro-components/types/common.d.ts @@ -19,6 +19,13 @@ export interface StandardProps extends EventProps { animation?: { actions: object[] } /** 引用 */ ref?: LegacyRef + /** + * 渲染 HTML + * @see https://taro-docs.jd.com/taro/docs/html + */ + dangerouslySetInnerHTML?: { + __html: string; + } } export interface FormItemProps { From 1e6f8f963949f9d05820e8cc98e5ee073bf73279 Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Sat, 1 Aug 2020 00:24:38 +0800 Subject: [PATCH 03/23] =?UTF-8?q?fix(components):=20=E4=BF=AE=E5=A4=8D=20H?= =?UTF-8?q?5=20Canvas=20=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98,=20fix=20#6990?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/canvas.tsx | 42 ++++--------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/packages/taro-components/src/components/canvas/canvas.tsx b/packages/taro-components/src/components/canvas/canvas.tsx index f828bbafc586..6c83d2e1a0ed 100644 --- a/packages/taro-components/src/components/canvas/canvas.tsx +++ b/packages/taro-components/src/components/canvas/canvas.tsx @@ -1,5 +1,5 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars -import { Component, h, ComponentInterface, Prop, State, Element, Event } from '@stencil/core' +import { Component, h, ComponentInterface, Prop, Element, Event } from '@stencil/core' const LONG_TAP_DELAY = 500 @@ -9,13 +9,8 @@ const LONG_TAP_DELAY = 500 }) export class Canvas implements ComponentInterface { private timer: NodeJS.Timeout - // @Prop() type: '2d' | 'webgl' - @Prop() canvasId: string - @State() width = 300 - @State() height = 150 - @State() klass: string - @State() css: string + @Prop() canvasId: string @Element() el: HTMLElement @@ -25,26 +20,6 @@ export class Canvas implements ComponentInterface { onLongTap - private canvas?: HTMLCanvasElement - - componentDidLoad () { - const { width, height } = this.el.getBoundingClientRect() - this.width = width - this.height = height - this.klass = this.el.className - this.css = this.el.style.cssText - } - - componentDidUpdate () { - const { width, height } = this.el.getBoundingClientRect() - if (this.width !== width) this.width = width - if (this.height !== height) this.height = height - if (this.canvas) { - this.canvas.className = this.el.className - this.canvas.style.cssText = this.el.style.cssText - } - } - onTouchStart = () => { this.timer = setTimeout(() => { this.onLongTap.emit() @@ -60,18 +35,15 @@ export class Canvas implements ComponentInterface { } render () { - const { - canvasId, - width, - height - } = this + const { canvasId } = this return ( (this.canvas = node!)} - width={width} - height={height} + style={{ + width: '100%', + height: '100%' + }} onTouchStart={this.onTouchStart} onTouchMove={this.onTouchMove} onTouchEnd={this.onTouchEnd} From 9b808135d383e9c2f9af28bb37981a9940e7d195 Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Sat, 1 Aug 2020 00:26:38 +0800 Subject: [PATCH 04/23] =?UTF-8?q?fix(shared):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E7=BB=84=E4=BB=B6=E7=9A=84=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Canvas 的 type 需要默认值 '2d' * Map 的数组类型需要默认值，否则头条下会报错，fix #7207 --- packages/shared/src/components.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/shared/src/components.ts b/packages/shared/src/components.ts index ed3cbaf9e3c6..5c5ee25c4f7d 100644 --- a/packages/shared/src/components.ts +++ b/packages/shared/src/components.ts @@ -50,12 +50,12 @@ const Map = { longitude: '', latitude: '', scale: '16', - markers: '', + markers: '[]', covers: '', - polyline: '', - circles: '', + polyline: '[]', + circles: '[]', controls: '', - 'include-point': 'false', + 'include-point': '[]', 'show-location': '', polygons: '', subkey: '', @@ -569,7 +569,7 @@ const Video = { } const Canvas = { - type: '', + type: singleQuote('2d'), 'canvas-id': '', 'disable-scroll': 'false', bindTouchStart: '', From a2695ae8d4a64653ef50999e80c8789f9e6d3054 Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Sat, 1 Aug 2020 01:32:58 +0800 Subject: [PATCH 05/23] =?UTF-8?q?fix(shared):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=E5=B1=9E=E6=80=A7=EF=BC=8C?= =?UTF-8?q?fix=20#7178?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/shared/src/components.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/src/components.ts b/packages/shared/src/components.ts index 5c5ee25c4f7d..62048abe42ca 100644 --- a/packages/shared/src/components.ts +++ b/packages/shared/src/components.ts @@ -55,7 +55,7 @@ const Map = { polyline: '[]', circles: '[]', controls: '', - 'include-point': '[]', + 'include-points': '[]', 'show-location': '', polygons: '', subkey: '', From 7c3d5ce7969a99441a7c4806b107fb72a02ddb0e Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Mon, 3 Aug 2020 15:14:21 +0800 Subject: [PATCH 06/23] =?UTF-8?q?fix(shared):=20=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=B9=BF=E5=91=8A=E7=BB=84=E4=BB=B6=E7=BC=BA=E5=A4=B1=E5=B1=9E?= =?UTF-8?q?=E6=80=A7,=20fix=20#7237?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/shared/src/components.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/shared/src/components.ts b/packages/shared/src/components.ts index 62048abe42ca..e972a1e9a18f 100644 --- a/packages/shared/src/components.ts +++ b/packages/shared/src/components.ts @@ -583,6 +583,8 @@ const Canvas = { const Ad = { 'unit-id': '', 'ad-intervals': '', + 'ad-type': singleQuote('banner'), + 'ad-theme': singleQuote('white'), bindLoad: '', bindError: '', bindClose: '' From ffda8a43f1746204ef7fd56e49ceb3c489e658a0 Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Mon, 3 Aug 2020 20:31:52 +0800 Subject: [PATCH 07/23] =?UTF-8?q?fix(service):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=BC=95=E7=94=A8=20service=20=E5=8C=85=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=8Cfix=20#7058?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-service/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/taro-service/package.json b/packages/taro-service/package.json index 002a64f0e223..4f3b723e6741 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -20,7 +20,8 @@ "files": [ "index.js", "dist", - "types" + "types", + "src" ], "keywords": [ "taro" From 5b1229e8ae32c59369e0a90d0925aa7a22a4f12c Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Mon, 3 Aug 2020 18:47:45 +0800 Subject: [PATCH 08/23] =?UTF-8?q?fix(runtime):=20=20=E4=BF=AE=E5=A4=8D=20h?= =?UTF-8?q?tml=20=E8=A7=A3=E6=9E=90=E5=99=A8=E5=88=86=E6=9E=90=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=97=B6=E5=AF=B9=E7=A9=BA=E6=A0=BC=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=A4=84=E7=90=86=EF=BC=8Cfix=20#6911?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-runtime/src/dom/html/parser.ts | 4 ++- packages/taro-runtime/src/dom/html/scaner.ts | 32 ++++++++++++++++++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/packages/taro-runtime/src/dom/html/parser.ts b/packages/taro-runtime/src/dom/html/parser.ts index 8dd979e79bd7..fe259a32474a 100644 --- a/packages/taro-runtime/src/dom/html/parser.ts +++ b/packages/taro-runtime/src/dom/html/parser.ts @@ -94,7 +94,9 @@ function splitEqual (str: string) { const sep = '=' const idx = str.indexOf(sep) if (idx === -1) return [str] - return [str.slice(0, idx), str.slice(idx + sep.length)] + const key = str.slice(0, idx).trim() + const value = str.slice(idx + sep.length).trim() + return [key, value] } function format (children: ChildNode[]) { diff --git a/packages/taro-runtime/src/dom/html/scaner.ts b/packages/taro-runtime/src/dom/html/scaner.ts index e140de758f55..5c4f5ce495a6 100644 --- a/packages/taro-runtime/src/dom/html/scaner.ts +++ b/packages/taro-runtime/src/dom/html/scaner.ts @@ -62,6 +62,11 @@ function isWhitespaceChar (char: string) { return whitespace.test(char) } +const equalSign = /=/ +function isEqualSignChar (char: string) { + return equalSign.test(char) +} + function shouldBeIgnore (tagName: string) { const name = tagName.toLowerCase() if (options.html.skipElements.has(name)) { @@ -86,6 +91,30 @@ function findTextEnd (str: string, index: number) { } } +function isWordEnd (cursor: number, wordBegin: number, html: string) { + if (!isWhitespaceChar(html.charAt(cursor))) return false + + const len = html.length + + // backwrad + for (let i = cursor - 1; i > wordBegin; i--) { + const char = html.charAt(i) + if (!isWhitespaceChar(char)) { + if (isEqualSignChar(char)) return false + break + } + } + + // forward + for (let i = cursor + 1; i < len; i++) { + const char = html.charAt(i) + if (!isWhitespaceChar(char)) { + if (isEqualSignChar(char)) return false + return true + } + } +} + export class Scaner { private tokens: Token[] = [] @@ -248,8 +277,7 @@ export class Scaner { break } - const isWordEnd = isWhitespaceChar(char) - if (isWordEnd) { + if (isWordEnd(cursor, wordBegin, html)) { if (cursor !== wordBegin) { words.push(html.slice(wordBegin, cursor)) } From a0c94bc7bb693ad8a149c8744933fc8225a7df7c Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Mon, 3 Aug 2020 22:51:29 +0800 Subject: [PATCH 09/23] =?UTF-8?q?fix(runtime/share):=20swiperitem=E4=B8=8D?= =?UTF-8?q?=E8=AE=BE=E7=BD=AEstyle=E5=B1=9E=E6=80=A7=EF=BC=8Cfix=20#7147?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/shared/src/components.ts | 4 ++++ packages/taro-runtime/src/hydrate.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/shared/src/components.ts b/packages/shared/src/components.ts index e972a1e9a18f..d5f95867cc9c 100644 --- a/packages/shared/src/components.ts +++ b/packages/shared/src/components.ts @@ -685,6 +685,10 @@ export function createMiniComponents (components: Components, buildType: string) Object.assign(newComp, styles, isAlipay ? alipayEvents : events) } + if (compName === 'swiper-item') { + delete newComp.style + } + if (compName === 'slot' || compName === 'slot-view') { result[compName] = { slot: 'i.name' diff --git a/packages/taro-runtime/src/hydrate.ts b/packages/taro-runtime/src/hydrate.ts index 952832d58191..2f6e59b7bcd8 100644 --- a/packages/taro-runtime/src/hydrate.ts +++ b/packages/taro-runtime/src/hydrate.ts @@ -69,7 +69,7 @@ export function hydrate (node: TaroElement | TaroText): MiniData { data[Shortcuts.Class] = node.className } - if (node.cssText !== '') { + if (node.cssText !== '' && node.nodeName !== 'swiper-item') { data[Shortcuts.Style] = node.cssText } From c2a3ee43a00a5d4d470b1c9e1ff770f3caa41b23 Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Fri, 31 Jul 2020 17:04:11 +0800 Subject: [PATCH 10/23] =?UTF-8?q?fix(runtime):=20=E4=BF=AE=E5=A4=8D=20reac?= =?UTF-8?q?t=20=E7=BB=84=E4=BB=B6=E5=8D=B8=E8=BD=BD=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8Cfix=20#7206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-runtime/src/dsl/react.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taro-runtime/src/dsl/react.ts b/packages/taro-runtime/src/dsl/react.ts index a9f407330c4e..49e496cd0276 100644 --- a/packages/taro-runtime/src/dsl/react.ts +++ b/packages/taro-runtime/src/dsl/react.ts @@ -163,7 +163,7 @@ export function createReactApp (App: React.ComponentClass, react: typeof React, public unmount (id: string, cb: () => void) { for (let i = 0; i < this.elements.length; i++) { const element = this.elements[i] - if (element.key === id) { + if (element.props.tid === id) { this.elements.splice(i, 1) break } From 38e02cea234e9357293bd90a20c946559477ee1f Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Fri, 31 Jul 2020 17:04:56 +0800 Subject: [PATCH 11/23] =?UTF-8?q?fix(router):=20=E4=BF=AE=E5=A4=8D=20h5=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=84=E4=BB=B6=20id=20=E5=B8=A6=E6=9C=89?= =?UTF-8?q?=20undefined=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-router/src/qs.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/taro-router/src/qs.ts b/packages/taro-router/src/qs.ts index 985415a5f90e..42e481fa342d 100644 --- a/packages/taro-router/src/qs.ts +++ b/packages/taro-router/src/qs.ts @@ -7,10 +7,12 @@ export const qs = function () { ? location.hash.slice(routerConfig.router.pathname.length + 1) : location.search - search.substr(1).split('&').forEach(pair => { - const [key, value] = pair.split('=') - params[key] = value - }) + if (search) { + search.substr(1).split('&').forEach(pair => { + const [key, value] = pair.split('=') + params[key] = value + }) + } return params } From 29a4d6893f558dd6a0555989c27ac544893b6b89 Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Thu, 30 Jul 2020 19:11:47 +0800 Subject: [PATCH 12/23] =?UTF-8?q?fix(react):=20=E4=BF=AE=E5=A4=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=AC=AC=E4=B8=89=E6=96=B9=E7=BB=84=E4=BB=B6=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E8=A7=A6=E5=8F=91=20onClick=20=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8Cfix=20#7182?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-react/src/props.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/taro-react/src/props.ts b/packages/taro-react/src/props.ts index 7a04fbfd501f..1f4a8c054a0d 100644 --- a/packages/taro-react/src/props.ts +++ b/packages/taro-react/src/props.ts @@ -1,5 +1,5 @@ import { TaroElement, Style, document, FormElement } from '@tarojs/runtime' -import { isFunction, isString, isObject, isNumber } from '@tarojs/shared' +import { isFunction, isString, isObject, isNumber, internalComponents, capitalize, toCamelCase } from '@tarojs/shared' import { CommonEvent } from '@tarojs/components' export type Props = Record @@ -39,7 +39,11 @@ function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: un eventName = eventName.slice(0, -7) } - if (eventName === 'click') { + const compName = capitalize(toCamelCase(dom.tagName.toLowerCase())) + + console.log('compName: ', compName, compName in internalComponents) + + if (eventName === 'click' && compName in internalComponents) { eventName = 'tap' } From 67adf3775a551b692acba1a834b790c5af06a023 Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Thu, 30 Jul 2020 19:39:49 +0800 Subject: [PATCH 13/23] fix: ci --- packages/taro-react/src/props.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/taro-react/src/props.ts b/packages/taro-react/src/props.ts index 1f4a8c054a0d..5d39a197cc87 100644 --- a/packages/taro-react/src/props.ts +++ b/packages/taro-react/src/props.ts @@ -41,8 +41,6 @@ function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: un const compName = capitalize(toCamelCase(dom.tagName.toLowerCase())) - console.log('compName: ', compName, compName in internalComponents) - if (eventName === 'click' && compName in internalComponents) { eventName = 'tap' } From bc4f9207510141a19f3c7d5ffb058e764cfcd032 Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Thu, 30 Jul 2020 20:10:07 +0800 Subject: [PATCH 14/23] fix: ci --- packages/taro-react/__tests__/props.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/taro-react/__tests__/props.spec.js b/packages/taro-react/__tests__/props.spec.js index 0b1d8f05104c..8bcc53dbb79b 100644 --- a/packages/taro-react/__tests__/props.spec.js +++ b/packages/taro-react/__tests__/props.spec.js @@ -64,7 +64,7 @@ describe('Context', () => { it('onClick should work like onTap', () => { const container = document.createElement('div') const spy = jest.fn() - render(
, container) + render(, container) expect('tap' in container.firstChild.__handlers).toBe(true) }) @@ -72,7 +72,7 @@ describe('Context', () => { const createEvent = runtime.createEvent const container = document.createElement('div') const spy = jest.fn() - render(
, container) + render(, container) const event = createEvent({ type: 'tap', currentTarget: { id: container.firstChild.uid }, target: { id: container.firstChild.uid } }) container.firstChild.dispatchEvent(event) expect(spy).toBeCalled() From 4bac3ea24b28b1fc826fff53186ca8a97ba197b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=86=AC=E6=9E=97?= <18323965465@163.com> Date: Tue, 4 Aug 2020 19:55:49 +0800 Subject: [PATCH 15/23] =?UTF-8?q?fix(shared):=20scroll-view=20=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E4=BA=8B=E4=BB=B6=E7=BB=91=E5=AE=9A=20(#7245)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(shared): scroll-view 模版事件绑定 * chore(mini-runner): fix ci Co-authored-by: lidonglin Co-authored-by: chenjiajian <798095202@qq.com> --- packages/shared/src/components.ts | 5 + .../__snapshots__/alipay.spec.ts.snap | 32 ++--- .../__snapshots__/babel.spec.ts.snap | 32 ++--- .../__snapshots__/bytedance.spec.ts.snap | 32 ++--- .../__snapshots__/common-style.spec.ts.snap | 32 ++--- .../__snapshots__/config.spec.ts.snap | 104 +++++++------- .../__snapshots__/css-modules.spec.ts.snap | 64 ++++----- .../__snapshots__/custom-tabbar.spec.ts.snap | Bin 108043 -> 110395 bytes .../__tests__/__snapshots__/jd.spec.ts.snap | 32 ++--- .../__tests__/__snapshots__/nerv.spec.ts.snap | 32 ++--- .../__snapshots__/parse-html.spec.ts.snap | 32 ++--- .../__snapshots__/prerender.spec.ts.snap | 96 ++++++------- .../__tests__/__snapshots__/qq.spec.ts.snap | 52 +++---- .../__snapshots__/react.spec.ts.snap | 32 ++--- .../__tests__/__snapshots__/sass.spec.ts.snap | 128 +++++++++--------- .../__snapshots__/subpackages.spec.ts.snap | 32 ++--- .../__tests__/__snapshots__/swan.spec.ts.snap | 32 ++--- .../__snapshots__/tabbar.spec.ts.snap | Bin 182275 -> 186979 bytes .../__tests__/__snapshots__/ts.spec.ts.snap | 32 ++--- .../__tests__/__snapshots__/vue.spec.ts.snap | 32 ++--- .../__tests__/__snapshots__/vue3.spec.ts.snap | 32 ++--- .../__snapshots__/wx-hybrid.spec.ts.snap | 32 ++--- 22 files changed, 451 insertions(+), 446 deletions(-) diff --git a/packages/shared/src/components.ts b/packages/shared/src/components.ts index d5f95867cc9c..0c77afe89f1f 100644 --- a/packages/shared/src/components.ts +++ b/packages/shared/src/components.ts @@ -374,6 +374,11 @@ const ScrollView = { bindScrolltoUpper: '', bindScrolltoLower: '', bindScroll: '', + animation: '', + bindTransitionEnd: '', + bindAnimationStart: '', + bindAnimationIteration: '', + bindAnimationEnd: '', ...touchEvents } diff --git a/packages/taro-mini-runner/__tests__/__snapshots__/alipay.spec.ts.snap b/packages/taro-mini-runner/__tests__/__snapshots__/alipay.spec.ts.snap index 2c09c70d4cb3..7821d6013e21 100644 --- a/packages/taro-mini-runner/__tests__/__snapshots__/alipay.spec.ts.snap +++ b/packages/taro-mini-runner/__tests__/__snapshots__/alipay.spec.ts.snap @@ -125,7 +125,7 @@ require(\\"./taro\\");