From 1f5bc867526e4d61737121c326b89e591733ab2f Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Thu, 12 Mar 2020 00:37:50 +0800 Subject: [PATCH 01/54] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=20API=20=E4=BD=BF=E7=94=A8=20React?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 34 ++++++---- src/common/component.tsx | 6 +- src/common/utils.ts | 61 ++++++++++++++---- src/components/accordion/index.tsx | 15 ++--- src/components/action-sheet/body/index.tsx | 5 +- .../action-sheet/body/item/index.tsx | 9 +-- src/components/action-sheet/footer/index.tsx | 9 +-- src/components/action-sheet/header/index.tsx | 5 +- src/components/action-sheet/index.tsx | 7 +- src/components/activity-indicator/index.tsx | 5 +- src/components/avatar/index.tsx | 7 +- src/components/badge/index.tsx | 12 ++-- src/components/button/index.tsx | 21 ++---- src/components/calendar/body/index.tsx | 64 ++++++++----------- src/components/calendar/controller/index.tsx | 5 +- src/components/calendar/index.tsx | 51 ++++++--------- .../calendar/ui/date-list/index.tsx | 15 ++--- src/components/calendar/ui/day-list/index.tsx | 9 +-- src/components/card/index.tsx | 8 +-- src/components/checkbox/index.tsx | 8 +-- src/components/countdown/index.tsx | 25 ++++---- src/components/countdown/item/index.tsx | 7 +- src/components/curtain/index.tsx | 8 +-- src/components/divider/index.tsx | 10 ++- src/components/drawer/index.tsx | 11 ++-- src/components/fab/index.tsx | 8 +-- src/components/flex/index.tsx | 5 +- src/components/flex/item/index.tsx | 5 +- src/components/float-layout/index.tsx | 25 ++++---- src/components/form/index.tsx | 9 +-- src/components/grid/index.tsx | 20 +++--- src/components/icon/index.tsx | 13 ++-- src/components/image-picker/index.tsx | 22 +++---- src/components/indexes/index.tsx | 28 ++++---- src/components/input-number/index.tsx | 46 +++++++------ src/components/input/index.tsx | 13 ++-- src/components/list/index.tsx | 5 +- src/components/list/item/index.tsx | 29 ++++----- src/components/load-more/index.tsx | 8 +-- src/components/loading/index.tsx | 7 +- src/components/message/index.tsx | 4 +- src/components/modal/action/index.tsx | 5 +- src/components/modal/content/index.tsx | 7 +- src/components/modal/header/index.tsx | 5 +- src/components/modal/index.tsx | 10 ++- src/components/nav-bar/index.tsx | 19 ++---- src/components/noticebar/index.tsx | 18 +++--- src/components/pagination/index.tsx | 20 +++--- src/components/progress/index.tsx | 5 +- src/components/radio/index.tsx | 10 +-- src/components/range/index.tsx | 51 +++++++-------- src/components/rate/index.tsx | 29 +++++---- src/components/search-bar/index.tsx | 16 ++--- src/components/segmented-control/index.tsx | 29 ++++----- src/components/slider/index.tsx | 19 +++--- src/components/steps/index.tsx | 8 +-- src/components/swipe-action/index.tsx | 10 ++- src/components/swipe-action/options/index.tsx | 9 +-- src/components/switch/index.tsx | 9 +-- src/components/tab-bar/index.tsx | 13 ++-- src/components/tabs-pane/index.tsx | 5 +- src/components/tabs/index.tsx | 20 +++--- src/components/tag/index.tsx | 19 +++--- src/components/textarea/index.tsx | 23 +++---- src/components/timeline/index.tsx | 5 +- src/components/toast/index.tsx | 13 ++-- src/index.ts | 3 - tsconfig.json | 5 +- yarn.lock | 13 +++- 69 files changed, 494 insertions(+), 568 deletions(-) diff --git a/package.json b/package.json index e9f640eb7..dca98ef04 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,13 @@ "eslintConfig": { "extends": [ "o2team", - "taro", + "plugin:react/recommended", "plugin:prettier/recommended" ], "parser": "babel-eslint", + "plugins": [ + "react" + ], "env": { "jest": true }, @@ -45,7 +48,7 @@ "no-unused-vars": [ "error", { - "varsIgnorePattern": "Taro" + "varsIgnorePattern": "React" } ], "no-console": [ @@ -94,14 +97,19 @@ "react", "@typescript-eslint" ], - "extends": "plugin:prettier/recommended", + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended", + "plugin:react/recommended", + "plugin:prettier/recommended" + ], "env": { "jest": true }, "rules": { - "no-undef": 0, - "no-unused-vars": 0, - "@typescript-eslint/class-name-casing": 2, + "@typescript-eslint/no-explicit-any": ["off"], + "@typescript-eslint/member-delimiter-style": ["off"], "class-methods-use-this": "off", "prefer-rest-params": "off", "arrow-body-style": "warn", @@ -115,8 +123,7 @@ ".tsx" ] } - ], - "taro/custom-component-children": "off" + ] } } ] @@ -212,12 +219,10 @@ "clean": "rimraf .temp dist coverage" }, "dependencies": { - "@types/react": "^16.7.3", "bind-decorator": "^1.0.11", "classnames": "^2.2.6", "dayjs": "^1.7.7", - "lodash": "^4.17.10", - "prop-types": "^15.6.2" + "lodash": "^4.17.10" }, "devDependencies": { "@babel/core": "^7.0.0-rc.1", @@ -244,6 +249,7 @@ "@tarojs/taro-weapp": "^2.0.3", "@tarojs/webpack-runner": "^2.0.3", "@types/classnames": "^2.2.9", + "@types/react": "^16.9.23", "@types/webpack-env": "^1.13.6", "@typescript-eslint/eslint-plugin": "^2.10.0", "@typescript-eslint/parser": "^2.10.0", @@ -300,7 +306,9 @@ "postcss": "^7.0.2", "postcss-loader": "^3.0.0", "prettier": "^1.19.1", + "prop-types": "^15.7.2", "qrcode.react": "^1.0.0", + "react": "^16.13.0", "react-markdown-loader": "^1.1.14", "react-router-dom": "^5.1.2", "regenerator-runtime": "^0.13.3", @@ -317,5 +325,9 @@ "webpack-dev-server": "^3.1.5", "webpack-merge": "^4.1.3", "yaml-loader": "^0.5.0" + }, + "peerDependencies": { + "prop-types": ">=15.7.2", + "react": ">=16.13.0" } } diff --git a/src/common/component.tsx b/src/common/component.tsx index 2631e60b7..9e6d39d0e 100644 --- a/src/common/component.tsx +++ b/src/common/component.tsx @@ -1,4 +1,4 @@ -import { Component } from '@tarojs/taro' +import { Component } from 'react' const objectToString = (style: object | string): string => { if (style && typeof style === 'object') { @@ -15,10 +15,6 @@ const objectToString = (style: object | string): string => { } export default class AtComponent

extends Component { - static options = { - addGlobalClass: true - } - /** * 合并 style * @param {Object|String} style1 diff --git a/src/common/utils.ts b/src/common/utils.ts index 3346cabe5..7483a58a2 100644 --- a/src/common/utils.ts +++ b/src/common/utils.ts @@ -1,5 +1,5 @@ import Taro from '@tarojs/taro' -import { execObject, SelectorQuery } from '@tarojs/taro/types/index' +import { SelectorQuery } from '@tarojs/taro/types/index' const ENV = Taro.getEnv() @@ -19,29 +19,28 @@ function delayQuerySelector( self, selectorStr: string, delayTime = 500 -): Promise> { - const $scope = ENV === Taro.ENV_TYPE.WEB ? self : self.$scope - const selector: SelectorQuery = Taro.createSelectorQuery().in($scope) +): Promise { + const selector: SelectorQuery = Taro.createSelectorQuery() return new Promise(resolve => { delay(delayTime).then(() => { selector .select(selectorStr) .boundingClientRect() - .exec((res: Array) => { + .exec((res: any[]) => { resolve(res) }) }) }) } -function delayGetScrollOffset({ delayTime = 500 }): Promise> { +function delayGetScrollOffset({ delayTime = 500 }): Promise { return new Promise(resolve => { delay(delayTime).then(() => { Taro.createSelectorQuery() .selectViewport() .scrollOffset() - .exec((res: Array) => { + .exec((res: any[]) => { resolve(res) }) }) @@ -52,17 +51,15 @@ function delayGetClientRect({ self, selectorStr, delayTime = 500 -}): Promise> { - const $scope = - ENV === Taro.ENV_TYPE.WEB || ENV === Taro.ENV_TYPE.SWAN ? self : self.$scope - const selector: SelectorQuery = Taro.createSelectorQuery().in($scope) +}): Promise { + const selector: SelectorQuery = Taro.createSelectorQuery() return new Promise(resolve => { delay(delayTime).then(() => { selector .select(selectorStr) .boundingClientRect() - .exec((res: Array) => { + .exec((res: any[]) => { resolve(res) }) }) @@ -215,7 +212,7 @@ function handleTouchScroll(flag: any): void { // 把脱离文档流的body拉上去！否则页面会回到顶部！ document.body.style.top = `${-scrollTop}px` } else { - document.body.style.top = null + document.body.style.top = '' document.body.classList.remove('at-frozen') document.documentElement.scrollTop = scrollTop @@ -227,6 +224,41 @@ function pxTransform(size: number): string { return Taro.pxTransform(size) } +function objectToString(style: object | string): string { + if (style && typeof style === 'object') { + let styleStr = '' + Object.keys(style).forEach(key => { + const lowerCaseKey = key.replace(/([A-Z])/g, '-$1').toLowerCase() + styleStr += `${lowerCaseKey}:${style[key]};` + }) + return styleStr + } else if (style && typeof style === 'string') { + return style + } + return '' +} + +/** + * 合并 style + * @param {Object|String} style1 + * @param {Object|String} style2 + * @returns {String} + */ +function mergeStyle( + style1: object | string, + style2: object | string +): object | string { + if ( + style1 && + typeof style1 === 'object' && + style2 && + typeof style2 === 'object' + ) { + return Object.assign({}, style1, style2) + } + return objectToString(style1) + objectToString(style2) +} + export { delay, delayQuerySelector, @@ -237,5 +269,6 @@ export { pxTransform, handleTouchScroll, delayGetClientRect, - delayGetScrollOffset + delayGetScrollOffset, + mergeStyle } diff --git a/src/components/accordion/index.tsx b/src/components/accordion/index.tsx index e822ef247..446b5b784 100644 --- a/src/components/accordion/index.tsx +++ b/src/components/accordion/index.tsx @@ -1,16 +1,12 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtAccordionProps, AtAccordionState } from 'types/accordion' import { Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -import { delayQuerySelector, initTestEnv } from '../../common/utils' +import { delayQuerySelector } from '../../common/utils' -initTestEnv() - -// 文档 -export default class AtAccordion extends AtComponent< +export default class AtAccordion extends React.Component< AtAccordionProps, AtAccordionState > { @@ -69,7 +65,7 @@ export default class AtAccordion extends AtComponent< }) } - public componentWillReceiveProps(nextProps: AtAccordionProps): void { + public UNSAFE_componentWillReceiveProps(nextProps: AtAccordionProps): void { if (nextProps.open !== this.props.open) { this.startOpen = !!nextProps.open && !!nextProps.isAnimation this.toggleWithAnimation() @@ -145,8 +141,7 @@ AtAccordion.defaultProps = { note: '', icon: { value: '' }, hasBorder: true, - isAnimation: true, - onClick: () => {} + isAnimation: true } AtAccordion.propTypes = { diff --git a/src/components/action-sheet/body/index.tsx b/src/components/action-sheet/body/index.tsx index 82f4bc4ba..bc246753d 100644 --- a/src/components/action-sheet/body/index.tsx +++ b/src/components/action-sheet/body/index.tsx @@ -1,10 +1,9 @@ import classNames from 'classnames' +import React from 'react' import { AtActionSheetBodyProps } from 'types/action-sheet' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../../common/component' -export default class AtActionSheetBody extends AtComponent< +export default class AtActionSheetBody extends React.Component< AtActionSheetBodyProps > { public render(): JSX.Element { diff --git a/src/components/action-sheet/body/item/index.tsx b/src/components/action-sheet/body/item/index.tsx index f3a1d4741..aa4846e61 100644 --- a/src/components/action-sheet/body/item/index.tsx +++ b/src/components/action-sheet/body/item/index.tsx @@ -1,12 +1,11 @@ import classNames from 'classnames' import _isFunction from 'lodash/isFunction' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtActionSheetItemProps } from 'types/action-sheet' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../../../common/component' -export default class AtActionSheetItem extends AtComponent< +export default class AtActionSheetItem extends React.Component< AtActionSheetItemProps > { public static defaultProps: AtActionSheetItemProps @@ -29,10 +28,6 @@ export default class AtActionSheetItem extends AtComponent< } } -AtActionSheetItem.defaultProps = { - onClick: () => {} -} - AtActionSheetItem.propTypes = { onClick: PropTypes.func } diff --git a/src/components/action-sheet/footer/index.tsx b/src/components/action-sheet/footer/index.tsx index 9f45cb013..55e45ee88 100644 --- a/src/components/action-sheet/footer/index.tsx +++ b/src/components/action-sheet/footer/index.tsx @@ -1,12 +1,11 @@ import classNames from 'classnames' import _isFunction from 'lodash/isFunction' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtActionSheetFooterProps } from 'types/action-sheet' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../../common/component' -export default class AtActionSheetFooter extends AtComponent< +export default class AtActionSheetFooter extends React.Component< AtActionSheetFooterProps > { public static defaultProps: AtActionSheetFooterProps @@ -32,10 +31,6 @@ export default class AtActionSheetFooter extends AtComponent< } } -AtActionSheetFooter.defaultProps = { - onClick: () => {} -} - AtActionSheetFooter.propTypes = { onClick: PropTypes.func } diff --git a/src/components/action-sheet/header/index.tsx b/src/components/action-sheet/header/index.tsx index cee58d7b2..d6fbd8c86 100644 --- a/src/components/action-sheet/header/index.tsx +++ b/src/components/action-sheet/header/index.tsx @@ -1,10 +1,9 @@ import classNames from 'classnames' +import React from 'react' import { AtActionSheetHeaderProps } from 'types/action-sheet' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../../common/component' -export default class AtActionSheetHeader extends AtComponent< +export default class AtActionSheetHeader extends React.Component< AtActionSheetHeaderProps > { public render(): JSX.Element { diff --git a/src/components/action-sheet/index.tsx b/src/components/action-sheet/index.tsx index 62291e3cd..baea90b21 100644 --- a/src/components/action-sheet/index.tsx +++ b/src/components/action-sheet/index.tsx @@ -1,16 +1,15 @@ import classNames from 'classnames' import _isFunction from 'lodash/isFunction' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtActionSheetProps, AtActionSheetState } from 'types/action-sheet' import { View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' import AtActionSheetBody from './body/index' import AtActionSheetFooter from './footer/index' import AtActionSheetHeader from './header/index' -export default class AtActionSheet extends AtComponent< +export default class AtActionSheet extends React.Component< AtActionSheetProps, AtActionSheetState > { @@ -26,7 +25,7 @@ export default class AtActionSheet extends AtComponent< } } - public componentWillReceiveProps(nextProps: AtActionSheetProps): void { + public UNSAFE_componentWillReceiveProps(nextProps: AtActionSheetProps): void { const { isOpened } = nextProps if (isOpened !== this.state._isOpened) { this.setState({ diff --git a/src/components/activity-indicator/index.tsx b/src/components/activity-indicator/index.tsx index 644559fa1..d18a7a816 100644 --- a/src/components/activity-indicator/index.tsx +++ b/src/components/activity-indicator/index.tsx @@ -1,12 +1,11 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtActivityIndicatorProps } from 'types/activity-indicator' import { Text, View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' import AtLoading from '../loading/index' -export default class AtActivityIndicator extends AtComponent< +export default class AtActivityIndicator extends React.Component< AtActivityIndicatorProps > { public static defaultProps: AtActivityIndicatorProps diff --git a/src/components/avatar/index.tsx b/src/components/avatar/index.tsx index 1d831f586..440a5fa93 100644 --- a/src/components/avatar/index.tsx +++ b/src/components/avatar/index.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtAvatarProps, AtAvatarState } from 'types/avatar' import { Image, OpenData, Text, View } from '@tarojs/components' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' const SIZE_CLASS = { large: 'large', @@ -11,7 +11,7 @@ const SIZE_CLASS = { small: 'small' } -export default class AtAvatar extends AtComponent< +export default class AtAvatar extends React.Component< AtAvatarProps, AtAvatarState > { @@ -37,7 +37,7 @@ export default class AtAvatar extends AtComponent< let letter = '' if (text) letter = text[0] - let elem + let elem: React.ReactNode if (openData && openData.type === 'userAvatarUrl' && this.state.isWEAPP) { elem = } else if (image) { @@ -61,7 +61,6 @@ AtAvatar.defaultProps = { circle: false, text: '', image: '', - openData: undefined, customStyle: {}, className: '' } diff --git a/src/components/badge/index.tsx b/src/components/badge/index.tsx index 8b5e7e05c..b10edd64d 100644 --- a/src/components/badge/index.tsx +++ b/src/components/badge/index.tsx @@ -1,12 +1,11 @@ import classNames from 'classnames' import isNaN from 'lodash/isNaN' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtBadgeProps } from 'types/badge' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtBadge extends AtComponent { +export default class AtBadge extends React.Component { public static defaultProps: AtBadgeProps public static propTypes: InferProps @@ -19,7 +18,8 @@ export default class AtBadge extends AtComponent { value: string | number | undefined, maxValue: number ): string | number { - if (value === '' || value === null || value === undefined) return '' + if (value === '' || value === null || typeof value === 'undefined') + return '' const numValue = +value if (isNaN(numValue)) { return value @@ -28,10 +28,10 @@ export default class AtBadge extends AtComponent { } public render(): JSX.Element { - const { dot, value, maxValue, customStyle } = this.props + const { dot, value, maxValue = 99, customStyle } = this.props const rootClassName = ['at-badge'] - const val = this.formatValue(value, maxValue!) + const val = this.formatValue(value, maxValue) return ( { @@ -62,6 +62,7 @@ export default class AtButton extends AtComponent< private onSumit(event: CommonEvent): void { if (this.state.isWEAPP || this.state.isWEB) { + // TODO: 3.0 this.$scope this.$scope.triggerEvent('submit', event.detail, { bubbles: true, composed: true @@ -71,6 +72,7 @@ export default class AtButton extends AtComponent< private onReset(event: CommonEvent): void { if (this.state.isWEAPP || this.state.isWEB) { + // TODO: 3.0 this.$scope this.$scope.triggerEvent('reset', event.detail, { bubbles: true, composed: true @@ -123,9 +125,7 @@ export default class AtButton extends AtComponent< ) @@ -175,28 +175,19 @@ export default class AtButton extends AtComponent< AtButton.defaultProps = { size: 'normal', - type: undefined, circle: false, full: false, loading: false, disabled: false, customStyle: {}, - onClick: () => {}, // Button props - formType: undefined, - openType: undefined, lang: 'en', sessionFrom: '', sendMessageTitle: '', sendMessagePath: '', sendMessageImg: '', showMessageCard: false, - appParameter: '', - onGetUserInfo: () => {}, - onContact: () => {}, - onGetPhoneNumber: () => {}, - onError: () => {}, - onOpenSetting: () => {} + appParameter: '' } AtButton.propTypes = { diff --git a/src/components/calendar/body/index.tsx b/src/components/calendar/body/index.tsx index 3cc0ba798..dc2c57411 100644 --- a/src/components/calendar/body/index.tsx +++ b/src/components/calendar/body/index.tsx @@ -1,8 +1,6 @@ -import bind from 'bind-decorator' import classnames from 'classnames' import dayjs from 'dayjs' -import _chunk from 'lodash/chunk' -import _throttle from 'lodash/throttle' +import React from 'react' import { AtCalendarBodyListGroup, AtCalendarBodyProps, @@ -11,13 +9,12 @@ import { } from 'types/calendar' import { Swiper, SwiperItem, View } from '@tarojs/components' import { BaseEvent, ITouch, ITouchEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' import { delayQuerySelector } from '../../../common/utils' import generateCalendarGroup from '../common/helper' import AtCalendarDateList from '../ui/date-list/index' import AtCalendarDayList from '../ui/day-list/index' -const ANIMTE_DURATION: number = 300 +const ANIMTE_DURATION = 300 const defaultProps: Partial = { marks: [], @@ -35,7 +32,7 @@ export default class AtCalendarBody extends Taro.Component< > { static defaultProps: Partial = defaultProps - constructor(props: AtCalendarBodyProps) { + public constructor(props: AtCalendarBodyProps) { super(props) const { validDates, @@ -65,13 +62,15 @@ export default class AtCalendarBody extends Taro.Component< } } - componentDidMount() { + public componentDidMount(): void { delayQuerySelector(this, '.at-calendar-slider__main').then(res => { this.maxWidth = res[0].width }) } - componentWillReceiveProps(nextProps: AtCalendarBodyProps) { + public UNSAFE_componentWillReceiveProps( + nextProps: AtCalendarBodyProps + ): void { const { validDates, marks, @@ -99,15 +98,13 @@ export default class AtCalendarBody extends Taro.Component< }) } - static options = { addGlobalClass: true } - - private changeCount: number = 0 - private currentSwiperIndex: number = 1 - private startX: number = 0 - private swipeStartPoint: number = 0 - private isPreMonth: boolean = false - private maxWidth: number = 0 - private isTouching: boolean = false + private changeCount = 0 + private currentSwiperIndex = 1 + private startX = 0 + private swipeStartPoint = 0 + private isPreMonth = false + private maxWidth = 0 + private isTouching = false private generateFunc: ( generateDate: number, @@ -115,11 +112,10 @@ export default class AtCalendarBody extends Taro.Component< isShowStatus?: boolean ) => Calendar.ListInfo - @bind - private getGroups( + private getGroups = ( generateDate: number, selectedDate: Calendar.SelectedDate - ): AtCalendarBodyListGroup { + ): AtCalendarBodyListGroup => { const dayjsDate = dayjs(generateDate) const arr: AtCalendarBodyListGroup = [] const preList: Calendar.ListInfo = this.generateFunc( @@ -150,8 +146,7 @@ export default class AtCalendarBody extends Taro.Component< return arr } - @bind - private handleTouchStart(e: ITouchEvent) { + private handleTouchStart = (e: ITouchEvent): void => { if (!this.props.isSwiper) { return } @@ -159,7 +154,7 @@ export default class AtCalendarBody extends Taro.Component< this.startX = e.touches[0].clientX } - private handleTouchMove = (e: ITouchEvent) => { + private handleTouchMove = (e: ITouchEvent): void => { if (!this.props.isSwiper) { return } @@ -173,7 +168,7 @@ export default class AtCalendarBody extends Taro.Component< }) } - private animateMoveSlide(offset: number, callback?: Function) { + private animateMoveSlide = (offset: number, callback?: Function): void => { this.setState( { isAnimate: true @@ -196,8 +191,7 @@ export default class AtCalendarBody extends Taro.Component< ) } - @bind - private handleTouchEnd() { + private handleTouchEnd = (): void => { if (!this.props.isSwiper) { return } @@ -219,8 +213,7 @@ export default class AtCalendarBody extends Taro.Component< this.animateMoveSlide(0) } - @bind - private handleChange(e: BaseEvent) { + private handleChange = (e: BaseEvent): void => { const { current, source } = e.detail if (source === 'touch') { @@ -229,8 +222,7 @@ export default class AtCalendarBody extends Taro.Component< } } - @bind - private handleAnimateFinish() { + private handleAnimateFinish = (): void => { if (this.changeCount > 0) { this.props.onSwipeMonth( this.isPreMonth ? -this.changeCount : this.changeCount @@ -239,25 +231,23 @@ export default class AtCalendarBody extends Taro.Component< } } - @bind - private handleSwipeTouchStart( + private handleSwipeTouchStart = ( e: ITouchEvent & { changedTouches: Array } - ) { + ): void => { const { clientY, clientX } = e.changedTouches[0] this.swipeStartPoint = this.props.isVertical ? clientY : clientX } - @bind - private handleSwipeTouchEnd( + private handleSwipeTouchEnd = ( e: ITouchEvent & { changedTouches: Array } - ) { + ): void => { const { clientY, clientX } = e.changedTouches[0] this.isPreMonth = this.props.isVertical ? clientY - this.swipeStartPoint > 0 : clientX - this.swipeStartPoint > 0 } - render() { + public render(): JSX.Element { const { isSwiper } = this.props const { isAnimate, offsetSize, listGroup } = this.state diff --git a/src/components/calendar/controller/index.tsx b/src/components/calendar/controller/index.tsx index 8bba2aabf..b11216840 100644 --- a/src/components/calendar/controller/index.tsx +++ b/src/components/calendar/controller/index.tsx @@ -1,5 +1,6 @@ import classnames from 'classnames' import dayjs, { Dayjs } from 'dayjs' +import React from 'react' import { AtCalendarControllerProps, AtCalendarControllerState @@ -11,9 +12,7 @@ export default class AtCalendarController extends Taro.Component< AtCalendarControllerProps, AtCalendarControllerState > { - static options = { addGlobalClass: true } - - render() { + public render(): JSX.Element { const { generateDate, minDate, diff --git a/src/components/calendar/index.tsx b/src/components/calendar/index.tsx index 4ede1e844..fc7c3c076 100644 --- a/src/components/calendar/index.tsx +++ b/src/components/calendar/index.tsx @@ -1,9 +1,7 @@ -import bind from 'bind-decorator' import classnames from 'classnames' import dayjs, { Dayjs } from 'dayjs' import _isFunction from 'lodash/isFunction' -import _isObject from 'lodash/isObject' -import _pick from 'lodash/pick' +import React from 'react' import { AtCalendarDefaultProps, AtCalendarProps, @@ -13,7 +11,6 @@ import { } from 'types/calendar' import { View } from '@tarojs/components' import { BaseEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' import AtCalendarBody from './body/index' import AtCalendarController from './controller/index' @@ -36,7 +33,7 @@ export default class AtCalendar extends Taro.Component< > { static defaultProps: AtCalendarDefaultProps = defaultProps - constructor(props: AtCalendarProps) { + public constructor(props: AtCalendarProps) { super(props) const { currentDate, isMultiSelect } = props as AtCalendarPropsWithDefaults @@ -44,7 +41,7 @@ export default class AtCalendar extends Taro.Component< this.state = this.getInitializeState(currentDate, isMultiSelect) } - componentWillReceiveProps(nextProps: AtCalendarProps) { + public UNSAFE_componentWillReceiveProps(nextProps: AtCalendarProps): void { const { currentDate, isMultiSelect } = nextProps if (!currentDate || currentDate === this.props.currentDate) return @@ -66,10 +63,7 @@ export default class AtCalendar extends Taro.Component< this.setState(stateValue) } - static options = { addGlobalClass: true } - - @bind - private getSingleSelectdState(value: Dayjs): Partial { + private getSingleSelectdState = (value: Dayjs): Partial => { const { generateDate } = this.state const stateValue: Partial = { @@ -87,10 +81,9 @@ export default class AtCalendar extends Taro.Component< return stateValue } - @bind - private getMultiSelectedState( + private getMultiSelectedState = ( value: Dayjs - ): Pick { + ): Pick => { const { selectedDate } = this.state const { end, start } = selectedDate @@ -109,7 +102,10 @@ export default class AtCalendar extends Taro.Component< return state } - private getSelectedDate(start: number, end?: number): Calendar.SelectedDate { + private getSelectedDate = ( + start: number, + end?: number + ): Calendar.SelectedDate => { const stateValue: Calendar.SelectedDate = { start, end: start @@ -170,8 +166,7 @@ export default class AtCalendar extends Taro.Component< } } - @bind - private triggerChangeDate(value: Dayjs) { + private triggerChangeDate = (value: Dayjs): void => { const { format } = this.props if (!_isFunction(this.props.onMonthChange)) return @@ -179,8 +174,7 @@ export default class AtCalendar extends Taro.Component< this.props.onMonthChange(value.format(format)) } - @bind - setMonth(vectorCount: number) { + private setMonth = (vectorCount: number): void => { const { format } = this.props const { generateDate } = this.state @@ -194,8 +188,7 @@ export default class AtCalendar extends Taro.Component< } } - @bind - handleClickPreMonth(isMinMonth?: boolean): void { + private handleClickPreMonth = (isMinMonth?: boolean): void => { if (isMinMonth === true) { return } @@ -207,8 +200,7 @@ export default class AtCalendar extends Taro.Component< } } - @bind - handleClickNextMonth(isMaxMonth?: boolean): void { + private handleClickNextMonth = (isMaxMonth?: boolean): void => { if (isMaxMonth === true) { return } @@ -221,8 +213,9 @@ export default class AtCalendar extends Taro.Component< } // picker 选择时间改变时触发 - @bind - handleSelectDate(e: BaseEvent & { detail: { value: string } }) { + private handleSelectDate = ( + e: BaseEvent & { detail: { value: string } } + ): void => { const { value } = e.detail const _generateDate: Dayjs = dayjs(value) @@ -236,8 +229,7 @@ export default class AtCalendar extends Taro.Component< }) } - @bind - handleDayClick(item: Calendar.Item) { + private handleDayClick = (item: Calendar.Item): void => { const { isMultiSelect } = this.props const { isDisabled, value } = item @@ -262,7 +254,7 @@ export default class AtCalendar extends Taro.Component< } } - handleSelectedDate() { + private handleSelectedDate = (): void => { const selectDate = this.state.selectedDate if (_isFunction(this.props.onSelectDate)) { const info: Calendar.SelectedDate = { @@ -279,14 +271,13 @@ export default class AtCalendar extends Taro.Component< } } - @bind - handleDayLongClick(item: Calendar.Item) { + private handleDayLongClick = (item: Calendar.Item): void => { if (_isFunction(this.props.onDayLongClick)) { this.props.onDayLongClick({ value: item.value }) } } - render() { + public render(): JSX.Element { const { generateDate, selectedDate } = this.state const { validDates, diff --git a/src/components/calendar/ui/date-list/index.tsx b/src/components/calendar/ui/date-list/index.tsx index eae58d01d..88737abff 100644 --- a/src/components/calendar/ui/date-list/index.tsx +++ b/src/components/calendar/ui/date-list/index.tsx @@ -1,9 +1,8 @@ -import bind from 'bind-decorator' import classnames from 'classnames' import _isFunction from 'lodash/isFunction' +import React from 'react' import { Calendar } from 'types/calendar' import { Text, View } from '@tarojs/components' -import Taro from '@tarojs/taro' import * as constant from '../../common/constant' const MAP: { [key: number]: string } = { @@ -20,24 +19,20 @@ export interface Props { onLongClick?: (item: Calendar.Item) => void } -export default class AtCalendarList extends Taro.Component { - static options = { addGlobalClass: true } - - @bind - handleClick(item) { +export default class AtCalendarList extends React.Component { + private handleClick = (item: Calendar.Item): void => { if (_isFunction(this.props.onClick)) { this.props.onClick(item) } } - @bind - handleLongClick(item) { + private handleLongClick = (item: Calendar.Item): void => { if (_isFunction(this.props.onLongClick)) { this.props.onLongClick(item) } } - render() { + public render(): JSX.Element | null { const { list } = this.props if (!list || list.length === 0) return null diff --git a/src/components/calendar/ui/day-list/index.tsx b/src/components/calendar/ui/day-list/index.tsx index 3fc7bba53..6b7b6330b 100644 --- a/src/components/calendar/ui/day-list/index.tsx +++ b/src/components/calendar/ui/day-list/index.tsx @@ -1,11 +1,8 @@ -import _chunk from 'lodash/chunk' +import React from 'react' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -export default class AtCalendarHeader extends Taro.Component { - static options = { addGlobalClass: true } - - render() { +export default class AtCalendarHeader extends React.Component { + public render(): JSX.Element { return ( diff --git a/src/components/card/index.tsx b/src/components/card/index.tsx index c094eeedd..c437c8e80 100644 --- a/src/components/card/index.tsx +++ b/src/components/card/index.tsx @@ -1,12 +1,11 @@ import classNames from 'classnames' import _isFunction from 'lodash/isFunction' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtCardProps } from 'types/card' import { Image, Text, View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtCard extends AtComponent { +export default class AtCard extends React.Component { public static defaultProps: AtCardProps public static propTypes: InferProps @@ -85,9 +84,6 @@ AtCard.defaultProps = { thumb: '', title: '', extra: '', - icon: undefined, - onClick() {}, - renderIcon: undefined, extraStyle: {} } diff --git a/src/components/checkbox/index.tsx b/src/components/checkbox/index.tsx index 10c84a6c8..16a64d505 100644 --- a/src/components/checkbox/index.tsx +++ b/src/components/checkbox/index.tsx @@ -1,11 +1,10 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtCheckboxProps } from 'types/checkbox' import { Text, View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtCheckbox extends AtComponent> { +export default class AtCheckbox extends React.Component> { public static defaultProps: AtCheckboxProps public static propTypes: InferProps> @@ -66,7 +65,8 @@ AtCheckbox.defaultProps = { className: '', options: [], selectedList: [], - onChange() {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + onChange: (): void => {} } AtCheckbox.propTypes = { diff --git a/src/components/countdown/index.tsx b/src/components/countdown/index.tsx index c55c507b6..75186e9b6 100644 --- a/src/components/countdown/index.tsx +++ b/src/components/countdown/index.tsx @@ -1,11 +1,17 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtCountDownProps, AtCountdownState } from 'types/countdown' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' import AtCountdownItem from './item' +type TimeObject = { + day: number + hours: number + minutes: number + seconds: number +} + const toSeconds = ( day: number, hours: number, @@ -13,7 +19,7 @@ const toSeconds = ( seconds: number ): number => day * 60 * 60 * 24 + hours * 60 * 60 + minutes * 60 + seconds -export default class AtCountdown extends AtComponent< +export default class AtCountdown extends React.Component< AtCountDownProps, AtCountdownState > { @@ -25,8 +31,8 @@ export default class AtCountdown extends AtComponent< public constructor(props: AtCountDownProps) { super(props) - const { day, hours, minutes, seconds } = this.props - this.seconds = toSeconds(day!, hours!, minutes!, seconds!) + const { day = 0, hours = 0, minutes = 0, seconds = 0 } = this.props + this.seconds = toSeconds(day, hours, minutes, seconds) const { day: _day, hours: _hours, @@ -40,7 +46,6 @@ export default class AtCountdown extends AtComponent< _minutes, _seconds } - this.timer = undefined } private setTimer(): void { @@ -50,11 +55,10 @@ export default class AtCountdown extends AtComponent< private clearTimer(): void { if (this.timer) { clearTimeout(this.timer as number) - this.timer = undefined } } - private calculateTime() { + private calculateTime(): TimeObject { let [day, hours, minutes, seconds] = [0, 0, 0, 0] if (this.seconds > 0) { @@ -97,7 +101,7 @@ export default class AtCountdown extends AtComponent< }, 1000) } - public componentWillReceiveProps(nextProps: AtCountDownProps): void { + public UNSAFE_componentWillReceiveProps(nextProps: AtCountDownProps): void { if (JSON.stringify(this.props) === JSON.stringify(nextProps)) return const { day, hours, minutes, seconds } = nextProps @@ -170,8 +174,7 @@ AtCountdown.defaultProps = { day: 0, hours: 0, minutes: 0, - seconds: 0, - onTimeUp() {} + seconds: 0 } AtCountdown.propTypes = { diff --git a/src/components/countdown/item/index.tsx b/src/components/countdown/item/index.tsx index 9e7bfd98d..83157b633 100644 --- a/src/components/countdown/item/index.tsx +++ b/src/components/countdown/item/index.tsx @@ -1,10 +1,11 @@ import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtCountdownItemProps } from 'types/countdown' import { Text, View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../../common/component' -export default class AtCountdownItem extends AtComponent { +export default class AtCountdownItem extends React.Component< + AtCountdownItemProps +> { public static defaultProps: AtCountdownItemProps public static propTypes: InferProps diff --git a/src/components/curtain/index.tsx b/src/components/curtain/index.tsx index 89f0b36d8..5a0429cef 100644 --- a/src/components/curtain/index.tsx +++ b/src/components/curtain/index.tsx @@ -1,12 +1,11 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtCurtainProps } from 'types/curtain' import { View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtCurtain extends AtComponent { +export default class AtCurtain extends React.Component { public static defaultProps: AtCurtainProps public static propTypes: InferProps @@ -59,7 +58,8 @@ AtCurtain.defaultProps = { className: '', isOpened: false, closeBtnPosition: 'bottom', - onClose: () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + onClose: (): void => {} } AtCurtain.propTypes = { diff --git a/src/components/divider/index.tsx b/src/components/divider/index.tsx index 526f4d79a..1cfc7109f 100644 --- a/src/components/divider/index.tsx +++ b/src/components/divider/index.tsx @@ -1,14 +1,12 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtDividerProps } from 'types/divider' import { View } from '@tarojs/components' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -import { initTestEnv } from '../../common/utils' +import { mergeStyle } from '../../common/utils' -initTestEnv() - -export default class AtDivider extends AtComponent { +export default class AtDivider extends React.Component { public static defaultProps: AtDividerProps public static propTypes: InferProps @@ -39,7 +37,7 @@ export default class AtDivider extends AtComponent { return ( {content === '' ? this.props.children : content} diff --git a/src/components/drawer/index.tsx b/src/components/drawer/index.tsx index 06f407503..b034e7672 100644 --- a/src/components/drawer/index.tsx +++ b/src/components/drawer/index.tsx @@ -1,13 +1,12 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtDrawerProps, AtDrawerState } from 'types/drawer' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' import AtList from '../list/index' import AtListItem from '../list/item/index' -export default class AtDrawer extends AtComponent< +export default class AtDrawer extends React.Component< AtDrawerProps, AtDrawerState > { @@ -60,7 +59,7 @@ export default class AtDrawer extends AtComponent< this.animHide() } - public componentWillReceiveProps(nextProps: AtDrawerProps): void { + public UNSAFE_componentWillReceiveProps(nextProps: AtDrawerProps): void { const { show } = nextProps if (show !== this.state._show) { show ? this.animShow() : this.animHide() @@ -128,9 +127,7 @@ AtDrawer.defaultProps = { mask: true, width: '', right: false, - items: [], - onItemClick: () => {}, - onClose: () => {} + items: [] } AtDrawer.propTypes = { diff --git a/src/components/fab/index.tsx b/src/components/fab/index.tsx index 4bfe286f6..12fb9c5d4 100644 --- a/src/components/fab/index.tsx +++ b/src/components/fab/index.tsx @@ -1,11 +1,10 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtFabProps } from 'types/fab' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtFab extends AtComponent { +export default class AtFab extends React.Component { public static defaultProps: AtFabProps public static propTypes: InferProps @@ -34,6 +33,5 @@ AtFab.propTypes = { } AtFab.defaultProps = { - size: 'normal', - onClick: () => {} + size: 'normal' } diff --git a/src/components/flex/index.tsx b/src/components/flex/index.tsx index 1787f3d75..89667c909 100644 --- a/src/components/flex/index.tsx +++ b/src/components/flex/index.tsx @@ -1,12 +1,11 @@ import classNames from 'classnames' import _forEach from 'lodash/forEach' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' import { AtFlexProps } from '../../../types/flex' -import AtComponent from '../../common/component' -export default class AtFlex extends AtComponent { +export default class AtFlex extends React.Component { public static propTypes: InferProps public render(): JSX.Element { diff --git a/src/components/flex/item/index.tsx b/src/components/flex/item/index.tsx index f5ee722d0..a80673fb6 100644 --- a/src/components/flex/item/index.tsx +++ b/src/components/flex/item/index.tsx @@ -1,12 +1,11 @@ import classNames from 'classnames' import _forEach from 'lodash/forEach' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtFlexItemProps } from 'types/flex' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../../common/component' -export default class AtFlexItem extends AtComponent { +export default class AtFlexItem extends React.Component { public static propTypes: InferProps public render(): JSX.Element { diff --git a/src/components/float-layout/index.tsx b/src/components/float-layout/index.tsx index b9aa5a6f2..0bd364e56 100644 --- a/src/components/float-layout/index.tsx +++ b/src/components/float-layout/index.tsx @@ -1,14 +1,13 @@ import classNames from 'classnames' import _isFunction from 'lodash/isFunction' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtFloatLayoutProps, AtFloatLayoutState } from 'types/float-layout' import { ScrollView, Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' import { handleTouchScroll } from '../../common/utils' -export default class AtFloatLayout extends AtComponent< +export default class AtFloatLayout extends React.Component< AtFloatLayoutProps, AtFloatLayoutState > { @@ -24,7 +23,7 @@ export default class AtFloatLayout extends AtComponent< } } - public componentWillReceiveProps(nextProps: AtFloatLayoutProps): void { + public UNSAFE_componentWillReceiveProps(nextProps: AtFloatLayoutProps): void { const { isOpened } = nextProps if (this.props.isOpened !== isOpened) { @@ -38,9 +37,11 @@ export default class AtFloatLayout extends AtComponent< } } - private handleClose = () => { + private handleClose = (): void => { if (_isFunction(this.props.onClose)) { - // @ts-ignore // TODO: Fix typings + // TODO: Fix typings + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore + // @ts-ignore this.props.onClose() } } @@ -58,7 +59,7 @@ export default class AtFloatLayout extends AtComponent< e.stopPropagation() } - render() { + public render(): JSX.Element { const { _isOpened } = this.state const { title, @@ -99,10 +100,13 @@ export default class AtFloatLayout extends AtComponent< upperThreshold={upperThreshold} lowerThreshold={lowerThreshold} scrollWithAnimation={scrollWithAnimation} + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore // @ts-ignore // TODO: Fix typings onScroll={this.props.onScroll} + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore // @ts-ignore // TODO: Fix typings onScrollToLower={this.props.onScrollToLower} + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore // @ts-ignore // TODO: Fix typings onScrollToUpper={this.props.onScrollToUpper} className='layout-body__content' @@ -122,12 +126,7 @@ AtFloatLayout.defaultProps = { scrollY: true, scrollX: false, - scrollWithAnimation: false, - - onClose: () => {}, - onScroll: () => {}, - onScrollToLower: () => {}, - onScrollToUpper: () => {} + scrollWithAnimation: false } AtFloatLayout.propTypes = { diff --git a/src/components/form/index.tsx b/src/components/form/index.tsx index 25908b340..02962db93 100644 --- a/src/components/form/index.tsx +++ b/src/components/form/index.tsx @@ -1,11 +1,10 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtFormProps } from 'types/form' import { Form } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtForm extends AtComponent { +export default class AtForm extends React.Component { public static defaultProps: AtFormProps public static propTypes: InferProps @@ -38,9 +37,7 @@ export default class AtForm extends AtComponent { AtForm.defaultProps = { customStyle: '', className: '', - reportSubmit: false, - onSubmit: () => {}, - onReset: () => {} + reportSubmit: false } AtForm.propTypes = { diff --git a/src/components/grid/index.tsx b/src/components/grid/index.tsx index 1303d2c4c..e0832d12a 100644 --- a/src/components/grid/index.tsx +++ b/src/components/grid/index.tsx @@ -3,13 +3,13 @@ import _chunk from 'lodash/chunk' import _isFunction from 'lodash/isFunction' import _isObject from 'lodash/isObject' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtGridProps, Item } from 'types/grid' import { Image, Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' +import { mergeStyle } from '../../common/utils' -export default class AtGrid extends AtComponent { +export default class AtGrid extends React.Component { public static defaultProps: AtGridProps public static propTypes: InferProps @@ -19,16 +19,15 @@ export default class AtGrid extends AtComponent { row: number, event: CommonEvent ): void => { - const { onClick, columnNum } = this.props + const { onClick, columnNum = 3 } = this.props if (_isFunction(onClick)) { - /* prettier-ignore */ - const clickIndex = (row * columnNum!) + index + const clickIndex = row * columnNum + index onClick(item, clickIndex, event) } } public render(): JSX.Element | null { - const { data, mode, columnNum, hasBorder } = this.props + const { data, mode, columnNum = 3, hasBorder } = this.props if (Array.isArray(data) && data.length === 0) { return null @@ -51,11 +50,11 @@ export default class AtGrid extends AtComponent { @@ -80,11 +79,12 @@ export default class AtGrid extends AtComponent { }, childItem.iconInfo.className )} - style={this.mergeStyle( + style={mergeStyle( { color: childItem.iconInfo.color, fontSize: `${childItem.iconInfo.size || 24}px` }, + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion childItem.iconInfo!.customStyle! )} /> diff --git a/src/components/icon/index.tsx b/src/components/icon/index.tsx index aef904d15..dfa84d99f 100644 --- a/src/components/icon/index.tsx +++ b/src/components/icon/index.tsx @@ -1,14 +1,12 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtIconProps } from 'types/icon' import { Text } from '@tarojs/components' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -import { initTestEnv } from '../../common/utils' +import { mergeStyle } from '../../common/utils' -initTestEnv() - -export default class AtIcon extends AtComponent { +export default class AtIcon extends React.Component { public static defaultProps: AtIconProps public static propTypes: InferProps @@ -35,7 +33,7 @@ export default class AtIcon extends AtComponent { return ( ) @@ -48,8 +46,7 @@ AtIcon.defaultProps = { prefixClass: 'at-icon', value: '', color: '', - size: 24, - onClick: () => {} + size: 24 } AtIcon.propTypes = { diff --git a/src/components/image-picker/index.tsx b/src/components/image-picker/index.tsx index b11292b3f..71835f77e 100644 --- a/src/components/image-picker/index.tsx +++ b/src/components/image-picker/index.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtImagePickerProps, File } from 'types/image-picker' import { Image, View } from '@tarojs/components' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' import { uuid } from '../../common/utils' interface MatrixFile extends Partial { @@ -16,7 +16,7 @@ const generateMatrix = ( files: MatrixFile[], col: number, showAddBtn: boolean -) => { +): MatrixFile[][] => { const matrix: Array[] = [] const length = showAddBtn ? files.length + 1 : files.length const row = Math.ceil(length / col) @@ -43,7 +43,7 @@ const generateMatrix = ( const ENV = Taro.getEnv() -export default class AtImagePicker extends AtComponent { +export default class AtImagePicker extends React.Component { public static defaultProps: AtImagePickerProps public static propTypes: InferProps @@ -113,28 +113,25 @@ export default class AtImagePicker extends AtComponent { item.url ? ( ) : ( {item.type === 'btn' && ( {}, - onImageClick: () => {}, - onFail: () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + onChange: (): void => {} } AtImagePicker.propTypes = { diff --git a/src/components/indexes/index.tsx b/src/components/indexes/index.tsx index 2b440b859..b7aab0058 100644 --- a/src/components/indexes/index.tsx +++ b/src/components/indexes/index.tsx @@ -1,25 +1,19 @@ import classNames from 'classnames' import _findIndex from 'lodash/findIndex' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtIndexesProps, AtIndexesState, Item } from 'types/indexes' import { ScrollView, View } from '@tarojs/components' import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -import { - delayQuerySelector, - initTestEnv, - isTest, - uuid -} from '../../common/utils' +import { delayQuerySelector, isTest, uuid } from '../../common/utils' import AtList from '../list/index' import AtListItem from '../list/item/index' import AtToast from '../toast/index' -initTestEnv() const ENV = Taro.getEnv() -export default class AtIndexes extends AtComponent< +export default class AtIndexes extends React.Component< AtIndexesProps, AtIndexesState > { @@ -52,7 +46,6 @@ export default class AtIndexes extends AtComponent< // 当前索引 this.currentIndex = -1 this.listId = isTest() ? 'indexes-list-AOTU2018' : `list-${uuid()}` - this.timeoutTimer = undefined } private handleClick = (item: Item): void => { @@ -80,8 +73,8 @@ export default class AtIndexes extends AtComponent< } private jumpTarget(_scrollIntoView: string, idx: number): void { - const { topKey, list } = this.props - const _tipText = idx === 0 ? topKey! : list[idx - 1].key + const { topKey = 'Top', list } = this.props + const _tipText = idx === 0 ? topKey : list[idx - 1].key if (ENV === Taro.ENV_TYPE.WEB) { delayQuerySelector(this, '.at-indexes', 0).then(rect => { @@ -113,6 +106,7 @@ export default class AtIndexes extends AtComponent< const { isShowToast, isVibrate } = this.props const { _scrollIntoView, _tipText, _scrollTop } = state // TODO: Fix dirty hack + /* eslint-disable @typescript-eslint/no-non-null-assertion */ this.setState( { _scrollIntoView: _scrollIntoView!, @@ -120,6 +114,7 @@ export default class AtIndexes extends AtComponent< _scrollTop: _scrollTop!, _isShowToast: isShowToast! }, + /* eslint-enable @typescript-eslint/no-non-null-assertion */ () => { clearTimeout(this.timeoutTimer as number) this.timeoutTimer = setTimeout(() => { @@ -153,7 +148,7 @@ export default class AtIndexes extends AtComponent< } } - public componentWillReceiveProps(nextProps: AtIndexesProps): void { + public UNSAFE_componentWillReceiveProps(nextProps: AtIndexesProps): void { if (nextProps.list.length !== this.props.list.length) { this.initData() } @@ -166,7 +161,7 @@ export default class AtIndexes extends AtComponent< this.initData() } - public componentWillMount(): void { + public UNSAFE_componentWillMount(): void { this.props.onScrollIntoView && this.props.onScrollIntoView(this.__jumpTarget.bind(this)) } @@ -244,6 +239,7 @@ export default class AtIndexes extends AtComponent< id={this.listId} scrollY scrollWithAnimation={animation} + // eslint-disable-next-line no-undefined scrollTop={isWEB ? _scrollTop : undefined} scrollIntoView={!isWEB ? _scrollIntoView : ''} onScroll={this.handleScroll.bind(this)} @@ -277,7 +273,5 @@ AtIndexes.defaultProps = { topKey: 'Top', isVibrate: true, isShowToast: true, - list: [], - onClick: () => {}, - onScrollIntoView: () => {} + list: [] } diff --git a/src/components/input-number/index.tsx b/src/components/input-number/index.tsx index 6192d1068..969cb8c15 100644 --- a/src/components/input-number/index.tsx +++ b/src/components/input-number/index.tsx @@ -1,11 +1,11 @@ import classNames from 'classnames' import _toString from 'lodash/toString' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtInputNumberProps, InputError } from 'types/input-number' import { Input, Text, View } from '@tarojs/components' import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' import { initTestEnv } from '../../common/utils' // TODO: Check all types @@ -47,18 +47,17 @@ type ExtendEvent = { } } -export default class AtInputNumber extends AtComponent { +export default class AtInputNumber extends React.Component { public static defaultProps: AtInputNumberProps public static propTypes: InferProps private handleClick(clickType: 'minus' | 'plus', e: CommonEvent): void { - // TODO: Fix dirty hack - const { disabled, value, min, max, step } = this.props - const lowThanMin = clickType === 'minus' && value <= min! - const overThanMax = clickType === 'plus' && value >= max! + const { disabled, value, min = 0, max = 100, step = 1 } = this.props + const lowThanMin = clickType === 'minus' && value <= min + const overThanMax = clickType === 'plus' && value >= max if (lowThanMin || overThanMax || disabled) { - const deltaValue = clickType === 'minus' ? -step! : step - const errorValue = addNum(Number(value), deltaValue!) + const deltaValue = clickType === 'minus' ? -step : step + const errorValue = addNum(Number(value), deltaValue) if (disabled) { this.handleError({ type: 'DISABLED', @@ -72,29 +71,28 @@ export default class AtInputNumber extends AtComponent { } return } - const deltaValue = clickType === 'minus' ? -step! : step - let newValue = addNum(Number(value), deltaValue!) + const deltaValue = clickType === 'minus' ? -step : step + let newValue = addNum(Number(value), deltaValue) newValue = Number(this.handleValue(newValue)) this.props.onChange(newValue, e) } private handleValue = (value: string | number): string => { - // TODO: Fix dirty hack - const { max, min } = this.props + const { max = 100, min = 0 } = this.props let resultValue = value === '' ? min : value // 此处不能使用 Math.max，会是字符串变数字，并丢失 . - if (resultValue! > max!) { + if (resultValue > max) { resultValue = max this.handleError({ type: 'OVER', - errorValue: resultValue! + errorValue: resultValue }) } - if (resultValue! < min!) { + if (resultValue < min) { resultValue = min this.handleError({ type: 'LOW', - errorValue: resultValue! + errorValue: resultValue }) } if (resultValue && !Number(resultValue)) { @@ -110,10 +108,10 @@ export default class AtInputNumber extends AtComponent { return resultValue } - private handleInput = (e: CommonEvent & ExtendEvent) => { + private handleInput = (e: CommonEvent & ExtendEvent): string => { const { value } = e.target const { disabled } = this.props - if (disabled) return + if (disabled) return '' const newValue = this.handleValue(value) this.props.onChange(Number(newValue), e) @@ -138,8 +136,8 @@ export default class AtInputNumber extends AtComponent { disabled, value, type, - min, - max, + min = 0, + max = 100, size, disabledInput } = this.props @@ -156,10 +154,10 @@ export default class AtInputNumber extends AtComponent { className ) const minusBtnCls = classNames('at-input-number__btn', { - 'at-input-number--disabled': inputValue <= min! || disabled + 'at-input-number--disabled': inputValue <= min || disabled }) const plusBtnCls = classNames('at-input-number__btn', { - 'at-input-number--disabled': inputValue >= max! || disabled + 'at-input-number--disabled': inputValue >= max || disabled }) return ( @@ -202,8 +200,8 @@ AtInputNumber.defaultProps = { max: 100, step: 1, size: 'normal', - onChange: () => {}, - onBlur: () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + onChange: (): void => {} } AtInputNumber.propTypes = { diff --git a/src/components/input/index.tsx b/src/components/input/index.tsx index 6d41afe90..2b075d769 100644 --- a/src/components/input/index.tsx +++ b/src/components/input/index.tsx @@ -1,11 +1,10 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtInputProps } from 'types/input' import { Input, Label, Text, View } from '@tarojs/components' import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common' import { InputProps } from '@tarojs/components/types/Input' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' type PickAtInputProps = Pick< AtInputProps, @@ -45,7 +44,7 @@ type ExtendEvent = { } } -export default class AtInput extends AtComponent { +export default class AtInput extends React.Component { public static defaultProps: AtInputProps public static propTypes: InferProps @@ -207,12 +206,8 @@ AtInput.defaultProps = { autoFocus: false, focus: false, required: false, - onChange: () => {}, - onFocus: () => {}, - onBlur: () => {}, - onConfirm: () => {}, - onErrorClick: () => {}, - onClick: () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + onChange: (): void => {} } AtInput.propTypes = { diff --git a/src/components/list/index.tsx b/src/components/list/index.tsx index 9f99d42d8..12aaae117 100644 --- a/src/components/list/index.tsx +++ b/src/components/list/index.tsx @@ -1,11 +1,10 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtListProps } from 'types/list' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtList extends AtComponent { +export default class AtList extends React.Component { public static defaultProps: AtListProps public static propTypes: InferProps diff --git a/src/components/list/item/index.tsx b/src/components/list/item/index.tsx index 67b8a1b6f..aeadd7792 100644 --- a/src/components/list/item/index.tsx +++ b/src/components/list/item/index.tsx @@ -1,14 +1,13 @@ import classNames from 'classnames' import _isFunction from 'lodash/isFunction' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtListItemProps } from 'types/list' import { Image, Switch, Text, View } from '@tarojs/components' import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../../common/component' +import { mergeStyle } from '../../../common/utils' -// TODO: Fix dirty hack -export default class AtListItem extends AtComponent { +export default class AtListItem extends React.Component { public static defaultProps: AtListItemProps public static propTypes: InferProps @@ -58,12 +57,12 @@ export default class AtListItem extends AtComponent { this.props.className ) const iconClass = classNames( - iconInfo!.prefixClass || 'at-icon', + (iconInfo && iconInfo.prefixClass) || 'at-icon', { - [`${iconInfo!.prefixClass || 'at-icon'}-${iconInfo!.value}`]: iconInfo! - .value + [`${(iconInfo && iconInfo.prefixClass) || 'at-icon'}-${iconInfo && + iconInfo.value}`]: iconInfo && iconInfo.value }, - iconInfo!.className + iconInfo && iconInfo.className ) return ( @@ -78,16 +77,16 @@ export default class AtListItem extends AtComponent { /> )} - {iconInfo!.value && ( + {iconInfo && iconInfo.value && ( @@ -150,9 +149,7 @@ AtListItem.defaultProps = { switchIsCheck: false, extraText: '', extraThumb: '', - iconInfo: { value: '' }, - onSwitchChange: () => {}, - onClick: () => {} + iconInfo: { value: '' } } AtListItem.propTypes = { diff --git a/src/components/load-more/index.tsx b/src/components/load-more/index.tsx index b10927101..e95abb752 100644 --- a/src/components/load-more/index.tsx +++ b/src/components/load-more/index.tsx @@ -1,13 +1,12 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtLoadMoreProps } from 'types/load-more' import { Text, View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' import AtActivityIndicator from '../activity-indicator/index' import AtButton from '../button/index' -export default class AtLoadMore extends AtComponent { +export default class AtLoadMore extends React.Component { public static defaultProps: AtLoadMoreProps public static propTypes: InferProps @@ -69,8 +68,7 @@ AtLoadMore.defaultProps = { status: 'more', loadingText: '加载中', moreText: '查看更多', - noMoreText: '没有更多', - onClick: () => {} + noMoreText: '没有更多' } AtLoadMore.propTypes = { diff --git a/src/components/loading/index.tsx b/src/components/loading/index.tsx index 749260bd1..83ac7ded3 100644 --- a/src/components/loading/index.tsx +++ b/src/components/loading/index.tsx @@ -1,17 +1,14 @@ import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { View } from '@tarojs/components' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -import { initTestEnv } from '../../common/utils' - -initTestEnv() interface AtLoadingProps { size?: string | number color?: string | number } -export default class AtLoading extends AtComponent { +export default class AtLoading extends React.Component { public static defaultProps: AtLoadingProps public static propTypes: InferProps diff --git a/src/components/message/index.tsx b/src/components/message/index.tsx index 3aa5db928..065148169 100644 --- a/src/components/message/index.tsx +++ b/src/components/message/index.tsx @@ -1,11 +1,11 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtMessageProps, AtMessageState } from 'types/message' import { View } from '@tarojs/components' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtMessage extends AtComponent< +export default class AtMessage extends React.Component< AtMessageProps, AtMessageState > { diff --git a/src/components/modal/action/index.tsx b/src/components/modal/action/index.tsx index a23bd2d87..4b46d142b 100644 --- a/src/components/modal/action/index.tsx +++ b/src/components/modal/action/index.tsx @@ -1,11 +1,10 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtModalActionProps } from 'types/modal' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../../common/component' -export default class AtModalAction extends AtComponent { +export default class AtModalAction extends React.Component { public static defaultProps: AtModalActionProps public static propTypes: InferProps diff --git a/src/components/modal/content/index.tsx b/src/components/modal/content/index.tsx index 7e824fb4a..8aae9e567 100644 --- a/src/components/modal/content/index.tsx +++ b/src/components/modal/content/index.tsx @@ -1,10 +1,11 @@ import classNames from 'classnames' +import React from 'react' import { AtModalContentProps } from 'types/modal' import { ScrollView } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../../common/component' -export default class AtModalContent extends AtComponent { +export default class AtModalContent extends React.Component< + AtModalContentProps +> { public render(): JSX.Element { const rootClass = classNames('at-modal__content', this.props.className) return ( diff --git a/src/components/modal/header/index.tsx b/src/components/modal/header/index.tsx index c130eb7ea..ed948bddf 100644 --- a/src/components/modal/header/index.tsx +++ b/src/components/modal/header/index.tsx @@ -1,10 +1,9 @@ import classNames from 'classnames' +import React from 'react' import { AtModalHeaderProps } from 'types/modal' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../../common/component' -export default class AtModalHeader extends AtComponent { +export default class AtModalHeader extends React.Component { public render(): JSX.Element { const rootClass = classNames('at-modal__header', this.props.className) return {this.props.children} diff --git a/src/components/modal/index.tsx b/src/components/modal/index.tsx index 95edc8dbb..af4409dbb 100644 --- a/src/components/modal/index.tsx +++ b/src/components/modal/index.tsx @@ -1,17 +1,20 @@ import classNames from 'classnames' import _isFunction from 'lodash/isFunction' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtModalProps, AtModalState } from 'types/modal' import { Button, Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' import { handleTouchScroll } from '../../common/utils' import AtModalAction from './action/index' import AtModalContent from './content/index' import AtModalHeader from './header/index' -export default class AtModal extends AtComponent { +export default class AtModal extends React.Component< + AtModalProps, + AtModalState +> { public static defaultProps: AtModalProps public static propTypes: InferProps @@ -24,7 +27,7 @@ export default class AtModal extends AtComponent { } } - public componentWillReceiveProps(nextProps: AtModalProps): void { + public UNSAFE_componentWillReceiveProps(nextProps: AtModalProps): void { const { isOpened } = nextProps if (this.props.isOpened !== isOpened) { @@ -51,6 +54,7 @@ export default class AtModal extends AtComponent { private handleClose = (event?: CommonEvent): void => { if (_isFunction(this.props.onClose)) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion this.props.onClose(event!) } } diff --git a/src/components/nav-bar/index.tsx b/src/components/nav-bar/index.tsx index 5357944a7..3a7e7d75e 100644 --- a/src/components/nav-bar/index.tsx +++ b/src/components/nav-bar/index.tsx @@ -1,16 +1,14 @@ import classNames from 'classnames' import isObject from 'lodash/isObject' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtNavBarProps } from 'types/nav-bar' import { Text, View } from '@tarojs/components' import { ITouchEvent } from '@tarojs/components/types/common' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -import { initTestEnv } from '../../common/utils' +import { mergeStyle } from '../../common/utils' -initTestEnv() - -export default class AtNavBar extends AtComponent { +export default class AtNavBar extends React.Component { public static defaultProps: AtNavBarProps public static propTypes: InferProps @@ -103,7 +101,7 @@ export default class AtNavBar extends AtComponent { {leftIconType && ( { {rightSecondIconType && ( { {rightFirstIconType && ( {}, - onClickRgIconSt: () => {}, - onClickRgIconNd: () => {} + rightSecondIconType: '' } AtNavBar.propTypes = { diff --git a/src/components/noticebar/index.tsx b/src/components/noticebar/index.tsx index 174fac46a..5dbae04f3 100644 --- a/src/components/noticebar/index.tsx +++ b/src/components/noticebar/index.tsx @@ -1,12 +1,12 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtNoticeBarProps, AtNoticeBarState } from 'types/noticebar' import { Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtNoticebar extends AtComponent< +export default class AtNoticebar extends React.Component< AtNoticeBarProps, AtNoticeBarState > { @@ -41,7 +41,7 @@ export default class AtNoticebar extends AtComponent< this.props.onGotoMore && this.props.onGotoMore(event) } - public componentWillReceiveProps(): void { + public UNSAFE_componentWillReceiveProps(): void { if (!this.timeout) { this.interval && clearInterval(this.interval) this.initAnimation() @@ -58,10 +58,11 @@ export default class AtNoticebar extends AtComponent< this.timeout = setTimeout(() => { this.timeout = null if (this.state.isWEB) { + const { speed = 100 } = this.props const elem = document.querySelector(`.${this.state.animElemId}`) if (!elem) return const width = elem.getBoundingClientRect().width - const dura = width / +this.props.speed! + const dura = width / +speed this.setState({ dura }) } else if (isWEAPP || isALIPAY) { const query = isALIPAY @@ -74,7 +75,8 @@ export default class AtNoticebar extends AtComponent< const queryRes = res[0] if (!queryRes) return const { width } = queryRes - const dura = width / +this.props.speed! + const { speed = 100 } = this.props + const dura = width / +speed const animation = Taro.createAnimation({ duration: dura * 1000, timingFunction: 'linear' @@ -87,7 +89,7 @@ export default class AtNoticebar extends AtComponent< duration: 0, timingFunction: 'linear' }) - const animBody = () => { + const animBody = (): void => { resetOpacityAnimation.opacity(0).step() this.setState({ animationData: resetOpacityAnimation.export() }) @@ -204,9 +206,7 @@ AtNoticebar.defaultProps = { moreText: '查看详情', showMore: false, icon: '', - customStyle: {}, - onClose: () => {}, - onGotoMore: () => {} + customStyle: {} } AtNoticebar.propTypes = { diff --git a/src/components/pagination/index.tsx b/src/components/pagination/index.tsx index 2848f90a2..517627685 100644 --- a/src/components/pagination/index.tsx +++ b/src/components/pagination/index.tsx @@ -1,13 +1,12 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtPaginationProps, AtPaginationState } from 'types/pagination' import { Text, View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' import AtButton from '../button/index' const MIN_MAXPAGE = 1 -const getMaxPage = (maxPage: number = 0): number => { +const getMaxPage = (maxPage = 0): number => { if (maxPage <= 0) return MIN_MAXPAGE return maxPage } @@ -17,7 +16,7 @@ const createPickerRange = (max: number): number[] => { return range } -export default class AtPagination extends AtComponent< +export default class AtPagination extends React.Component< AtPaginationProps, AtPaginationState > { @@ -26,8 +25,8 @@ export default class AtPagination extends AtComponent< public constructor(props: AtPaginationProps) { super(props) - const { current, pageSize, total } = this.props - const maxPage = getMaxPage(Math.ceil(total / pageSize!)) + const { current, pageSize = 20, total } = this.props + const maxPage = getMaxPage(Math.ceil(total / pageSize)) this.state = { currentPage: current || 1, maxPage, @@ -58,9 +57,9 @@ export default class AtPagination extends AtComponent< this.setState({ currentPage }) } - public componentWillReceiveProps(props: AtPaginationProps): void { - const { total, pageSize, current } = props - const maxPage = getMaxPage(Math.ceil(total / pageSize!)) + public UNSAFE_componentWillReceiveProps(props: AtPaginationProps): void { + const { total, pageSize = 20, current } = props + const maxPage = getMaxPage(Math.ceil(total / pageSize)) if (maxPage !== this.state.maxPage) { this.setState({ maxPage, @@ -170,8 +169,7 @@ AtPagination.defaultProps = { total: 0, pageSize: 20, icon: false, - customStyle: {}, - onPageChange: () => {} + customStyle: {} } AtPagination.propTypes = { diff --git a/src/components/progress/index.tsx b/src/components/progress/index.tsx index f2cbca031..61aa7db44 100644 --- a/src/components/progress/index.tsx +++ b/src/components/progress/index.tsx @@ -1,11 +1,10 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtProgressProps } from 'types/progress' import { Text, View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtProgress extends AtComponent { +export default class AtProgress extends React.Component { public static propTypes: InferProps public render(): JSX.Element { diff --git a/src/components/radio/index.tsx b/src/components/radio/index.tsx index 5a3009093..8a50d3570 100644 --- a/src/components/radio/index.tsx +++ b/src/components/radio/index.tsx @@ -1,16 +1,15 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtRadioProps, RadioOption } from 'types/radio' import { Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtRadio extends AtComponent> { +export default class AtRadio extends React.Component> { public static defaultProps: AtRadioProps public static propTypes: InferProps> - private handleClick(option: RadioOption, event: CommonEvent) { + private handleClick(option: RadioOption, event: CommonEvent): void { if (option.disabled) return this.props.onClick(option.value, event) } @@ -57,7 +56,8 @@ AtRadio.defaultProps = { className: '', value: '', options: [], - onClick: () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + onClick: (): void => {} } AtRadio.propTypes = { diff --git a/src/components/range/index.tsx b/src/components/range/index.tsx index 23196025a..e41465627 100644 --- a/src/components/range/index.tsx +++ b/src/components/range/index.tsx @@ -1,13 +1,19 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtRangeProps, AtRangeState } from 'types/range' import { View } from '@tarojs/components' import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -import { delayQuerySelector, getEventDetail } from '../../common/utils' - -export default class AtRange extends AtComponent { +import { + delayQuerySelector, + getEventDetail, + mergeStyle +} from '../../common/utils' + +export default class AtRange extends React.Component< + AtRangeProps, + AtRangeState +> { public static defaultProps: AtRangeProps public static propTypes: InferProps @@ -77,19 +83,17 @@ export default class AtRange extends AtComponent { } private setValue(value: number[]): void { - const aX = Math.round( - ((value[0] - this.props.min!) / this.deltaValue) * 100 - ) // fix issue #670 - const bX = Math.round( - ((value[1] - this.props.min!) / this.deltaValue) * 100 - ) // fix issue #670 + const { min = 0 } = this.props + const aX = Math.round(((value[0] - min) / this.deltaValue) * 100) // fix issue #670 + const bX = Math.round(((value[1] - min) / this.deltaValue) * 100) // fix issue #670 this.setState({ aX, bX }) } private triggerEvent(funcName: string): void { + const { min = 0 } = this.props const { aX, bX } = this.state - const a = Math.round((aX / 100) * this.deltaValue) + this.props.min! // fix issue #670 - const b = Math.round((bX / 100) * this.deltaValue) + this.props.min! // fix issue #670 + const a = Math.round((aX / 100) * this.deltaValue) + min // fix issue #670 + const b = Math.round((bX / 100) * this.deltaValue) + min // fix issue #670 const result = [a, b].sort((x, y) => x - y) as [number, number] if (funcName === 'onChange') { @@ -100,14 +104,13 @@ export default class AtRange extends AtComponent { } private updatePos(): void { - delayQuerySelector(this, '.at-range__container', 0) - .then(rect => { - this.width = Math.round(rect[0].width) - this.left = Math.round(rect[0].left) - }) + delayQuerySelector(this, '.at-range__container', 0).then(rect => { + this.width = Math.round(rect[0].width) + this.left = Math.round(rect[0].left) + }) } - public componentWillReceiveProps(nextProps: AtRangeProps): void { + public UNSAFE_componentWillReceiveProps(nextProps: AtRangeProps): void { const { value } = nextProps this.updatePos() if ( @@ -173,17 +176,17 @@ export default class AtRange extends AtComponent { @@ -203,9 +206,7 @@ AtRange.defaultProps = { min: 0, max: 100, disabled: false, - blockSize: 0, - onChange: () => {}, - onAfterChange: () => {} + blockSize: 0 } AtRange.propTypes = { diff --git a/src/components/rate/index.tsx b/src/components/rate/index.tsx index 42faa5120..8ef95340d 100644 --- a/src/components/rate/index.tsx +++ b/src/components/rate/index.tsx @@ -1,27 +1,31 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtRateProps } from 'types/rate' import { Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -import { initTestEnv } from '../../common/utils' -initTestEnv() - -export default class AtRate extends AtComponent { +export default class AtRate extends React.Component { public static defaultProps: AtRateProps public static propTypes: InferProps - private handleClick(event: CommonEvent) { + private handleClick(event: CommonEvent): void { this.props.onChange && this.props.onChange(event) } public render(): JSX.Element { - const { customStyle, className, value, max, size, margin } = this.props + const { + customStyle, + className, + value = 0, + max = 5, + size, + margin = 5 + } = this.props const iconStyle = { - marginRight: Taro.pxTransform(margin!) + marginRight: Taro.pxTransform(margin) } const starIconStyle = { fontSize: size ? `${size}px` : '' @@ -29,9 +33,9 @@ export default class AtRate extends AtComponent { // 生成星星颜色 className 数组，方便在jsx中直接map const classNameArr: string[] = [] - const floorValue = Math.floor(value!) - const ceilValue = Math.ceil(value!) - for (let i = 0; i < max!; i++) { + const floorValue = Math.floor(value) + const ceilValue = Math.ceil(value) + for (let i = 0; i < max; i++) { if (floorValue > i) { classNameArr.push('at-rate__icon at-rate__icon--on') } else if (ceilValue - 1 === i) { @@ -73,8 +77,7 @@ AtRate.defaultProps = { size: 0, value: 0, max: 5, - margin: 5, - onChange: () => {} + margin: 5 } AtRate.propTypes = { diff --git a/src/components/search-bar/index.tsx b/src/components/search-bar/index.tsx index 6b2929eb4..19bc3b3fe 100644 --- a/src/components/search-bar/index.tsx +++ b/src/components/search-bar/index.tsx @@ -1,10 +1,9 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtSearchBarProps, AtSearchBarState } from 'types/search-bar' import { Input, Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' type ExtendEvent = { target: { @@ -12,7 +11,7 @@ type ExtendEvent = { } } -export default class AtSearchBar extends AtComponent< +export default class AtSearchBar extends React.Component< AtSearchBarProps, AtSearchBarState > { @@ -68,7 +67,7 @@ export default class AtSearchBar extends AtComponent< fixed, disabled, showActionButton, - actionName, + actionName = '搜索', inputType, // 处理issue#464 className, customStyle @@ -91,7 +90,7 @@ export default class AtSearchBar extends AtComponent< } else if (!isFocus && !value) { placeholderWrapStyle.flexGrow = 1 actionStyle.opacity = 0 - actionStyle.marginRight = `-${(actionName!.length + 1) * fontSize + + actionStyle.marginRight = `-${(actionName.length + 1) * fontSize + fontSize / 2 + 10}px` } @@ -165,11 +164,8 @@ AtSearchBar.defaultProps = { showActionButton: false, actionName: '搜索', inputType: 'text', - onChange: () => {}, - onFocus: () => {}, - onBlur: () => {}, - onConfirm: () => {}, - onActionClick: () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + onChange: (): void => {} } AtSearchBar.propTypes = { diff --git a/src/components/segmented-control/index.tsx b/src/components/segmented-control/index.tsx index 3c6b18027..05452d680 100644 --- a/src/components/segmented-control/index.tsx +++ b/src/components/segmented-control/index.tsx @@ -1,35 +1,32 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtSegmentedControlProps } from 'types/segmented-control' import { View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -import { initTestEnv, pxTransform } from '../../common/utils' +import { mergeStyle, pxTransform } from '../../common/utils' -initTestEnv() - -export default class AtSegmentedControl extends AtComponent< +export default class AtSegmentedControl extends React.Component< AtSegmentedControlProps > { public static defaultProps: AtSegmentedControlProps public static propTypes: InferProps - private handleClick(index: number, event: CommonEvent) { + private handleClick(index: number, event: CommonEvent): void { if (this.props.disabled) return this.props.onClick(index, event) } public render(): JSX.Element { const { - customStyle, + customStyle = '', className, disabled, values, selectedColor, current, color, - fontSize + fontSize = 28 } = this.props const rootStyle = { @@ -37,13 +34,13 @@ export default class AtSegmentedControl extends AtComponent< } const itemStyle = { color: selectedColor, - fontSize: pxTransform(fontSize!), + fontSize: pxTransform(fontSize), borderColor: selectedColor, backgroundColor: color } const selectedItemStyle = { color, - fontSize: pxTransform(fontSize!), + fontSize: pxTransform(fontSize), borderColor: selectedColor, backgroundColor: selectedColor } @@ -56,10 +53,7 @@ export default class AtSegmentedControl extends AtComponent< ) return ( - + {values.map((value, i) => ( {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + onClick: (): void => {} } AtSegmentedControl.propTypes = { diff --git a/src/components/slider/index.tsx b/src/components/slider/index.tsx index 940710489..198f096c7 100644 --- a/src/components/slider/index.tsx +++ b/src/components/slider/index.tsx @@ -1,12 +1,11 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtSliderProps, AtSliderState } from 'types/slider' import { Slider, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtSlider extends AtComponent< +export default class AtSlider extends React.Component< AtSliderProps, AtSliderState > { @@ -15,9 +14,9 @@ export default class AtSlider extends AtComponent< public constructor(props: AtSliderProps) { super(props) - const { value, min, max } = props + const { value = 0, min = 0, max = 100 } = props this.state = { - _value: AtSlider.clampNumber(value!, min!, max!) + _value: AtSlider.clampNumber(value, min, max) } } @@ -46,10 +45,10 @@ export default class AtSlider extends AtComponent< this.props.onChange && this.props.onChange(value) } - public componentWillReceiveProps(props: AtSliderProps): void { - const { value, min, max } = props + public UNSAFE_componentWillReceiveProps(props: AtSliderProps): void { + const { value = 0, min = 0, max = 100 } = props this.setState({ - _value: AtSlider.clampNumber(value!, min!, max!) + _value: AtSlider.clampNumber(value, min, max) }) } @@ -113,9 +112,7 @@ AtSlider.defaultProps = { backgroundColor: '#e9e9e9', blockSize: 28, blockColor: '#ffffff', - showValue: false, - onChange: () => {}, - onChanging: () => {} + showValue: false } AtSlider.propTypes = { diff --git a/src/components/steps/index.tsx b/src/components/steps/index.tsx index ca8dbe84e..75595ab19 100644 --- a/src/components/steps/index.tsx +++ b/src/components/steps/index.tsx @@ -1,12 +1,11 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtStepsProps } from 'types/steps' import { Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtSteps extends AtComponent { +export default class AtSteps extends React.Component { public static defaultProps: AtStepsProps public static propTypes: InferProps @@ -76,7 +75,8 @@ AtSteps.defaultProps = { className: '', current: 0, items: [], - onChange: () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + onChange: (): void => {} } AtSteps.propTypes = { diff --git a/src/components/swipe-action/index.tsx b/src/components/swipe-action/index.tsx index e5d88b96f..bca504338 100644 --- a/src/components/swipe-action/index.tsx +++ b/src/components/swipe-action/index.tsx @@ -2,8 +2,8 @@ import classNames from 'classnames' import _inRange from 'lodash/inRange' import _isEmpty from 'lodash/isEmpty' import _isFunction from 'lodash/isFunction' -import _isNil from 'lodash/isNil' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtSwipeActionProps, AtSwipeActionState, @@ -11,8 +11,6 @@ import { } from 'types/swipe-action' import { Text, View } from '@tarojs/components' import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' import { delayGetClientRect, delayGetScrollOffset, @@ -21,7 +19,7 @@ import { } from '../../common/utils' import AtSwipeActionOptions from './options/index' -export default class AtSwipeAction extends AtComponent< +export default class AtSwipeAction extends React.Component< AtSwipeActionProps, AtSwipeActionState > { @@ -32,7 +30,7 @@ export default class AtSwipeAction extends AtComponent< private startX: number private startY: number private maxOffsetSize: number - private domInfo: Taro.rectElement + private domInfo: any private isMoving: boolean private isTouching: boolean @@ -73,7 +71,7 @@ export default class AtSwipeAction extends AtComponent< }) } - public componentWillReceiveProps(nextProps: AtSwipeActionProps): void { + public UNSAFE_componentWillReceiveProps(nextProps: AtSwipeActionProps): void { const { isOpened } = nextProps const { _isOpened } = this.state diff --git a/src/components/swipe-action/options/index.tsx b/src/components/swipe-action/options/index.tsx index b845700fb..2253306e4 100644 --- a/src/components/swipe-action/options/index.tsx +++ b/src/components/swipe-action/options/index.tsx @@ -1,11 +1,10 @@ import classNames from 'classnames' +import React from 'react' import { AtSwipeActionOptionsProps } from 'types/swipe-action' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../../common/component' import { delayQuerySelector } from '../../../common/utils' -export default class AtSwipeActionOptions extends AtComponent< +export default class AtSwipeActionOptions extends React.Component< AtSwipeActionOptionsProps > { private trrigerOptionsDomUpadte(): void { @@ -21,7 +20,9 @@ export default class AtSwipeActionOptions extends AtComponent< this.trrigerOptionsDomUpadte() } - public componentWillReceiveProps(nextProps: AtSwipeActionOptionsProps): void { + public UNSAFE_componentWillReceiveProps( + nextProps: AtSwipeActionOptionsProps + ): void { if (nextProps.options !== this.props.options) { this.trrigerOptionsDomUpadte() } diff --git a/src/components/switch/index.tsx b/src/components/switch/index.tsx index ad80b4e37..337fb403f 100644 --- a/src/components/switch/index.tsx +++ b/src/components/switch/index.tsx @@ -1,13 +1,11 @@ import classNames from 'classnames' -import _isUndefined from 'lodash/isUndefined' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtSwitchProps } from 'types/switch' import { Switch, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtSwitch extends AtComponent { +export default class AtSwitch extends React.Component { public static defaultProps: AtSwitchProps public static propTypes: InferProps @@ -63,8 +61,7 @@ AtSwitch.defaultProps = { color: '#6190e8', border: true, disabled: false, - checked: false, - onChange: () => {} + checked: false } AtSwitch.propTypes = { diff --git a/src/components/tab-bar/index.tsx b/src/components/tab-bar/index.tsx index 2af3d6efe..84908386d 100644 --- a/src/components/tab-bar/index.tsx +++ b/src/components/tab-bar/index.tsx @@ -1,13 +1,13 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtTabBarProps, TabItem } from 'types/tab-bar' import { Image, Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' +import { mergeStyle } from '../../common/utils' import AtBadge from '../badge/index' -export default class AtTabBar extends AtComponent { +export default class AtTabBar extends React.Component { public static defaultProps: AtTabBarProps public static propTypes: InferProps @@ -35,7 +35,7 @@ export default class AtTabBar extends AtComponent { public render(): JSX.Element { const { - customStyle, + customStyle = '', className, fixed, backgroundColor, @@ -74,7 +74,7 @@ export default class AtTabBar extends AtComponent { }, className )} - style={this.mergeStyle(rootStyle, customStyle!)} + style={mergeStyle(rootStyle, customStyle)} > {tabList.map((item: TabItem, i: number) => ( {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + onClick: (): void => {} } AtTabBar.propTypes = { diff --git a/src/components/tabs-pane/index.tsx b/src/components/tabs-pane/index.tsx index 101761d69..5c1b72129 100644 --- a/src/components/tabs-pane/index.tsx +++ b/src/components/tabs-pane/index.tsx @@ -1,11 +1,10 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtTabsPaneProps } from 'types/tabs-pane' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtTabsPane extends AtComponent { +export default class AtTabsPane extends React.Component { public static defaultProps: AtTabsPaneProps public static propTypes: InferProps diff --git a/src/components/tabs/index.tsx b/src/components/tabs/index.tsx index e6f748171..1a136c0cf 100644 --- a/src/components/tabs/index.tsx +++ b/src/components/tabs/index.tsx @@ -1,17 +1,17 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtTabsProps, AtTabsState } from 'types/tabs' import { ScrollView, View } from '@tarojs/components' import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -import { isTest, uuid } from '../../common/utils' +import { isTest, mergeStyle, uuid } from '../../common/utils' const ENV = Taro.getEnv() const MIN_DISTANCE = 100 const MAX_INTERVAL = 10 -export default class AtTabs extends AtComponent { +export default class AtTabs extends React.Component { public static defaultProps: AtTabsProps public static propTypes: InferProps @@ -127,7 +127,7 @@ export default class AtTabs extends AtComponent { } } - public componentWillReceiveProps(nextProps: AtTabsProps): void { + public UNSAFE_componentWillReceiveProps(nextProps: AtTabsProps): void { if (nextProps.scroll !== this.props.scroll) { this.getTabHeaderRef() } @@ -147,7 +147,7 @@ export default class AtTabs extends AtComponent { public render(): JSX.Element { const { - customStyle, + customStyle = '', className, height, tabDirection, @@ -207,10 +207,7 @@ export default class AtTabs extends AtComponent { const scrollY = tabDirection === 'vertical' return ( - + {scroll ? ( { onTouchStart={this.handleTouchStart.bind(this)} onTouchEnd={this.handleTouchEnd.bind(this)} onTouchMove={this.handleTouchMove.bind(this)} - style={this.mergeStyle(bodyStyle, heightStyle)} + style={mergeStyle(bodyStyle, heightStyle)} > {this.props.children} @@ -255,7 +252,8 @@ AtTabs.defaultProps = { scroll: false, animated: true, tabList: [], - onClick: () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + onClick: (): void => {} } AtTabs.propTypes = { diff --git a/src/components/tag/index.tsx b/src/components/tag/index.tsx index d28d8741a..19c0474c7 100644 --- a/src/components/tag/index.tsx +++ b/src/components/tag/index.tsx @@ -1,10 +1,9 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtTagProps } from 'types/tag' import { View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' const SIZE_CLASS = { normal: 'normal', @@ -15,17 +14,18 @@ const TYPE_CLASS = { primary: 'primary' } -export default class AtTag extends AtComponent { +export default class AtTag extends React.Component { public static defaultProps: AtTagProps public static propTypes: InferProps private onClick(event: CommonEvent): void { - if (!this.props.disabled) { - this.props.onClick && - this.props.onClick( + const { name = '', active = false, disabled, onClick } = this.props + if (!disabled) { + typeof onClick === 'function' && + onClick( { - name: this.props.name!, - active: this.props.active! + name, + active }, event ) @@ -70,8 +70,7 @@ AtTag.defaultProps = { circle: false, active: false, disabled: false, - customStyle: {}, - onClick: () => {} + customStyle: {} } AtTag.propTypes = { diff --git a/src/components/textarea/index.tsx b/src/components/textarea/index.tsx index f43ee1d1f..55187c8f9 100644 --- a/src/components/textarea/index.tsx +++ b/src/components/textarea/index.tsx @@ -1,11 +1,10 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtTextareaProps } from 'types/textarea' import { Textarea, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -import { initTestEnv } from '../../common/utils' type ExtendEvent = { target: { @@ -24,9 +23,8 @@ function getMaxLength( } const ENV = Taro.getEnv() -initTestEnv() -export default class AtTextarea extends AtComponent { +export default class AtTextarea extends React.Component { public static defaultProps: AtTextareaProps public static propTypes: InferProps @@ -46,7 +44,7 @@ export default class AtTextarea extends AtComponent { this.props.onConfirm && this.props.onConfirm(event) } - private handleLinechange = (event: CommonEvent) => { + private handleLinechange = (event: CommonEvent): void => { this.props.onLinechange && this.props.onLinechange(event) } @@ -59,7 +57,7 @@ export default class AtTextarea extends AtComponent { placeholder, placeholderStyle, placeholderClass, - maxLength, + maxLength = 200, count, disabled, autoFocus, @@ -68,12 +66,12 @@ export default class AtTextarea extends AtComponent { selectionStart, selectionEnd, fixed, - textOverflowForbidden, + textOverflowForbidden = true, height } = this.props - const _maxLength = parseInt(maxLength!.toString()) - const actualMaxLength = getMaxLength(_maxLength, textOverflowForbidden!) + const _maxLength = parseInt(maxLength.toString()) + const actualMaxLength = getMaxLength(_maxLength, textOverflowForbidden) const textareaStyle = height ? `height:${Taro.pxTransform(Number(height))}` : '' @@ -138,11 +136,8 @@ AtTextarea.defaultProps = { fixed: false, height: '', textOverflowForbidden: true, - onLinechange: () => {}, - onChange: () => {}, - onFocus: () => {}, - onBlur: () => {}, - onConfirm: () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + onChange: (): void => {} } AtTextarea.propTypes = { diff --git a/src/components/timeline/index.tsx b/src/components/timeline/index.tsx index 43b51758b..3784095e8 100644 --- a/src/components/timeline/index.tsx +++ b/src/components/timeline/index.tsx @@ -1,11 +1,10 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtTimelineProps } from 'types/timeline' import { Text, View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' -export default class AtTimeline extends AtComponent { +export default class AtTimeline extends React.Component { public static defaultProps: AtTimelineProps public static propTypes: InferProps diff --git a/src/components/toast/index.tsx b/src/components/toast/index.tsx index 141cdeb63..b84951de3 100644 --- a/src/components/toast/index.tsx +++ b/src/components/toast/index.tsx @@ -1,14 +1,16 @@ import classNames from 'classnames' import _isFunction from 'lodash/isFunction' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { AtToastProps, AtToastState } from 'types/toast' import { Image, Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import AtComponent from '../../common/component' import statusImg from './img.json' -export default class AtToast extends AtComponent { +export default class AtToast extends React.Component< + AtToastProps, + AtToastState +> { public static defaultProps: AtToastProps public static propTypes: InferProps @@ -58,6 +60,7 @@ export default class AtToast extends AtComponent { private handleClose(event?: CommonEvent): void { // TODO: Fix dirty hack if (_isFunction(this.props.onClose)) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion this.props.onClose(event!) } } @@ -73,7 +76,7 @@ export default class AtToast extends AtComponent { this.close() } - public componentWillReceiveProps(nextProps: AtToastProps): void { + public UNSAFE_componentWillReceiveProps(nextProps: AtToastProps): void { const { isOpened, duration } = nextProps if (!isOpened) { this.close() @@ -94,8 +97,10 @@ export default class AtToast extends AtComponent { const { _isOpened } = this.state const { customStyle, text, icon, status, image, hasMask } = this.props + /* eslint-disable @typescript-eslint/no-non-null-assertion */ const realImg = image || statusImg[status!] || null const isRenderIcon = !!(icon && !(image || statusImg[status!])) + /* eslint-enable @typescript-eslint/no-non-null-assertion */ const bodyClass = classNames('toast-body', { 'at-toast__body--custom-image': image, diff --git a/src/index.ts b/src/index.ts index 210e47483..1b94acc5b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,10 +1,7 @@ -import Taro from '@tarojs/taro' import './style/index.scss' import './style/themes/red.scss' import './style/themes/purple.scss' -Taro.initPxTransform({ designWidth: 750, deviceRatio: {} }) - export { default as AtActionSheet } from './components/action-sheet' export { default as AtActionSheetItem } from './components/action-sheet/body/item' export { default as AtActivityIndicator } from './components/activity-indicator' diff --git a/tsconfig.json b/tsconfig.json index ef52d7bc0..b626e397d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,14 +2,13 @@ "compilerOptions": { "target": "es2017", "module": "commonjs", - "removeComments": false, "preserveConstEnums": true, "moduleResolution": "node", "experimentalDecorators": true, - "jsxFactory": "Taro.createElement", + "jsxFactory": "React.createElement", "noImplicitAny": false, "allowSyntheticDefaultImports": true, - "outDir": "lib", + "outDir": "dist", "noUnusedLocals": true, "noUnusedParameters": true, "strictNullChecks": true, diff --git a/yarn.lock b/yarn.lock index 79fcc9c4d..1de8a4853 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1828,7 +1828,7 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== -"@types/react@^16.7.3": +"@types/react@^16.9.23": version "16.9.23" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.23.tgz#1a66c6d468ba11a8943ad958a8cb3e737568271c" integrity sha512-SsGVT4E7L2wLN3tPYLiF20hmZTPGuzaayVunfgXzUn1x4uHVsKH6QDJQ/TdpHqwsTLd4CwrmQ2vOgxN7gE24gw== @@ -10584,7 +10584,7 @@ longest-streak@^2.0.1: resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4" integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg== -loose-envify@^1.0.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: +loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -13415,6 +13415,15 @@ react-router@5.1.2: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" +react@^16.13.0: + version "16.13.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.13.0.tgz#d046eabcdf64e457bbeed1e792e235e1b9934cf7" + integrity sha512-TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + read-cache@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" From c6cad2551b27b882707d36b64a0e268434c78d90 Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Thu, 26 Mar 2020 03:00:07 +0800 Subject: [PATCH 02/54] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=20page=20?= =?UTF-8?q?=E5=88=B0=20next?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- babel.config.js | 23 +- config/index.js | 46 +- package.json | 10 +- src/app.config.js | 64 + src/app.tsx | 89 +- src/common/utils.ts | 15 +- src/components/calendar/body/index.tsx | 8 +- src/components/calendar/index.tsx | 6 +- src/components/noticebar/index.tsx | 7 +- src/components/swipe-action/options/index.tsx | 3 +- src/pages/action/action-sheet/index.tsx | 21 +- src/pages/action/activity-indicator/index.tsx | 32 +- src/pages/action/message/index.tsx | 13 +- src/pages/action/modal/index.tsx | 34 +- src/pages/action/progress/index.tsx | 18 +- src/pages/action/swipe-action/index.tsx | 38 +- src/pages/action/toast/index.tsx | 16 +- src/pages/advanced/calendar/index.tsx | 129 +- src/pages/basic/button/index.tsx | 230 ++- src/pages/basic/color/index.tsx | 28 +- src/pages/basic/icon/index.tsx | 55 +- src/pages/basic/typo/index.tsx | 9 +- src/pages/components/doc-header/index.tsx | 7 +- src/pages/form/checkbox/index.tsx | 65 +- src/pages/form/form/index.tsx | 55 +- src/pages/form/image-picker/index.tsx | 38 +- src/pages/form/input-number/index.tsx | 27 +- src/pages/form/input/index.tsx | 5 +- src/pages/form/picker-view/index.tsx | 84 +- src/pages/form/picker/index.tsx | 55 +- src/pages/form/radio/index.tsx | 50 +- src/pages/form/range/index.tsx | 22 +- src/pages/form/rate/index.tsx | 38 +- src/pages/form/search-bar/index.tsx | 18 +- src/pages/form/slider/index.tsx | 31 +- src/pages/form/switch/index.tsx | 21 +- src/pages/form/textarea/index.tsx | 5 +- src/pages/index/index.config.js | 3 + src/pages/index/index.tsx | 42 +- src/pages/layout/accordion/index.tsx | 17 +- src/pages/layout/card/index.tsx | 28 +- src/pages/layout/flex/index.tsx | 7 +- src/pages/layout/float-layout/index.tsx | 46 +- src/pages/layout/grid/index.tsx | 5 +- src/pages/layout/list/index.tsx | 31 +- src/pages/navigation/drawer/index.tsx | 97 +- src/pages/navigation/indexes/index.tsx | 52 +- src/pages/navigation/indexes/mock-data.ts | 1228 +++++++++-------- src/pages/navigation/navbar/index.tsx | 41 +- src/pages/navigation/pagination/index.tsx | 85 +- .../navigation/segmented-control/index.tsx | 33 +- src/pages/navigation/tabbar/index.tsx | 100 +- src/pages/navigation/tabs/index.tsx | 96 +- src/pages/panel/index.tsx | 37 +- src/pages/theme/index.tsx | 11 +- src/pages/view/article/index.tsx | 40 +- src/pages/view/avatar/index.tsx | 58 +- src/pages/view/badge/index.tsx | 25 +- src/pages/view/countdown/index.tsx | 17 +- src/pages/view/curtain/index.tsx | 95 +- src/pages/view/divider/index.tsx | 27 +- src/pages/view/load-more/index.tsx | 23 +- src/pages/view/noticebar/index.tsx | 139 +- src/pages/view/steps/index.tsx | 33 +- src/pages/view/swiper/index.tsx | 66 +- src/pages/view/tag/index.tsx | 74 +- src/pages/view/timeline/index.tsx | 73 +- yarn.lock | 148 +- 68 files changed, 2532 insertions(+), 1660 deletions(-) create mode 100644 src/app.config.js create mode 100644 src/pages/index/index.config.js diff --git a/babel.config.js b/babel.config.js index 770ea984e..83f3c2c88 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,4 +1,3 @@ -/* eslint-disable import/no-commonjs */ const apis = require('@tarojs/taro-h5/dist/taroApis') module.exports = { @@ -9,20 +8,30 @@ module.exports = { spec: true, useBuiltIns: false } - ] + ], + '@babel/typescript' ], plugins: [ '@babel/plugin-proposal-class-properties', [ '@babel/plugin-transform-react-jsx', { - pragma: 'Nerv.createElement' + pragma: 'React.createElement' + } + ], + [ + '@babel/plugin-proposal-decorators', + { + legacy: true } ], ['@babel/plugin-proposal-object-rest-spread'], - ['babel-plugin-transform-taroapi', { - apis, - packageName: '@tarojs/taro-h5' - }] + [ + 'babel-plugin-transform-taroapi', + { + apis, + packageName: '@tarojs/taro-h5' + } + ] ] } diff --git a/config/index.js b/config/index.js index 8b4e8ed54..567776287 100644 --- a/config/index.js +++ b/config/index.js @@ -1,6 +1,6 @@ -/* eslint-disable import/no-commonjs */ const path = require('path') const MiniCssExtractPlugin = require('mini-css-extract-plugin') +const webpack = require('webpack') const isBuildComponent = process.env.TARO_BUILD_TYPE === 'component' @@ -12,20 +12,36 @@ const config = { plugins: {}, babel: { sourceMap: true, - presets: [ - 'env' - ], + presets: ['env'], plugins: [ 'transform-class-properties', 'transform-decorators-legacy', 'transform-object-rest-spread' ] }, - defineConstants: {}, + framework: 'react', + mini: { + webpackChain(chain) { + chain.merge({ + devtool: 'source-map', + plugins: [ + new webpack.ProvidePlugin({ + window: ['@tarojs/runtime', 'window'], + document: ['@tarojs/runtime', 'document'] + }) + ], + resolve: { + alias: { + nervjs: 'react', + 'react-dom': '@tarojs/react' + } + } + }) + } + }, alias: { - 'taro-ui': path.resolve(__dirname, '../src/ui.ts'), + 'taro-ui': path.resolve(__dirname, '../src/ui.ts') }, - mini: {}, h5: { staticDirectory: 'static', postcss: { @@ -33,7 +49,7 @@ const config = { enable: true } } - }, + } } if (isBuildComponent) { @@ -57,22 +73,24 @@ if (isBuildComponent) { classnames: 'commonjs2 classnames', '@tarojs/components': 'commonjs2 @tarojs/components', '@tarojs/taro-h5': 'commonjs2 @tarojs/taro-h5', - 'weui': 'commonjs2 weui' + weui: 'commonjs2 weui' }, plugin: { extractCSS: { plugin: MiniCssExtractPlugin, - args: [{ - filename: 'css/index.css', - chunkFilename: 'css/[id].css' - }] + args: [ + { + filename: 'css/index.css', + chunkFilename: 'css/[id].css' + } + ] } } }) } } -module.exports = function (merge) { +module.exports = function(merge) { if (process.env.NODE_ENV === 'development') { return merge({}, config, require('./dev')) } diff --git a/package.json b/package.json index dca98ef04..f10993a3b 100644 --- a/package.json +++ b/package.json @@ -108,8 +108,12 @@ "jest": true }, "rules": { - "@typescript-eslint/no-explicit-any": ["off"], - "@typescript-eslint/member-delimiter-style": ["off"], + "@typescript-eslint/no-explicit-any": [ + "off" + ], + "@typescript-eslint/member-delimiter-style": [ + "off" + ], "class-methods-use-this": "off", "prefer-rest-params": "off", "arrow-body-style": "warn", @@ -227,9 +231,11 @@ "devDependencies": { "@babel/core": "^7.0.0-rc.1", "@babel/plugin-proposal-class-properties": "^7.0.0-beta.55", + "@babel/plugin-proposal-decorators": "^7.8.3", "@babel/plugin-proposal-object-rest-spread": "^7.0.0", "@babel/plugin-transform-react-jsx": "^7.0.0-beta.55", "@babel/preset-env": "^7.0.0-beta.55", + "@babel/preset-typescript": "^7.9.0", "@commitlint/cli": "^8.2.0", "@commitlint/config-conventional": "^8.2.0", "@mapbox/jsxtreme-markdown-loader": "^0.8.3", diff --git a/src/app.config.js b/src/app.config.js new file mode 100644 index 000000000..48a97d6b8 --- /dev/null +++ b/src/app.config.js @@ -0,0 +1,64 @@ +export default { + pages: [ + 'pages/index/index', + 'pages/panel/index', + 'pages/basic/icon/index', + 'pages/basic/button/index', + 'pages/basic/color/index', + 'pages/basic/typo/index', + 'pages/view/noticebar/index', + 'pages/view/badge/index', + 'pages/view/tag/index', + 'pages/view/avatar/index', + 'pages/view/article/index', + 'pages/view/timeline/index', + 'pages/view/swiper/index', + 'pages/view/load-more/index', + 'pages/view/divider/index', + 'pages/view/countdown/index', + 'pages/view/steps/index', + 'pages/view/curtain/index', + 'pages/action/toast/index', + 'pages/action/modal/index', + 'pages/action/progress/index', + 'pages/action/action-sheet/index', + 'pages/action/swipe-action/index', + 'pages/action/activity-indicator/index', + 'pages/action/message/index', + 'pages/navigation/drawer/index', + 'pages/navigation/pagination/index', + 'pages/navigation/tabs/index', + 'pages/navigation/tabbar/index', + 'pages/navigation/segmented-control/index', + 'pages/navigation/navbar/index', + 'pages/navigation/indexes/index', + 'pages/layout/flex/index', + 'pages/layout/grid/index', + 'pages/layout/float-layout/index', + 'pages/layout/card/index', + 'pages/layout/list/index', + 'pages/layout/accordion/index', + 'pages/form/form/index', + 'pages/form/checkbox/index', + 'pages/form/input/index', + 'pages/form/input-number/index', + 'pages/form/radio/index', + 'pages/form/textarea/index', + 'pages/form/switch/index', + 'pages/form/rate/index', + 'pages/form/picker/index', + 'pages/form/picker-view/index', + 'pages/form/slider/index', + 'pages/form/search-bar/index', + 'pages/form/image-picker/index', + 'pages/form/range/index', + 'pages/advanced/calendar/index', + 'pages/theme/index' + ], + window: { + backgroundTextStyle: 'light', + navigationBarBackgroundColor: '#fff', + navigationBarTitleText: 'WeChat', + navigationBarTextStyle: 'black' + } +} diff --git a/src/app.tsx b/src/app.tsx index 9e45a21bb..e582c2129 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -1,84 +1,17 @@ -import Taro, { Component } from '@tarojs/taro' -import Index from './pages/index/index' +import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import './app.scss' -class App extends Component { - config: Taro.Config = { - pages: [ - 'pages/index/index', - 'pages/panel/index', - 'pages/basic/icon/index', - 'pages/basic/button/index', - 'pages/basic/color/index', - 'pages/basic/typo/index', - 'pages/view/noticebar/index', - 'pages/view/badge/index', - 'pages/view/tag/index', - 'pages/view/avatar/index', - 'pages/view/article/index', - 'pages/view/timeline/index', - 'pages/view/swiper/index', - 'pages/view/load-more/index', - 'pages/view/divider/index', - 'pages/view/countdown/index', - 'pages/view/steps/index', - 'pages/view/curtain/index', - 'pages/action/toast/index', - 'pages/action/modal/index', - 'pages/action/progress/index', - 'pages/action/action-sheet/index', - 'pages/action/swipe-action/index', - 'pages/action/activity-indicator/index', - 'pages/action/message/index', - 'pages/navigation/drawer/index', - 'pages/navigation/pagination/index', - 'pages/navigation/tabs/index', - 'pages/navigation/tabbar/index', - 'pages/navigation/segmented-control/index', - 'pages/navigation/navbar/index', - 'pages/navigation/indexes/index', - 'pages/layout/flex/index', - 'pages/layout/grid/index', - 'pages/layout/float-layout/index', - 'pages/layout/card/index', - 'pages/layout/list/index', - 'pages/layout/accordion/index', - 'pages/form/form/index', - 'pages/form/checkbox/index', - 'pages/form/input/index', - 'pages/form/input-number/index', - 'pages/form/radio/index', - 'pages/form/textarea/index', - 'pages/form/switch/index', - 'pages/form/rate/index', - 'pages/form/picker/index', - 'pages/form/picker-view/index', - 'pages/form/slider/index', - 'pages/form/search-bar/index', - 'pages/form/image-picker/index', - 'pages/form/range/index', - 'pages/advanced/calendar/index', - 'pages/theme/index' - ], - window: { - backgroundTextStyle: 'light', - navigationBarBackgroundColor: '#fff', - navigationBarTitleText: 'WeChat', - navigationBarTextStyle: 'black' - } - } - - componentDidMount () {} - - componentDidShow () {} - - componentDidHide () {} +class App extends React.Component { + public static propTypes: InferProps<{}> - componentCatchError () {} - - render () { - return + public render(): React.ReactNode { + return this.props.children } } -Taro.render(, document.getElementById('app')) +App.propTypes = { + children: PropTypes.node +} + +export default App diff --git a/src/common/utils.ts b/src/common/utils.ts index 7483a58a2..0477c5050 100644 --- a/src/common/utils.ts +++ b/src/common/utils.ts @@ -3,15 +3,11 @@ import { SelectorQuery } from '@tarojs/taro/types/index' const ENV = Taro.getEnv() -function delay(delayTime = 500): Promise { +function delay(delayTime = 25): Promise { return new Promise(resolve => { - if ([Taro.ENV_TYPE.WEB, Taro.ENV_TYPE.SWAN].includes(ENV)) { - setTimeout(() => { - resolve() - }, delayTime) - return - } - resolve() + setTimeout(() => { + resolve() + }, delayTime) }) } @@ -20,9 +16,8 @@ function delayQuerySelector( selectorStr: string, delayTime = 500 ): Promise { - const selector: SelectorQuery = Taro.createSelectorQuery() - return new Promise(resolve => { + const selector: SelectorQuery = Taro.createSelectorQuery() delay(delayTime).then(() => { selector .select(selectorStr) diff --git a/src/components/calendar/body/index.tsx b/src/components/calendar/body/index.tsx index dc2c57411..a85dada2d 100644 --- a/src/components/calendar/body/index.tsx +++ b/src/components/calendar/body/index.tsx @@ -8,7 +8,11 @@ import { Calendar } from 'types/calendar' import { Swiper, SwiperItem, View } from '@tarojs/components' -import { BaseEvent, ITouch, ITouchEvent } from '@tarojs/components/types/common' +import { + BaseEventOrig, + ITouch, + ITouchEvent +} from '@tarojs/components/types/common' import { delayQuerySelector } from '../../../common/utils' import generateCalendarGroup from '../common/helper' import AtCalendarDateList from '../ui/date-list/index' @@ -213,7 +217,7 @@ export default class AtCalendarBody extends Taro.Component< this.animateMoveSlide(0) } - private handleChange = (e: BaseEvent): void => { + private handleChange = (e: BaseEventOrig): void => { const { current, source } = e.detail if (source === 'touch') { diff --git a/src/components/calendar/index.tsx b/src/components/calendar/index.tsx index fc7c3c076..ab485dba0 100644 --- a/src/components/calendar/index.tsx +++ b/src/components/calendar/index.tsx @@ -10,7 +10,7 @@ import { Calendar } from 'types/calendar' import { View } from '@tarojs/components' -import { BaseEvent } from '@tarojs/components/types/common' +import { BaseEventOrig } from '@tarojs/components/types/common' import AtCalendarBody from './body/index' import AtCalendarController from './controller/index' @@ -213,9 +213,7 @@ export default class AtCalendar extends Taro.Component< } // picker 选择时间改变时触发 - private handleSelectDate = ( - e: BaseEvent & { detail: { value: string } } - ): void => { + private handleSelectDate = (e: BaseEventOrig<{ value: string }>): void => { const { value } = e.detail const _generateDate: Dayjs = dayjs(value) diff --git a/src/components/noticebar/index.tsx b/src/components/noticebar/index.tsx index 5dbae04f3..f0a0eacaa 100644 --- a/src/components/noticebar/index.tsx +++ b/src/components/noticebar/index.tsx @@ -65,9 +65,7 @@ export default class AtNoticebar extends React.Component< const dura = width / +speed this.setState({ dura }) } else if (isWEAPP || isALIPAY) { - const query = isALIPAY - ? Taro.createSelectorQuery() - : Taro.createSelectorQuery().in(this.$scope) + const query = Taro.createSelectorQuery() query .select(`.${this.state.animElemId}`) .boundingClientRect() @@ -112,7 +110,7 @@ export default class AtNoticebar extends React.Component< this.interval = setInterval(animBody, dura * 1000 + 1000) }) } - }, 100) + }, 1000) } public render(): JSX.Element | boolean { @@ -171,6 +169,7 @@ export default class AtNoticebar extends React.Component< )} { this.props.onQueryedDom(res[0]) }) diff --git a/src/pages/action/action-sheet/index.tsx b/src/pages/action/action-sheet/index.tsx index 2fc64f0cb..e15a3a9c6 100644 --- a/src/pages/action/action-sheet/index.tsx +++ b/src/pages/action/action-sheet/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View, Text } from '@tarojs/components' +import React from 'react' import { AtActionSheet, AtActionSheetItem, AtButton } from 'taro-ui' +import { Text, View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -11,13 +12,16 @@ interface ActionSheetPageState { [key: string]: boolean } -export default class ActionSheetPage extends Taro.Component<{}, ActionSheetPageState> { +export default class ActionSheetPage extends React.Component< + {}, + ActionSheetPageState +> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { isOpened1: false, isOpened2: false, @@ -32,10 +36,13 @@ export default class ActionSheetPage extends Taro.Component<{}, ActionSheetPageS } private handleClose = (name: string): void => { - console.log(`第 ${name} 个Action Sheet已经关闭`) this.setState({ [`isOpened${name}`]: false }) + Taro.showToast({ + title: `第 ${name} 个Action Sheet已经关闭`, + icon: 'none' + }) } private handleCancel = (): void => { @@ -49,7 +56,7 @@ export default class ActionSheetPage extends Taro.Component<{}, ActionSheetPageS }) } - public render (): JSX.Element { + public render(): JSX.Element { const { isOpened1, isOpened2, isOpened3 } = this.state return ( diff --git a/src/pages/action/activity-indicator/index.tsx b/src/pages/action/activity-indicator/index.tsx index 08e094fc1..78d09e566 100644 --- a/src/pages/action/activity-indicator/index.tsx +++ b/src/pages/action/activity-indicator/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtActivityIndicator, AtSwitch } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -8,25 +9,28 @@ interface ActivityIndicatorPageState { isOpened: boolean } -export default class ActivityIndicatorPage extends Taro.Component<{}, ActivityIndicatorPageState> { +export default class ActivityIndicatorPage extends React.Component< + {}, + ActivityIndicatorPageState +> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { isOpened: true } } - private handleChange (value: boolean): void { + private handleChange(value: boolean): void { this.setState({ isOpened: value }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} @@ -41,7 +45,7 @@ export default class ActivityIndicatorPage extends Taro.Component<{}, ActivityIn - + @@ -85,9 +89,17 @@ export default class ActivityIndicatorPage extends Taro.Component<{}, ActivityIn 状态切换 - + - + diff --git a/src/pages/action/message/index.tsx b/src/pages/action/message/index.tsx index 580e08806..d3f2a5f77 100644 --- a/src/pages/action/message/index.tsx +++ b/src/pages/action/message/index.tsx @@ -1,24 +1,25 @@ -import Taro, { Component } from '@tarojs/taro' +import React from 'react' +import { AtButton, AtMessage } from 'taro-ui' import { View } from '@tarojs/components' -import { AtMessage, AtButton } from 'taro-ui' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' type MessageType = 'info' | 'success' | 'error' | 'warning' -export default class ToastPage extends Component { +export default class ToastPage extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - private handleClick (type: MessageType): void { + private handleClick(type: MessageType): void { Taro.atMessage({ message: '消息通知', - type: type, + type }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} diff --git a/src/pages/action/modal/index.tsx b/src/pages/action/modal/index.tsx index 1e1398505..4ce3fbec8 100644 --- a/src/pages/action/modal/index.tsx +++ b/src/pages/action/modal/index.tsx @@ -1,31 +1,29 @@ -import Taro from '@tarojs/taro' -import { View, Button } from '@tarojs/components' +import React from 'react' import { AtButton, + AtIndexes, AtModal, - AtModalHeader, - AtModalContent, AtModalAction, - AtIndexes + AtModalContent, + AtModalHeader } from 'taro-ui' - +import { Button, View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' - import mockData from '../../navigation/indexes/mock-data' - import './index.scss' interface ModalPageState { [key: string]: boolean } -export default class ModalPage extends Taro.Component<{}, ModalPageState> { +export default class ModalPage extends React.Component<{}, ModalPageState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { isOpened1: false, isOpened2: false, @@ -42,11 +40,9 @@ export default class ModalPage extends Taro.Component<{}, ModalPageState> { } private closeModal = (type: string, msg: string): void => { - console.log(msg) this.setState({ [`isOpened${type}`]: false }) - Taro.showToast({ icon: 'none', title: msg @@ -64,7 +60,7 @@ export default class ModalPage extends Taro.Component<{}, ModalPageState> { }) } - public render (): JSX.Element { + public render(): JSX.Element { const { isOpened1, isOpened2, isOpened3, isOpened4, isOpened5 } = this.state return ( @@ -185,9 +181,7 @@ export default class ModalPage extends Taro.Component<{}, ModalPageState> { onConfirm={this.closeModalConfirm.bind(this, 3, '点击了确认')} cancelText='取消' confirmText='确认' - > - - + > {/* 简化使用 */} { - + 用户自定义内容 diff --git a/src/pages/action/progress/index.tsx b/src/pages/action/progress/index.tsx index 60fd67cc2..a16893b40 100644 --- a/src/pages/action/progress/index.tsx +++ b/src/pages/action/progress/index.tsx @@ -1,22 +1,26 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtButton, AtIcon, AtProgress } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' -const OFFSET: number = 15 +const OFFSET = 15 interface ProgressPageState { percent: number } -export default class ProgressPage extends Taro.Component<{}, ProgressPageState> { +export default class ProgressPage extends React.Component< + {}, + ProgressPageState +> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { percent: 0 } @@ -48,7 +52,7 @@ export default class ProgressPage extends Taro.Component<{}, ProgressPageState> }) } - public render (): JSX.Element { + public render(): JSX.Element { const { percent } = this.state return ( diff --git a/src/pages/action/swipe-action/index.tsx b/src/pages/action/swipe-action/index.tsx index fb6227746..addae6691 100644 --- a/src/pages/action/swipe-action/index.tsx +++ b/src/pages/action/swipe-action/index.tsx @@ -1,13 +1,10 @@ -import { AtButton, AtList, AtListItem, AtSwipeAction } from 'taro-ui'; - -import { View } from '@tarojs/components'; -import { CommonEvent } from '@tarojs/components/types/common'; -import Taro from '@tarojs/taro'; -import { SwipeActionOption } from 'types/swipe-action'; - -import DocsHeader from '../../components/doc-header'; - -import './index.scss'; +import React from 'react' +import { AtButton, AtList, AtListItem, AtSwipeAction } from 'taro-ui' +import { SwipeActionOption } from 'types/swipe-action' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' +import DocsHeader from '../../components/doc-header' +import './index.scss' const OPTIONS: SwipeActionOption[] = [ { @@ -36,14 +33,16 @@ interface SwipeActionPageState { list: ActionListItem[] } -export default class SwipeActionPage extends Taro.Component<{}, SwipeActionPageState> { +export default class SwipeActionPage extends React.Component< + {}, + SwipeActionPageState +> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { isOpened2: false, list: [ @@ -81,9 +80,8 @@ export default class SwipeActionPage extends Taro.Component<{}, SwipeActionPageS } } - private handleClick = (item: SwipeActionOption, key: number, e: CommonEvent): void => { - console.log('触发了点击', item, key, e) - this.showToast(`点击了${item.text}按钮`) + private handleClick = (item: SwipeActionOption, key: number): void => { + this.showToast(`点击了${item.text}按钮，Key: ${key}`) } private handleClicked = (index: number): void => { @@ -101,14 +99,12 @@ export default class SwipeActionPage extends Taro.Component<{}, SwipeActionPageS } private handleStatusOpened = (): void => { - console.log('handleStatusOpened') this.setState({ isOpened2: true }) } private handleStatusClosed = (): void => { - console.log('handleStatusClosed') this.setState({ isOpened2: false }) @@ -126,12 +122,10 @@ export default class SwipeActionPage extends Taro.Component<{}, SwipeActionPageS private handleOpened = (): void => { this.showToast('Handle Opened') - console.log('handleOpened') } private handleClosed = (): void => { this.showToast('Handle Closed') - console.log('handleClosed') } private showToast = (name: string): void => { @@ -141,7 +135,7 @@ export default class SwipeActionPage extends Taro.Component<{}, SwipeActionPageS }) } - public render (): JSX.Element { + public render(): JSX.Element { const { list, isOpened2 } = this.state return ( diff --git a/src/pages/action/toast/index.tsx b/src/pages/action/toast/index.tsx index 55efb42b2..8a6e5680b 100644 --- a/src/pages/action/toast/index.tsx +++ b/src/pages/action/toast/index.tsx @@ -1,6 +1,7 @@ -import Taro, { Component } from '@tarojs/taro' +import React from 'react' +import { AtButton, AtToast } from 'taro-ui' import { View } from '@tarojs/components' -import { AtToast, AtButton } from 'taro-ui' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -8,7 +9,6 @@ const INIT_STATE: ToastPageState = { image: '', icon: '', text: '', - status: undefined, duration: 3000, hasMask: false, isOpened: false @@ -24,17 +24,17 @@ interface ToastPageState { isOpened: boolean } -export default class ToastPage extends Component<{}, ToastPageState> { +export default class ToastPage extends React.Component<{}, ToastPageState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = INIT_STATE } - private handleClick = (params: ToastPageState) => { + private handleClick = (params: ToastPageState): void => { if (this.state.isOpened) { return this.setState(INIT_STATE) } @@ -50,7 +50,7 @@ export default class ToastPage extends Component<{}, ToastPageState> { }) } - public render (): JSX.Element { + public render(): JSX.Element { const { text, icon, diff --git a/src/pages/advanced/calendar/index.tsx b/src/pages/advanced/calendar/index.tsx index 285b25567..262216b5d 100644 --- a/src/pages/advanced/calendar/index.tsx +++ b/src/pages/advanced/calendar/index.tsx @@ -1,74 +1,99 @@ -import bind from 'bind-decorator'; -import { AtButton, AtCalendar } from 'taro-ui'; +import React from 'react' +import { AtButton, AtCalendar } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' +import DocsHeader from '../../components/doc-header' +import './index.scss' -import { View } from '@tarojs/components'; -import Taro, { Component } from '@tarojs/taro'; +type DateObject = { + value: string +} -import DocsHeader from '../../components/doc-header'; -import './index.scss' +interface IndexState { + now: number + minDate: string + maxDate: string + multiCurentDate: { + start: number + } + mark: DateObject[] + validDates: DateObject[] + [key: string]: any +} -export default class Index extends Component { +export default class Index extends React.Component<{}, IndexState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro日历组件展示' } - state = { - now: Date.now(), - minDate: '2018/06/11', - maxDate: '2020/12/12', - multiCurentDate: { - start: Date.now() - }, - mark: [ - { - value: '2018/11/11' - } - ], - validDates: [ - { - value: '2019/04/17' - }, - { - value: '2019/04/21' + public constructor() { + super(arguments) + this.state = { + now: Date.now(), + minDate: '2018/06/11', + maxDate: '2020/12/12', + multiCurentDate: { + start: Date.now() }, - { - value: '2019/05/04' - }, - { - value: '2019/05/28' - } - ] + mark: [ + { + value: '2018/11/11' + } + ], + validDates: [ + { + value: '2019/04/17' + }, + { + value: '2019/04/21' + }, + { + value: '2019/05/04' + }, + { + value: '2019/05/28' + } + ] + } } - @bind - private handleClick (key: string, value: string): void { + private handleClick = (key: string, value: string): void => { this.setState({ [key]: value }) } - @bind - private handleDayClick (...arg): void { - console.log('handleDayClick', arg) - } + // private handleDayClick = (...arg): void => { + // console.log('handleDayClick', arg) + // } - @bind - private handleDayLongClick (...arg): void { - console.log('handleDayLongClick', arg) - } + // private handleDayLongClick = (...arg): void => { + // console.log('handleDayLongClick', arg) + // } - @bind - private handleDateChange (arg): void { - console.log('handleDateChange', arg) + private handleDateChange = (arg: any): void => { + Taro.showToast({ + title: `handleDateChange: ${JSON.stringify(arg)}`, + icon: 'none' + }) } - @bind - private handleMonthChange (arg): void { - console.log('handleMonthChange', arg) + private handleMonthChange = (arg: any): void => { + Taro.showToast({ + title: `handleMonthChange: ${JSON.stringify(arg)}`, + icon: 'none' + }) } - public render (): JSX.Element { - const { now, minDate, maxDate, mark, multiCurentDate, validDates } = this.state + public render(): JSX.Element { + const { + now, + minDate, + maxDate, + mark, + multiCurentDate, + validDates + } = this.state return ( @@ -153,7 +178,7 @@ export default class Index extends Component { 垂直滑动 - + @@ -183,7 +208,7 @@ export default class Index extends Component { 有效时间组 - + diff --git a/src/pages/basic/button/index.tsx b/src/pages/basic/button/index.tsx index aa3d2ad35..c1fc191ec 100644 --- a/src/pages/basic/button/index.tsx +++ b/src/pages/basic/button/index.tsx @@ -1,44 +1,44 @@ -import { AtButton, AtFab, AtForm } from 'taro-ui'; - -import { Form, Text, View } from '@tarojs/components'; -import { CommonEvent } from '@tarojs/components/types/common'; -import Taro, { ShareAppMessageReturn } from '@tarojs/taro'; - -import DocsHeader from '../../components/doc-header'; - -import './index.scss'; +import React from 'react' +import { AtButton, AtFab, AtForm } from 'taro-ui' +import { Form, Text, View } from '@tarojs/components' +import { CommonEvent } from '@tarojs/components/types/common' +import Taro, { ShareAppMessageReturn } from '@tarojs/taro' +import DocsHeader from '../../components/doc-header' +import './index.scss' interface ButtonPageState { isWEAPP: boolean isALIPAY: boolean } -export default class ButtonPage extends Taro.Component<{}, ButtonPageState> { +export default class ButtonPage extends React.Component<{}, ButtonPageState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } public constructor() { - super() - + super(arguments) this.state = { isWEAPP: Taro.getEnv() === Taro.ENV_TYPE.WEAPP, - isALIPAY: Taro.getEnv() === Taro.ENV_TYPE.ALIPAY, + isALIPAY: Taro.getEnv() === Taro.ENV_TYPE.ALIPAY } } - private onButtonClick (): void { + private onButtonClick(): void { const content = [...arguments].find(item => typeof item === 'string') const ENV = Taro.getEnv() if (ENV === 'WEAPP') { - Taro.showModal({ content: content || '您点击了按钮！', showCancel: false }) + Taro.showModal({ + content: content || '您点击了按钮！', + showCancel: false + }) } if (ENV === 'WEB') { alert(content || '您点击了按钮！') } } - public onShareAppMessage (): ShareAppMessageReturn { + public onShareAppMessage(): ShareAppMessageReturn { return { title: 'Taro UI', path: '/pages/index/index', @@ -46,27 +46,41 @@ export default class ButtonPage extends Taro.Component<{}, ButtonPageState> { } } - private onContact (event: CommonEvent): void { - console.log('呼起客服回调', event.detail) + private onContact(event: CommonEvent): void { + Taro.showToast({ + title: `呼起客服回调: ${event.detail}` + }) } - private onSubmit (event: CommonEvent): void { - Taro.showModal({ content: `submit event detail: ${JSON.stringify(event.detail)}`, showCancel: false }) + private onSubmit(event: CommonEvent): void { + Taro.showModal({ + content: `submit event detail: ${JSON.stringify(event.detail)}`, + showCancel: false + }) } - private onReset (event: CommonEvent): void { - Taro.showModal({ content: `reset event detail: ${JSON.stringify(event.detail || '无数据')}`, showCancel: false }) + private onReset(event: CommonEvent): void { + Taro.showModal({ + content: `reset event detail: ${JSON.stringify( + event.detail || '无数据' + )}`, + showCancel: false + }) } - private onGetUserInfo (event: CommonEvent): void { - Taro.showModal({ content: `getUserInfo event detail: ${JSON.stringify(event.detail)}` }) + private onGetUserInfo(event: CommonEvent): void { + Taro.showModal({ + content: `getUserInfo event detail: ${JSON.stringify(event.detail)}` + }) } private onOpenSetting(event: CommonEvent): void { - console.log('onOpenSetting', event.detail) + Taro.showToast({ + title: `onOpenSetting: ${event.detail}` + }) } - public render (): JSX.Element { + public render(): JSX.Element { const { isWEAPP, isALIPAY } = this.state return ( @@ -81,13 +95,26 @@ export default class ButtonPage extends Taro.Component<{}, ButtonPageState> { 主操作 - 主操作按钮 + + 主操作按钮 + - Loading + + Loading + - 不可操作 + + 不可操作 + @@ -100,10 +127,14 @@ export default class ButtonPage extends Taro.Component<{}, ButtonPageState> { 次操作按钮 - Loading + + Loading + - 不可操作 + + 不可操作 + @@ -129,16 +160,22 @@ export default class ButtonPage extends Taro.Component<{}, ButtonPageState> { 通栏按钮 - 主操作按钮 + + 主操作按钮 + - 次操作按钮 + + 次操作按钮 + 次次要操作按钮 - 不可操作 + + 不可操作 + @@ -149,10 +186,14 @@ export default class ButtonPage extends Taro.Component<{}, ButtonPageState> { - 按钮 + + 按钮 + - 按钮 + + 按钮 + 按钮 @@ -171,13 +212,19 @@ export default class ButtonPage extends Taro.Component<{}, ButtonPageState> { - 按钮 + + 按钮 + - 按钮 + + 按钮 + - 按钮 + + 按钮 + @@ -189,21 +236,37 @@ export default class ButtonPage extends Taro.Component<{}, ButtonPageState> { - 按钮 + + 按钮 + - 按钮 + + 按钮 + - 按钮 + + 按钮 + - + - + @@ -211,13 +274,19 @@ export default class ButtonPage extends Taro.Component<{}, ButtonPageState> { - 按钮 + + 按钮 + - 按钮 + + 按钮 + - 按钮 + + 按钮 + @@ -228,9 +297,7 @@ export default class ButtonPage extends Taro.Component<{}, ButtonPageState> { 浮动按钮 - - 右侧是浮动操作按钮👉 - + 右侧是浮动操作按钮👉 @@ -246,24 +313,52 @@ export default class ButtonPage extends Taro.Component<{}, ButtonPageState> { 微信小程序 button 属性 - 分享 + + 分享 + - 登录授权 + + 登录授权 + - 联系 Taro UI 客服 + + 联系 Taro UI 客服 + - 打开设置 + + 打开设置 + -

+ - form submit + + form submit + - form reset + + form reset +
@@ -277,17 +372,28 @@ export default class ButtonPage extends Taro.Component<{}, ButtonPageState> { 支付宝小程序 button 属性 - 分享 + + 分享 + - 登录授权 + + 登录授权 + - + - form submit + + form submit + - form reset + + form reset + diff --git a/src/pages/basic/color/index.tsx b/src/pages/basic/color/index.tsx index 6910c98fe..4560e2d12 100644 --- a/src/pages/basic/color/index.tsx +++ b/src/pages/basic/color/index.tsx @@ -1,14 +1,14 @@ +import React from 'react' +import { Text, View } from '@tarojs/components' import Taro from '@tarojs/taro' -import { View, Text } from '@tarojs/components' - import DocsHeader from '../../components/doc-header' - import './index.scss' type Color = { name: string hex: string } + type ColorData = { type: string data: Color[] @@ -18,13 +18,13 @@ interface BasicColorState { colorData: ColorData[] } -export default class BasicColor extends Taro.Component<{}, BasicColorState> { +export default class BasicColor extends React.Component<{}, BasicColorState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super() + public constructor() { + super(arguments) this.state = { colorData: [ @@ -132,7 +132,7 @@ export default class BasicColor extends Taro.Component<{}, BasicColorState> { } } - public render (): JSX.Element { + public render(): JSX.Element { const { colorData } = this.state return ( @@ -150,13 +150,21 @@ export default class BasicColor extends Taro.Component<{}, BasicColorState> { {item.data.map(color => ( - + - + {color.name} - {color.hex} + + {color.hex} + ))} diff --git a/src/pages/basic/icon/index.tsx b/src/pages/basic/icon/index.tsx index 815ae7fae..305cc62fe 100644 --- a/src/pages/basic/icon/index.tsx +++ b/src/pages/basic/icon/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtIcon } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import ICONS from './icons' import './index.scss' @@ -21,19 +22,19 @@ interface IconPageState { } } -export default class IconPage extends Taro.Component<{}, IconPageState> { +export default class IconPage extends React.Component<{}, IconPageState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super() + public constructor() { + super(arguments) this.state = { icons: ICONS } } - public render (): JSX.Element { + public render(): JSX.Element { const { icons } = this.state const iconColor = '#999' const iconSize = 30 @@ -54,7 +55,11 @@ export default class IconPage extends Taro.Component<{}, IconPageState> { {icons.main.map((icon, index) => ( - + {icon} @@ -71,7 +76,11 @@ export default class IconPage extends Taro.Component<{}, IconPageState> { {icons.file.map((icon, index) => ( - + {icon} @@ -88,7 +97,11 @@ export default class IconPage extends Taro.Component<{}, IconPageState> { {icons.text.map((icon, index) => ( - + {icon} @@ -105,7 +118,11 @@ export default class IconPage extends Taro.Component<{}, IconPageState> { {icons.arrow.map((icon, index) => ( - + {icon} @@ -122,7 +139,11 @@ export default class IconPage extends Taro.Component<{}, IconPageState> { {icons.media.map((icon, index) => ( - + {icon} @@ -139,7 +160,11 @@ export default class IconPage extends Taro.Component<{}, IconPageState> { {icons.photo.map((icon, index) => ( - + {icon} @@ -156,7 +181,11 @@ export default class IconPage extends Taro.Component<{}, IconPageState> { {icons.logo.map((icon, index) => ( - + {icon} diff --git a/src/pages/basic/typo/index.tsx b/src/pages/basic/typo/index.tsx index 613ef4819..0d9b91e7f 100644 --- a/src/pages/basic/typo/index.tsx +++ b/src/pages/basic/typo/index.tsx @@ -1,16 +1,15 @@ -import Taro from '@tarojs/taro' +import React from 'react' import { View } from '@tarojs/components' - +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' - import './index.scss' -export default class BasicTypo extends Taro.Component { +export default class BasicTypo extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} diff --git a/src/pages/components/doc-header/index.tsx b/src/pages/components/doc-header/index.tsx index 091511941..b68c1aec3 100644 --- a/src/pages/components/doc-header/index.tsx +++ b/src/pages/components/doc-header/index.tsx @@ -1,18 +1,17 @@ -import Taro, { Component } from '@tarojs/taro' import PropTypes, { InferProps } from 'prop-types' +import React from 'react' import { View } from '@tarojs/components' - import './index.scss' export interface DocsHeaderProps { title?: string } -export default class DocsHeader extends Component { +export default class DocsHeader extends React.Component { public static defaultProps: DocsHeaderProps public static propTypes: InferProps - public render (): JSX.Element { + public render(): JSX.Element { const { title } = this.props return ( diff --git a/src/pages/form/checkbox/index.tsx b/src/pages/form/checkbox/index.tsx index f53530345..2e04c18b3 100644 --- a/src/pages/form/checkbox/index.tsx +++ b/src/pages/form/checkbox/index.tsx @@ -1,8 +1,9 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtCheckbox } from 'taro-ui' -import DocsHeader from '../../components/doc-header' import { CheckboxOption } from 'types/checkbox' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' +import DocsHeader from '../../components/doc-header' import './index.scss' interface IndexState { @@ -14,13 +15,13 @@ interface IndexState { checkboxOption3: CheckboxOption[] } -export default class Index extends Taro.Component<{}, IndexState> { +export default class Index extends React.Component<{}, IndexState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { checkedList1: ['list1'], checkedList2: ['list1'], @@ -31,38 +32,70 @@ export default class Index extends Taro.Component<{}, IndexState> { { value: 'list3', label: 'OPPO Find X' } ], checkboxOption2: [ - { value: 'list1', label: 'iPhone X', desc: '部分地区提供电子普通发票，用户可自行打印，效力等同纸质普通发票，具体以实际出具的发票类型为准。' }, - { value: 'list2', label: 'HUAWEI P20', desc: '部分地区提供电子普通发票，用户可自行打印，效力等同纸质普通发票，具体以实际出具的发票类型为准。' }, - { value: 'list3', label: 'OPPO Find X', desc: '部分地区提供电子普通发票，用户可自行打印，效力等同纸质普通发票，具体以实际出具的发票类型为准。' } + { + value: 'list1', + label: 'iPhone X', + desc: + '部分地区提供电子普通发票，用户可自行打印，效力等同纸质普通发票，具体以实际出具的发票类型为准。' + }, + { + value: 'list2', + label: 'HUAWEI P20', + desc: + '部分地区提供电子普通发票，用户可自行打印，效力等同纸质普通发票，具体以实际出具的发票类型为准。' + }, + { + value: 'list3', + label: 'OPPO Find X', + desc: + '部分地区提供电子普通发票，用户可自行打印，效力等同纸质普通发票，具体以实际出具的发票类型为准。' + } ], checkboxOption3: [ - { value: 'list1', label: 'iPhone X', desc: '部分地区提供电子普通发票，用户可自行打印，效力等同纸质普通发票，具体以实际出具的发票类型为准。' }, + { + value: 'list1', + label: 'iPhone X', + desc: + '部分地区提供电子普通发票，用户可自行打印，效力等同纸质普通发票，具体以实际出具的发票类型为准。' + }, { value: 'list2', label: 'HUAWEI P20' }, - { value: 'list3', label: 'OPPO Find X', desc: '部分地区提供电子普通发票，用户可自行打印，效力等同纸质普通发票，具体以实际出具的发票类型为准。', disabled: true }, - { value: 'list4', label: 'vivo NEX', desc: '部分地区提供电子普通发票，用户可自行打印，效力等同纸质普通发票，具体以实际出具的发票类型为准。', disabled: true } + { + value: 'list3', + label: 'OPPO Find X', + desc: + '部分地区提供电子普通发票，用户可自行打印，效力等同纸质普通发票，具体以实际出具的发票类型为准。', + disabled: true + }, + { + value: 'list4', + label: 'vivo NEX', + desc: + '部分地区提供电子普通发票，用户可自行打印，效力等同纸质普通发票，具体以实际出具的发票类型为准。', + disabled: true + } ] } } - private handleChange (value: string[]): void { + private handleChange(value: string[]): void { this.setState({ checkedList1: value }) } - private handleChangeSnd (value: string[]): void { + private handleChangeSnd(value: string[]): void { this.setState({ checkedList2: value }) } - private handleChangeThd (value: string[]): void { + private handleChangeThd(value: string[]): void { this.setState({ checkedList3: value }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} diff --git a/src/pages/form/form/index.tsx b/src/pages/form/form/index.tsx index d99fa7ec5..ed54416cb 100644 --- a/src/pages/form/form/index.tsx +++ b/src/pages/form/form/index.tsx @@ -1,9 +1,8 @@ +import React from 'react' import { AtButton, AtCheckbox, AtForm, AtInput, AtToast } from 'taro-ui' import { CheckboxOption } from 'types/checkbox' - import { View } from '@tarojs/components' import Taro from '@tarojs/taro' - import DocsHeader from '../../components/doc-header' import './index.scss' @@ -16,13 +15,13 @@ interface PageFormState { [key: string]: string | boolean | CheckboxOption[] } -export default class PageForm extends Taro.Component<{}, PageFormState> { +export default class PageForm extends React.Component<{}, PageFormState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { value1: '', value2: '', @@ -32,13 +31,13 @@ export default class PageForm extends Taro.Component<{}, PageFormState> { } } - private handleChange (stateName: string, value: any): void { + private handleChange(stateName: string, value: any): void { this.setState({ [stateName]: value }) } - private handleSubmit (): void { + private handleSubmit(): void { const { value1, value2, value3 } = this.state if (!value1 || !value2) { this.setState({ @@ -48,21 +47,24 @@ export default class PageForm extends Taro.Component<{}, PageFormState> { } else { this.setState({ isOpened: true, - text: value3 && value3.length > 0 ? `${value1} / ${value2} / ${value3.join(',')}` : `${value1} / ${value2}` + text: + value3 && value3.length > 0 + ? `${value1} / ${value2} / ${value3.join(',')}` + : `${value1} / ${value2}` }) } this.closeToast() } - private closeToast (): void { + private closeToast(): void { setTimeout(() => { this.setState({ - isOpened: false, + isOpened: false }) }, 2000) } - private handleReset (): void { + private handleReset(): void { this.setState({ isOpened: true, text: `表单已被重置`, @@ -73,7 +75,7 @@ export default class PageForm extends Taro.Component<{}, PageFormState> { this.closeToast() } - public render (): JSX.Element { + public render(): JSX.Element { return ( @@ -87,8 +89,24 @@ export default class PageForm extends Taro.Component<{}, PageFormState> { onSubmit={this.handleSubmit.bind(this)} onReset={this.handleReset.bind(this)} > - - + + { /> - 提交 + + 提交 + 重置 @@ -110,7 +130,10 @@ export default class PageForm extends Taro.Component<{}, PageFormState> { - + ) } diff --git a/src/pages/form/image-picker/index.tsx b/src/pages/form/image-picker/index.tsx index cf324cc6c..70a7bd0f3 100644 --- a/src/pages/form/image-picker/index.tsx +++ b/src/pages/form/image-picker/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtImagePicker } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -24,38 +25,47 @@ interface IndexState { [key: string]: DogaImage[] } -export default class Index extends Taro.Component<{}, IndexState> { +export default class Index extends React.Component<{}, IndexState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { files1: Array.from(dogaImages), files2: Array.from(dogaImages), files3: Array.from(dogaImages), - files4: dogaImages.concat([{ - url: 'https://storage.360buyimg.com/mtd/home/36549825_887087111478302_5745542532574478336_n1543234831971.jpg' - }]) + files4: dogaImages.concat([ + { + url: + 'https://storage.360buyimg.com/mtd/home/36549825_887087111478302_5745542532574478336_n1543234831971.jpg' + } + ]) } } - private onChange (stateName: string, files: DogaImage[]): void { + private onChange(stateName: string, files: DogaImage[]): void { this.setState({ [stateName]: files }) } - private onFail (mes: string): void { - console.log(mes) + private onFail(mes: string): void { + Taro.showToast({ + title: `onFail: ${mes}`, + icon: 'none' + }) } - private onImageClick (index: number, file: DogaImage): void { - console.log(index, file) + private onImageClick(index: number, file: DogaImage): void { + Taro.showToast({ + title: `onImageClick: ${index}${file}`, + icon: 'none' + }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} diff --git a/src/pages/form/input-number/index.tsx b/src/pages/form/input-number/index.tsx index 26f0a0167..db8453deb 100644 --- a/src/pages/form/input-number/index.tsx +++ b/src/pages/form/input-number/index.tsx @@ -1,7 +1,8 @@ -import Taro from '@tarojs/taro' +import React from 'react' +import { AtInputNumber } from 'taro-ui' import { View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import { AtInputNumber } from 'taro-ui' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -9,13 +10,13 @@ interface IndexState { [key: string]: number } -export default class Index extends Taro.Component<{}, IndexState> { +export default class Index extends React.Component<{}, IndexState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { number1: 1, number2: 1, @@ -26,7 +27,11 @@ export default class Index extends Taro.Component<{}, IndexState> { } } - private handleNumberChange (stateName: string, value: number, e: CommonEvent): void { + private handleNumberChange( + stateName: string, + value: number, + e: CommonEvent + ): void { this.setState({ [stateName]: value }) @@ -34,7 +39,7 @@ export default class Index extends Taro.Component<{}, IndexState> { console.log('Event:', e) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} @@ -48,7 +53,9 @@ export default class Index extends Taro.Component<{}, IndexState> { 基础用法 - min=0, max=10, step=1 + + min=0, max=10, step=1 + { 小数 - min=0, max=10, step=0.1 + + min=0, max=10, step=0.1 + { +export default class Index extends React.Component<{}, IndexState> { public constructor() { - super(...arguments) + super(arguments) this.state = { value1: '', value2: '', diff --git a/src/pages/form/picker-view/index.tsx b/src/pages/form/picker-view/index.tsx index 557ad8495..92705a5d5 100644 --- a/src/pages/form/picker-view/index.tsx +++ b/src/pages/form/picker-view/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View, PickerView, PickerViewColumn } from '@tarojs/components' +import React from 'react' +import { PickerView, PickerViewColumn, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -16,13 +17,13 @@ interface IndexState { isAlipay: boolean } -export default class Index extends Taro.Component<{}, IndexState> { +export default class Index extends React.Component<{}, IndexState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) const date = new Date() const years: number[] = [] const months: number[] = [] @@ -51,11 +52,11 @@ export default class Index extends Taro.Component<{}, IndexState> { } } - public componentDidMount (): void { + public componentDidMount(): void { const env = Taro.getEnv() this.setState({ isWeapp: env === Taro.ENV_TYPE.WEAPP, - isAlipay: env === Taro.ENV_TYPE.ALIPAY, + isAlipay: env === Taro.ENV_TYPE.ALIPAY }) } @@ -70,8 +71,18 @@ export default class Index extends Taro.Component<{}, IndexState> { }) } - public render (): JSX.Element { - const { years, months, days, value, year, month, day, isWeapp, isAlipay } = this.state + public render(): JSX.Element { + const { + years, + months, + days, + value, + year, + month, + day, + isWeapp, + isAlipay + } = this.state return ( @@ -87,28 +98,47 @@ export default class Index extends Taro.Component<{}, IndexState> { 嵌入页面的滑动选择器 - { - isWeapp || isAlipay ? ( - - {year}年{month}月{day}日 - - - { years.map((item, idx) => {item}年) } - - - { months.map((item, idx) => {item}月) } - - - { days.map((item, idx) => {item}日) } - - + {isWeapp || isAlipay ? ( + + + {year}年{month}月{day}日 - ) : 暂时仅支持微信小程序 - } + + + {years.map((item, idx) => ( + + {item}年 + + ))} + + + {months.map((item, idx) => ( + + {item}月 + + ))} + + + {days.map((item, idx) => ( + + {item}日 + + ))} + + + + ) : ( + 暂时仅支持微信小程序 + )} - {/* E Body */} diff --git a/src/pages/form/picker/index.tsx b/src/pages/form/picker/index.tsx index 45f961644..143a956c6 100644 --- a/src/pages/form/picker/index.tsx +++ b/src/pages/form/picker/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View, Picker } from '@tarojs/components' +import React from 'react' +import { Picker, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -14,14 +15,17 @@ interface IndexState { isAlipay: boolean } -export default class Index extends Taro.Component<{}, IndexState> { +export default class Index extends React.Component<{}, IndexState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } public state: IndexState = { selector: ['中国', '美国', '巴西', '日本'], - multiSelector: [['饭', '粥', '粉'], ['猪肉', '牛肉']], + multiSelector: [ + ['饭', '粥', '粉'], + ['猪肉', '牛肉'] + ], selectorValue: 0, mulitSelectorValues: [0, 1], timeSel: '06:18', @@ -29,10 +33,10 @@ export default class Index extends Taro.Component<{}, IndexState> { isAlipay: false } - public componentDidMount (): void { + public componentDidMount(): void { const env = Taro.getEnv() this.setState({ - isAlipay: env === Taro.ENV_TYPE.ALIPAY, + isAlipay: env === Taro.ENV_TYPE.ALIPAY }) } @@ -60,7 +64,7 @@ export default class Index extends Taro.Component<{}, IndexState> { }) } - public render (): JSX.Element { + public render(): JSX.Element { const { selector, selectorValue, @@ -68,7 +72,7 @@ export default class Index extends Taro.Component<{}, IndexState> { mulitSelectorValues, timeSel, dateSel, - isAlipay, + isAlipay } = this.state return ( @@ -84,10 +88,17 @@ export default class Index extends Taro.Component<{}, IndexState> { 普通选择器 - + 国家地区 - {selector[selectorValue]} + + {selector[selectorValue]} + @@ -100,10 +111,17 @@ export default class Index extends Taro.Component<{}, IndexState> { 多列选择器 - + 请选择早餐 - {`${multiSelector[0][mulitSelectorValues[0]]} & ${multiSelector[1][mulitSelectorValues[1]]}`} + {`${ + multiSelector[0][mulitSelectorValues[0]] + } & ${multiSelector[1][mulitSelectorValues[1]]}`} @@ -116,7 +134,11 @@ export default class Index extends Taro.Component<{}, IndexState> { 时间选择器 - + 请选择时间 {timeSel} @@ -131,7 +153,11 @@ export default class Index extends Taro.Component<{}, IndexState> { 日期选择器 - + 请选择日期 {dateSel} @@ -140,7 +166,6 @@ export default class Index extends Taro.Component<{}, IndexState> { - {/* E Body */} diff --git a/src/pages/form/radio/index.tsx b/src/pages/form/radio/index.tsx index 96fb783d6..39507aaf0 100644 --- a/src/pages/form/radio/index.tsx +++ b/src/pages/form/radio/index.tsx @@ -1,8 +1,9 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtRadio } from 'taro-ui' -import DocsHeader from '../../components/doc-header' import { RadioOption } from 'types/radio' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' +import DocsHeader from '../../components/doc-header' import './index.scss' interface IndexState { @@ -14,13 +15,13 @@ interface IndexState { radioOptions3: RadioOption[] } -export default class Index extends Taro.Component<{}, IndexState> { +export default class Index extends React.Component<{}, IndexState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - - public constructor () { - super(...arguments) + + public constructor() { + super(arguments) this.state = { radioValue1: 'option1', radioValue2: 'option1', @@ -38,30 +39,35 @@ export default class Index extends Taro.Component<{}, IndexState> { radioOptions3: [ { label: '单选项一', value: 'option1', desc: '单选项描述' }, { label: '单选项二', value: 'option2' }, - { label: '单选项三禁用', value: 'option3', desc: '单选项描述', disabled: true } - ], + { + label: '单选项三禁用', + value: 'option3', + desc: '单选项描述', + disabled: true + } + ] } } - private handleRadioChange (value: string): void { + private handleRadioChange(value: string): void { this.setState({ radioValue1: value }) } - private handleRadioChangeScnd (value: string): void { + private handleRadioChangeScnd(value: string): void { this.setState({ radioValue2: value }) } - private handleRadioChangeThd (value: string): void { + private handleRadioChangeThd(value: string): void { this.setState({ radioValue3: value }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} @@ -75,7 +81,11 @@ export default class Index extends Taro.Component<{}, IndexState> { 基础用法 - + @@ -85,7 +95,11 @@ export default class Index extends Taro.Component<{}, IndexState> { 含有单项描述 - + @@ -95,7 +109,11 @@ export default class Index extends Taro.Component<{}, IndexState> { 单项禁用 - + diff --git a/src/pages/form/range/index.tsx b/src/pages/form/range/index.tsx index 4c85bfe3c..f57d4e68f 100644 --- a/src/pages/form/range/index.tsx +++ b/src/pages/form/range/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtRange } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -8,26 +9,26 @@ interface IndexState { [key: string]: [number, number] } -export default class Index extends Taro.Component<{}, IndexState> { +export default class Index extends React.Component<{}, IndexState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { value1: [50, 60], - value2: [50, 60], + value2: [50, 60] } } - private handleChange (stateName: string, value: [number, number]): void { + private handleChange(stateName: string, value: [number, number]): void { this.setState({ [stateName]: value }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} @@ -69,10 +70,7 @@ export default class Index extends Taro.Component<{}, IndexState> { 禁止状态 - + diff --git a/src/pages/form/rate/index.tsx b/src/pages/form/rate/index.tsx index 390e0917b..53a2aef6d 100644 --- a/src/pages/form/rate/index.tsx +++ b/src/pages/form/rate/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtRate } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -8,13 +9,13 @@ interface IndexState { [key: string]: number } -export default class Index extends Taro.Component<{}, IndexState> { +export default class Index extends React.Component<{}, IndexState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { rateValue1: 3, rateValue2: 3, @@ -23,13 +24,13 @@ export default class Index extends Taro.Component<{}, IndexState> { } } - private handleRateChange (stateName: string, value: number): void { + private handleRateChange(stateName: string, value: number): void { this.setState({ [stateName]: value }) } - public render (): JSX.Element { + public render(): JSX.Element { const { rateValue1, rateValue2, rateValue3, rateValue4 } = this.state return ( @@ -44,7 +45,10 @@ export default class Index extends Taro.Component<{}, IndexState> { 基础用法 - + @@ -54,7 +58,11 @@ export default class Index extends Taro.Component<{}, IndexState> { 自定义尺寸 - + @@ -64,7 +72,11 @@ export default class Index extends Taro.Component<{}, IndexState> { 自定义评分数 - + @@ -74,7 +86,11 @@ export default class Index extends Taro.Component<{}, IndexState> { 自定义星星间隔 - + diff --git a/src/pages/form/search-bar/index.tsx b/src/pages/form/search-bar/index.tsx index 9d6df6ec8..9697bac4b 100644 --- a/src/pages/form/search-bar/index.tsx +++ b/src/pages/form/search-bar/index.tsx @@ -1,21 +1,21 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtSearchBar } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' - import './index.scss' interface IndexState { [key: string]: string } -export default class Index extends Taro.Component<{}, IndexState> { +export default class Index extends React.Component<{}, IndexState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { value1: '', value2: '', @@ -24,13 +24,13 @@ export default class Index extends Taro.Component<{}, IndexState> { } } - private onChange (stateName: string, value: string): void { + private onChange(stateName: string, value: string): void { this.setState({ [stateName]: value }) } - private onActionClick (): void { + private onActionClick(): void { Taro.showToast({ title: '开始搜索', icon: 'success', @@ -38,7 +38,7 @@ export default class Index extends Taro.Component<{}, IndexState> { }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} diff --git a/src/pages/form/slider/index.tsx b/src/pages/form/slider/index.tsx index ac4bff6e2..b199f85f4 100644 --- a/src/pages/form/slider/index.tsx +++ b/src/pages/form/slider/index.tsx @@ -1,15 +1,16 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtSlider } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' -export default class PageSlider extends Taro.Component { +export default class PageSlider extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} @@ -45,8 +46,16 @@ export default class PageSlider extends Taro.Component { 设置最大/最小值 - step=1, min=50, max=200 - + + step=1, min=50, max=200 + + @@ -57,7 +66,14 @@ export default class PageSlider extends Taro.Component { step=1, blockSize=24 - + @@ -72,7 +88,6 @@ export default class PageSlider extends Taro.Component { - {/* E Body */} diff --git a/src/pages/form/switch/index.tsx b/src/pages/form/switch/index.tsx index cf6c6e8cc..23d8f9843 100644 --- a/src/pages/form/switch/index.tsx +++ b/src/pages/form/switch/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' +import React from 'react' +import { AtForm, AtSwitch } from 'taro-ui' import { View } from '@tarojs/components' -import { AtSwitch, AtForm } from 'taro-ui' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -8,15 +9,15 @@ interface IndexState { switchValue: boolean } -export default class Index extends Taro.Component<{}, IndexState> { +export default class Index extends React.Component<{}, IndexState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { - switchValue: true, + switchValue: true } } @@ -26,7 +27,7 @@ export default class Index extends Taro.Component<{}, IndexState> { }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} @@ -41,7 +42,11 @@ export default class Index extends Taro.Component<{}, IndexState> { - + diff --git a/src/pages/form/textarea/index.tsx b/src/pages/form/textarea/index.tsx index df4e66897..e66bf3585 100644 --- a/src/pages/form/textarea/index.tsx +++ b/src/pages/form/textarea/index.tsx @@ -1,3 +1,4 @@ +import React from 'react' import { AtTextarea } from 'taro-ui' import { View } from '@tarojs/components' import Taro from '@tarojs/taro' @@ -8,9 +9,9 @@ interface IndexState { [key: string]: string } -export default class Index extends Taro.Component<{}, IndexState> { +export default class Index extends React.Component<{}, IndexState> { public constructor() { - super(...arguments) + super(arguments) this.state = { value1: '', value2: '', diff --git a/src/pages/index/index.config.js b/src/pages/index/index.config.js new file mode 100644 index 000000000..799bc7214 --- /dev/null +++ b/src/pages/index/index.config.js @@ -0,0 +1,3 @@ +export default { + navigationBarTitleText: 'Taro UI' +} diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 2274196c2..a34126503 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -1,16 +1,14 @@ -import { Image, Text, View } from '@tarojs/components'; -import { CommonEvent } from '@tarojs/components/types/common'; -import Taro, { ShareAppMessageReturn } from '@tarojs/taro'; - -import iconAction from '../../assets/images/icon-list-action.png'; -import iconBasic from '../../assets/images/icon-list-basic.png'; -import iconForm from '../../assets/images/icon-list-form.png'; -import iconHOC from '../../assets/images/icon-list-hoc.png'; -import iconLayout from '../../assets/images/icon-list-layout.png'; -import iconNavigation from '../../assets/images/icon-list-navigation.png'; -import iconView from '../../assets/images/icon-list-view.png'; -import logoImg from '../../assets/images/logo_taro.png'; - +import React from 'react' +import { Image, Text, View } from '@tarojs/components' +import Taro, { ShareAppMessageReturn } from '@tarojs/taro' +import iconAction from '../../assets/images/icon-list-action.png' +import iconBasic from '../../assets/images/icon-list-basic.png' +import iconForm from '../../assets/images/icon-list-form.png' +import iconHOC from '../../assets/images/icon-list-hoc.png' +import iconLayout from '../../assets/images/icon-list-layout.png' +import iconNavigation from '../../assets/images/icon-list-navigation.png' +import iconView from '../../assets/images/icon-list-view.png' +import logoImg from '../../assets/images/logo_taro.png' import './index.scss' interface IndexState { @@ -23,13 +21,13 @@ interface IndexState { }[] } -export default class Index extends Taro.Component<{}, IndexState> { +export default class Index extends React.Component<{}, IndexState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { list: [ @@ -68,7 +66,8 @@ export default class Index extends Taro.Component<{}, IndexState> { title: '导航', content: '包含标签栏、导航栏、分段器等', icon: iconNavigation - }, { + }, + { id: 'Advanced', title: '高阶组件', content: '包含日历等', @@ -78,7 +77,7 @@ export default class Index extends Taro.Component<{}, IndexState> { } } - public onShareAppMessage (): ShareAppMessageReturn { + public onShareAppMessage(): ShareAppMessageReturn { return { title: 'Taro UI', path: '/pages/index/index', @@ -86,14 +85,13 @@ export default class Index extends Taro.Component<{}, IndexState> { } } - private gotoPanel = (e: CommonEvent): void => { - const { id } = e.currentTarget.dataset + private gotoPanel = (id: string): void => { Taro.navigateTo({ url: `/pages/panel/index?id=${id.toLowerCase()}` }) } - public render (): JSX.Element { + public render(): JSX.Element { const { list } = this.state return ( @@ -110,7 +108,7 @@ export default class Index extends Taro.Component<{}, IndexState> { data-id={item.id} data-name={item.title} data-list={item.subpages} - onClick={this.gotoPanel} + onTap={this.gotoPanel(item.id)} > diff --git a/src/pages/layout/accordion/index.tsx b/src/pages/layout/accordion/index.tsx index 472c43cbf..5ba9bcc45 100644 --- a/src/pages/layout/accordion/index.tsx +++ b/src/pages/layout/accordion/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtAccordion, AtList, AtListItem } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -8,28 +9,28 @@ interface CardPageState { [key: string]: boolean } -export default class CardPage extends Taro.Component<{}, CardPageState> { +export default class CardPage extends React.Component<{}, CardPageState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { value1: false, value2: true, value3: false, - value4: false, + value4: false } } - private onClick (stateName: string, value: boolean): void { + private onClick(stateName: string, value: boolean): void { this.setState({ [stateName]: value }) } - public render (): JSX.Element { + public render(): JSX.Element { const { value1, value2, value3, value4 } = this.state return ( diff --git a/src/pages/layout/card/index.tsx b/src/pages/layout/card/index.tsx index 3b3bf5051..7994445e0 100644 --- a/src/pages/layout/card/index.tsx +++ b/src/pages/layout/card/index.tsx @@ -1,19 +1,23 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtCard, AtIcon } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' -export default class CardPage extends Taro.Component { +export default class CardPage extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } private handleClick = (): void => { - console.log('Card handleClick') + Taro.showToast({ + title: 'Card handleClick', + icon: 'none' + }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( @@ -65,7 +69,13 @@ export default class CardPage extends Taro.Component { + } > 这也是内容区 可以随意定义功能 @@ -96,7 +106,11 @@ export default class CardPage extends Taro.Component { diff --git a/src/pages/layout/flex/index.tsx b/src/pages/layout/flex/index.tsx index b5e991927..4f1a5be47 100644 --- a/src/pages/layout/flex/index.tsx +++ b/src/pages/layout/flex/index.tsx @@ -1,15 +1,16 @@ -import Taro from '@tarojs/taro' +import React from 'react' import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import '../../../style/components/flex.scss' import './index.scss' -export default class FlexPage extends Taro.Component { +export default class FlexPage extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public render (): JSX.Element { + public render(): JSX.Element { return ( diff --git a/src/pages/layout/float-layout/index.tsx b/src/pages/layout/float-layout/index.tsx index 9a4330778..0f258a3af 100644 --- a/src/pages/layout/float-layout/index.tsx +++ b/src/pages/layout/float-layout/index.tsx @@ -1,23 +1,25 @@ -import { AtButton, AtFloatLayout } from 'taro-ui'; - -import { View } from '@tarojs/components'; -import { CommonEvent } from '@tarojs/components/types/common'; -import Taro from '@tarojs/taro'; - -import DocsHeader from '../../components/doc-header'; +import React from 'react' +import { AtButton, AtFloatLayout } from 'taro-ui' +import { View } from '@tarojs/components' +import { CommonEvent } from '@tarojs/components/types/common' +import Taro from '@tarojs/taro' +import DocsHeader from '../../components/doc-header' import './index.scss' interface FloatLayoutPageState { [key: string]: boolean } -export default class FloatLayoutPage extends Taro.Component<{}, FloatLayoutPageState> { +export default class FloatLayoutPage extends React.Component< + {}, + FloatLayoutPageState +> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { isOpened1: false, isOpened2: false, @@ -26,15 +28,24 @@ export default class FloatLayoutPage extends Taro.Component<{}, FloatLayoutPageS } private onScroll = (event: CommonEvent): void => { - console.log('onScroll', event) + Taro.showToast({ + title: `onScroll: ${event}`, + icon: 'none' + }) } - private onScrollToLower = (event: CommonEvent) => { - console.log('onScrollToLower', event) + private onScrollToLower = (event: CommonEvent): void => { + Taro.showToast({ + title: `onScrollToLower: ${event}`, + icon: 'none' + }) } private onScrollToUpper = (event: CommonEvent): void => { - console.log('onScrollToUpper', event) + Taro.showToast({ + title: `onScrollToUpper: ${event}`, + icon: 'none' + }) } private handleClick = (type: string): void => { @@ -44,13 +55,16 @@ export default class FloatLayoutPage extends Taro.Component<{}, FloatLayoutPageS } private handleClose = (type: string): void => { - console.log('handleClose') this.setState({ [`isOpened${type}`]: false }) + Taro.showToast({ + title: `handleClose: ${type}`, + icon: 'none' + }) } - public render (): JSX.Element { + public render(): JSX.Element { const { isOpened1, isOpened2, isOpened3 } = this.state return ( diff --git a/src/pages/layout/grid/index.tsx b/src/pages/layout/grid/index.tsx index bacfa09c2..eafc87dcf 100644 --- a/src/pages/layout/grid/index.tsx +++ b/src/pages/layout/grid/index.tsx @@ -1,3 +1,4 @@ +import React from 'react' import { AtGrid } from 'taro-ui' import { AtGridItem } from 'types/grid' import { View } from '@tarojs/components' @@ -9,9 +10,9 @@ interface GridPageState { data: AtGridItem[] } -export default class GridPage extends Taro.Component<{}, GridPageState> { +export default class GridPage extends React.Component<{}, GridPageState> { public constructor() { - super(...arguments) + super(arguments) this.state = { data: [ { diff --git a/src/pages/layout/list/index.tsx b/src/pages/layout/list/index.tsx index 2ad0f2762..aa9336cc0 100644 --- a/src/pages/layout/list/index.tsx +++ b/src/pages/layout/list/index.tsx @@ -1,26 +1,31 @@ -import { AtList, AtListItem } from 'taro-ui'; - -import { View } from '@tarojs/components'; -import { CommonEvent } from '@tarojs/components/types/common'; -import Taro, { Component } from '@tarojs/taro'; - -import DocsHeader from '../../components/doc-header'; +import React from 'react' +import { AtList, AtListItem } from 'taro-ui' +import { View } from '@tarojs/components' +import { CommonEvent } from '@tarojs/components/types/common' +import Taro from '@tarojs/taro' +import DocsHeader from '../../components/doc-header' import './index.scss' -export default class ListPage extends Component { +export default class ListPage extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } private handleChange = (e: CommonEvent): void => { - console.log('Change Switch', e) + Taro.showToast({ + title: `Change Switch: ${e}`, + icon: 'none' + }) } private handleClick = (e: CommonEvent): void => { - console.log('Click Item', e) + Taro.showToast({ + title: `Click Item: ${e}`, + icon: 'none' + }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( @@ -102,7 +107,7 @@ export default class ListPage extends Component { iconInfo={{ size: 25, color: '#78A4FA', - value: 'calendar', + value: 'calendar' }} /> diff --git a/src/pages/navigation/drawer/index.tsx b/src/pages/navigation/drawer/index.tsx index ec88e18e6..91b653add 100644 --- a/src/pages/navigation/drawer/index.tsx +++ b/src/pages/navigation/drawer/index.tsx @@ -1,7 +1,8 @@ -import Taro from '@tarojs/taro' import classNames from 'classnames' +import React from 'react' +import { AtBadge, AtButton, AtDrawer, AtIcon } from 'taro-ui' import { View } from '@tarojs/components' -import { AtDrawer, AtButton, AtIcon, AtBadge } from 'taro-ui' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -13,41 +14,41 @@ interface DrawerPageState { icons: string[] } -export default class DrawerPage extends Taro.Component<{}, DrawerPageState> { +export default class DrawerPage extends React.Component<{}, DrawerPageState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { leftDrawerShow: false, rightDrawerShow: false, childrenDrawerShow: false, childrenItem: ['首页', '可自定义结构', '或自定义样式', '消息', '个人'], - icons: ['home', '', '', 'message', 'user'], + icons: ['home', '', '', 'message', 'user'] } } - private leftDrawerClick (): void { + private leftDrawerClick(): void { this.setState({ - leftDrawerShow: !this.state.leftDrawerShow, + leftDrawerShow: !this.state.leftDrawerShow }) } - private rightDrawerClick (): void { + private rightDrawerClick(): void { this.setState({ - rightDrawerShow: !this.state.rightDrawerShow, + rightDrawerShow: !this.state.rightDrawerShow }) } - private childrenDrawerClick (): void { + private childrenDrawerClick(): void { this.setState({ - childrenDrawerShow: !this.state.childrenDrawerShow, + childrenDrawerShow: !this.state.childrenDrawerShow }) } - private onItemClick (index: number): void { + private onItemClick(index: number): void { const ENV = Taro.getEnv() let content: string if (typeof index !== 'number') { @@ -59,15 +60,15 @@ export default class DrawerPage extends Taro.Component<{}, DrawerPageState> { else content && alert(content) } - private onClose (): void { + private onClose(): void { this.setState({ leftDrawerShow: false, rightDrawerShow: false, - childrenDrawerShow: false, + childrenDrawerShow: false }) } - public render (): JSX.Element { + public render(): JSX.Element { const { icons } = this.state return ( @@ -78,9 +79,16 @@ export default class DrawerPage extends Taro.Component<{}, DrawerPageState> { 左边滑出 - 显示 Drawer - - + + 显示 Drawer + + @@ -89,9 +97,17 @@ export default class DrawerPage extends Taro.Component<{}, DrawerPageState> { 右边滑出 - 显示 Drawer - - + + 显示 Drawer + + @@ -100,24 +116,39 @@ export default class DrawerPage extends Taro.Component<{}, DrawerPageState> { 自定义内容 - 显示 Drawer - - { - this.state.childrenItem.map((item, index) => + 显示 Drawer + + + {this.state.childrenItem.map((item, index) => ( + {item} - {index !== 3 && icons[index] && } - {index === 3 && icons[index] && } - ) - } + {index !== 3 && icons[index] && ( + + )} + {index === 3 && icons[index] && ( + + + + )} + + ))} - ) } diff --git a/src/pages/navigation/indexes/index.tsx b/src/pages/navigation/indexes/index.tsx index 5922e9531..479158796 100644 --- a/src/pages/navigation/indexes/index.tsx +++ b/src/pages/navigation/indexes/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtIndexes, AtSearchBar } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import mockData, { CityItem } from './mock-data' import './index.scss' @@ -8,32 +9,38 @@ interface IndexesState { value: string } -export default class Index extends Taro.Component<{}, IndexesState> { +export default class Index extends React.Component<{}, IndexesState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { value: '' } } - public componentDidMount (): void { - console.log(this.scrollIntoView) - // this.scrollIntoView && this.scrollIntoView('top', 0) - } + // public componentDidMount(): void { + // console.log(this.scrollIntoView) + // // this.scrollIntoView && this.scrollIntoView('top', 0) + // } - private scrollIntoView (key: string): void { - console.log('不需要实际实现', key) + private scrollIntoView(key: string): void { + Taro.showToast({ + title: `scrollIntoView: ${key}`, + icon: 'none' + }) } - - private onClick (item: CityItem): void { - console.log(item) + + private onClick(item: CityItem): void { + Taro.showToast({ + title: `onClick: ${item}`, + icon: 'none' + }) } - private handleActionClick (): void { + private handleActionClick(): void { if (!this.state.value) { return } @@ -43,13 +50,13 @@ export default class Index extends Taro.Component<{}, IndexesState> { this.scrollIntoView && this.scrollIntoView(this.state.value.toUpperCase()) } - private handleChange (value: string): void { + private handleChange(value: string): void { this.setState({ value }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* 基础用法 */} @@ -58,11 +65,18 @@ export default class Index extends Taro.Component<{}, IndexesState> { list={mockData} topKey='Top' onClick={this.onClick.bind(this)} - onScrollIntoView={fn => { this.scrollIntoView = fn }} + onScrollIntoView={(fn: any): void => { + this.scrollIntoView = fn + }} > 用户自定义内容 - + diff --git a/src/pages/navigation/indexes/mock-data.ts b/src/pages/navigation/indexes/mock-data.ts index 0a7b5d9bd..44b863252 100644 --- a/src/pages/navigation/indexes/mock-data.ts +++ b/src/pages/navigation/indexes/mock-data.ts @@ -15,1279 +15,1283 @@ const city: CityObject[] = [ key: 'A', items: [ { - 'name': ' 阿坝 ', - 'key': 'A' + name: ' 阿坝 ', + key: 'A' }, { - 'name': ' 阿拉善 ', - 'key': 'A' + name: ' 阿拉善 ', + key: 'A' }, { - 'name': ' 阿里 ', - 'key': 'A' + name: ' 阿里 ', + key: 'A' }, { - 'name': ' 安康 ', - 'key': 'A' + name: ' 安康 ', + key: 'A' }, { - 'name': ' 安庆 ', - 'key': 'A' + name: ' 安庆 ', + key: 'A' }, { - 'name': ' 鞍山 ', - 'key': 'A' + name: ' 鞍山 ', + key: 'A' }, { - 'name': ' 安顺 ', - 'key': 'A' + name: ' 安顺 ', + key: 'A' }, { - 'name': ' 安阳 ', - 'key': 'A' + name: ' 安阳 ', + key: 'A' }, { - 'name': ' 澳门 ', - 'key': 'A' + name: ' 澳门 ', + key: 'A' } ] - }, { + }, + { title: 'B', key: 'B', items: [ { - 'name': ' 北京 ', - 'key': 'B' + name: ' 北京 ', + key: 'B' }, { - 'name': ' 白银 ', - 'key': 'B' + name: ' 白银 ', + key: 'B' }, { - 'name': ' 保定 ', - 'key': 'B' + name: ' 保定 ', + key: 'B' }, { - 'name': ' 宝鸡 ', - 'key': 'B' + name: ' 宝鸡 ', + key: 'B' }, { - 'name': ' 保山 ', - 'key': 'B' + name: ' 保山 ', + key: 'B' }, { - 'name': ' 包头 ', - 'key': 'B' + name: ' 包头 ', + key: 'B' }, { - 'name': ' 巴中 ', - 'key': 'B' + name: ' 巴中 ', + key: 'B' }, { - 'name': ' 北海 ', - 'key': 'B' + name: ' 北海 ', + key: 'B' }, { - 'name': ' 蚌埠 ', - 'key': 'B' + name: ' 蚌埠 ', + key: 'B' }, { - 'name': ' 本溪 ', - 'key': 'B' + name: ' 本溪 ', + key: 'B' }, { - 'name': ' 毕节 ', - 'key': 'B' + name: ' 毕节 ', + key: 'B' }, { - 'name': ' 滨州 ', - 'key': 'B' + name: ' 滨州 ', + key: 'B' }, { - 'name': ' 百色 ', - 'key': 'B' + name: ' 百色 ', + key: 'B' }, { - 'name': ' 亳州 ', - 'key': 'B' + name: ' 亳州 ', + key: 'B' } ] - }, { + }, + { title: 'C', key: 'C', items: [ { - 'name': ' 重庆 ', - 'key': 'C' + name: ' 重庆 ', + key: 'C' }, { - 'name': ' 成都 ', - 'key': 'C' + name: ' 成都 ', + key: 'C' }, { - 'name': ' 长沙 ', - 'key': 'C' + name: ' 长沙 ', + key: 'C' }, { - 'name': ' 长春 ', - 'key': 'C' + name: ' 长春 ', + key: 'C' }, { - 'name': ' 沧州 ', - 'key': 'C' + name: ' 沧州 ', + key: 'C' }, { - 'name': ' 常德 ', - 'key': 'C' + name: ' 常德 ', + key: 'C' }, { - 'name': ' 昌都 ', - 'key': 'C' + name: ' 昌都 ', + key: 'C' }, { - 'name': ' 长治 ', - 'key': 'C' + name: ' 长治 ', + key: 'C' }, { - 'name': ' 常州 ', - 'key': 'C' + name: ' 常州 ', + key: 'C' }, { - 'name': ' 巢湖 ', - 'key': 'C' + name: ' 巢湖 ', + key: 'C' }, { - 'name': ' 潮州 ', - 'key': 'C' + name: ' 潮州 ', + key: 'C' }, { - 'name': ' 承德 ', - 'key': 'C' + name: ' 承德 ', + key: 'C' }, { - 'name': ' 郴州 ', - 'key': 'C' + name: ' 郴州 ', + key: 'C' }, { - 'name': ' 赤峰 ', - 'key': 'C' + name: ' 赤峰 ', + key: 'C' }, { - 'name': ' 池州 ', - 'key': 'C' + name: ' 池州 ', + key: 'C' }, { - 'name': ' 崇左 ', - 'key': 'C' + name: ' 崇左 ', + key: 'C' }, { - 'name': ' 楚雄 ', - 'key': 'C' + name: ' 楚雄 ', + key: 'C' }, { - 'name': ' 滁州 ', - 'key': 'C' + name: ' 滁州 ', + key: 'C' }, { - 'name': ' 朝阳 ', - 'key': 'C' + name: ' 朝阳 ', + key: 'C' } ] - }, { + }, + { title: 'D', key: 'D', items: [ { - 'name': ' 大连 ', - 'key': 'D' + name: ' 大连 ', + key: 'D' }, { - 'name': ' 东莞 ', - 'key': 'D' + name: ' 东莞 ', + key: 'D' }, { - 'name': ' 大理 ', - 'key': 'D' + name: ' 大理 ', + key: 'D' }, { - 'name': ' 丹东 ', - 'key': 'D' + name: ' 丹东 ', + key: 'D' }, { - 'name': ' 大庆 ', - 'key': 'D' + name: ' 大庆 ', + key: 'D' }, { - 'name': ' 大同 ', - 'key': 'D' + name: ' 大同 ', + key: 'D' }, { - 'name': ' 大兴安岭 ', - 'key': 'D' + name: ' 大兴安岭 ', + key: 'D' }, { - 'name': ' 德宏 ', - 'key': 'D' + name: ' 德宏 ', + key: 'D' }, { - 'name': ' 德阳 ', - 'key': 'D' + name: ' 德阳 ', + key: 'D' }, { - 'name': ' 德州 ', - 'key': 'D' + name: ' 德州 ', + key: 'D' }, { - 'name': ' 定西 ', - 'key': 'D' + name: ' 定西 ', + key: 'D' }, { - 'name': ' 迪庆 ', - 'key': 'D' + name: ' 迪庆 ', + key: 'D' }, { - 'name': ' 东营 ', - 'key': 'D' + name: ' 东营 ', + key: 'D' } - ] - }, { + }, + { title: 'E', key: 'E', items: [ { - 'name': ' 鄂尔多斯 ', - 'key': 'E' + name: ' 鄂尔多斯 ', + key: 'E' }, { - 'name': ' 恩施 ', - 'key': 'E' + name: ' 恩施 ', + key: 'E' }, { - 'name': ' 鄂州 ', - 'key': 'E' + name: ' 鄂州 ', + key: 'E' } ] - }, { + }, + { title: 'F', key: 'F', items: [ { - 'name': ' 福州 ', - 'key': 'F' + name: ' 福州 ', + key: 'F' }, { - 'name': ' 防城港 ', - 'key': 'F' + name: ' 防城港 ', + key: 'F' }, { - 'name': ' 佛山 ', - 'key': 'F' + name: ' 佛山 ', + key: 'F' }, { - 'name': ' 抚顺 ', - 'key': 'F' + name: ' 抚顺 ', + key: 'F' }, { - 'name': ' 抚州 ', - 'key': 'F' + name: ' 抚州 ', + key: 'F' }, { - 'name': ' 阜新 ', - 'key': 'F' + name: ' 阜新 ', + key: 'F' }, { - 'name': ' 阜阳 ', - 'key': 'F' + name: ' 阜阳 ', + key: 'F' } ] - }, { + }, + { title: 'G', key: 'G', items: [ { - 'name': ' 广州 ', - 'key': 'G' + name: ' 广州 ', + key: 'G' }, { - 'name': ' 赣州 ', - 'key': 'G' + name: ' 赣州 ', + key: 'G' }, { - 'name': ' 桂林 ', - 'key': 'G' + name: ' 桂林 ', + key: 'G' }, { - 'name': ' 贵阳 ', - 'key': 'G' + name: ' 贵阳 ', + key: 'G' }, { - 'name': ' 甘南 ', - 'key': 'G' + name: ' 甘南 ', + key: 'G' }, { - 'name': ' 甘孜 ', - 'key': 'G' + name: ' 甘孜 ', + key: 'G' }, { - 'name': ' 广安 ', - 'key': 'G' + name: ' 广安 ', + key: 'G' }, { - 'name': ' 广元 ', - 'key': 'G' + name: ' 广元 ', + key: 'G' }, { - 'name': ' 果洛 ', - 'key': 'G' + name: ' 果洛 ', + key: 'G' }, { - 'name': ' 贵港 ', - 'key': 'G' + name: ' 贵港 ', + key: 'G' } - ] - }, { - + }, + { title: 'H', key: 'H', items: [ { - 'name': ' 杭州 ', - 'key': 'H' + name: ' 杭州 ', + key: 'H' }, { - 'name': ' 哈尔滨 ', - 'key': 'H' + name: ' 哈尔滨 ', + key: 'H' }, { - 'name': ' 合肥 ', - 'key': 'H' + name: ' 合肥 ', + key: 'H' }, { - 'name': ' 海口 ', - 'key': 'H' + name: ' 海口 ', + key: 'H' }, { - 'name': ' 海东 ', - 'key': 'H' + name: ' 海东 ', + key: 'H' }, { - 'name': ' 海北 ', - 'key': 'H' + name: ' 海北 ', + key: 'H' }, { - 'name': ' 海南 ', - 'key': 'H' + name: ' 海南 ', + key: 'H' }, { - 'name': ' 海西 ', - 'key': 'H' + name: ' 海西 ', + key: 'H' }, { - 'name': ' 邯郸 ', - 'key': 'H' + name: ' 邯郸 ', + key: 'H' }, { - 'name': ' 汉中 ', - 'key': 'H' + name: ' 汉中 ', + key: 'H' }, { - 'name': ' 鹤壁 ', - 'key': 'H' + name: ' 鹤壁 ', + key: 'H' }, { - 'name': ' 河池 ', - 'key': 'H' + name: ' 河池 ', + key: 'H' }, { - 'name': ' 鹤岗 ', - 'key': 'H' + name: ' 鹤岗 ', + key: 'H' }, { - 'name': ' 黑河 ', - 'key': 'H' + name: ' 黑河 ', + key: 'H' }, { - 'name': ' 衡水 ', - 'key': 'H' + name: ' 衡水 ', + key: 'H' }, { - 'name': ' 衡阳 ', - 'key': 'H' + name: ' 衡阳 ', + key: 'H' }, { - 'name': ' 河源 ', - 'key': 'H' + name: ' 河源 ', + key: 'H' }, { - 'name': ' 贺州 ', - 'key': 'H' + name: ' 贺州 ', + key: 'H' }, { - 'name': ' 红河 ', - 'key': 'H' + name: ' 红河 ', + key: 'H' }, { - 'name': ' 淮安 ', - 'key': 'H' + name: ' 淮安 ', + key: 'H' }, { - 'name': ' 淮北 ', - 'key': 'H' + name: ' 淮北 ', + key: 'H' }, { - 'name': ' 怀化 ', - 'key': 'H' + name: ' 怀化 ', + key: 'H' }, { - 'name': ' 淮南 ', - 'key': 'H' + name: ' 淮南 ', + key: 'H' }, { - 'name': ' 黄冈 ', - 'key': 'H' + name: ' 黄冈 ', + key: 'H' }, { - 'name': ' 黄南 ', - 'key': 'H' + name: ' 黄南 ', + key: 'H' }, { - 'name': ' 黄山 ', - 'key': 'H' + name: ' 黄山 ', + key: 'H' }, { - 'name': ' 黄石 ', - 'key': 'H' + name: ' 黄石 ', + key: 'H' }, { - 'name': ' 惠州 ', - 'key': 'H' + name: ' 惠州 ', + key: 'H' }, { - 'name': ' 葫芦岛 ', - 'key': 'H' + name: ' 葫芦岛 ', + key: 'H' }, { - 'name': ' 呼伦贝尔 ', - 'key': 'H' + name: ' 呼伦贝尔 ', + key: 'H' }, { - 'name': ' 湖州 ', - 'key': 'H' + name: ' 湖州 ', + key: 'H' }, { - 'name': ' 菏泽 ', - 'key': 'H' + name: ' 菏泽 ', + key: 'H' } - ] - }, { + }, + { title: 'J', key: 'J', items: [ - { - 'name': ' 济南 ', - 'key': 'J' + name: ' 济南 ', + key: 'J' }, { - 'name': ' 佳木斯 ', - 'key': 'J' + name: ' 佳木斯 ', + key: 'J' }, { - 'name': ' 吉安 ', - 'key': 'J' + name: ' 吉安 ', + key: 'J' }, { - 'name': ' 江门 ', - 'key': 'J' + name: ' 江门 ', + key: 'J' }, { - 'name': ' 焦作 ', - 'key': 'J' + name: ' 焦作 ', + key: 'J' }, { - 'name': ' 嘉兴 ', - 'key': 'J' + name: ' 嘉兴 ', + key: 'J' } ] - }, { - + }, + { title: 'L', key: 'L', items: [ { - 'name': ' 兰州 ', - 'key': 'L' + name: ' 兰州 ', + key: 'L' }, { - 'name': ' 拉萨 ', - 'key': 'L' + name: ' 拉萨 ', + key: 'L' }, { - 'name': ' 来宾 ', - 'key': 'L' + name: ' 来宾 ', + key: 'L' }, { - 'name': ' 莱芜 ', - 'key': 'L' + name: ' 莱芜 ', + key: 'L' }, { - 'name': ' 廊坊 ', - 'key': 'L' + name: ' 廊坊 ', + key: 'L' }, { - 'name': ' 乐山 ', - 'key': 'L' + name: ' 乐山 ', + key: 'L' }, { - 'name': ' 凉山 ', - 'key': 'L' + name: ' 凉山 ', + key: 'L' } ] - }, { - + }, + { title: 'M', key: 'M', items: [ { - 'name': ' 马鞍山 ', - 'key': 'M' + name: ' 马鞍山 ', + key: 'M' }, { - 'name': ' 茂名 ', - 'key': 'M' + name: ' 茂名 ', + key: 'M' }, { - 'name': ' 眉山 ', - 'key': 'M' + name: ' 眉山 ', + key: 'M' }, { - 'name': ' 梅州 ', - 'key': 'M' + name: ' 梅州 ', + key: 'M' }, { - 'name': ' 绵阳 ', - 'key': 'M' + name: ' 绵阳 ', + key: 'M' }, { - 'name': ' 牡丹江 ', - 'key': 'M' + name: ' 牡丹江 ', + key: 'M' } ] - }, { + }, + { title: 'N', key: 'N', items: [ { - 'name': ' 南京 ', - 'key': 'N' + name: ' 南京 ', + key: 'N' }, { - 'name': ' 南昌 ', - 'key': 'N' + name: ' 南昌 ', + key: 'N' }, { - 'name': ' 南宁 ', - 'key': 'N' + name: ' 南宁 ', + key: 'N' }, { - 'name': ' 南充 ', - 'key': 'N' + name: ' 南充 ', + key: 'N' }, { - 'name': ' 南平 ', - 'key': 'N' + name: ' 南平 ', + key: 'N' }, { - 'name': ' 南通 ', - 'key': 'N' + name: ' 南通 ', + key: 'N' }, { - 'name': ' 南阳 ', - 'key': 'N' + name: ' 南阳 ', + key: 'N' }, { - 'name': ' 那曲 ', - 'key': 'N' + name: ' 那曲 ', + key: 'N' }, { - 'name': ' 内江 ', - 'key': 'N' + name: ' 内江 ', + key: 'N' }, { - 'name': ' 宁德 ', - 'key': 'N' + name: ' 宁德 ', + key: 'N' }, { - 'name': ' 怒江 ', - 'key': 'N' + name: ' 怒江 ', + key: 'N' } ] - }, { + }, + { title: 'P', key: 'P', items: [ { - 'name': ' 盘锦 ', - 'key': 'P' + name: ' 盘锦 ', + key: 'P' }, { - 'name': ' 攀枝花 ', - 'key': 'P' + name: ' 攀枝花 ', + key: 'P' }, { - 'name': ' 平顶山 ', - 'key': 'P' + name: ' 平顶山 ', + key: 'P' }, { - 'name': ' 平凉 ', - 'key': 'P' + name: ' 平凉 ', + key: 'P' }, { - 'name': ' 萍乡 ', - 'key': 'P' + name: ' 萍乡 ', + key: 'P' }, { - 'name': ' 莆田 ', - 'key': 'P' + name: ' 莆田 ', + key: 'P' }, { - 'name': ' 濮阳 ', - 'key': 'P' + name: ' 濮阳 ', + key: 'P' } ] - }, { + }, + { title: 'Q', key: 'Q', items: [ - { - 'name': ' 青岛 ', - 'key': 'Q' + name: ' 青岛 ', + key: 'Q' }, { - 'name': ' 黔东南 ', - 'key': 'Q' + name: ' 黔东南 ', + key: 'Q' }, { - 'name': ' 黔南 ', - 'key': 'Q' + name: ' 黔南 ', + key: 'Q' }, { - 'name': ' 黔西南 ', - 'key': 'Q' + name: ' 黔西南 ', + key: 'Q' }, { - 'name': ' 庆阳 ', - 'key': 'Q' + name: ' 庆阳 ', + key: 'Q' }, { - 'name': ' 清远 ', - 'key': 'Q' + name: ' 清远 ', + key: 'Q' }, { - 'name': ' 秦皇岛 ', - 'key': 'Q' + name: ' 秦皇岛 ', + key: 'Q' } ] - }, { - + }, + { title: 'R', key: 'R', items: [ { - 'name': ' 日喀则 ', - 'key': 'R' + name: ' 日喀则 ', + key: 'R' }, { - 'name': ' 日照 ', - 'key': 'R' + name: ' 日照 ', + key: 'R' } ] - }, { - + }, + { title: 'S', key: 'S', items: [ { - 'name': ' 上海 ', - 'key': 'S' + name: ' 上海 ', + key: 'S' }, { - 'name': ' 深圳 ', - 'key': 'S' + name: ' 深圳 ', + key: 'S' }, { - 'name': ' 苏州 ', - 'key': 'S' + name: ' 苏州 ', + key: 'S' }, { - 'name': ' 沈阳 ', - 'key': 'S' + name: ' 沈阳 ', + key: 'S' }, { - 'name': ' 石家庄 ', - 'key': 'S' + name: ' 石家庄 ', + key: 'S' }, { - 'name': ' 三门峡 ', - 'key': 'S' + name: ' 三门峡 ', + key: 'S' }, { - 'name': ' 三明 ', - 'key': 'S' + name: ' 三明 ', + key: 'S' }, { - 'name': ' 三亚 ', - 'key': 'S' + name: ' 三亚 ', + key: 'S' }, { - 'name': ' 商洛 ', - 'key': 'S' + name: ' 商洛 ', + key: 'S' }, { - 'name': ' 商丘 ', - 'key': 'S' + name: ' 商丘 ', + key: 'S' }, { - 'name': ' 上饶 ', - 'key': 'S' + name: ' 上饶 ', + key: 'S' }, { - 'name': ' 山南 ', - 'key': 'S' + name: ' 山南 ', + key: 'S' }, { - 'name': ' 汕头 ', - 'key': 'S' + name: ' 汕头 ', + key: 'S' }, { - 'name': ' 汕尾 ', - 'key': 'S' + name: ' 汕尾 ', + key: 'S' }, { - 'name': ' 韶关 ', - 'key': 'S' + name: ' 韶关 ', + key: 'S' }, { - 'name': ' 绍兴 ', - 'key': 'S' + name: ' 绍兴 ', + key: 'S' }, { - 'name': ' 邵阳 ', - 'key': 'S' + name: ' 邵阳 ', + key: 'S' }, { - 'name': ' 十堰 ', - 'key': 'S' + name: ' 十堰 ', + key: 'S' }, { - 'name': ' 朔州 ', - 'key': 'S' + name: ' 朔州 ', + key: 'S' }, { - 'name': ' 四平 ', - 'key': 'S' + name: ' 四平 ', + key: 'S' }, { - 'name': ' 绥化 ', - 'key': 'S' + name: ' 绥化 ', + key: 'S' }, { - 'name': ' 遂宁 ', - 'key': 'S' + name: ' 遂宁 ', + key: 'S' }, { - 'name': ' 随州 ', - 'key': 'S' + name: ' 随州 ', + key: 'S' }, { - 'name': ' 娄底 ', - 'key': 'S' + name: ' 娄底 ', + key: 'S' }, { - 'name': ' 宿迁 ', - 'key': 'S' + name: ' 宿迁 ', + key: 'S' }, { - 'name': ' 宿州 ', - 'key': 'S' + name: ' 宿州 ', + key: 'S' } - ] - }, { + }, + { title: 'T', key: 'T', items: [ - { - 'name': ' 天津 ', - 'key': 'T' + name: ' 天津 ', + key: 'T' }, { - 'name': ' 太原 ', - 'key': 'T' + name: ' 太原 ', + key: 'T' }, { - 'name': ' 泰安 ', - 'key': 'T' + name: ' 泰安 ', + key: 'T' }, { - 'name': ' 泰州 ', - 'key': 'T' + name: ' 泰州 ', + key: 'T' }, { - 'name': ' 唐山 ', - 'key': 'T' + name: ' 唐山 ', + key: 'T' }, { - 'name': ' 天水 ', - 'key': 'T' + name: ' 天水 ', + key: 'T' }, { - 'name': ' 铁岭 ', - 'key': 'T' + name: ' 铁岭 ', + key: 'T' }, { - 'name': ' 铜川 ', - 'key': 'T' + name: ' 铜川 ', + key: 'T' }, { - 'name': ' 通化 ', - 'key': 'T' + name: ' 通化 ', + key: 'T' }, { - 'name': ' 通辽 ', - 'key': 'T' + name: ' 通辽 ', + key: 'T' }, { - 'name': ' 铜陵 ', - 'key': 'T' + name: ' 铜陵 ', + key: 'T' }, { - 'name': ' 铜仁 ', - 'key': 'T' + name: ' 铜仁 ', + key: 'T' }, { - 'name': ' 台湾 ', - 'key': 'T' + name: ' 台湾 ', + key: 'T' } - - ] - }, { + }, + { title: 'W', key: 'W', items: [ - { - 'name': ' 武汉 ', - 'key': 'W' + name: ' 武汉 ', + key: 'W' }, { - 'name': ' 乌鲁木齐 ', - 'key': 'W' + name: ' 乌鲁木齐 ', + key: 'W' }, { - 'name': ' 无锡 ', - 'key': 'W' + name: ' 无锡 ', + key: 'W' }, { - 'name': ' 威海 ', - 'key': 'W' + name: ' 威海 ', + key: 'W' }, { - 'name': ' 潍坊 ', - 'key': 'W' + name: ' 潍坊 ', + key: 'W' }, { - 'name': ' 文山 ', - 'key': 'W' + name: ' 文山 ', + key: 'W' }, { - 'name': ' 温州 ', - 'key': 'W' + name: ' 温州 ', + key: 'W' }, { - 'name': ' 乌海 ', - 'key': 'W' + name: ' 乌海 ', + key: 'W' }, { - 'name': ' 芜湖 ', - 'key': 'W' + name: ' 芜湖 ', + key: 'W' }, { - 'name': ' 乌兰察布 ', - 'key': 'W' + name: ' 乌兰察布 ', + key: 'W' }, { - 'name': ' 武威 ', - 'key': 'W' + name: ' 武威 ', + key: 'W' }, { - 'name': ' 梧州 ', - 'key': 'W' + name: ' 梧州 ', + key: 'W' } - ] - }, { + }, + { title: 'X', key: 'X', items: [ { - 'name': ' 厦门 ', - 'key': 'X' + name: ' 厦门 ', + key: 'X' }, { - 'name': ' 西安 ', - 'key': 'X' + name: ' 西安 ', + key: 'X' }, { - 'name': ' 西宁 ', - 'key': 'X' + name: ' 西宁 ', + key: 'X' }, { - 'name': ' 襄樊 ', - 'key': 'X' + name: ' 襄樊 ', + key: 'X' }, { - 'name': ' 湘潭 ', - 'key': 'X' + name: ' 湘潭 ', + key: 'X' }, { - 'name': ' 湘西 ', - 'key': 'X' + name: ' 湘西 ', + key: 'X' }, { - 'name': ' 咸宁 ', - 'key': 'X' + name: ' 咸宁 ', + key: 'X' }, { - 'name': ' 咸阳 ', - 'key': 'X' + name: ' 咸阳 ', + key: 'X' }, { - 'name': ' 孝感 ', - 'key': 'X' + name: ' 孝感 ', + key: 'X' }, { - 'name': ' 邢台 ', - 'key': 'X' + name: ' 邢台 ', + key: 'X' }, { - 'name': ' 新乡 ', - 'key': 'X' + name: ' 新乡 ', + key: 'X' }, { - 'name': ' 信阳 ', - 'key': 'X' + name: ' 信阳 ', + key: 'X' }, { - 'name': ' 新余 ', - 'key': 'X' + name: ' 新余 ', + key: 'X' }, { - 'name': ' 忻州 ', - 'key': 'X' + name: ' 忻州 ', + key: 'X' }, { - 'name': ' 西双版纳 ', - 'key': 'X' + name: ' 西双版纳 ', + key: 'X' }, { - 'name': ' 宣城 ', - 'key': 'X' + name: ' 宣城 ', + key: 'X' }, { - 'name': ' 许昌 ', - 'key': 'X' + name: ' 许昌 ', + key: 'X' }, { - 'name': ' 徐州 ', - 'key': 'X' + name: ' 徐州 ', + key: 'X' }, { - 'name': ' 香港 ', - 'key': 'X' + name: ' 香港 ', + key: 'X' }, { - 'name': ' 锡林郭勒 ', - 'key': 'X' + name: ' 锡林郭勒 ', + key: 'X' }, { - 'name': ' 兴安 ', - 'key': 'X' + name: ' 兴安 ', + key: 'X' } ] - }, { + }, + { title: 'Y', key: 'Y', items: [ { - 'name': ' 银川 ', - 'key': 'Y' + name: ' 银川 ', + key: 'Y' }, { - 'name': ' 雅安 ', - 'key': 'Y' + name: ' 雅安 ', + key: 'Y' }, { - 'name': ' 延安 ', - 'key': 'Y' + name: ' 延安 ', + key: 'Y' }, { - 'name': ' 延边 ', - 'key': 'Y' + name: ' 延边 ', + key: 'Y' }, { - 'name': ' 盐城 ', - 'key': 'Y' + name: ' 盐城 ', + key: 'Y' }, { - 'name': ' 阳江 ', - 'key': 'Y' + name: ' 阳江 ', + key: 'Y' }, { - 'name': ' 阳泉 ', - 'key': 'Y' + name: ' 阳泉 ', + key: 'Y' }, { - 'name': ' 扬州 ', - 'key': 'Y' + name: ' 扬州 ', + key: 'Y' }, { - 'name': ' 烟台 ', - 'key': 'Y' + name: ' 烟台 ', + key: 'Y' }, { - 'name': ' 宜宾 ', - 'key': 'Y' + name: ' 宜宾 ', + key: 'Y' }, { - 'name': ' 宜昌 ', - 'key': 'Y' + name: ' 宜昌 ', + key: 'Y' }, { - 'name': ' 宜春 ', - 'key': 'Y' + name: ' 宜春 ', + key: 'Y' }, { - 'name': ' 营口 ', - 'key': 'Y' + name: ' 营口 ', + key: 'Y' }, { - 'name': ' 益阳 ', - 'key': 'Y' + name: ' 益阳 ', + key: 'Y' }, { - 'name': ' 永州 ', - 'key': 'Y' + name: ' 永州 ', + key: 'Y' }, { - 'name': ' 岳阳 ', - 'key': 'Y' + name: ' 岳阳 ', + key: 'Y' }, { - 'name': ' 榆林 ', - 'key': 'Y' + name: ' 榆林 ', + key: 'Y' }, { - 'name': ' 运城 ', - 'key': 'Y' + name: ' 运城 ', + key: 'Y' }, { - 'name': ' 云浮 ', - 'key': 'Y' + name: ' 云浮 ', + key: 'Y' }, { - 'name': ' 玉树 ', - 'key': 'Y' + name: ' 玉树 ', + key: 'Y' }, { - 'name': ' 玉溪 ', - 'key': 'Y' + name: ' 玉溪 ', + key: 'Y' }, { - 'name': ' 玉林 ', - 'key': 'Y' + name: ' 玉林 ', + key: 'Y' } ] - }, { + }, + { title: 'Z', key: 'Z', items: [ { - 'name': ' 杂多县 ', - 'key': 'Z' + name: ' 杂多县 ', + key: 'Z' }, { - 'name': ' 赞皇县 ', - 'key': 'Z' + name: ' 赞皇县 ', + key: 'Z' }, { - 'name': ' 枣强县 ', - 'key': 'Z' + name: ' 枣强县 ', + key: 'Z' }, { - 'name': ' 枣阳市 ', - 'key': 'Z' + name: ' 枣阳市 ', + key: 'Z' }, { - 'name': ' 枣庄 ', - 'key': 'Z' + name: ' 枣庄 ', + key: 'Z' }, { - 'name': ' 泽库县 ', - 'key': 'Z' + name: ' 泽库县 ', + key: 'Z' }, { - 'name': ' 增城市 ', - 'key': 'Z' + name: ' 增城市 ', + key: 'Z' }, { - 'name': ' 曾都区 ', - 'key': 'Z' + name: ' 曾都区 ', + key: 'Z' }, { - 'name': ' 泽普县 ', - 'key': 'Z' + name: ' 泽普县 ', + key: 'Z' }, { - 'name': ' 泽州县 ', - 'key': 'Z' + name: ' 泽州县 ', + key: 'Z' }, { - 'name': ' 札达县 ', - 'key': 'Z' + name: ' 札达县 ', + key: 'Z' }, { - 'name': ' 扎赉特旗 ', - 'key': 'Z' + name: ' 扎赉特旗 ', + key: 'Z' }, { - 'name': ' 扎兰屯市 ', - 'key': 'Z' + name: ' 扎兰屯市 ', + key: 'Z' }, { - 'name': ' 扎鲁特旗 ', - 'key': 'Z' + name: ' 扎鲁特旗 ', + key: 'Z' }, { - 'name': ' 扎囊县 ', - 'key': 'Z' + name: ' 扎囊县 ', + key: 'Z' }, { - 'name': ' 张北县 ', - 'key': 'Z' + name: ' 张北县 ', + key: 'Z' }, { - 'name': ' 张店区 ', - 'key': 'Z' + name: ' 张店区 ', + key: 'Z' }, { - 'name': ' 章贡区 ', - 'key': 'Z' + name: ' 章贡区 ', + key: 'Z' }, { - 'name': ' 张家港 ', - 'key': 'Z' + name: ' 张家港 ', + key: 'Z' }, { - 'name': ' 张家界 ', - 'key': 'Z' + name: ' 张家界 ', + key: 'Z' }, { - 'name': ' 张家口 ', - 'key': 'Z' + name: ' 张家口 ', + key: 'Z' }, { - 'name': ' 漳平市 ', - 'key': 'Z' + name: ' 漳平市 ', + key: 'Z' }, { - 'name': ' 漳浦县 ', - 'key': 'Z' + name: ' 漳浦县 ', + key: 'Z' }, { - 'name': ' 章丘市 ', - 'key': 'Z' + name: ' 章丘市 ', + key: 'Z' }, { - 'name': ' 樟树市 ', - 'key': 'Z' + name: ' 樟树市 ', + key: 'Z' }, { - 'name': ' 张湾区 ', - 'key': 'Z' + name: ' 张湾区 ', + key: 'Z' }, { - 'name': ' 彰武县 ', - 'key': 'Z' + name: ' 彰武县 ', + key: 'Z' }, { - 'name': ' 漳县 ', - 'key': 'Z' + name: ' 漳县 ', + key: 'Z' }, { - 'name': ' 张掖 ', - 'key': 'Z' + name: ' 张掖 ', + key: 'Z' }, { - 'name': ' 漳州 ', - 'key': 'Z' + name: ' 漳州 ', + key: 'Z' }, { - 'name': ' 长子县 ', - 'key': 'Z' + name: ' 长子县 ', + key: 'Z' }, { - 'name': ' 湛河区 ', - 'key': 'Z' + name: ' 湛河区 ', + key: 'Z' }, { - 'name': ' 湛江 ', - 'key': 'Z' + name: ' 湛江 ', + key: 'Z' }, { - 'name': ' 站前区 ', - 'key': 'Z' + name: ' 站前区 ', + key: 'Z' }, { - 'name': ' 沾益县 ', - 'key': 'Z' + name: ' 沾益县 ', + key: 'Z' }, { - 'name': ' 诏安县 ', - 'key': 'Z' + name: ' 诏安县 ', + key: 'Z' }, { - 'name': ' 召陵区 ', - 'key': 'Z' + name: ' 召陵区 ', + key: 'Z' }, { - 'name': ' 昭平县 ', - 'key': 'Z' + name: ' 昭平县 ', + key: 'Z' }, { - 'name': ' 肇庆 ', - 'key': 'Z' + name: ' 肇庆 ', + key: 'Z' }, { - 'name': ' 昭通 ', - 'key': 'Z' + name: ' 昭通 ', + key: 'Z' }, { - 'name': ' 赵县 ', - 'key': 'Z' + name: ' 赵县 ', + key: 'Z' } ] } diff --git a/src/pages/navigation/navbar/index.tsx b/src/pages/navigation/navbar/index.tsx index 311024e5e..fff9eb28b 100644 --- a/src/pages/navigation/navbar/index.tsx +++ b/src/pages/navigation/navbar/index.tsx @@ -1,47 +1,48 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtNavBar } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' -export default class Index extends Taro.Component { +export default class Index extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - private handleClick (title: string): void { + private handleClick(title: string): void { Taro.showToast({ - 'title': title, - 'duration': 2000, - 'icon': 'success' + title, + duration: 2000, + icon: 'success' }) } - private clickReturn (): void { + private clickReturn(): void { Taro.showToast({ - 'title': '返回', - 'duration': 2000, - 'icon': 'success' + title: '返回', + duration: 2000, + icon: 'success' }) } - private clickMy (): void { + private clickMy(): void { Taro.showToast({ - 'title': '我的', - 'duration': 2000, - 'icon': 'success' + title: '我的', + duration: 2000, + icon: 'success' }) } - private clickList (): void { + private clickList(): void { Taro.showToast({ - 'title': '功能列表', - 'duration': 2000, - 'icon': 'success' + title: '功能列表', + duration: 2000, + icon: 'success' }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( diff --git a/src/pages/navigation/pagination/index.tsx b/src/pages/navigation/pagination/index.tsx index cd10ec299..c536fe9fb 100644 --- a/src/pages/navigation/pagination/index.tsx +++ b/src/pages/navigation/pagination/index.tsx @@ -1,10 +1,9 @@ -import { AtButton, AtPagination } from 'taro-ui'; -import { PageChangeData } from 'types/pagination'; - -import { View } from '@tarojs/components'; -import Taro from '@tarojs/taro'; - -import DocsHeader from '../../components/doc-header'; +import React from 'react' +import { AtButton, AtPagination } from 'taro-ui' +import { PageChangeData } from 'types/pagination' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' +import DocsHeader from '../../components/doc-header' import './index.scss' interface PaginationPageState { @@ -13,42 +12,48 @@ interface PaginationPageState { pageSize: number } -export default class PaginationPage extends Taro.Component<{}, PaginationPageState> { +export default class PaginationPage extends React.Component< + {}, + PaginationPageState +> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { list: [], current: 1, - pageSize: 10, + pageSize: 10 } } - private onPage (data: PageChangeData): void { - console.log('pagination: ', data) + private onPage(data: PageChangeData): void { this.setState({ - current: data.current, + current: data.current + }) + Taro.showToast({ + title: `Pagination: ${data}`, + icon: 'none' }) } - private onPageDataChange (): void { + private onPageDataChange(): void { const _list = new Array(10).fill(1) this.setState({ - list: this.state.list.concat(_list), + list: this.state.list.concat(_list) }) } - private onCurrentChange (): void { + private onCurrentChange(): void { this.setState({ current: 1, - list: [], + list: [] }) } - public render (): JSX.Element { + public render(): JSX.Element { const len = this.state.list.length return ( @@ -62,7 +67,11 @@ export default class PaginationPage extends Taro.Component<{}, PaginationPageSta 基础用法 - + @@ -72,7 +81,12 @@ export default class PaginationPage extends Taro.Component<{}, PaginationPageSta 图标类型 - + @@ -82,7 +96,12 @@ export default class PaginationPage extends Taro.Component<{}, PaginationPageSta picker快速选择页码 - + @@ -92,15 +111,29 @@ export default class PaginationPage extends Taro.Component<{}, PaginationPageSta 改变数据长度 - + - 当前页：{this.state.current}，当前数据：{len}条，分页大小：{this.state.pageSize} + 当前页：{this.state.current}，当前数据：{len}条，分页大小： + {this.state.pageSize} - 增加10条数据 + + 增加10条数据 + - 重置 + + 重置 + diff --git a/src/pages/navigation/segmented-control/index.tsx b/src/pages/navigation/segmented-control/index.tsx index 85eac05b0..378c7030a 100644 --- a/src/pages/navigation/segmented-control/index.tsx +++ b/src/pages/navigation/segmented-control/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtSegmentedControl } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -8,28 +9,28 @@ interface IndexPageState { [key: string]: number } -export default class Index extends Taro.Component<{}, IndexPageState> { +export default class Index extends React.Component<{}, IndexPageState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { current1: 0, - current2: 0, + current2: 0 } } - private handleClick (num: number, value: number): void { + private handleClick(num: number, value: number): void { this.setState({ [`current${num}`]: value }) } - public render (): JSX.Element { + public render(): JSX.Element { const { current1, current2 } = this.state - const tabList1 = ['标签页1', '标签页2' ] + const tabList1 = ['标签页1', '标签页2'] const tabList2 = ['标签页1', '标签页2', '标签页3'] return ( @@ -45,7 +46,11 @@ export default class Index extends Taro.Component<{}, IndexPageState> { 基础用法 - + 标签 {current1 + 1} 的内容 @@ -56,7 +61,13 @@ export default class Index extends Taro.Component<{}, IndexPageState> { 自定义颜色、字体大小 - + 标签 {current2 + 1} 的内容 diff --git a/src/pages/navigation/tabbar/index.tsx b/src/pages/navigation/tabbar/index.tsx index d2b97dfff..9523b051b 100644 --- a/src/pages/navigation/tabbar/index.tsx +++ b/src/pages/navigation/tabbar/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtTabBar } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -8,36 +9,61 @@ interface IndexPageState { [key: string]: number } -export default class Index extends Taro.Component<{}, IndexPageState> { +export default class Index extends React.Component<{}, IndexPageState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { current1: 0, current2: 0, current3: 0, current4: 0, - current5: 0, + current5: 0 } } - private handleClick (num: number, value: number): void { + private handleClick(num: number, value: number): void { this.setState({ [`current${num}`]: value }) } - public render (): JSX.Element { + public render(): JSX.Element { const { current1, current2, current3, current4, current5 } = this.state - const tabList1 = [{ title: '待办事项', text: 8 }, { title: '拍照' }, { title: '通讯录', dot: true }] - const tabList2 = [{ title: '待办事项', iconType: 'bullet-list', text: 'new' }, { title: '拍照', iconType: 'camera' }, { title: '文件夹', iconType: 'folder', text: '100', max: 99 }] + const tabList1 = [ + { title: '待办事项', text: 8 }, + { title: '拍照' }, + { title: '通讯录', dot: true } + ] + const tabList2 = [ + { title: '待办事项', iconType: 'bullet-list', text: 'new' }, + { title: '拍照', iconType: 'camera' }, + { title: '文件夹', iconType: 'folder', text: '100', max: 99 } + ] const tabList3 = [ - { title: '领取中心', image: 'https://img12.360buyimg.com/jdphoto/s72x72_jfs/t6160/14/2008729947/2754/7d512a86/595c3aeeNa89ddf71.png', selectedImage: 'https://img14.360buyimg.com/jdphoto/s72x72_jfs/t17251/336/1311038817/3177/72595a07/5ac44618Na1db7b09.png', text: 'new' }, - { title: '找折扣', image: 'https://img20.360buyimg.com/jdphoto/s72x72_jfs/t15151/308/1012305375/2300/536ee6ef/5a411466N040a074b.png' }, - { title: '领会员', image: 'https://img10.360buyimg.com/jdphoto/s72x72_jfs/t5872/209/5240187906/2872/8fa98cd/595c3b2aN4155b931.png', text: '100', max: 99 } + { + title: '领取中心', + image: + 'https://img12.360buyimg.com/jdphoto/s72x72_jfs/t6160/14/2008729947/2754/7d512a86/595c3aeeNa89ddf71.png', + selectedImage: + 'https://img14.360buyimg.com/jdphoto/s72x72_jfs/t17251/336/1311038817/3177/72595a07/5ac44618Na1db7b09.png', + text: 'new' + }, + { + title: '找折扣', + image: + 'https://img20.360buyimg.com/jdphoto/s72x72_jfs/t15151/308/1012305375/2300/536ee6ef/5a411466N040a074b.png' + }, + { + title: '领会员', + image: + 'https://img10.360buyimg.com/jdphoto/s72x72_jfs/t5872/209/5240187906/2872/8fa98cd/595c3b2aN4155b931.png', + text: '100', + max: 99 + } ] return ( @@ -48,31 +74,63 @@ export default class Index extends Taro.Component<{}, IndexPageState> { 文本标签栏 - + 图标文本标签栏 - + - 自定义图标颜色、字体颜色、背景颜色 + + 自定义图标颜色、字体颜色、背景颜色 + - + 图片icon - - + + 固定底部 - - + + diff --git a/src/pages/navigation/tabs/index.tsx b/src/pages/navigation/tabs/index.tsx index 09fb7ae94..b0a30f767 100644 --- a/src/pages/navigation/tabs/index.tsx +++ b/src/pages/navigation/tabs/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtTabs, AtTabsPane } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -8,13 +9,13 @@ interface IndexPageState { [key: string]: number } -export default class Index extends Taro.Component<{}, IndexPageState> { +export default class Index extends React.Component<{}, IndexPageState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { current1: 0, current2: 0, @@ -24,15 +25,19 @@ export default class Index extends Taro.Component<{}, IndexPageState> { } } - private handleClick (stateName: string, value: number): void { + private handleClick(stateName: string, value: number): void { this.setState({ [stateName]: value }) } - public render (): JSX.Element { + public render(): JSX.Element { const { current1, current2, current3, current4, current5 } = this.state - const tabList1 = [{ title: '标签页1' }, { title: '标签页2' }, { title: '标签页3' }] + const tabList1 = [ + { title: '标签页1' }, + { title: '标签页2' }, + { title: '标签页3' } + ] const tabList2 = [ { title: '标签页1' }, { title: '标签页2' }, @@ -51,8 +56,13 @@ export default class Index extends Taro.Component<{}, IndexPageState> { 等宽标签栏 - - + + 标签页一的内容 @@ -67,7 +77,13 @@ export default class Index extends Taro.Component<{}, IndexPageState> { 滚动标签栏 - + 标签页一的内容 @@ -92,7 +108,11 @@ export default class Index extends Taro.Component<{}, IndexPageState> { 滑动切换内容 - + 标签页一的内容 @@ -109,23 +129,54 @@ export default class Index extends Taro.Component<{}, IndexPageState> { 垂直模式 - - + + 标签页一的内容 - + 标签页二的内容 - + 标签页三的内容 - + 标签页四的内容 - + 标签页五的内容 - + 标签页六的内容 @@ -135,7 +186,12 @@ export default class Index extends Taro.Component<{}, IndexPageState> { 禁止内容切换动画 - + 标签页一的内容 diff --git a/src/pages/panel/index.tsx b/src/pages/panel/index.tsx index 7a6c757ff..45d75f2b6 100644 --- a/src/pages/panel/index.tsx +++ b/src/pages/panel/index.tsx @@ -1,16 +1,15 @@ -import { Image, Text, View } from '@tarojs/components'; -import { CommonEvent } from '@tarojs/components/types/common'; -import Taro, { Component } from '@tarojs/taro'; - -import iconAction from '../../assets/images/icon-list-action.png'; -import iconBasic from '../../assets/images/icon-list-basic.png'; -import iconForm from '../../assets/images/icon-list-form.png'; -import iconHOC from '../../assets/images/icon-list-hoc.png'; -import iconLayout from '../../assets/images/icon-list-layout.png'; -import iconNavigation from '../../assets/images/icon-list-navigation.png'; -import iconView from '../../assets/images/icon-list-view.png'; - -import './index.scss'; +import React from 'react' +import { Image, Text, View } from '@tarojs/components' +import { CommonEvent } from '@tarojs/components/types/common' +import Taro from '@tarojs/taro' +import iconAction from '../../assets/images/icon-list-action.png' +import iconBasic from '../../assets/images/icon-list-basic.png' +import iconForm from '../../assets/images/icon-list-form.png' +import iconHOC from '../../assets/images/icon-list-hoc.png' +import iconLayout from '../../assets/images/icon-list-layout.png' +import iconNavigation from '../../assets/images/icon-list-navigation.png' +import iconView from '../../assets/images/icon-list-view.png' +import './index.scss' interface PanelBasicState { panelNames: { @@ -28,13 +27,13 @@ interface PanelBasicState { currentId: string } -export default class PanelBasic extends Component<{}, PanelBasicState> { +export default class PanelBasic extends React.Component<{}, PanelBasicState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { panelNames: { @@ -291,8 +290,8 @@ export default class PanelBasic extends Component<{}, PanelBasicState> { } } - public componentDidMount (): void { - const { id } = this.$router.params + public componentDidMount(): void { + const { id } = Taro.Current.router.params this.setState({ currentId: id.toLowerCase() || '' }) @@ -305,7 +304,7 @@ export default class PanelBasic extends Component<{}, PanelBasicState> { }) } - public render (): JSX.Element { + public render(): JSX.Element { const { list, currentId, panelNames } = this.state const itemList = list[currentId] || [] const title = (panelNames[currentId] && panelNames[currentId].name) || '' diff --git a/src/pages/theme/index.tsx b/src/pages/theme/index.tsx index 3f80c41cf..0935b9ea1 100644 --- a/src/pages/theme/index.tsx +++ b/src/pages/theme/index.tsx @@ -1,15 +1,14 @@ -import Taro, { Component } from '@tarojs/taro' +import React from 'react' import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import './index.scss' -export default class ThemePage extends Component { +export default class ThemePage extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public render (): JSX.Element { - return ( - Theme - ) + public render(): JSX.Element { + return Theme } } diff --git a/src/pages/view/article/index.tsx b/src/pages/view/article/index.tsx index 6fa0629a0..f91aac55d 100644 --- a/src/pages/view/article/index.tsx +++ b/src/pages/view/article/index.tsx @@ -1,16 +1,16 @@ +import React from 'react' +import { Image, View } from '@tarojs/components' import Taro from '@tarojs/taro' -import { View, Image } from '@tarojs/components' import DocsHeader from '../../components/doc-header' - -import './index.scss' import '../../../style/components/article.scss' +import './index.scss' -export default class ArticlePage extends Taro.Component { +export default class ArticlePage extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Article 文章' } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} @@ -24,21 +24,39 @@ export default class ArticlePage extends Taro.Component { 这是一级标题这是一级标题 - 2017-05-07   这是作者 + + 2017-05-07   这是作者 + 这是二级标题 这是三级标题 - 这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。1234567890123456789012345678901234567890 ABCDEFGHIJKLMNOPQRSTUVWXYZ - 这是文本段落。这是文本段落。 - + + 这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。1234567890123456789012345678901234567890 + ABCDEFGHIJKLMNOPQRSTUVWXYZ + + + 这是文本段落。这是文本段落。 + + 这是二级标题 这是三级标题 - 这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。1234567890123456789012345678901234567890 ABCDEFGHIJKLMNOPQRSTUVWXYZ - + + 这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。这是文本段落。1234567890123456789012345678901234567890 + ABCDEFGHIJKLMNOPQRSTUVWXYZ + + diff --git a/src/pages/view/avatar/index.tsx b/src/pages/view/avatar/index.tsx index 42df4f71f..25e4c2aa3 100644 --- a/src/pages/view/avatar/index.tsx +++ b/src/pages/view/avatar/index.tsx @@ -1,16 +1,18 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtAvatar } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' -export default class AvatarPage extends Taro.Component { +export default class AvatarPage extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public render (): JSX.Element { - const avatarImg = 'http://storage.360buyimg.com/mtd/home/32443566_635798770100444_2113947400891531264_n1533825816008.jpg' + public render(): JSX.Element { + const avatarImg = + 'http://storage.360buyimg.com/mtd/home/32443566_635798770100444_2113947400891531264_n1533825816008.jpg' return ( @@ -93,25 +95,39 @@ export default class AvatarPage extends Taro.Component { {/* openData 头像（仅微信小程序支持） */} - {Taro.getEnv() === Taro.ENV_TYPE.WEAPP && - openData 头像（仅微信小程序支持） - - - - - - - - - - - - - + {Taro.getEnv() === Taro.ENV_TYPE.WEAPP && ( + + + openData 头像（仅微信小程序支持） + + + + + + + + + + + + + + + - } + )} {/* E Body */} diff --git a/src/pages/view/badge/index.tsx b/src/pages/view/badge/index.tsx index eb346a499..c4e2108f1 100644 --- a/src/pages/view/badge/index.tsx +++ b/src/pages/view/badge/index.tsx @@ -1,15 +1,16 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtBadge, AtButton } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' -export default class BadgePage extends Taro.Component { +export default class BadgePage extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public render (): JSX.Element { + public render(): JSX.Element { const dot = '···' return ( @@ -27,7 +28,9 @@ export default class BadgePage extends Taro.Component { - 按钮 + + 按钮 + @@ -46,7 +49,9 @@ export default class BadgePage extends Taro.Component { - 按钮 + + 按钮 + @@ -65,7 +70,9 @@ export default class BadgePage extends Taro.Component { - 按钮 + + 按钮 + @@ -84,7 +91,9 @@ export default class BadgePage extends Taro.Component { - 按钮 + + 按钮 + diff --git a/src/pages/view/countdown/index.tsx b/src/pages/view/countdown/index.tsx index 5b969397d..d0b9c2835 100644 --- a/src/pages/view/countdown/index.tsx +++ b/src/pages/view/countdown/index.tsx @@ -1,15 +1,16 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtCountdown } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' -export default class CountDownPage extends Taro.Component { +export default class CountDownPage extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - private onTimeUp (): void { + private onTimeUp(): void { Taro.showToast({ title: '时间到', icon: 'success', @@ -17,7 +18,7 @@ export default class CountDownPage extends Taro.Component { }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} @@ -58,11 +59,7 @@ export default class CountDownPage extends Taro.Component { 卡片式 - + { +export default class TagPage extends React.Component<{}, TagPageState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { isOpened: false, - closeBtnPosition: 'bottom', + closeBtnPosition: 'bottom' } } - private handleChange (stateName: string, value: string): void { + private handleChange(stateName: string, value: string): void { this.setState({ isOpened: true, [stateName]: value }) } - private onClose (): void { + private onClose(): void { this.setState({ isOpened: false }) } - public render (): JSX.Element { + public render(): JSX.Element { const { isOpened, closeBtnPosition } = this.state return ( @@ -53,11 +60,7 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { closeBtnPosition={closeBtnPosition} onClose={this.onClose.bind(this)} > - + {/* 顶部关闭 */} @@ -65,7 +68,15 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { 顶部关闭 - 顶部关闭幕帘 + + 顶部关闭幕帘 + @@ -75,7 +86,15 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { 底部关闭 - 底部关闭幕帘 + + 底部关闭幕帘 + @@ -85,7 +104,15 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { 左上关闭 - 左上关闭幕帘 + + 左上关闭幕帘 + @@ -95,7 +122,15 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { 右上关闭 - 右上关闭幕帘 + + 右上关闭幕帘 + @@ -105,7 +140,15 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { 左下关闭 - 左下关闭幕帘 + + 左下关闭幕帘 + @@ -115,7 +158,15 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { 右下关闭 - 右下关闭幕帘 + + 右下关闭幕帘 + diff --git a/src/pages/view/divider/index.tsx b/src/pages/view/divider/index.tsx index b085500cd..f227b6f7f 100644 --- a/src/pages/view/divider/index.tsx +++ b/src/pages/view/divider/index.tsx @@ -1,15 +1,16 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtDivider, AtIcon } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' -export default class LoadMorePage extends Taro.Component { +export default class LoadMorePage extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} @@ -30,9 +31,21 @@ export default class LoadMorePage extends Taro.Component { 自定义颜色 - - - + + + diff --git a/src/pages/view/load-more/index.tsx b/src/pages/view/load-more/index.tsx index 574ebcc8f..39cdc964e 100644 --- a/src/pages/view/load-more/index.tsx +++ b/src/pages/view/load-more/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtLoadMore } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -8,19 +9,22 @@ interface LoadMorePageState { status: 'more' | 'loading' | 'noMore' } -export default class LoadMorePage extends Taro.Component<{}, LoadMorePageState> { +export default class LoadMorePage extends React.Component< + {}, + LoadMorePageState +> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { status: 'more' } } - private handleClick (): void { + private handleClick(): void { this.setState({ status: 'loading' }) @@ -31,7 +35,7 @@ export default class LoadMorePage extends Taro.Component<{}, LoadMorePageState> }, 2000) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} @@ -44,7 +48,10 @@ export default class LoadMorePage extends Taro.Component<{}, LoadMorePageState> 一般用法 - + diff --git a/src/pages/view/noticebar/index.tsx b/src/pages/view/noticebar/index.tsx index a94dd3496..a84f445f5 100644 --- a/src/pages/view/noticebar/index.tsx +++ b/src/pages/view/noticebar/index.tsx @@ -1,15 +1,16 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtNoticebar } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' -export default class NoticebarPage extends Taro.Component { +export default class NoticebarPage extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - private onGotoMore (): void { + private onGotoMore(): void { if (Taro.getEnv() === Taro.ENV_TYPE.WEB) { alert('您点击了更多!') return @@ -21,7 +22,7 @@ export default class NoticebarPage extends Taro.Component { }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} @@ -35,10 +36,16 @@ export default class NoticebarPage extends Taro.Component { 文字 - [单行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + [单行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + - [多行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + [多行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + @@ -48,13 +55,19 @@ export default class NoticebarPage extends Taro.Component { 跑马灯 - [纯文字]这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏[结束] + + [纯文字]这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏[结束] + - [带icon]这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏[结束] + + [带icon]这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏[结束] + - [超长文本]这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏[结束] + + [超长文本]这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏[结束] + @@ -64,10 +77,16 @@ export default class NoticebarPage extends Taro.Component { 图标 - [单行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + [单行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + - [多行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + [多行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + @@ -77,16 +96,46 @@ export default class NoticebarPage extends Taro.Component { 查看更多 - [单行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 - - - [单行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 - - - [多行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 - - - [多行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + [单行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + + + + [单行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + + + + [多行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + + + + [多行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + @@ -96,25 +145,57 @@ export default class NoticebarPage extends Taro.Component { 关闭按钮 - [单行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + [单行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + - [单行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + [单行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + - [单行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + [单行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + - [单行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + [单行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + - [多行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + [多行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + - [多行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + [多行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + - [多行] 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + + [多行] + 这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏，这是NoticeBar通告栏 + diff --git a/src/pages/view/steps/index.tsx b/src/pages/view/steps/index.tsx index b0144fe38..f25930e5c 100644 --- a/src/pages/view/steps/index.tsx +++ b/src/pages/view/steps/index.tsx @@ -1,7 +1,8 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtSteps } from 'taro-ui' -import { Item } from 'types/steps'; +import { Item } from 'types/steps' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -9,33 +10,33 @@ interface TimelinePageState { [key: string]: number } -export default class TimelinePage extends Taro.Component<{}, TimelinePageState> { +export default class TimelinePage extends React.Component< + {}, + TimelinePageState +> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { current1: 0, current2: 0, current3: 0, current4: 0, - current5: 1, + current5: 1 } } - private onChange (stateName: string, current: number): void { + private onChange(stateName: string, current: number): void { this.setState({ [stateName]: current }) } - public render (): JSX.Element { - const items1: Item[] = [ - { title: '步骤一' }, - { title: '步骤二' } - ] + public render(): JSX.Element { + const items1: Item[] = [{ title: '步骤一' }, { title: '步骤二' }] const items2: Item[] = [ { title: '步骤一' }, @@ -57,7 +58,7 @@ export default class TimelinePage extends Taro.Component<{}, TimelinePageState> value: 'sound', activeColor: '#fff', inactiveColor: '#78A4FA', - size: '14', + size: '14' } }, { @@ -67,7 +68,7 @@ export default class TimelinePage extends Taro.Component<{}, TimelinePageState> value: 'shopping-cart', activeColor: '#fff', inactiveColor: '#78A4FA', - size: '14', + size: '14' } }, { @@ -77,7 +78,7 @@ export default class TimelinePage extends Taro.Component<{}, TimelinePageState> value: 'camera', activeColor: '#fff', inactiveColor: '#78A4FA', - size: '14', + size: '14' } } ] diff --git a/src/pages/view/swiper/index.tsx b/src/pages/view/swiper/index.tsx index 6fdf5a88b..6063fa524 100644 --- a/src/pages/view/swiper/index.tsx +++ b/src/pages/view/swiper/index.tsx @@ -1,7 +1,15 @@ -import Taro from '@tarojs/taro' -import { View, Text, Swiper, SwiperItem, Slider, Image } from '@tarojs/components' -import { CommonEvent } from '@tarojs/components/types/common' +import React from 'react' import { AtList, AtListItem } from 'taro-ui' +import { + Image, + Slider, + Swiper, + SwiperItem, + Text, + View +} from '@tarojs/components' +import { CommonEvent } from '@tarojs/components/types/common' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -15,13 +23,13 @@ interface SwiperPageState { imgUrls: string[] } -export default class SwiperPage extends Taro.Component<{}, SwiperPageState> { +export default class SwiperPage extends React.Component<{}, SwiperPageState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { current: 1, duration: 500, @@ -67,8 +75,16 @@ export default class SwiperPage extends Taro.Component<{}, SwiperPageState> { }) } - public render (): JSX.Element { - const { current, isAutoplay, duration, isCircular, interval, hasIndicatorDots, imgUrls } = this.state + public render(): JSX.Element { + const { + current, + isAutoplay, + duration, + isCircular, + interval, + hasIndicatorDots, + imgUrls + } = this.state return ( @@ -94,20 +110,33 @@ export default class SwiperPage extends Taro.Component<{}, SwiperPageState> { indicatorDots={hasIndicatorDots} previousMargin='20' > - { - imgUrls.map((item, idx) => ( - - - - )) - } + {imgUrls.map((item, idx) => ( + + + + ))} - - - + + + @@ -148,7 +177,6 @@ export default class SwiperPage extends Taro.Component<{}, SwiperPageState> { - {/* E Body */} diff --git a/src/pages/view/tag/index.tsx b/src/pages/view/tag/index.tsx index 7c15d859a..a8696f33c 100644 --- a/src/pages/view/tag/index.tsx +++ b/src/pages/view/tag/index.tsx @@ -1,6 +1,7 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtTag } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' @@ -17,13 +18,13 @@ interface TagPageState { solidTagList2: ListItem[] } -export default class TagPage extends Taro.Component<{}, TagPageState> { +export default class TagPage extends React.Component<{}, TagPageState> { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public constructor () { - super(...arguments) + public constructor() { + super(arguments) this.state = { tagList: [ { name: 'tag-1', active: false }, @@ -54,11 +55,11 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { { name: '标签2', active: false }, { name: '标签3', active: true }, { name: '标签4', active: true } - ], + ] } } - private onClick (data: ListItem): void { + private onClick(data: ListItem): void { const { tagList } = this.state const findIndex = tagList.findIndex(item => item.name === data.name) const active = !tagList[findIndex].active @@ -72,11 +73,9 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { } else { Taro.showModal({ content, showCancel: false }) } - - console.log(data) } - private handleHollowClick (data: ListItem): void { + private handleHollowClick(data: ListItem): void { const { hollowTagList } = this.state const findIndex = hollowTagList.findIndex(item => item.name === data.name) @@ -84,7 +83,7 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { this.setState({ hollowTagList }) } - private handleSolidClick (data: ListItem): void { + private handleSolidClick(data: ListItem): void { const { solidTagList } = this.state const findIndex = solidTagList.findIndex(item => item.name === data.name) @@ -92,7 +91,7 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { this.setState({ solidTagList }) } - private handleHollowSmallClick (data: ListItem): void { + private handleHollowSmallClick(data: ListItem): void { const { hollowTagList2 } = this.state const findIndex = hollowTagList2.findIndex(item => item.name === data.name) @@ -100,7 +99,7 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { this.setState({ hollowTagList2 }) } - private handleSolidSmallClick (data: ListItem): void { + private handleSolidSmallClick(data: ListItem): void { const { solidTagList2 } = this.state const findIndex = solidTagList2.findIndex(item => item.name === data.name) @@ -108,7 +107,7 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { this.setState({ solidTagList2 }) } - public render (): JSX.Element { + public render(): JSX.Element { return ( {/* S Header */} @@ -129,7 +128,9 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { active={item.active} circle={index % 2 === 0} onClick={this.handleHollowClick.bind(this)} - >标签 + > + 标签 + ))} @@ -149,7 +150,9 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { active={item.active} circle={index % 2 === 0} onClick={this.handleSolidClick.bind(this)} - >标签 + > + 标签 + ))} @@ -161,8 +164,19 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { 点击事件 - {this.state.tagList.map((item, index) => tag-{index + 1} - )} + {this.state.tagList.map((item, index) => ( + + + tag-{index + 1} + + + ))} @@ -173,10 +187,14 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { - 标签 + + 标签 + - 标签 + + 标签 + @@ -195,7 +213,9 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { active={item.active} circle={index % 2 === 0} onClick={this.handleHollowSmallClick.bind(this)} - >标签 + > + 标签 + ))} @@ -216,7 +236,9 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { active={item.active} circle={index % 2 === 0} onClick={this.handleSolidSmallClick.bind(this)} - >标签 + > + 标签 + ))} @@ -229,10 +251,14 @@ export default class TagPage extends Taro.Component<{}, TagPageState> { - 标签 + + 标签 + - 标签 + + 标签 + diff --git a/src/pages/view/timeline/index.tsx b/src/pages/view/timeline/index.tsx index 688089f09..4f0a3431c 100644 --- a/src/pages/view/timeline/index.tsx +++ b/src/pages/view/timeline/index.tsx @@ -1,15 +1,16 @@ -import Taro from '@tarojs/taro' -import { View } from '@tarojs/components' +import React from 'react' import { AtTimeline } from 'taro-ui' +import { View } from '@tarojs/components' +import Taro from '@tarojs/taro' import DocsHeader from '../../components/doc-header' import './index.scss' -export default class TimelinePage extends Taro.Component { +export default class TimelinePage extends React.Component { public config: Taro.PageConfig = { navigationBarTitleText: 'Taro UI' } - public render (): JSX.Element { + public render(): JSX.Element { return ( @@ -20,8 +21,14 @@ export default class TimelinePage extends Taro.Component { 基础用法 - - + @@ -31,8 +38,14 @@ export default class TimelinePage extends Taro.Component { 自定义颜色 - - + @@ -42,8 +55,14 @@ export default class TimelinePage extends Taro.Component { 自定义图标 - - + @@ -53,8 +72,15 @@ export default class TimelinePage extends Taro.Component { 幽灵节点 - - + @@ -64,8 +90,27 @@ export default class TimelinePage extends Taro.Component { 丰富内容 - - + diff --git a/yarn.lock b/yarn.lock index 1de8a4853..975020fa5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -335,6 +335,15 @@ "@babel/helper-create-class-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-proposal-decorators@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e" + integrity sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.8.3" + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-decorators" "^7.8.3" + "@babel/plugin-proposal-dynamic-import@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054" @@ -398,6 +407,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-decorators@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda" + integrity sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-dynamic-import@^7.8.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" @@ -454,6 +470,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-syntax-typescript@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz#c1f659dda97711a569cef75275f7e15dcaa6cabc" + integrity sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-transform-arrow-functions@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6" @@ -700,6 +723,15 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-transform-typescript@^7.9.0": + version "7.9.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz#4bb4dde4f10bbf2d787fce9707fb09b483e33359" + integrity sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.8.3" + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-typescript" "^7.8.3" + "@babel/plugin-transform-unicode-regex@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad" @@ -771,6 +803,14 @@ levenary "^1.1.1" semver "^5.5.0" +"@babel/preset-typescript@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192" + integrity sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-transform-typescript" "^7.9.0" + "@babel/runtime-corejs3@^7.8.3": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz#8209d9dff2f33aa2616cb319c83fe159ffb07b8c" @@ -5560,7 +5600,7 @@ debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6. dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -5867,7 +5907,7 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" -detect-libc@^1.0.2, detect-libc@^1.0.3: +detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= @@ -7467,13 +7507,6 @@ fs-extra@^8.0.1, fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -8493,7 +8526,7 @@ husky@^4.0.3: slash "^3.0.0" which-pm-runs "^1.0.0" -iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -8529,13 +8562,6 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - ignore@^3.3.3, ignore@^3.3.5: version "3.3.10" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" @@ -11184,14 +11210,6 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - minipass@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -11199,13 +11217,6 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - minizlib@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz#fd52c645301ef09a63a2c209697c294c6ce02cf3" @@ -11383,15 +11394,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^2.2.1: - version "2.3.3" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117" - integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -11564,22 +11566,6 @@ node-notifier@^5.2.1: shellwords "^0.1.1" which "^1.3.0" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-prismjs@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/node-prismjs/-/node-prismjs-0.1.2.tgz#dbfbc62d2210e1649d9dd8a6c6a2d7d6ca99a0f9" @@ -11636,14 +11622,6 @@ noop-logger@^0.1.1: dependencies: abbrev "1" -nopt@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" - integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== - dependencies: - abbrev "1" - osenv "^0.1.4" - normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -11695,13 +11673,6 @@ normalize-url@2.0.1: query-string "^5.0.1" sort-keys "^2.0.0" -npm-bundled@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" - integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - dependencies: - npm-normalize-package-bin "^1.0.1" - npm-check@^5.9.0: version "5.9.2" resolved "https://registry.yarnpkg.com/npm-check/-/npm-check-5.9.2.tgz#3b8a6230a3f8c11db113a9735b19b1ceac157dbb" @@ -11742,20 +11713,6 @@ npm-conf@^1.1.0: config-chain "^1.1.11" pify "^3.0.0" -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.8" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" - integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-normalize-package-bin "^1.0.1" - npm-run-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f" @@ -11777,7 +11734,7 @@ npm-run-path@^3.0.0: dependencies: path-key "^3.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -12098,7 +12055,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0, osenv@^0.1.4: +osenv@0: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -15605,19 +15562,6 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - tar@^5.0.5: version "5.0.5" resolved "https://registry.yarnpkg.com/tar/-/tar-5.0.5.tgz#03fcdb7105bc8ea3ce6c86642b9c942495b04f93" @@ -17220,7 +17164,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From ee265e05b09ceec196d87fa69df77f9e8c762093 Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Thu, 26 Mar 2020 18:18:05 +0800 Subject: [PATCH 03/54] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=88=B0=20next?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/dev.js | 3 +- config/index.js | 5 + config/prod.js | 5 +- package.json | 13 +- yarn.lock | 1543 ++++++++++++++++++++++++++++++++++++----------- 5 files changed, 1216 insertions(+), 353 deletions(-) diff --git a/config/dev.js b/config/dev.js index dc0235167..68fca1467 100644 --- a/config/dev.js +++ b/config/dev.js @@ -1,4 +1,3 @@ -/* eslint-disable import/no-commonjs */ module.exports = { env: { NODE_ENV: '"development"' @@ -9,7 +8,7 @@ module.exports = { url: { enable: true, config: { - limit: 102400000000 + limit: 2046 } } } diff --git a/config/index.js b/config/index.js index 567776287..47242aac8 100644 --- a/config/index.js +++ b/config/index.js @@ -7,6 +7,11 @@ const isBuildComponent = process.env.TARO_BUILD_TYPE === 'component' const config = { projectName: 'taro-ui', designWidth: 750, + deviceRatio: { + '640': 2.34 / 2, + '750': 1, + '828': 1.81 / 2 + }, sourceRoot: 'src', outputRoot: isBuildComponent ? 'dist' : `dist/${process.env.TARO_ENV}`, plugins: {}, diff --git a/config/prod.js b/config/prod.js index 354bf7c44..828b51e2c 100644 --- a/config/prod.js +++ b/config/prod.js @@ -1,4 +1,3 @@ -/* eslint-disable import/no-commonjs */ module.exports = { env: { NODE_ENV: '"production"' @@ -9,12 +8,12 @@ module.exports = { url: { enable: true, config: { - limit: 102400000000 + limit: 2046 } } } }, h5: { - publicPath: './', + publicPath: './' } } diff --git a/package.json b/package.json index f10993a3b..01b47dbcc 100644 --- a/package.json +++ b/package.json @@ -239,20 +239,17 @@ "@commitlint/cli": "^8.2.0", "@commitlint/config-conventional": "^8.2.0", "@mapbox/jsxtreme-markdown-loader": "^0.8.3", - "@tarojs/cli": "^2.0.3", - "@tarojs/components": "^2.0.3", - "@tarojs/mini-runner": "^2.0.3", + "@tarojs/cli": "^3.0.0-beta.1", + "@tarojs/components": "^3.0.0-beta.1", + "@tarojs/mini-runner": "^3.0.0-beta.1", "@tarojs/plugin-babel": "^2.0.3", "@tarojs/plugin-csso": "^2.0.3", "@tarojs/plugin-sass": "^2.0.3", "@tarojs/plugin-uglifyjs": "^2.0.3", + "@tarojs/react": "^3.0.0-beta.1", "@tarojs/router": "^2.0.3", - "@tarojs/taro": "^2.0.3", - "@tarojs/taro-alipay": "^2.0.3", + "@tarojs/taro": "^3.0.0-beta.1", "@tarojs/taro-h5": "^2.0.3", - "@tarojs/taro-qq": "^2.0.3", - "@tarojs/taro-swan": "^2.0.3", - "@tarojs/taro-weapp": "^2.0.3", "@tarojs/webpack-runner": "^2.0.3", "@types/classnames": "^2.2.9", "@types/react": "^16.9.23", diff --git a/yarn.lock b/yarn.lock index 975020fa5..5dc081599 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,7 +9,7 @@ dependencies: "@babel/highlight" "7.0.0-beta.44" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35", "@babel/code-frame@^7.0.0-beta.44", "@babel/code-frame@^7.8.3": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35", "@babel/code-frame@^7.0.0-beta.44", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== @@ -25,6 +25,26 @@ invariant "^2.2.4" semver "^5.5.0" +"@babel/core@7.6.4": + version "7.6.4" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff" + integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ== + dependencies: + "@babel/code-frame" "^7.5.5" + "@babel/generator" "^7.6.4" + "@babel/helpers" "^7.6.2" + "@babel/parser" "^7.6.4" + "@babel/template" "^7.6.0" + "@babel/traverse" "^7.6.3" + "@babel/types" "^7.6.3" + convert-source-map "^1.1.0" + debug "^4.1.0" + json5 "^2.1.0" + lodash "^4.17.13" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + "@babel/core@>=7.2.2", "@babel/core@^7.0.0-rc.1": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b" @@ -46,6 +66,28 @@ semver "^5.4.1" source-map "^0.5.0" +"@babel/core@^7.8.4": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e" + integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w== + dependencies: + "@babel/code-frame" "^7.8.3" + "@babel/generator" "^7.9.0" + "@babel/helper-module-transforms" "^7.9.0" + "@babel/helpers" "^7.9.0" + "@babel/parser" "^7.9.0" + "@babel/template" "^7.8.6" + "@babel/traverse" "^7.9.0" + "@babel/types" "^7.9.0" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.13" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + "@babel/generator@7.0.0-beta.44": version "7.0.0-beta.44" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42" @@ -57,6 +99,16 @@ source-map "^0.5.0" trim-right "^1.0.1" +"@babel/generator@^7.6.4", "@babel/generator@^7.9.0": + version "7.9.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz#12441e90c3b3c4159cdecf312075bf1a8ce2dbce" + integrity sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA== + dependencies: + "@babel/types" "^7.9.0" + jsesc "^2.5.1" + lodash "^4.17.13" + source-map "^0.5.0" + "@babel/generator@^7.8.6", "@babel/generator@^7.8.7": version "7.8.8" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.8.tgz#cdcd58caab730834cee9eeadb729e833b625da3e" @@ -110,7 +162,7 @@ levenary "^1.1.1" semver "^5.5.0" -"@babel/helper-create-class-features-plugin@^7.8.3": +"@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.8.3": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz#243a5b46e2f8f0f674dc1387631eb6b28b851de0" integrity sha512-klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg== @@ -194,7 +246,7 @@ dependencies: "@babel/types" "^7.8.3" -"@babel/helper-module-imports@^7.8.3": +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498" integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg== @@ -214,6 +266,19 @@ "@babel/types" "^7.8.6" lodash "^4.17.13" +"@babel/helper-module-transforms@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5" + integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA== + dependencies: + "@babel/helper-module-imports" "^7.8.3" + "@babel/helper-replace-supers" "^7.8.6" + "@babel/helper-simple-access" "^7.8.3" + "@babel/helper-split-export-declaration" "^7.8.3" + "@babel/template" "^7.8.6" + "@babel/types" "^7.9.0" + lodash "^4.17.13" + "@babel/helper-optimise-call-expression@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9" @@ -221,7 +286,7 @@ dependencies: "@babel/types" "^7.8.3" -"@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670" integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ== @@ -276,6 +341,11 @@ dependencies: "@babel/types" "^7.8.3" +"@babel/helper-validator-identifier@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed" + integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw== + "@babel/helper-wrap-function@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610" @@ -286,6 +356,15 @@ "@babel/traverse" "^7.8.3" "@babel/types" "^7.8.3" +"@babel/helpers@^7.6.2", "@babel/helpers@^7.9.0": + version "7.9.2" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f" + integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA== + dependencies: + "@babel/template" "^7.8.3" + "@babel/traverse" "^7.9.0" + "@babel/types" "^7.9.0" + "@babel/helpers@^7.8.4": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73" @@ -318,7 +397,12 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.8.tgz#4c3b7ce36db37e0629be1f0d50a571d2f86f6cd4" integrity sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA== -"@babel/plugin-proposal-async-generator-functions@^7.8.3": +"@babel/parser@^7.6.4", "@babel/parser@^7.9.0": + version "7.9.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8" + integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA== + +"@babel/plugin-proposal-async-generator-functions@^7.2.0", "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f" integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw== @@ -327,6 +411,14 @@ "@babel/helper-remap-async-to-generator" "^7.8.3" "@babel/plugin-syntax-async-generators" "^7.8.0" +"@babel/plugin-proposal-class-properties@7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4" + integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.5.5" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-proposal-class-properties@^7.0.0-beta.55": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e" @@ -344,7 +436,7 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-decorators" "^7.8.3" -"@babel/plugin-proposal-dynamic-import@^7.8.3": +"@babel/plugin-proposal-dynamic-import@^7.5.0", "@babel/plugin-proposal-dynamic-import@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054" integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w== @@ -352,7 +444,7 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-dynamic-import" "^7.8.0" -"@babel/plugin-proposal-json-strings@^7.8.3": +"@babel/plugin-proposal-json-strings@^7.2.0", "@babel/plugin-proposal-json-strings@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b" integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q== @@ -376,7 +468,15 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" -"@babel/plugin-proposal-optional-catch-binding@^7.8.3": +"@babel/plugin-proposal-object-rest-spread@^7.6.2": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz#a28993699fc13df165995362693962ba6b061d6f" + integrity sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + +"@babel/plugin-proposal-optional-catch-binding@^7.2.0", "@babel/plugin-proposal-optional-catch-binding@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9" integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw== @@ -392,7 +492,7 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.0" -"@babel/plugin-proposal-unicode-property-regex@^7.8.3": +"@babel/plugin-proposal-unicode-property-regex@^7.6.2", "@babel/plugin-proposal-unicode-property-regex@^7.8.3": version "7.8.8" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d" integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A== @@ -400,7 +500,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.8.8" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-async-generators@^7.8.0": +"@babel/plugin-syntax-async-generators@^7.2.0", "@babel/plugin-syntax-async-generators@^7.8.0": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== @@ -414,14 +514,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-dynamic-import@^7.8.0": +"@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.8.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-json-strings@^7.8.0": +"@babel/plugin-syntax-json-strings@^7.2.0", "@babel/plugin-syntax-json-strings@^7.8.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== @@ -442,14 +542,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-object-rest-spread@^7.8.0": +"@babel/plugin-syntax-object-rest-spread@^7.2.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-catch-binding@^7.8.0": +"@babel/plugin-syntax-optional-catch-binding@^7.2.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== @@ -477,14 +577,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-arrow-functions@^7.8.3": +"@babel/plugin-transform-arrow-functions@^7.2.0", "@babel/plugin-transform-arrow-functions@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6" integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg== dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-async-to-generator@^7.8.3": +"@babel/plugin-transform-async-to-generator@^7.5.0", "@babel/plugin-transform-async-to-generator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086" integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ== @@ -493,14 +593,14 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-remap-async-to-generator" "^7.8.3" -"@babel/plugin-transform-block-scoped-functions@^7.8.3": +"@babel/plugin-transform-block-scoped-functions@^7.2.0", "@babel/plugin-transform-block-scoped-functions@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3" integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg== dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-block-scoping@^7.8.3": +"@babel/plugin-transform-block-scoping@^7.6.3", "@babel/plugin-transform-block-scoping@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a" integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w== @@ -508,6 +608,20 @@ "@babel/helper-plugin-utils" "^7.8.3" lodash "^4.17.13" +"@babel/plugin-transform-classes@^7.5.5": + version "7.9.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz#8603fc3cc449e31fdbdbc257f67717536a11af8d" + integrity sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.8.3" + "@babel/helper-define-map" "^7.8.3" + "@babel/helper-function-name" "^7.8.3" + "@babel/helper-optimise-call-expression" "^7.8.3" + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/helper-replace-supers" "^7.8.6" + "@babel/helper-split-export-declaration" "^7.8.3" + globals "^11.1.0" + "@babel/plugin-transform-classes@^7.8.6": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz#77534447a477cbe5995ae4aee3e39fbc8090c46d" @@ -522,21 +636,21 @@ "@babel/helper-split-export-declaration" "^7.8.3" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.8.3": +"@babel/plugin-transform-computed-properties@^7.2.0", "@babel/plugin-transform-computed-properties@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b" integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA== dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-destructuring@^7.8.3": +"@babel/plugin-transform-destructuring@^7.6.0", "@babel/plugin-transform-destructuring@^7.8.3": version "7.8.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz#fadb2bc8e90ccaf5658de6f8d4d22ff6272a2f4b" integrity sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ== dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-dotall-regex@^7.8.3": +"@babel/plugin-transform-dotall-regex@^7.6.2", "@babel/plugin-transform-dotall-regex@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e" integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw== @@ -544,14 +658,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-duplicate-keys@^7.8.3": +"@babel/plugin-transform-duplicate-keys@^7.5.0", "@babel/plugin-transform-duplicate-keys@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1" integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ== dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-exponentiation-operator@^7.8.3": +"@babel/plugin-transform-exponentiation-operator@^7.2.0", "@babel/plugin-transform-exponentiation-operator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7" integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ== @@ -559,6 +673,13 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-transform-for-of@^7.4.4": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e" + integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-transform-for-of@^7.8.6": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz#a051bd1b402c61af97a27ff51b468321c7c2a085" @@ -566,7 +687,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-function-name@^7.8.3": +"@babel/plugin-transform-function-name@^7.4.4", "@babel/plugin-transform-function-name@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b" integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ== @@ -574,20 +695,29 @@ "@babel/helper-function-name" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-literals@^7.8.3": +"@babel/plugin-transform-literals@^7.2.0", "@babel/plugin-transform-literals@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1" integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A== dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-member-expression-literals@^7.8.3": +"@babel/plugin-transform-member-expression-literals@^7.2.0", "@babel/plugin-transform-member-expression-literals@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410" integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA== dependencies: "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-transform-modules-amd@^7.5.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4" + integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q== + dependencies: + "@babel/helper-module-transforms" "^7.9.0" + "@babel/helper-plugin-utils" "^7.8.3" + babel-plugin-dynamic-import-node "^2.3.0" + "@babel/plugin-transform-modules-amd@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz#65606d44616b50225e76f5578f33c568a0b876a5" @@ -597,6 +727,16 @@ "@babel/helper-plugin-utils" "^7.8.3" babel-plugin-dynamic-import-node "^2.3.0" +"@babel/plugin-transform-modules-commonjs@^7.6.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940" + integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g== + dependencies: + "@babel/helper-module-transforms" "^7.9.0" + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/helper-simple-access" "^7.8.3" + babel-plugin-dynamic-import-node "^2.3.0" + "@babel/plugin-transform-modules-commonjs@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz#df251706ec331bd058a34bdd72613915f82928a5" @@ -607,6 +747,16 @@ "@babel/helper-simple-access" "^7.8.3" babel-plugin-dynamic-import-node "^2.3.0" +"@babel/plugin-transform-modules-systemjs@^7.5.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90" + integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ== + dependencies: + "@babel/helper-hoist-variables" "^7.8.3" + "@babel/helper-module-transforms" "^7.9.0" + "@babel/helper-plugin-utils" "^7.8.3" + babel-plugin-dynamic-import-node "^2.3.0" + "@babel/plugin-transform-modules-systemjs@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz#d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420" @@ -617,6 +767,14 @@ "@babel/helper-plugin-utils" "^7.8.3" babel-plugin-dynamic-import-node "^2.3.0" +"@babel/plugin-transform-modules-umd@^7.2.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697" + integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ== + dependencies: + "@babel/helper-module-transforms" "^7.9.0" + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-transform-modules-umd@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz#592d578ce06c52f5b98b02f913d653ffe972661a" @@ -625,21 +783,21 @@ "@babel/helper-module-transforms" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3": +"@babel/plugin-transform-named-capturing-groups-regex@^7.6.3", "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c" integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.8.3" -"@babel/plugin-transform-new-target@^7.8.3": +"@babel/plugin-transform-new-target@^7.4.4", "@babel/plugin-transform-new-target@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43" integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw== dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-object-super@^7.8.3": +"@babel/plugin-transform-object-super@^7.5.5", "@babel/plugin-transform-object-super@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725" integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ== @@ -647,6 +805,14 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-replace-supers" "^7.8.3" +"@babel/plugin-transform-parameters@^7.4.4": + version "7.9.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz#3028d0cc20ddc733166c6e9c8534559cee09f54a" + integrity sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg== + dependencies: + "@babel/helper-get-function-arity" "^7.8.3" + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-transform-parameters@^7.8.7": version "7.8.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz#0381de466c85d5404565243660c4496459525daf" @@ -656,7 +822,7 @@ "@babel/helper-get-function-arity" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-property-literals@^7.8.3": +"@babel/plugin-transform-property-literals@^7.2.0", "@babel/plugin-transform-property-literals@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263" integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg== @@ -672,35 +838,35 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-jsx" "^7.8.3" -"@babel/plugin-transform-regenerator@^7.8.7": +"@babel/plugin-transform-regenerator@^7.4.5", "@babel/plugin-transform-regenerator@^7.8.7": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8" integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA== dependencies: regenerator-transform "^0.14.2" -"@babel/plugin-transform-reserved-words@^7.8.3": +"@babel/plugin-transform-reserved-words@^7.2.0", "@babel/plugin-transform-reserved-words@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5" integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A== dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-shorthand-properties@^7.8.3": +"@babel/plugin-transform-shorthand-properties@^7.2.0", "@babel/plugin-transform-shorthand-properties@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8" integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w== dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-spread@^7.8.3": +"@babel/plugin-transform-spread@^7.6.2", "@babel/plugin-transform-spread@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8" integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g== dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-sticky-regex@^7.8.3": +"@babel/plugin-transform-sticky-regex@^7.2.0", "@babel/plugin-transform-sticky-regex@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100" integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw== @@ -708,7 +874,7 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-regex" "^7.8.3" -"@babel/plugin-transform-template-literals@^7.8.3": +"@babel/plugin-transform-template-literals@^7.4.4", "@babel/plugin-transform-template-literals@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80" integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ== @@ -716,7 +882,7 @@ "@babel/helper-annotate-as-pure" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-typeof-symbol@^7.8.4": +"@babel/plugin-transform-typeof-symbol@^7.2.0", "@babel/plugin-transform-typeof-symbol@^7.8.4": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412" integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg== @@ -732,7 +898,7 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-typescript" "^7.8.3" -"@babel/plugin-transform-unicode-regex@^7.8.3": +"@babel/plugin-transform-unicode-regex@^7.6.2", "@babel/plugin-transform-unicode-regex@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad" integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw== @@ -740,6 +906,62 @@ "@babel/helper-create-regexp-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" +"@babel/preset-env@7.6.3": + version "7.6.3" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271" + integrity sha512-CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-proposal-async-generator-functions" "^7.2.0" + "@babel/plugin-proposal-dynamic-import" "^7.5.0" + "@babel/plugin-proposal-json-strings" "^7.2.0" + "@babel/plugin-proposal-object-rest-spread" "^7.6.2" + "@babel/plugin-proposal-optional-catch-binding" "^7.2.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.6.2" + "@babel/plugin-syntax-async-generators" "^7.2.0" + "@babel/plugin-syntax-dynamic-import" "^7.2.0" + "@babel/plugin-syntax-json-strings" "^7.2.0" + "@babel/plugin-syntax-object-rest-spread" "^7.2.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" + "@babel/plugin-transform-arrow-functions" "^7.2.0" + "@babel/plugin-transform-async-to-generator" "^7.5.0" + "@babel/plugin-transform-block-scoped-functions" "^7.2.0" + "@babel/plugin-transform-block-scoping" "^7.6.3" + "@babel/plugin-transform-classes" "^7.5.5" + "@babel/plugin-transform-computed-properties" "^7.2.0" + "@babel/plugin-transform-destructuring" "^7.6.0" + "@babel/plugin-transform-dotall-regex" "^7.6.2" + "@babel/plugin-transform-duplicate-keys" "^7.5.0" + "@babel/plugin-transform-exponentiation-operator" "^7.2.0" + "@babel/plugin-transform-for-of" "^7.4.4" + "@babel/plugin-transform-function-name" "^7.4.4" + "@babel/plugin-transform-literals" "^7.2.0" + "@babel/plugin-transform-member-expression-literals" "^7.2.0" + "@babel/plugin-transform-modules-amd" "^7.5.0" + "@babel/plugin-transform-modules-commonjs" "^7.6.0" + "@babel/plugin-transform-modules-systemjs" "^7.5.0" + "@babel/plugin-transform-modules-umd" "^7.2.0" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.3" + "@babel/plugin-transform-new-target" "^7.4.4" + "@babel/plugin-transform-object-super" "^7.5.5" + "@babel/plugin-transform-parameters" "^7.4.4" + "@babel/plugin-transform-property-literals" "^7.2.0" + "@babel/plugin-transform-regenerator" "^7.4.5" + "@babel/plugin-transform-reserved-words" "^7.2.0" + "@babel/plugin-transform-shorthand-properties" "^7.2.0" + "@babel/plugin-transform-spread" "^7.6.2" + "@babel/plugin-transform-sticky-regex" "^7.2.0" + "@babel/plugin-transform-template-literals" "^7.4.4" + "@babel/plugin-transform-typeof-symbol" "^7.2.0" + "@babel/plugin-transform-unicode-regex" "^7.6.2" + "@babel/types" "^7.6.3" + browserslist "^4.6.0" + core-js-compat "^3.1.1" + invariant "^2.2.2" + js-levenshtein "^1.1.3" + semver "^5.5.0" + "@babel/preset-env@^7.0.0-beta.55": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db" @@ -836,7 +1058,7 @@ babylon "7.0.0-beta.44" lodash "^4.2.0" -"@babel/template@^7.8.3", "@babel/template@^7.8.6": +"@babel/template@^7.6.0", "@babel/template@^7.8.3", "@babel/template@^7.8.6": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg== @@ -876,6 +1098,21 @@ globals "^11.1.0" lodash "^4.17.13" +"@babel/traverse@^7.6.3", "@babel/traverse@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892" + integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w== + dependencies: + "@babel/code-frame" "^7.8.3" + "@babel/generator" "^7.9.0" + "@babel/helper-function-name" "^7.8.3" + "@babel/helper-split-export-declaration" "^7.8.3" + "@babel/parser" "^7.9.0" + "@babel/types" "^7.9.0" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.13" + "@babel/types@7.0.0-beta.44": version "7.0.0-beta.44" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757" @@ -885,6 +1122,15 @@ lodash "^4.2.0" to-fast-properties "^2.0.0" +"@babel/types@^7.6.3", "@babel/types@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5" + integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng== + dependencies: + "@babel/helper-validator-identifier" "^7.9.0" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d" @@ -1413,81 +1659,112 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== -"@tarojs/cli@^2.0.3": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@tarojs/cli/-/cli-2.0.7.tgz#64c0fd5e232f0409134534f8f02f581ad35be3dc" - integrity sha512-USjgPJh2pLlTgxv2Xx+1u5U+eTOt/wpmbwG6CXp5JD4X8+bcbJdNZ0fDZbyJ99AQyzhW8uwJpiFpv6dBFnSgZw== +"@stencil/core@^1.8.1": + version "1.11.2" + resolved "https://registry.yarnpkg.com/@stencil/core/-/core-1.11.2.tgz#9ef89555fb534a98b8fddd73f58a172087258fb2" + integrity sha512-jF06JqUYa6Rt2kA4CTMY44WEmU+Nqw9lK9EYSCFZLzRg2lIG6i1hsn+zsH/Z9hQe8HDsZsQzr2MTlQCrTXCW9w== + dependencies: + typescript "3.8.3" + +"@tarojs/api@3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@tarojs/api/-/api-3.0.0-beta.1.tgz#90915f0f3302058b7d9d4ef45d4cdbe2dad2bdf1" + integrity sha512-O8NhPuWsixNe/jT11JiHIzHU027bqNsAqlxF5nDZMehK6C8mwd7EPIIbfXX553j17IOblSBv6V6yh4iHy7oEKw== + dependencies: + "@tarojs/runtime" "3.0.0-beta.1" + +"@tarojs/cli@^3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@tarojs/cli/-/cli-3.0.0-beta.1.tgz#17dba1e05b051d40535a541aea3aa4977b39c843" + integrity sha512-0amQeqBi+HD2SioF7V3lzFH1xziAkAYjFsGWQRwMDNzxW9/Fv4jd3PSq/l4RVak+utztI5EApAR3g5XPh104yw== dependencies: - "@tarojs/taroize" "2.0.7" - "@tarojs/transformer-wx" "2.0.7" + "@tarojs/taro" "3.0.0-beta.1" + "@tarojs/taroize" "^2.0.4" + "@tarojs/transformer-wx" "^2.0.4" "@types/request" "^2.48.1" "@typescript-eslint/parser" "^2.0.0" adm-zip "^0.4.13" + autoprefixer "^8.4.1" babel-core "^6.26.3" babel-eslint "^8.2.3" babel-generator "^6.26.1" babel-plugin-danger-remove-unused-import "^1.1.1" babel-plugin-preval "1.6.4" + babel-plugin-remove-dead-code "^1.3.2" babel-plugin-transform-decorators-legacy "^1.3.4" babel-plugin-transform-define "^1.3.0" - babel-plugin-transform-jsx-to-stylesheet "2.0.7" babel-plugin-transform-react-jsx "^6.24.1" babel-plugin-transform-taroapi "1.3.15" babel-template "^6.26.0" babel-traverse "^6.26.0" babel-types "^6.26.0" + babylon "^6.18.0" better-babel-generator "^6.26.1" chalk "2.4.2" chokidar "^2.0.3" commander "^2.19.0" cross-spawn "^6.0.5" + css-to-react-native-transform "^1.4.0" + css-what "^3.2.0" download-git-repo "^2.0.0" + ejs "^2.6.1" envinfo "^6.0.1" - eslint "^6.8.0" - eslint-config-taro "2.0.7" + eslint "^6.1.0" + eslint-config-taro "3.0.0-beta.1" eslint-plugin-import "^2.8.0" eslint-plugin-react "^7.4.0" eslint-plugin-react-hooks "^1.6.1" - eslint-plugin-taro "2.0.7" - eslint-plugin-typescript "^0.12.0" + eslint-plugin-taro "3.0.0-beta.1" fbjs "^1.0.0" find-yarn-workspace-root "1.2.1" fs-extra "^5.0.0" + generic-names "^2.0.1" glob "^7.1.2" inquirer "^5.2.0" joi "^14.0.6" - klaw "^3.0.0" + klaw "^2.1.1" latest-version "^4.0.0" lodash "^4.17.5" mem-fs "^1.1.3" mem-fs-editor "^4.0.0" + minimatch "^3.0.4" npm-check "^5.9.0" ora "^2.0.0" postcss "^6.0.22" - postcss-pxtransform "2.0.7" + postcss-modules-extract-imports "^1.1.0" + postcss-modules-local-by-default "^1.2.0" + postcss-modules-resolve-imports "^1.3.0" + postcss-modules-scope "^1.1.0" + postcss-modules-values "^1.3.0" + postcss-pxtransform "3.0.0-beta.1" postcss-reporter "^6.0.1" postcss-taro-unit-transform "1.2.15" + postcss-url "^7.3.2" prettier "^1.16.4" prop-types "^15.6.2" request "^2.88.0" resolve "^1.6.0" - rimraf "3.0.0" + sax "^1.2.4" semver "^5.5.0" shelljs "^0.8.1" stylelint "9.3.0" - stylelint-config-taro-rn "2.0.7" - stylelint-taro-rn "2.0.7" tapable "^1.1.3" - taro-css-to-react-native "2.0.7" + taro-css-to-react-native "^2.0.4" + through2 "^2.0.3" + vinyl "^2.1.0" + vinyl-fs "^3.0.2" xml2js "^0.4.19" xxhashjs "^0.2.2" yauzl "2.10.0" -"@tarojs/components@^2.0.3": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@tarojs/components/-/components-2.0.7.tgz#884a08f1347e2c282a23e4abe40d99cd5a30c892" - integrity sha512-dgkqR+a1AJpRzMDprjTjdKrPCUW60SkgVl6+6WXOjgwNZ3UGWYaLbvMBZoVVVn91nb3Xe1lo3OHZZT8uR3c3Ug== +"@tarojs/components@^3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@tarojs/components/-/components-3.0.0-beta.1.tgz#13c011711766a6c9e8aa6f8bf089796c492d2ae0" + integrity sha512-lwutDkRNCham+wD4oq5J8hPzKv/JE0LMcOfJA1+KxzCLhVZkMWc4YSQxoKZUk/UJdRMPii8hCcawrTnG+g4zUg== dependencies: + "@stencil/core" "^1.8.1" + "@tarojs/taro" "3.0.0-beta.1" + better-scroll "^1.14.1" classnames "^2.2.5" intersection-observer "^0.7.0" omit.js "^1.0.0" @@ -1495,51 +1772,55 @@ swiper "4.4.2" weui "^1.1.2" -"@tarojs/mini-runner@^2.0.3": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@tarojs/mini-runner/-/mini-runner-2.0.7.tgz#5fcf3ba41e0ccde3e419af34ad43ddb15f057bed" - integrity sha512-UZQuvUb3yn5As22zEtEDxhwQZAI4spP7KWKV4lsJKVInEslC0Cp/OAtgTmpPF9iBxyxjGx07TTGG5jLwyGRvIw== - dependencies: - "@tarojs/runner-utils" "2.0.7" - "@tarojs/taro" "2.0.7" - "@tarojs/transformer-wx" "2.0.7" - babel-core "^6.26.3" - babel-generator "^6.26.1" - babel-loader "^8.0.6" - babel-plugin-danger-remove-unused-import "^1.1.2" - babel-plugin-preval "1.6.2" - babel-traverse "^6.26.0" +"@tarojs/mini-runner@^3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@tarojs/mini-runner/-/mini-runner-3.0.0-beta.1.tgz#cee6164cb538fd01ff6b9c705b13b89dd59a4fbf" + integrity sha512-uekLuTfzOnZa9vMP12aaD9sVHI1QT/sKIne+PqbWXEoWo14dTdwPcwG2i42St1ChO++bkRZwtU16l/Lof+CX/Q== + dependencies: + "@babel/core" "7.6.4" + "@babel/plugin-proposal-class-properties" "7.5.5" + "@babel/preset-env" "7.6.3" + "@tarojs/runner-utils" "3.0.0-beta.1" + "@tarojs/runtime" "3.0.0-beta.1" + "@tarojs/shared" "3.0.0-beta.1" + "@tarojs/taro" "3.0.0-beta.1" + "@tarojs/taro-loader" "3.0.0-beta.1" + babel-loader "8.0.6" babel-types "^6.26.0" - better-babel-generator "^6.26.1" chalk "^2.4.2" copy-webpack-plugin "^5.0.3" css "2.2.4" css-loader "^3.0.0" css-what "3.2.0" - csso-webpack-plugin "^2.0.0-beta.1" + csso-webpack-plugin "^1.0.0-beta.12" file-loader "^4.0.0" fs-extra "^8.0.1" + jsdom "^15.2.1" less "^3.10.3" less-loader "^5.0.0" loader-utils "^1.2.3" lodash "^4.17.11" + micromatch "^4.0.2" mini-css-extract-plugin "^0.7.0" + miniprogram-simulate "^1.1.5" node-sass "^4.12.0" ora "^3.4.0" postcss-import "12.0.1" postcss-loader "^3.0.0" - postcss-pxtransform "2.0.7" - postcss-url "^8.0.0" + postcss-pxtransform "^1.3.2" request "^2.88.0" - resolve "^2.0.0-next.0" + resolve "^1.11.1" sass-loader "^7.1.0" - sax "^1.2.4" - scss-bundle "^2.5.1" + sax "1.2.4" + stylus "^0.54.7" stylus-loader "^3.0.2" tapable "1.1.3" - uglifyjs-webpack-plugin "^2.2.0" + terser-webpack-plugin "2.3.5" url-loader "^2.0.0" - webpack "4.41.6" + vm2 "^3.8.4" + vue-loader "^15.7.2" + vue-template-compiler "^2.6.10" + webpack "4.42.0" webpack-chain "4.9.0" webpack-format-messages "^2.0.5" yauzl "2.10.0" @@ -1573,6 +1854,25 @@ dependencies: uglify-js "^3.3.24" +"@tarojs/react@^3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@tarojs/react/-/react-3.0.0-beta.1.tgz#a2c20798a990410e6af2c0174172d9737248f337" + integrity sha512-SQjX3gsatz7HHcH0dALmdztja6Xa/XiLdHYqe5SYlLuOBvCdbvQr5HS+AYfn2IxBBnJxkNGbwLuRj/KKDocmUg== + dependencies: + "@tarojs/runtime" "3.0.0-beta.1" + react-reconciler "^0.23.0" + scheduler "^0.17.0" + +"@tarojs/router@3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@tarojs/router/-/router-3.0.0-beta.1.tgz#94cdc74b8a07423f63d270e989b1813916cb3797" + integrity sha512-PR3ynfWrhGs79D7YrnmU5/sjpSnjxu2x5vR7NHHbI5IwlNZiCNjJiDOgdyto9w5wJygcFqxKszkh3+fT9BVyyw== + dependencies: + "@tarojs/runtime" "3.0.0-beta.1" + history "^4.10.1" + universal-router "^8.3.0" + url-parse "^1.4.7" + "@tarojs/router@^2.0.3": version "2.0.7" resolved "https://registry.yarnpkg.com/@tarojs/router/-/router-2.0.7.tgz#3f1418d9633999a2f7d02c072fcd2888e480ec92" @@ -1592,15 +1892,26 @@ dependencies: scss-bundle "^3.0.2" -"@tarojs/taro-alipay@^2.0.3": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@tarojs/taro-alipay/-/taro-alipay-2.0.7.tgz#278e56ad9d8d437fdc12f01523563f4cffad2496" - integrity sha512-UnaJgTJri4sw+C2M7m4pCH2gakN/WgTCISUVbdqWQZ3GOLY3rcm1F8TZpD7SnUwD4NyFltTC++3eVj4C49D1cA== +"@tarojs/runner-utils@3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@tarojs/runner-utils/-/runner-utils-3.0.0-beta.1.tgz#0c7b86c8eb9a21d3a99deef5464c5294a5a1dfef" + integrity sha512-m73nxkV721EwYDpYYmGuXGWXc/+LkHVL3woyFoYRl4lhfwZHEw37asrORVo8u40kCjC02sNE2uvimh3fvI+ymg== dependencies: - "@tarojs/taro" "2.0.7" - "@tarojs/utils" "2.0.7" - lodash "^4.17.10" - prop-types "^15.6.1" + "@babel/core" "^7.8.4" + chalk "^3.0.0" + fs-extra "^8.1.0" + lodash "^4.17.15" + scss-bundle "^3.0.2" + +"@tarojs/runtime@3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@tarojs/runtime/-/runtime-3.0.0-beta.1.tgz#432af62308bcf5735c3ebba50cf04b215854a110" + integrity sha512-p+yoW7Y2/1kuB8+2bianimQLd4cWGhXIYy+O+9gn/s9neQsiXwUL5ps5eXSNLCfMi5et90n0yjaFtGELuJ7sEg== + +"@tarojs/shared@3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@tarojs/shared/-/shared-3.0.0-beta.1.tgz#b38dc418220b5c1e793591557a27ce29ce25d151" + integrity sha512-ayg0NDuy2TfE/B2tykvgLKGmdQGHa3wJ7j8LWt+70ZrhgmEujJ7oX44gMm9hHApM91n6YmPPYG+RM+c2XM7u6Q== "@tarojs/taro-h5@2.0.7", "@tarojs/taro-h5@^2.0.3": version "2.0.7" @@ -1613,44 +1924,44 @@ raf "^3.4.1" whatwg-fetch "^2.0.4" -"@tarojs/taro-qq@^2.0.3": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@tarojs/taro-qq/-/taro-qq-2.0.7.tgz#d0094975a2dcbc4cb465f0c16f0a299ff80d2b85" - integrity sha512-x0udwyhmVCa6Fb62cZYrydlUTUWZLKYItb7G1+yWba1ctcqM9YB8J+wEkLvC2f2Nx4YFVBapQaiNa8LGOp/fBA== +"@tarojs/taro-h5@3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@tarojs/taro-h5/-/taro-h5-3.0.0-beta.1.tgz#7c8742e8e4d7b4c1ac1570e1b220710763f7ebbc" + integrity sha512-rXGL/2h4saU2kgsZv5PCc3v8MKG0cy8UUZaGDiyxJic5v3MVeWCjZU6MWCb5bi7bQyIIKb9KL+Z9iN3X6mBkqA== dependencies: - "@tarojs/taro" "2.0.7" - "@tarojs/utils" "2.0.7" - lodash "^4.17.10" - prop-types "^15.6.1" - -"@tarojs/taro-swan@^2.0.3": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@tarojs/taro-swan/-/taro-swan-2.0.7.tgz#5e9403ee00dcd3526c7ef6ce705eeec9598ecd23" - integrity sha512-CwU22oV+0Ud4dud1oO2jGsE/0iwk0amyAQuirsqAjb5FIpopcNIPOSTuGD1JpYj8cyN1RBV16GysksFD6NAudA== - dependencies: - "@tarojs/taro" "2.0.7" - "@tarojs/utils" "2.0.7" - lodash "^4.17.10" - prop-types "^15.6.1" + "@tarojs/api" "3.0.0-beta.1" + "@tarojs/router" "3.0.0-beta.1" + "@tarojs/runtime" "3.0.0-beta.1" + base64-js "^1.3.0" + jsonp-retry "^1.0.3" + mobile-detect "^1.4.2" + raf "^3.4.1" + unfetch "^4.1.0" + whatwg-fetch "^2.0.4" -"@tarojs/taro-weapp@^2.0.3": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@tarojs/taro-weapp/-/taro-weapp-2.0.7.tgz#a63f6a4b3b5f4e1a33e60ff040d7756ab6bad8ab" - integrity sha512-LPKe6dP607ZzEb5GGvH0qO/aO/mUSYjCYZaZ7qST0KRmUpPIO7ytwiwOK944IoAaun3u4TpM4mj/dhlZJUpX6w== +"@tarojs/taro-loader@3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@tarojs/taro-loader/-/taro-loader-3.0.0-beta.1.tgz#4a249d9655103498943f732cc21589c7c479d930" + integrity sha512-MJIZ5XMhv6MM0cr90vVib3gLN1IQZBII8IvpYVJkXGlhXXhepYvmSI/CPxBcMYUJD0ddv1ttLjdfdLp5K689FQ== dependencies: - "@tarojs/taro" "2.0.7" - "@tarojs/utils" "2.0.7" - lodash "^4.17.10" - prop-types "^15.6.1" + loader-utils "^1.2.3" -"@tarojs/taro@2.0.7", "@tarojs/taro@^2.0.3": +"@tarojs/taro@2.0.7": version "2.0.7" resolved "https://registry.yarnpkg.com/@tarojs/taro/-/taro-2.0.7.tgz#eeb8d998fbc66c5b55eec371bc3506a22aad0e43" integrity sha512-W/l7LdyNCX/JE9o4y3O2XgM1RYlG2M8h0bqsd7R7pLIN+yL8EKmaG6Ok8xJqN8g9/QcwPI85T04VbLVg/Gebbg== dependencies: "@tarojs/utils" "2.0.7" -"@tarojs/taroize@2.0.7": +"@tarojs/taro@3.0.0-beta.1", "@tarojs/taro@^3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@tarojs/taro/-/taro-3.0.0-beta.1.tgz#669fc4e603f6b70df46cb8f221c4cfcbf69fa404" + integrity sha512-34PY61AuWYseJ5FeLfg6rU2VVl3AARNo2Dx8hm8E/8xogJGD3ipCxEx34JVogU1+GSWB6/J2qEr0hUmv1T6ZIw== + dependencies: + "@tarojs/api" "3.0.0-beta.1" + "@tarojs/taro-h5" "3.0.0-beta.1" + +"@tarojs/taroize@^2.0.4": version "2.0.7" resolved "https://registry.yarnpkg.com/@tarojs/taroize/-/taroize-2.0.7.tgz#3ba95bf56f9079528144dd8614aaa1f9e0102133" integrity sha512-c1y8Rj6Vbkzis+7UETngyeWlMLhvkDaQVqLUvd3OHtx+ku9qwxiRoeM1cDA80TGiahWaHrEjOSDCPDG6wcBCFA== @@ -1667,7 +1978,7 @@ lodash "^4.17.5" typescript "^3.0.1" -"@tarojs/transformer-wx@2.0.7": +"@tarojs/transformer-wx@^2.0.4": version "2.0.7" resolved "https://registry.yarnpkg.com/@tarojs/transformer-wx/-/transformer-wx-2.0.7.tgz#9a75ed043b4117fa70125b8443b443fe4fac92f6" integrity sha512-fuRTHIg/sdecMbyv3SCLzhtah++ZUGRZsimdaG930UkrUnUBYE6JgyECCVsKj/lkTSwaj09+Nzd4h925gywpgA== @@ -1982,6 +2293,16 @@ "@typescript-eslint/typescript-estree" "2.24.0" eslint-scope "^5.0.0" +"@typescript-eslint/experimental-utils@2.25.0": + version "2.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.25.0.tgz#13691c4fe368bd377b1e5b1e4ad660b220bf7714" + integrity sha512-0IZ4ZR5QkFYbaJk+8eJ2kYeA+1tzOE1sBjbwwtSV85oNWYUBep+EyhlZ7DLUCyhMUGuJpcCCFL0fDtYAP1zMZw== + dependencies: + "@types/json-schema" "^7.0.3" + "@typescript-eslint/typescript-estree" "2.25.0" + eslint-scope "^5.0.0" + eslint-utils "^2.0.0" + "@typescript-eslint/parser@^2.0.0", "@typescript-eslint/parser@^2.10.0": version "2.24.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.24.0.tgz#2cf0eae6e6dd44d162486ad949c126b887f11eb8" @@ -1992,6 +2313,16 @@ "@typescript-eslint/typescript-estree" "2.24.0" eslint-visitor-keys "^1.1.0" +"@typescript-eslint/parser@^2.x": + version "2.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.25.0.tgz#abfb3d999084824d9a756d9b9c0f36fba03adb76" + integrity sha512-mccBLaBSpNVgp191CP5W+8U1crTyXsRziWliCqzj02kpxdjKMvFHGJbK33NroquH3zB/gZ8H511HEsJBa2fNEg== + dependencies: + "@types/eslint-visitor-keys" "^1.0.0" + "@typescript-eslint/experimental-utils" "2.25.0" + "@typescript-eslint/typescript-estree" "2.25.0" + eslint-visitor-keys "^1.1.0" + "@typescript-eslint/typescript-estree@2.24.0": version "2.24.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz#38bbc8bb479790d2f324797ffbcdb346d897c62a" @@ -2005,6 +2336,34 @@ semver "^6.3.0" tsutils "^3.17.1" +"@typescript-eslint/typescript-estree@2.25.0": + version "2.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz#b790497556734b7476fa7dd3fa539955a5c79e2c" + integrity sha512-VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg== + dependencies: + debug "^4.1.1" + eslint-visitor-keys "^1.1.0" + glob "^7.1.6" + is-glob "^4.0.1" + lodash "^4.17.15" + semver "^6.3.0" + tsutils "^3.17.1" + +"@vue/component-compiler-utils@^3.1.0": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.1.1.tgz#d4ef8f80292674044ad6211e336a302e4d2a6575" + integrity sha512-+lN3nsfJJDGMNz7fCpcoYIORrXo0K3OTsdr8jCM7FuqdI4+70TY6gxY6viJ2Xi1clqyPg7LpeOWwjF31vSMmUw== + dependencies: + consolidate "^0.15.1" + hash-sum "^1.0.2" + lru-cache "^4.1.2" + merge-source-map "^1.1.0" + postcss "^7.0.14" + postcss-selector-parser "^6.0.2" + prettier "^1.18.2" + source-map "~0.6.1" + vue-template-es2015-compiler "^1.9.0" + "@webassemblyjs/ast@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace" @@ -2354,7 +2713,7 @@ acorn-dynamic-import@^3.0.0: dependencies: acorn "^5.0.0" -acorn-globals@^4.1.0: +acorn-globals@^4.1.0, acorn-globals@^4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A== @@ -2382,7 +2741,7 @@ acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== -acorn@^7.1.1: +acorn@^7.1.0, acorn@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== @@ -2548,6 +2907,13 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" +append-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1" + integrity sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE= + dependencies: + buffer-equal "^1.0.0" + append-transform@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991" @@ -2793,7 +3159,7 @@ autoprefixer@8.6.4: postcss "^6.0.23" postcss-value-parser "^3.2.3" -autoprefixer@^8.0.0: +autoprefixer@^8.0.0, autoprefixer@^8.4.1: version "8.6.5" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.6.5.tgz#343f3d193ed568b3208e00117a1b96eb691d4ee9" integrity sha512-PLWJN3Xo/rycNkx+mp8iBDMTm3FeWe4VmYaZDSqL5QQB9sLsQkG5k8n+LNDFnhh9kdq2K+egL/icpctOmDHwig== @@ -2919,7 +3285,7 @@ babel-core@^7.0.0-0: resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg== -babel-eslint@^10.0.3: +babel-eslint@^10.0.0, babel-eslint@^10.0.3: version "10.1.0" resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg== @@ -3111,7 +3477,7 @@ babel-loader@7.1.4: loader-utils "^1.0.2" mkdirp "^0.5.1" -babel-loader@^8.0.0-beta.0, babel-loader@^8.0.6: +babel-loader@8.0.6, babel-loader@^8.0.0-beta.0: version "8.0.6" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb" integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw== @@ -3121,13 +3487,6 @@ babel-loader@^8.0.0-beta.0, babel-loader@^8.0.6: mkdirp "^0.5.1" pify "^4.0.1" -babel-macros@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/babel-macros/-/babel-macros-1.2.0.tgz#39e47ed6d286d4a98f1948d8bab45dac17e4e2d4" - integrity sha512-/GIwkOeNHQU9R27Bkt0jHrJgaXBX5KLKrIH5h/iGebvKppvL9e4wKCgrl4qwUj0qssBHQFeSavk3lG2lQgdq8w== - dependencies: - cosmiconfig "3.1.0" - babel-messages@^6.23.0, babel-messages@^6.8.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" @@ -3142,7 +3501,7 @@ babel-plugin-check-es2015-constants@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-danger-remove-unused-import@^1.1.1, babel-plugin-danger-remove-unused-import@^1.1.2: +babel-plugin-danger-remove-unused-import@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/babel-plugin-danger-remove-unused-import/-/babel-plugin-danger-remove-unused-import-1.1.2.tgz#ac39c30edfe524ef8cfc411fec5edc479d19e132" integrity sha512-3bNmVAaakP3b1aROj7O3bOWj2kBa85sZR5naZ3Rn8L9buiZaAyZLgjfrPDL3zhX4wySOA5jrTm/wSmJPsMm3cg== @@ -3185,16 +3544,6 @@ babel-plugin-minify-dead-code@^1.3.2: dependencies: babel-core "6.10.4" -babel-plugin-preval@1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-1.6.2.tgz#8f580a1d4579d5fc79f1cfaee6f9fe0996fdeb1f" - integrity sha512-o/65+qySRSkh10QPqEk9dbudYCjRNHc4lZYb7EH838Ri7ATwhw/o/09tr72yJGiOaGO7GFa1MszUg8dN7TAjXQ== - dependencies: - babel-macros "^1.1.1" - babel-register "^6.26.0" - babylon "^6.18.0" - require-from-string "^2.0.1" - babel-plugin-preval@1.6.4, babel-plugin-preval@^1.6.4: version "1.6.4" resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-1.6.4.tgz#96febe8172b3ca6c3d03ed96eeb0382ba4b18056" @@ -3205,6 +3554,13 @@ babel-plugin-preval@1.6.4, babel-plugin-preval@^1.6.4: babylon "^6.18.0" require-from-string "^2.0.1" +babel-plugin-remove-dead-code@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/babel-plugin-remove-dead-code/-/babel-plugin-remove-dead-code-1.3.2.tgz#e1a2cd9595bb2f767291f35cab4ec9b467ee62c6" + integrity sha1-4aLNlZW7L3ZykfNcq07JtGfuYsY= + dependencies: + babel-core "6.10.4" + babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" @@ -3519,11 +3875,6 @@ babel-plugin-transform-flow-strip-types@^6.22.0: babel-plugin-syntax-flow "^6.18.0" babel-runtime "^6.22.0" -babel-plugin-transform-jsx-to-stylesheet@2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-jsx-to-stylesheet/-/babel-plugin-transform-jsx-to-stylesheet-2.0.7.tgz#94a6b42a908d2ba37f031b61a43266a2784494de" - integrity sha512-mU+yL6UjnB0nsiXKMdmRCKFluFiv1HnJ6S05psULVBw1hdnKwqYcJ4wJWAbIKm4jFa70eEcgZ/ijSrEnF4y2Zg== - babel-plugin-transform-object-rest-spread@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" @@ -3674,7 +4025,7 @@ babel-register@^6.26.0, babel-register@^6.9.0: mkdirp "^0.5.1" source-map-support "^0.4.15" -babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.6.1, babel-runtime@^6.9.1: +babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.6.1, babel-runtime@^6.9.1: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -3782,6 +4133,13 @@ better-babel-generator@^6.26.1: source-map "^0.5.7" trim-right "^1.0.1" +better-scroll@^1.14.1: + version "1.15.2" + resolved "https://registry.yarnpkg.com/better-scroll/-/better-scroll-1.15.2.tgz#65ffc6058b8b4ff337b8dfad4bcb334d7699ceb6" + integrity sha512-sSY2N8I9/B+YX/9JpIz6pMQYnmBuvspBqZG4UxYaQEfz/ZWrnxwdyKLL4t6IKpFmxqtZadVypXw7vSSHxBZpBQ== + dependencies: + babel-runtime "^6.0.0" + big.js@^3.1.3: version "3.2.0" resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" @@ -3848,7 +4206,7 @@ block-stream@*: dependencies: inherits "~2.0.0" -bluebird@^3.5.1, bluebird@^3.5.5: +bluebird@^3.1.1, bluebird@^3.5.1, bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -4043,6 +4401,16 @@ browserslist@^3.2.6, browserslist@^3.2.8: caniuse-lite "^1.0.30000844" electron-to-chromium "^1.3.47" +browserslist@^4.6.0: + version "4.11.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.0.tgz#aef4357b10a8abda00f97aac7cd587b2082ba1ad" + integrity sha512-WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A== + dependencies: + caniuse-lite "^1.0.30001035" + electron-to-chromium "^1.3.380" + node-releases "^1.1.52" + pkg-up "^3.1.0" + browserslist@^4.8.3, browserslist@^4.8.5, browserslist@^4.9.1: version "4.9.1" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.1.tgz#01ffb9ca31a1aef7678128fc6a2253316aa7287c" @@ -4082,6 +4450,11 @@ buffer-equal@0.0.1: resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b" integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs= +buffer-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" + integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= + buffer-fill@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" @@ -4184,6 +4557,30 @@ cacache@^12.0.2, cacache@^12.0.3: unique-filename "^1.1.1" y18n "^4.0.0" +cacache@^13.0.1: + version "13.0.1" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c" + integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w== + dependencies: + chownr "^1.1.2" + figgy-pudding "^3.5.1" + fs-minipass "^2.0.0" + glob "^7.1.4" + graceful-fs "^4.2.2" + infer-owner "^1.0.4" + lru-cache "^5.1.1" + minipass "^3.0.0" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" + mkdirp "^0.5.1" + move-concurrently "^1.0.1" + p-map "^3.0.0" + promise-inflight "^1.0.1" + rimraf "^2.7.1" + ssri "^7.0.0" + unique-filename "^1.1.1" + cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -4344,6 +4741,11 @@ caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000859, caniuse-lite@^1.0.300008 resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e" integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ== +caniuse-lite@^1.0.30001035: + version "1.0.30001038" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz#44da3cbca2ab6cb6aa83d1be5d324e17f141caff" + integrity sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ== + capture-exit@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f" @@ -4468,7 +4870,7 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2. optionalDependencies: fsevents "^1.2.7" -chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.3: +chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.3: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -4926,6 +5328,13 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= +consolidate@^0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7" + integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw== + dependencies: + bluebird "^3.1.1" + constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -5186,7 +5595,7 @@ copy-webpack-plugin@^5.0.3, copy-webpack-plugin@^5.0.5: serialize-javascript "^2.1.2" webpack-log "^2.0.0" -core-js-compat@^3.6.2: +core-js-compat@^3.1.1, core-js-compat@^3.6.2: version "3.6.4" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17" integrity sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA== @@ -5214,16 +5623,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cosmiconfig@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-3.1.0.tgz#640a94bf9847f321800403cd273af60665c73397" - integrity sha512-zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q== - dependencies: - is-directory "^0.3.1" - js-yaml "^3.9.0" - parse-json "^3.0.0" - require-from-string "^2.0.1" - cosmiconfig@^5.0.0, cosmiconfig@^5.2.0, cosmiconfig@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" @@ -5408,6 +5807,13 @@ css-parse@1.7.x: resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b" integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs= +css-parse@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4" + integrity sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q= + dependencies: + css "^2.0.0" + css-select@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" @@ -5427,6 +5833,24 @@ css-selector-tokenizer@^0.7.0: fastparse "^1.1.2" regexpu-core "^4.6.0" +css-to-react-native-transform@^1.4.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/css-to-react-native-transform/-/css-to-react-native-transform-1.9.0.tgz#63369f479048ab7662f5320f8010840ad91344e7" + integrity sha512-darzotx5xx+Q0bzASkvNBasztLCssNerzf9jpMZx0H4CTY6J/y2Wh50ZtYAJ3FmESEux1bJcGa6T0zfISTuFqw== + dependencies: + css "^2.2.4" + css-mediaquery "^0.1.2" + css-to-react-native "^2.3.0" + +css-to-react-native@^2.3.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-2.3.2.tgz#e75e2f8f7aa385b4c3611c52b074b70a002f2e7d" + integrity sha512-VOFaeZA053BqvvvqIA8c9n0+9vFppVBAHCp6JgFTtTMU3Mzi+XnelJ9XC9ul3BqFzZyQ5N+H0SnwsWT2Ebchxw== + dependencies: + camelize "^1.0.0" + css-color-keywords "^1.0.0" + postcss-value-parser "^3.3.0" + css-tree@1.0.0-alpha.29: version "1.0.0-alpha.29" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39" @@ -5435,14 +5859,6 @@ css-tree@1.0.0-alpha.29: mdn-data "~1.1.0" source-map "^0.5.3" -css-tree@1.0.0-alpha.37: - version "1.0.0-alpha.37" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" - integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== - dependencies: - mdn-data "2.0.4" - source-map "^0.6.1" - css-what@2.1: version "2.1.3" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" @@ -5453,6 +5869,11 @@ css-what@3.2.0: resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.2.0.tgz#0ce44ada45f97bcbbec450563a23ef04ee2572ef" integrity sha512-lukqnlbswsPmDZ5+ViDBCcrk+1fyPBA+ZoHSAQhRuEeXBKUb3Lj2kcTwMqoiFrJAnEeO9u3Oc8X617SUm3apYQ== +css-what@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz#f4a8f12421064621b456755e34a03a2c22df5da1" + integrity sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw== + css@2.2.4, css@^2.0.0, css@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" @@ -5468,7 +5889,7 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -csso-webpack-plugin@1.0.0-beta.12: +csso-webpack-plugin@1.0.0-beta.12, csso-webpack-plugin@^1.0.0-beta.12: version "1.0.0-beta.12" resolved "https://registry.yarnpkg.com/csso-webpack-plugin/-/csso-webpack-plugin-1.0.0-beta.12.tgz#a42d02f74043eb8e7f303c9ba27bbb65c78972b8" integrity sha512-GNjin1ggenll2ET69LYUXv8jhAwlJp2DPkpsmSoL1OgtvT55vrRIkxX7Vvhwt47E8bdy2lDaiuuSm3bS45q8/A== @@ -5478,34 +5899,23 @@ csso-webpack-plugin@1.0.0-beta.12: source-map "^0.6.1" webpack-sources "^1.0.1" -csso-webpack-plugin@^2.0.0-beta.1: - version "2.0.0-beta.1" - resolved "https://registry.yarnpkg.com/csso-webpack-plugin/-/csso-webpack-plugin-2.0.0-beta.1.tgz#92a133ef697c65b11f7ba3c72db11fcf950d7293" - integrity sha512-hzMrKC2ibIIsWCeivr4qK64Sbpe2kVfsuyDJZF9rSA5uifIsyOUDyxswSVN9Q8FMWdzGwjgi9v/o/Gg9jduvUw== - dependencies: - csso "^4.0.2" - source-map "^0.7.3" - webpack-sources "^1.0.1" - -csso@^3.4.0, csso@^3.5.0: +csso@^3.4.0, csso@^3.5.0, csso@^3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b" integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg== dependencies: css-tree "1.0.0-alpha.29" -csso@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz#e5f81ab3a56b8eefb7f0092ce7279329f454de3d" - integrity sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg== - dependencies: - css-tree "1.0.0-alpha.37" - -cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": +cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@~0.3.6: version "0.3.8" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== +cssom@^0.4.1: + version "0.4.4" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== + cssstyle@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1" @@ -5513,6 +5923,13 @@ cssstyle@^1.0.0: dependencies: cssom "0.3.x" +cssstyle@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.2.0.tgz#e4c44debccd6b7911ed617a4395e5754bba59992" + integrity sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA== + dependencies: + cssom "~0.3.6" + csstype@^2.2.0: version "2.6.9" resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098" @@ -5557,7 +5974,7 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -data-urls@^1.0.0: +data-urls@^1.0.0, data-urls@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe" integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ== @@ -5607,6 +6024,13 @@ debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: dependencies: ms "^2.1.1" +debug@~3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + decamelize-keys@^1.0.0, decamelize-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" @@ -6156,7 +6580,7 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -ejs@^2.5.9: +ejs@^2.5.9, ejs@^2.6.1: version "2.7.4" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== @@ -6166,6 +6590,11 @@ electron-to-chromium@^1.3.363, electron-to-chromium@^1.3.47: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.378.tgz#18c572cbb54bf5b2769855597cdc7511c02b481f" integrity sha512-nBp/AfhaVIOnfwgL1CZxt80IcqWcyYXiX6v5gflAksxy+SzBVz7A7UWR1Nos92c9ofXW74V9PoapzRb0jJfYXw== +electron-to-chromium@^1.3.380: + version "1.3.386" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.386.tgz#224f97c808da76014096848f80bb9342b6a95cdb" + integrity sha512-M7JHfp32Bq6Am59AWgglh2d3nqe6y8Y94Vcb/AXUsO3DGvKUHYI5ML9+U5oNShfdOEfurrrjKSoSgFt2mz7mpw== + elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" @@ -6340,7 +6769,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escodegen@^1.9.1: +escodegen@^1.11.1, escodegen@^1.9.1: version "1.14.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ== @@ -6364,7 +6793,15 @@ eslint-config-prettier@^6.10.0: dependencies: get-stdin "^6.0.0" -eslint-config-taro@2.0.7, eslint-config-taro@^2.0.3: +eslint-config-taro@3.0.0-beta.1: + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/eslint-config-taro/-/eslint-config-taro-3.0.0-beta.1.tgz#5ff79d71c779fdf332382b97250f5144d84d6766" + integrity sha512-CHesh4Eu/G47+KvPnvKKqIf22T1hjrZucMgF/i6YT5Lh0IGxM7huvDMBaVT/Z4dEejWHUuShyMiooZ052J+yZg== + dependencies: + "@typescript-eslint/parser" "^2.x" + babel-eslint "^10.0.0" + +eslint-config-taro@^2.0.3: version "2.0.7" resolved "https://registry.yarnpkg.com/eslint-config-taro/-/eslint-config-taro-2.0.7.tgz#752eeb283a22047f481099904d1e0b9e99a391a1" integrity sha512-FB8gYm382HONJmOeSv/WlIKyw78Im8B5SjlMFYTDCdA227FSSmLyUwE1ojOar+egV7rOG7N+UrLoo8qhiGF0Tw== @@ -6464,12 +6901,12 @@ eslint-plugin-taro@2.0.7: dependencies: has "^1.0.1" -eslint-plugin-typescript@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-typescript/-/eslint-plugin-typescript-0.12.0.tgz#e23d58cb27fe28e89fc641a1f20e8d862cb99aef" - integrity sha512-2+DNE8nTvdNkhem/FBJXLPSeMDOZL68vHHNfTbM+PBc5iAuwBe8xLSQubwKxABqSZDwUHg+mwGmv5c2NlImi0Q== +eslint-plugin-taro@3.0.0-beta.1: + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-taro/-/eslint-plugin-taro-3.0.0-beta.1.tgz#89565639af690aa884c320b0aef7d06c36b76da8" + integrity sha512-UZH/i0GiaVk7ZnvASNN3o+WaJbhGGeWiasmhjKOsYA/ypIWdSmj/2ODAf2eTipSe/0cvofEsxOJ4geEh3HF/cw== dependencies: - requireindex "~1.1.0" + has "^1.0.1" eslint-scope@3.7.1: version "3.7.1" @@ -6502,6 +6939,13 @@ eslint-utils@^1.3.1, eslint-utils@^1.4.3: dependencies: eslint-visitor-keys "^1.1.0" +eslint-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd" + integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA== + dependencies: + eslint-visitor-keys "^1.1.0" + eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" @@ -6549,7 +6993,7 @@ eslint@5.16.0: table "^5.2.3" text-table "^0.2.0" -eslint@^6.7.2, eslint@^6.8.0: +eslint@^6.1.0, eslint@^6.7.2: version "6.8.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== @@ -6828,6 +7272,11 @@ expect@^23.6.0: jest-message-util "^23.4.0" jest-regex-util "^23.3.0" +expr-parser@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/expr-parser/-/expr-parser-1.0.0.tgz#b85be870efce3c764977578d4a505795233f9022" + integrity sha512-ncuWTCWH0M5KbaYikXxZ3FG3Q+FTYIEXeXAbxYscdZLFNnR5Le5gRU2r/a/JUZHnxwBDZcxWEWzCoPQlW9Engg== + express@^4.16.2, express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" @@ -7374,7 +7823,7 @@ flatted@^2.0.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== -flush-write-stream@^1.0.0: +flush-write-stream@^1.0.0, flush-write-stream@^1.0.2: version "1.1.1" resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== @@ -7514,6 +7963,14 @@ fs-minipass@^2.0.0: dependencies: minipass "^3.0.0" +fs-mkdirp-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb" + integrity sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes= + dependencies: + graceful-fs "^4.1.11" + through2 "^2.0.3" + fs-write-stream-atomic@^1.0.8: version "1.0.10" resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" @@ -7583,6 +8040,13 @@ gaze@^1.0.0: dependencies: globule "^1.0.0" +generic-names@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-2.0.1.tgz#f8a378ead2ccaa7a34f0317b05554832ae41b872" + integrity sha512-kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ== + dependencies: + loader-utils "^1.1.0" + gensync@^1.0.0-beta.1: version "1.0.0-beta.1" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" @@ -7772,6 +8236,22 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" +glob-stream@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4" + integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ= + dependencies: + extend "^3.0.0" + glob "^7.1.1" + glob-parent "^3.1.0" + is-negated-glob "^1.0.0" + ordered-read-streams "^1.0.0" + pumpify "^1.3.5" + readable-stream "^2.1.5" + remove-trailing-separator "^1.0.1" + to-absolute-glob "^2.0.0" + unique-stream "^2.0.2" + glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" @@ -8029,7 +8509,7 @@ got@^8.3.1: url-parse-lax "^3.0.0" url-to-options "^1.0.1" -graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2: +graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2: version "4.2.3" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== @@ -8173,6 +8653,11 @@ hash-base@^3.0.0: inherits "^2.0.1" safe-buffer "^5.0.1" +hash-sum@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04" + integrity sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ= + hash.js@^1.0.0, hash.js@^1.0.3: version "1.1.7" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" @@ -8268,7 +8753,7 @@ himalaya-wxml@^1.1.0: resolved "https://registry.yarnpkg.com/himalaya-wxml/-/himalaya-wxml-1.1.0.tgz#85d0341af1c5f53f3b021be8e4be890cc8b4d7af" integrity sha512-n1l4NRjr9uIOiGy76t6bi5TO7EDZWTFe875OgygoR9myFXJAYWtrmVG9GY094j1SEazCwxYqhEMbaywLlOArbw== -history@^4.9.0: +history@^4.10.1, history@^4.9.0: version "4.10.1" resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== @@ -8545,6 +9030,13 @@ icss-utils@^2.1.0: dependencies: postcss "^6.0.1" +icss-utils@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-3.0.1.tgz#ee70d3ae8cac38c6be5ed91e851b27eed343ad0f" + integrity sha1-7nDTroysOMa+XtkehRsn7tNDrQ8= + dependencies: + postcss "^6.0.2" + icss-utils@^4.0.0, icss-utils@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" @@ -8687,7 +9179,7 @@ indexof@0.0.1: resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= -infer-owner@^1.0.3: +infer-owner@^1.0.3, infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== @@ -8881,6 +9373,14 @@ is-absolute-url@^3.0.3: resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== +is-absolute@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" + integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== + dependencies: + is-relative "^1.0.0" + is-windows "^1.0.1" + is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -9133,6 +9633,11 @@ is-natural-number@^4.0.1: resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg= +is-negated-glob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" + integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI= + is-npm@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" @@ -9276,6 +9781,13 @@ is-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d" integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA== +is-relative@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" + integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== + dependencies: + is-unc-path "^1.0.0" + is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" @@ -9320,11 +9832,23 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-utf8@^0.2.0: +is-unc-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" + integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== + dependencies: + unc-path-regex "^0.1.2" + +is-utf8@^0.2.0, is-utf8@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= +is-valid-glob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" + integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao= + is-whitespace-character@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" @@ -9477,6 +10001,14 @@ isurl@^1.0.0-alpha5: has-to-string-tag-x "^1.2.0" is-object "^1.0.1" +j-component@^1.1.10: + version "1.1.10" + resolved "https://registry.yarnpkg.com/j-component/-/j-component-1.1.10.tgz#4fedcb5adaf79c11705e45f7c8a373b14137b783" + integrity sha512-6RnuVcsqbGI1bI7hdmEoyA4e5ciserST0Kog12jUabGdfLdrECA9N0V7HFejDxEbEveKkjTid0+Q21ahcoe9LQ== + dependencies: + expr-parser "^1.0.0" + miniprogram-exparser "0.0.6" + javascript-stringify@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-1.6.0.tgz#142d111f3a6e3dae8f4a9afd77d45855b5a9cce3" @@ -9791,6 +10323,14 @@ jest-worker@^23.2.0: dependencies: merge-stream "^1.0.1" +jest-worker@^25.1.0: + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.1.tgz#209617015c768652646aa33a7828cc2ab472a18a" + integrity sha512-IHnpekk8H/hCUbBlfeaPZzU6v75bqwJp3n4dUrQuQOAgOneI4tx3jV2o8pvlXnDfcRsfkFIUD//HWXpCmR+evQ== + dependencies: + merge-stream "^2.0.0" + supports-color "^7.0.0" + jest@23.6.0: version "23.6.0" resolved "https://registry.yarnpkg.com/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d" @@ -9862,6 +10402,11 @@ js-base64@^2.1.8, js-base64@^2.1.9: resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209" integrity sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ== +js-levenshtein@^1.1.3: + version "1.1.6" + resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d" + integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g== + js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -9872,7 +10417,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.10.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.4.2, js-yaml@^3.5.2, js-yaml@^3.7.0, js-yaml@^3.9.0: +js-yaml@^3.10.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.4.2, js-yaml@^3.5.2, js-yaml@^3.7.0: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== @@ -9917,6 +10462,38 @@ jsdom@^11.5.1: ws "^5.2.0" xml-name-validator "^3.0.0" +jsdom@^15.2.1: + version "15.2.1" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz#d2feb1aef7183f86be521b8c6833ff5296d07ec5" + integrity sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g== + dependencies: + abab "^2.0.0" + acorn "^7.1.0" + acorn-globals "^4.3.2" + array-equal "^1.0.0" + cssom "^0.4.1" + cssstyle "^2.0.0" + data-urls "^1.1.0" + domexception "^1.0.1" + escodegen "^1.11.1" + html-encoding-sniffer "^1.0.2" + nwsapi "^2.2.0" + parse5 "5.1.0" + pn "^1.1.0" + request "^2.88.0" + request-promise-native "^1.0.7" + saxes "^3.1.9" + symbol-tree "^3.2.2" + tough-cookie "^3.0.1" + w3c-hr-time "^1.0.1" + w3c-xmlserializer "^1.1.2" + webidl-conversions "^4.0.2" + whatwg-encoding "^1.0.5" + whatwg-mimetype "^2.3.0" + whatwg-url "^7.0.0" + ws "^7.0.0" + xml-name-validator "^3.0.0" + jsesc@2, jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -9989,7 +10566,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.0: +json5@^2.1.0, json5@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e" integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ== @@ -10079,10 +10656,10 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klaw@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146" - integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g== +klaw@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/klaw/-/klaw-2.1.1.tgz#42b76894701169cc910fd0d19ce677b5fb378af1" + integrity sha1-QrdolHARacyRD9DRnOZ3tfs3ivE= dependencies: graceful-fs "^4.1.9" @@ -10120,6 +10697,13 @@ latest-version@^4.0.0: dependencies: package-json "^5.0.0" +lazystream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" + integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ= + dependencies: + readable-stream "^2.0.5" + lcid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" @@ -10134,6 +10718,13 @@ lcid@^2.0.0: dependencies: invert-kv "^2.0.0" +lead@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42" + integrity sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI= + dependencies: + flush-write-stream "^1.0.2" + left-pad@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" @@ -10640,7 +11231,7 @@ lowercase-keys@^1.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== -lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.1: +lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -10845,11 +11436,6 @@ mdast-util-to-string@^1.0.4: resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527" integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A== -mdn-data@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" - integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== - mdn-data@~1.1.0: version "1.1.4" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01" @@ -10984,6 +11570,13 @@ merge-descriptors@1.0.1: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= +merge-source-map@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" + integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw== + dependencies: + source-map "^0.6.1" + merge-stream@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" @@ -11210,13 +11803,58 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minipass@^3.0.0: +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz#3dcb6bb4a546e32969c7ad710f2c79a86abba93a" + integrity sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA== + dependencies: + minipass "^3.0.0" + +minipass@^3.0.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" integrity sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w== dependencies: yallist "^4.0.0" +miniprogram-compiler@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/miniprogram-compiler/-/miniprogram-compiler-0.1.2.tgz#2afab6e288d8bc085f803b1d49ae59c5df236e99" + integrity sha512-TDEV9Shvn41rQThyPffNnpRJk/zS+wFM9GCYo7gUjXRwMuMqPpjmpXumxgryFyWH7wX6BJ702kxFwiOuL8RUnw== + dependencies: + glob "^7.1.3" + unescape-js "^1.1.1" + +miniprogram-exparser@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/miniprogram-exparser/-/miniprogram-exparser-0.0.6.tgz#817721e9cf306d426b9ea6d1ca795b7c267e3cb5" + integrity sha512-iPkZfl41nPE6lnYDV/Mnj6DIPPN0JGjWapvtueCaAAchZJ/CHgIGA1Qyy34PF4Fq+YQeWbbxW+S7Y+JxzCHe7w== + +miniprogram-simulate@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/miniprogram-simulate/-/miniprogram-simulate-1.1.5.tgz#757c275b0d01e0651c33ff598ffd677e8c087941" + integrity sha512-jNb31aqAqDLqi6fidN3ApNmWP4ITOeOdoh91u/040RLr05Trc5DxdacTsIZFgt7iee62uyrsDLSltZizIGnV+g== + dependencies: + csso "^3.5.1" + j-component "^1.1.10" + less "^3.10.3" + miniprogram-compiler "^0.1.2" + postcss "^7.0.23" + minizlib@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz#fd52c645301ef09a63a2c209697c294c6ce02cf3" @@ -11287,6 +11925,13 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: dependencies: minimist "^1.2.5" +mkdirp@~0.5.x: + version "0.5.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512" + integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw== + dependencies: + minimist "^1.2.5" + mobile-detect@^1.4.2: version "1.4.4" resolved "https://registry.yarnpkg.com/mobile-detect/-/mobile-detect-1.4.4.tgz#686c74e92d3cc06b09a9b3594b7b981494b137f6" @@ -11573,7 +12218,7 @@ node-prismjs@^0.1.2: dependencies: prismjs "~1.6.0" -node-releases@^1.1.50: +node-releases@^1.1.50, node-releases@^1.1.52: version "1.1.52" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9" integrity sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ== @@ -11673,6 +12318,13 @@ normalize-url@2.0.1: query-string "^5.0.1" sort-keys "^2.0.0" +now-and-later@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c" + integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ== + dependencies: + once "^1.3.2" + npm-check@^5.9.0: version "5.9.2" resolved "https://registry.yarnpkg.com/npm-check/-/npm-check-5.9.2.tgz#3b8a6230a3f8c11db113a9735b19b1ceac157dbb" @@ -11761,7 +12413,7 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= -nwsapi@^2.0.7: +nwsapi@^2.0.7, nwsapi@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== @@ -11812,7 +12464,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0: +object.assign@^4.0.4, object.assign@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== @@ -11904,7 +12556,7 @@ on-headers@~1.0.2: resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= @@ -12017,6 +12669,13 @@ ora@^4.0.3: strip-ansi "^6.0.0" wcwidth "^1.0.1" +ordered-read-streams@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e" + integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4= + dependencies: + readable-stream "^2.0.1" + original@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f" @@ -12107,7 +12766,7 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1: +p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1, p-limit@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== @@ -12300,13 +12959,6 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" -parse-json@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-3.0.0.tgz#fa6f47b18e23826ead32f263e744d0e1e847fb13" - integrity sha1-+m9HsY4jgm6tMvJj50TQ4ehH+xM= - dependencies: - error-ex "^1.3.1" - parse-json@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" @@ -12342,6 +12994,11 @@ parse5@4.0.0: resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA== +parse5@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" + integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== + parse5@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c" @@ -12441,6 +13098,11 @@ path-to-regexp@^1.7.0: dependencies: isarray "0.0.1" +path-to-regexp@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.2.0.tgz#fa7877ecbc495c601907562222453c43cc204a5f" + integrity sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA== + path-type@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" @@ -12570,6 +13232,13 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" +pkg-up@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== + dependencies: + find-up "^3.0.0" + please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" @@ -12703,7 +13372,7 @@ postcss-media-query-parser@^0.2.3: resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ= -postcss-modules-extract-imports@^1.2.0: +postcss-modules-extract-imports@^1.1.0, postcss-modules-extract-imports@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a" integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw== @@ -12735,6 +13404,15 @@ postcss-modules-local-by-default@^3.0.2: postcss-selector-parser "^6.0.2" postcss-value-parser "^4.0.0" +postcss-modules-resolve-imports@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/postcss-modules-resolve-imports/-/postcss-modules-resolve-imports-1.3.0.tgz#398d3000b95ae969420cdf4cd83fa8067f1c5eae" + integrity sha1-OY0wALla6WlCDN9M2D+oBn8cXq4= + dependencies: + css-selector-tokenizer "^0.7.0" + icss-utils "^3.0.1" + minimist "^1.2.0" + postcss-modules-scope@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" @@ -12790,6 +13468,22 @@ postcss-pxtransform@2.0.7: postcss "^6.0.16" postcss-pxtorem "^4.0.1" +postcss-pxtransform@3.0.0-beta.1: + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/postcss-pxtransform/-/postcss-pxtransform-3.0.0-beta.1.tgz#0c0e42dc773d4ccae11a75f2757758122daebd26" + integrity sha512-IO2v14khgMve5nImveOfK8FdMXWQ2Ngn6Mr81z5OO+JvbRNY4TcKLFEq4lKMxuIniXqjBp2u0vdwUjnUGZXDJg== + dependencies: + postcss "^6.0.16" + postcss-pxtorem "^4.0.1" + +postcss-pxtransform@^1.3.2: + version "1.3.39" + resolved "https://registry.yarnpkg.com/postcss-pxtransform/-/postcss-pxtransform-1.3.39.tgz#5ea5d8690d7488f1fedd92eacb10b064e5a1da98" + integrity sha512-/+tS4zVtjoyTDnfOiIVXjqDAV/HdHrZTtCkCtj6w9/oetAH8M/5+FblBwqQGnAVmp2JC+I9QEAhkRjTJsVjZZQ== + dependencies: + postcss "^6.0.16" + postcss-pxtorem "^4.0.1" + postcss-reporter@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-5.0.0.tgz#a14177fd1342829d291653f2786efd67110332c3" @@ -12894,15 +13588,15 @@ postcss-taro-unit-transform@1.2.15: dependencies: postcss "^6.0.21" -postcss-url@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca" - integrity sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw== +postcss-url@^7.3.2: + version "7.3.2" + resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-7.3.2.tgz#5fea273807fb84b38c461c3c9a9e8abd235f7120" + integrity sha512-QMV5mA+pCYZQcUEPQkmor9vcPQ2MT+Ipuu8qdi1gVxbNiIiErEGft+eny1ak19qALoBkccS5AHaCaCDzh7b9MA== dependencies: - mime "^2.3.1" + mime "^1.4.1" minimatch "^3.0.4" mkdirp "^0.5.0" - postcss "^7.0.2" + postcss "^6.0.1" xxhashjs "^0.2.1" postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0: @@ -12925,7 +13619,7 @@ postcss@^5.2.10, postcss@^5.2.16: source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.14, postcss@^6.0.16, postcss@^6.0.21, postcss@^6.0.22, postcss@^6.0.23, postcss@^6.0.6, postcss@^6.0.8: +postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.14, postcss@^6.0.16, postcss@^6.0.2, postcss@^6.0.21, postcss@^6.0.22, postcss@^6.0.23, postcss@^6.0.6, postcss@^6.0.8: version "6.0.23" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== @@ -12999,7 +13693,7 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^1.14.2, prettier@^1.16.4, prettier@^1.19.1: +prettier@^1.14.2, prettier@^1.16.4, prettier@^1.18.2, prettier@^1.19.1: version "1.19.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== @@ -13089,7 +13783,7 @@ prompts@^0.1.9: kleur "^2.0.1" sisteransi "^0.1.1" -prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -13159,7 +13853,7 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -pumpify@^1.3.3: +pumpify@^1.3.3, pumpify@^1.3.5: version "1.5.1" resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== @@ -13338,10 +14032,15 @@ react-markdown-loader@^1.1.14: node-prismjs "^0.1.2" remarkable "^2.0.0" -react-native-known-styling-properties@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/react-native-known-styling-properties/-/react-native-known-styling-properties-1.0.5.tgz#dd99690d579c5136541e1df836e75088af6e7356" - integrity sha512-PKRW5v9Um2/7mIaUy2fxg3XugP/QyVoqnzpnkY6AUTIlfyC2c/PeEhDwEVJgTotWiFCIj2lUACQ2lsG5zp0NUQ== +react-reconciler@^0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.23.0.tgz#5f0bfc35dda030b0220c07de11f93131c5d6db63" + integrity sha512-vV0KlLimP9a/NuRcM6GRVakkmT6MKSzhfo8K72fjHMnlXMOhz9GlPe+/tCp5CWBkg+lsMUt/CR1nypJBTPfwuw== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.17.0" react-router-dom@^5.1.2: version "5.1.2" @@ -13463,7 +14162,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -13817,6 +14516,23 @@ remarkable@^2.0.0: argparse "^1.0.10" autolinker "^3.11.0" +remove-bom-buffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53" + integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ== + dependencies: + is-buffer "^1.1.5" + is-utf8 "^0.2.1" + +remove-bom-stream@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523" + integrity sha1-BfGlk/FuQuH7kOv1nejlaVJflSM= + dependencies: + remove-bom-buffer "^3.0.0" + safe-buffer "^5.1.0" + through2 "^2.0.3" + remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -13867,7 +14583,7 @@ request-promise-core@1.1.3: dependencies: lodash "^4.17.15" -request-promise-native@^1.0.5: +request-promise-native@^1.0.5, request-promise-native@^1.0.7: version "1.0.8" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36" integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ== @@ -13927,11 +14643,6 @@ require-package-name@^2.0.1: resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9" integrity sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk= -requireindex@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162" - integrity sha1-5UBLgVV+91225JxacgBIk/4D4WI= - requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -13986,6 +14697,13 @@ resolve-global@1.0.0, resolve-global@^1.0.0: dependencies: global-dirs "^0.1.1" +resolve-options@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131" + integrity sha1-MrueOcBtZzONyTeMDW1gdFZq0TE= + dependencies: + value-or-function "^3.0.0" + resolve-pathname@2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879" @@ -14035,20 +14753,13 @@ resolve@1.8.1: dependencies: path-parse "^1.0.5" -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.6.0: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.6.0: version "1.15.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== dependencies: path-parse "^1.0.6" -resolve@^2.0.0-next.0: - version "2.0.0-next.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.1.tgz#4d96ccb89bf82d54ab037241ae053db4e92bb5f1" - integrity sha512-ZGTmuLZAW++TDjgslfUMRZcv7kXHv8z0zwxvuRWOPjnqc56HVsn1lVaqsWOZeQ8MwiilPVJLrcPVKG909QsAfA== - dependencies: - path-parse "^1.0.6" - responselike@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -14108,7 +14819,7 @@ rework@^1.0.1: convert-source-map "^0.3.3" css "^2.0.0" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -14122,13 +14833,6 @@ rimraf@2.6.3, rimraf@~2.6.2: dependencies: glob "^7.1.3" -rimraf@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b" - integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg== - dependencies: - glob "^7.1.3" - rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" @@ -14218,7 +14922,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -14295,11 +14999,26 @@ sax@0.5.x: resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1" integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE= -sax@>=0.6.0, sax@^1.2.4: +sax@1.2.4, sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +saxes@^3.1.9: + version "3.1.11" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" + integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g== + dependencies: + xmlchars "^2.1.1" + +scheduler@^0.17.0: + version "0.17.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.17.0.tgz#7c9c673e4ec781fac853927916d1c426b6f3ddfe" + integrity sha512-7rro8Io3tnCPuY4la/NuI5F2yfESpnfZyT6TtkXnSWVkcu0BCDJ+8gk5ozUaFaxpIyNuWAPXrH0yFcSi28fnDA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.4.0, schema-utils@^0.4.4, schema-utils@^0.4.5: version "0.4.7" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" @@ -14317,7 +15036,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1: +schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4: version "2.6.5" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a" integrity sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ== @@ -14454,7 +15173,7 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@^1.4.0, serialize-javascript@^1.7.0: +serialize-javascript@^1.4.0: version "1.9.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb" integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A== @@ -14946,6 +15665,14 @@ ssri@^6.0.1: dependencies: figgy-pudding "^3.5.1" +ssri@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz#92c241bf6de82365b5c7fb4bd76e975522e1294d" + integrity sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g== + dependencies: + figgy-pudding "^3.5.1" + minipass "^3.1.1" + stack-utils@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" @@ -15083,6 +15810,11 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string.fromcodepoint@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz#8d978333c0bc92538f50f383e4888f3e5619d653" + integrity sha1-jZeDM8C8klOPUPOD5IiPPlYZ1lM= + string.prototype.matchall@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" @@ -15270,11 +16002,6 @@ stylelint-config-standard@^20.0.0: dependencies: stylelint-config-recommended "^3.0.0" -stylelint-config-taro-rn@2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/stylelint-config-taro-rn/-/stylelint-config-taro-rn-2.0.7.tgz#69928c40cbae1f40e8b3f23405ec98026a441dcb" - integrity sha512-E7lMGvazsnD3VWybCBHTQ2Jz2ntpC0JpWjCWnbJoPKoJ9MUndYMeTFxUzntbETuXYxujdsRiyroQhgcbq9GJ1g== - stylelint-scss@^3.2.0: version "3.15.0" resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.15.0.tgz#df873a1163b592ecbf985a84d598569222d67043" @@ -15286,13 +16013,6 @@ stylelint-scss@^3.2.0: postcss-selector-parser "^6.0.2" postcss-value-parser "^4.0.2" -stylelint-taro-rn@2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/stylelint-taro-rn/-/stylelint-taro-rn-2.0.7.tgz#9c681d0ba5d93bd8c67e3f375b2c1a3b569a2e5c" - integrity sha512-EzakB3+5BwCl74yVsC/bsYAD83ui6GhzQEg4eHEMiJrmHF0/eFGwHRBDhYG060GcO0us+Stu693wogxfrZyx7A== - dependencies: - react-native-known-styling-properties "^1.0.4" - stylelint@9.3.0: version "9.3.0" resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.3.0.tgz#fe176e4e421ac10eac1a6b6d9f28e908eb58c5db" @@ -15417,6 +16137,20 @@ stylus@0.54.5: sax "0.5.x" source-map "0.1.x" +stylus@^0.54.7: + version "0.54.7" + resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.7.tgz#c6ce4793965ee538bcebe50f31537bfc04d88cd2" + integrity sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug== + dependencies: + css-parse "~2.0.0" + debug "~3.1.0" + glob "^7.1.3" + mkdirp "~0.5.x" + safer-buffer "^2.1.2" + sax "~1.2.4" + semver "^6.0.0" + source-map "^0.7.3" + sugarss@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.1.tgz#be826d9003e0f247735f92365dc3fd7f1bae9e44" @@ -15457,7 +16191,7 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" -supports-color@^7.1.0: +supports-color@^7.0.0, supports-color@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== @@ -15574,7 +16308,7 @@ tar@^5.0.5: mkdirp "^0.5.0" yallist "^4.0.0" -taro-css-to-react-native@2.0.7: +taro-css-to-react-native@^2.0.4: version "2.0.7" resolved "https://registry.yarnpkg.com/taro-css-to-react-native/-/taro-css-to-react-native-2.0.7.tgz#7b9654c8b6adbfc3e4cee33b075853f15be6ffbd" integrity sha512-oD/oCAq++5WyVHLj+V0/wvZamL4MZPLA0L4eC2NA2fkz/udcFyYVxyuf8IP3G2Lf9WxZNEyJjhC/0v8NplqxqA== @@ -15605,6 +16339,21 @@ term-size@^1.2.0: dependencies: execa "^0.7.0" +terser-webpack-plugin@2.3.5: + version "2.3.5" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz#5ad971acce5c517440ba873ea4f09687de2f4a81" + integrity sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w== + dependencies: + cacache "^13.0.1" + find-cache-dir "^3.2.0" + jest-worker "^25.1.0" + p-limit "^2.2.2" + schema-utils "^2.6.4" + serialize-javascript "^2.1.2" + source-map "^0.6.1" + terser "^4.4.3" + webpack-sources "^1.4.3" + terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -15620,7 +16369,7 @@ terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@^4.1.2, terser@^4.4.2: +terser@^4.1.2, terser@^4.4.2, terser@^4.4.3: version "4.6.7" resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz#478d7f9394ec1907f0e488c5f6a6a9a2bad55e72" integrity sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g== @@ -15660,7 +16409,15 @@ throat@^4.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= -through2@^2.0.0, through2@^2.0.2: +through2-filter@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" + integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA== + dependencies: + through2 "~2.0.0" + xtend "~4.0.0" + +through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -15734,6 +16491,14 @@ tmpl@1.0.x: resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= +to-absolute-glob@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" + integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs= + dependencies: + is-absolute "^1.0.0" + is-negated-glob "^1.0.0" + to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" @@ -15797,6 +16562,13 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" +to-through@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6" + integrity sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY= + dependencies: + through2 "^2.0.3" + toggle-selection@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32" @@ -15827,6 +16599,15 @@ tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" +tough-cookie@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" + integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== + dependencies: + ip-regex "^2.1.0" + psl "^1.1.28" + punycode "^2.1.1" + tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" @@ -15986,7 +16767,7 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^3.0.1, typescript@^3.2.2: +typescript@3.8.3, typescript@^3.0.1, typescript@^3.2.2: version "3.8.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== @@ -16017,7 +16798,7 @@ uglify-js@3.4.x: commander "~2.19.0" source-map "~0.6.1" -uglify-js@^3.1.4, uglify-js@^3.3.24, uglify-js@^3.6.0: +uglify-js@^3.1.4, uglify-js@^3.3.24: version "3.8.0" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.0.tgz#f3541ae97b2f048d7e7e3aa4f39fd8a1f5d7a805" integrity sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ== @@ -16039,21 +16820,6 @@ uglifyjs-webpack-plugin@1.2.4: webpack-sources "^1.1.0" worker-farm "^1.5.2" -uglifyjs-webpack-plugin@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.2.0.tgz#e75bc80e7f1937f725954c9b4c5a1e967ea9d0d7" - integrity sha512-mHSkufBmBuJ+KHQhv5H0MXijtsoA1lynJt1lXOaotja8/I0pR4L9oGaPIZw+bQBOFittXZg9OC1sXSGO9D9ZYg== - dependencies: - cacache "^12.0.2" - find-cache-dir "^2.1.0" - is-wsl "^1.1.0" - schema-utils "^1.0.0" - serialize-javascript "^1.7.0" - source-map "^0.6.1" - uglify-js "^3.6.0" - webpack-sources "^1.4.0" - worker-farm "^1.7.0" - unbzip2-stream@^1.0.9: version "1.3.3" resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a" @@ -16062,6 +16828,23 @@ unbzip2-stream@^1.0.9: buffer "^5.2.1" through "^2.3.8" +unc-path-regex@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" + integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= + +unescape-js@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/unescape-js/-/unescape-js-1.1.4.tgz#4bc6389c499cb055a98364a0b3094e1c3d5da395" + integrity sha512-42SD8NOQEhdYntEiUQdYq/1V/YHwr1HLwlHuTJB5InVVdOSbgI6xu8jK5q65yIzuFCfczzyDF/7hbGzVbyCw0g== + dependencies: + string.fromcodepoint "^0.2.1" + +unfetch@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz#6ec2dd0de887e58a4dee83a050ded80ffc4137db" + integrity sha512-crP/n3eAPUJxZXM9T80/yv0YhkTEx2K1D3h7D1AJM6fzsWZrxdyRuLN0JH/dkZh1LNH8LxCnBzoPFCPbb2iGpg== + unherit@^1.0.4: version "1.1.3" resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" @@ -16148,6 +16931,14 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" +unique-stream@^2.0.2: + version "2.3.1" + resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac" + integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A== + dependencies: + json-stable-stringify-without-jsonify "^1.0.1" + through2-filter "^3.0.0" + unique-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" @@ -16222,6 +17013,13 @@ unist-util-visit@^1.0.0, unist-util-visit@^1.1.0, unist-util-visit@^1.3.0: dependencies: unist-util-visit-parents "^2.0.0" +universal-router@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/universal-router/-/universal-router-8.3.0.tgz#533bce135d7b1abf591421c5d2028d54407a34a0" + integrity sha512-cBkihRoHvRQAjdUnDE1GGuuw/TPAIi8z2pEsSmUVAWLeZdgjHzzAb1+0VOO6NvBOvySItOTQikzaGlRxRdJBnA== + dependencies: + path-to-regexp "^3.1.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -16331,7 +17129,7 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.3: +url-parse@^1.4.3, url-parse@^1.4.7: version "1.4.7" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== @@ -16453,6 +17251,11 @@ value-equal@^1.0.1: resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== +value-or-function@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" + integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM= + vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -16519,6 +17322,42 @@ vinyl-file@^2.0.0: strip-bom-stream "^2.0.0" vinyl "^1.1.0" +vinyl-fs@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7" + integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng== + dependencies: + fs-mkdirp-stream "^1.0.0" + glob-stream "^6.1.0" + graceful-fs "^4.0.0" + is-valid-glob "^1.0.0" + lazystream "^1.0.0" + lead "^1.0.0" + object.assign "^4.0.4" + pumpify "^1.3.5" + readable-stream "^2.3.3" + remove-bom-buffer "^3.0.0" + remove-bom-stream "^1.2.0" + resolve-options "^1.1.0" + through2 "^2.0.0" + to-through "^2.0.0" + value-or-function "^3.0.0" + vinyl "^2.0.0" + vinyl-sourcemap "^1.1.0" + +vinyl-sourcemap@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16" + integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY= + dependencies: + append-buffer "^1.0.2" + convert-source-map "^1.5.0" + graceful-fs "^4.1.6" + normalize-path "^2.1.1" + now-and-later "^2.0.0" + remove-bom-buffer "^3.0.0" + vinyl "^2.0.0" + vinyl@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" @@ -16528,7 +17367,7 @@ vinyl@^1.1.0: clone-stats "^0.0.1" replace-ext "0.0.1" -vinyl@^2.0.1, vinyl@^2.2.0: +vinyl@^2.0.0, vinyl@^2.0.1, vinyl@^2.1.0, vinyl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86" integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg== @@ -16545,6 +17384,35 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== +vm2@^3.8.4: + version "3.9.0" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.0.tgz#00fd8c84bffcef3ce12df29a8db39171f4a485a2" + integrity sha512-Bsnvxu50AryMYOsarSAuFmmAQO5X/H5fF/VCVkcDKTj3slrpHQuepUP45U90aaqjk4OdNmlmHfoF6oou3aUJRw== + +vue-hot-reload-api@^2.3.0: + version "2.3.4" + resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" + integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== + +vue-loader@^15.7.2: + version "15.9.1" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.1.tgz#bd2ab8f3d281e51d7b81d15390a58424d142243e" + integrity sha512-IaPU2KOPjs/QjMlxFs/TiTtQUSbftQ7lsAvoxe21rtcQohsMhx+1AltXCNhZIpIn46PtODiAgz+o8RbMpKtmJw== + dependencies: + "@vue/component-compiler-utils" "^3.1.0" + hash-sum "^1.0.2" + loader-utils "^1.1.0" + vue-hot-reload-api "^2.3.0" + vue-style-loader "^4.1.0" + +vue-style-loader@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8" + integrity sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ== + dependencies: + hash-sum "^1.0.2" + loader-utils "^1.0.2" + vue-template-compiler@^2.6.10: version "2.6.11" resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz#c04704ef8f498b153130018993e56309d4698080" @@ -16553,6 +17421,11 @@ vue-template-compiler@^2.6.10: de-indent "^1.0.2" he "^1.1.0" +vue-template-es2015-compiler@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" + integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== + w3c-hr-time@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -16560,6 +17433,15 @@ w3c-hr-time@^1.0.1: dependencies: browser-process-hrtime "^1.0.0" +w3c-xmlserializer@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794" + integrity sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg== + dependencies: + domexception "^1.0.1" + webidl-conversions "^4.0.2" + xml-name-validator "^3.0.0" + walkdir@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.3.2.tgz#ac8437a288c295656848ebc19981ebc677a5f590" @@ -16763,7 +17645,7 @@ webpack-merge@^4.1.3: dependencies: lodash "^4.17.15" -webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: +webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -16801,36 +17683,7 @@ webpack@4.28.4: watchpack "^1.5.0" webpack-sources "^1.3.0" -webpack@4.41.6: - version "4.41.6" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.6.tgz#12f2f804bf6542ef166755050d4afbc8f66ba7e1" - integrity sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-module-context" "1.8.5" - "@webassemblyjs/wasm-edit" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" - acorn "^6.2.1" - ajv "^6.10.2" - ajv-keywords "^3.4.1" - chrome-trace-event "^1.0.2" - enhanced-resolve "^4.1.0" - eslint-scope "^4.0.3" - json-parse-better-errors "^1.0.2" - loader-runner "^2.4.0" - loader-utils "^1.2.3" - memory-fs "^0.4.1" - micromatch "^3.1.10" - mkdirp "^0.5.1" - neo-async "^2.6.1" - node-libs-browser "^2.2.1" - schema-utils "^1.0.0" - tapable "^1.1.3" - terser-webpack-plugin "^1.4.3" - watchpack "^1.6.0" - webpack-sources "^1.4.1" - -webpack@^4.16.5: +webpack@4.42.0, webpack@^4.16.5: version "4.42.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8" integrity sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w== @@ -16878,7 +17731,7 @@ weui@^1.1.2: resolved "https://registry.yarnpkg.com/weui/-/weui-1.1.3.tgz#0f0899bb61bb2ec603b2648367a8139298f81514" integrity sha512-vC6eWUvG1MYoE8yLsvBBmLB2+4DZWynQOL47MUscHMwPVltOZPGsiRb2PE7y3z+w3ElF1SsmJsyhr40wiXgP5A== -whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: +whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== @@ -16895,7 +17748,7 @@ whatwg-fetch@^2.0.4: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng== -whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0: +whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== @@ -17077,6 +17930,11 @@ ws@^6.2.1: dependencies: async-limiter "~1.0.0" +ws@^7.0.0: + version "7.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.3.tgz#a5411e1fb04d5ed0efee76d26d5c46d830c39b46" + integrity sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ== + x-is-array@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/x-is-array/-/x-is-array-0.1.0.tgz#de520171d47b3f416f5587d629b89d26b12dc29d" @@ -17125,6 +17983,11 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== +xmlchars@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + xregexp@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020" @@ -17137,7 +18000,7 @@ xregexp@^4.3.0: dependencies: "@babel/runtime-corejs3" "^7.8.3" -xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: +xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== From a4554470a0f4c21486011eb1d1fd7ead488c1dcb Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Thu, 26 Mar 2020 18:18:48 +0800 Subject: [PATCH 04/54] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=92=8C=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/calendar/body/index.tsx | 2 +- src/components/calendar/controller/index.tsx | 3 +-- src/components/calendar/index.tsx | 2 +- src/components/loading/index.tsx | 4 +--- src/components/tabs/index.tsx | 4 ++-- src/pages/index/index.tsx | 6 +++--- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/components/calendar/body/index.tsx b/src/components/calendar/body/index.tsx index a85dada2d..40fc1a2db 100644 --- a/src/components/calendar/body/index.tsx +++ b/src/components/calendar/body/index.tsx @@ -30,7 +30,7 @@ const defaultProps: Partial = { generateDate: Date.now() } -export default class AtCalendarBody extends Taro.Component< +export default class AtCalendarBody extends React.Component< AtCalendarBodyProps, Readonly > { diff --git a/src/components/calendar/controller/index.tsx b/src/components/calendar/controller/index.tsx index b11216840..96efcfea1 100644 --- a/src/components/calendar/controller/index.tsx +++ b/src/components/calendar/controller/index.tsx @@ -6,9 +6,8 @@ import { AtCalendarControllerState } from 'types/calendar' import { Picker, Text, View } from '@tarojs/components' -import Taro from '@tarojs/taro' -export default class AtCalendarController extends Taro.Component< +export default class AtCalendarController extends React.Component< AtCalendarControllerProps, AtCalendarControllerState > { diff --git a/src/components/calendar/index.tsx b/src/components/calendar/index.tsx index ab485dba0..d7cdda88a 100644 --- a/src/components/calendar/index.tsx +++ b/src/components/calendar/index.tsx @@ -27,7 +27,7 @@ const defaultProps: AtCalendarDefaultProps = { monthFormat: 'YYYY年MM月' } -export default class AtCalendar extends Taro.Component< +export default class AtCalendar extends React.Component< AtCalendarProps, Readonly > { diff --git a/src/components/loading/index.tsx b/src/components/loading/index.tsx index 83ac7ded3..68a7d300a 100644 --- a/src/components/loading/index.tsx +++ b/src/components/loading/index.tsx @@ -21,9 +21,7 @@ export default class AtLoading extends React.Component { } const colorStyle = { border: color ? `1px solid ${color}` : '', - 'border-color': color - ? `${color} transparent transparent transparent` - : '' + borderColor: color ? `${color} transparent transparent transparent` : '' } const ringStyle = Object.assign({}, colorStyle, sizeStyle) diff --git a/src/components/tabs/index.tsx b/src/components/tabs/index.tsx index 1a136c0cf..067d82cac 100644 --- a/src/components/tabs/index.tsx +++ b/src/components/tabs/index.tsx @@ -49,7 +49,7 @@ export default class AtTabs extends React.Component { case Taro.ENV_TYPE.SWAN: { const index = Math.max(idx - 1, 0) this.setState({ - _scrollIntoView: `tab${index}` + _scrollIntoView: `tab${this._tabId}${index}` }) break } @@ -185,7 +185,7 @@ export default class AtTabs extends React.Component { return ( diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index a34126503..99db88fb7 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -1,5 +1,5 @@ import React from 'react' -import { Image, Text, View } from '@tarojs/components' +import { CommonEvent, Image, Text, View } from '@tarojs/components' import Taro, { ShareAppMessageReturn } from '@tarojs/taro' import iconAction from '../../assets/images/icon-list-action.png' import iconBasic from '../../assets/images/icon-list-basic.png' @@ -85,7 +85,7 @@ export default class Index extends React.Component<{}, IndexState> { } } - private gotoPanel = (id: string): void => { + private gotoPanel = (e: CommonEvent, id: string): void => { Taro.navigateTo({ url: `/pages/panel/index?id=${id.toLowerCase()}` }) @@ -108,7 +108,7 @@ export default class Index extends React.Component<{}, IndexState> { data-id={item.id} data-name={item.title} data-list={item.subpages} - onTap={this.gotoPanel(item.id)} + onTap={(e: CommonEvent): void => this.gotoPanel(e, item.id)} > From ffd80b1358d67ea8551d6ca9115612c4eb9ded6d Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Thu, 26 Mar 2020 19:08:57 +0800 Subject: [PATCH 05/54] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20pxTransform?= =?UTF-8?q?=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/utils.ts | 8 +++++++- src/components/divider/index.tsx | 7 +++---- src/components/icon/index.tsx | 5 ++--- src/components/indexes/index.tsx | 9 +++++++-- src/components/input-number/index.tsx | 9 +++------ src/components/loading/index.tsx | 6 +++--- src/components/nav-bar/index.tsx | 9 ++++----- src/components/rate/index.tsx | 4 ++-- src/components/textarea/index.tsx | 5 ++--- 9 files changed, 33 insertions(+), 29 deletions(-) diff --git a/src/common/utils.ts b/src/common/utils.ts index 0477c5050..9ec93957a 100644 --- a/src/common/utils.ts +++ b/src/common/utils.ts @@ -216,7 +216,13 @@ function handleTouchScroll(flag: any): void { function pxTransform(size: number): string { if (!size) return '' - return Taro.pxTransform(size) + const designWidth = 750 + const deviceRatio = { + 640: 2.34 / 2, + 750: 1, + 828: 1.81 / 2 + } + return `${size / deviceRatio[designWidth]}rpx` } function objectToString(style: object | string): string { diff --git a/src/components/divider/index.tsx b/src/components/divider/index.tsx index 1cfc7109f..9e7cd55b4 100644 --- a/src/components/divider/index.tsx +++ b/src/components/divider/index.tsx @@ -3,8 +3,7 @@ import PropTypes, { InferProps } from 'prop-types' import React from 'react' import { AtDividerProps } from 'types/divider' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import { mergeStyle } from '../../common/utils' +import { mergeStyle, pxTransform } from '../../common/utils' export default class AtDivider extends React.Component { public static defaultProps: AtDividerProps @@ -22,12 +21,12 @@ export default class AtDivider extends React.Component { } = this.props const rootStyle = { - height: height ? `${Taro.pxTransform(Number(height))}` : '' + height: height ? `${pxTransform(Number(height))}` : '' } const fontStyle = { color: fontColor, - 'font-size': fontSize ? `${Taro.pxTransform(Number(fontSize))}` : '' + 'font-size': fontSize ? `${pxTransform(Number(fontSize))}` : '' } const lineStyle: React.CSSProperties = { diff --git a/src/components/icon/index.tsx b/src/components/icon/index.tsx index dfa84d99f..eed56346b 100644 --- a/src/components/icon/index.tsx +++ b/src/components/icon/index.tsx @@ -3,8 +3,7 @@ import PropTypes, { InferProps } from 'prop-types' import React from 'react' import { AtIconProps } from 'types/icon' import { Text } from '@tarojs/components' -import Taro from '@tarojs/taro' -import { mergeStyle } from '../../common/utils' +import { mergeStyle, pxTransform } from '../../common/utils' export default class AtIcon extends React.Component { public static defaultProps: AtIconProps @@ -25,7 +24,7 @@ export default class AtIcon extends React.Component { } = this.props const rootStyle = { - fontSize: `${Taro.pxTransform(parseInt(String(size)) * 2)}`, + fontSize: `${pxTransform(parseInt(String(size)) * 2)}`, color } diff --git a/src/components/indexes/index.tsx b/src/components/indexes/index.tsx index b7aab0058..44356ec27 100644 --- a/src/components/indexes/index.tsx +++ b/src/components/indexes/index.tsx @@ -6,7 +6,12 @@ import { AtIndexesProps, AtIndexesState, Item } from 'types/indexes' import { ScrollView, View } from '@tarojs/components' import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common' import Taro from '@tarojs/taro' -import { delayQuerySelector, isTest, uuid } from '../../common/utils' +import { + delayQuerySelector, + isTest, + uuid, + pxTransform +} from '../../common/utils' import AtList from '../list/index' import AtListItem from '../list/item/index' import AtToast from '../toast/index' @@ -176,7 +181,7 @@ export default class AtIndexes extends React.Component< isWEB } = this.state - const toastStyle = { minWidth: Taro.pxTransform(100) } + const toastStyle = { minWidth: pxTransform(100) } const rootCls = classNames('at-indexes', className) const menuList = list.map((dataList, i) => { diff --git a/src/components/input-number/index.tsx b/src/components/input-number/index.tsx index 969cb8c15..cacdb0874 100644 --- a/src/components/input-number/index.tsx +++ b/src/components/input-number/index.tsx @@ -5,8 +5,7 @@ import React from 'react' import { AtInputNumberProps, InputError } from 'types/input-number' import { Input, Text, View } from '@tarojs/components' import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import { initTestEnv } from '../../common/utils' +import { pxTransform } from '../../common/utils' // TODO: Check all types @@ -39,8 +38,6 @@ function parseValue(num: string): string { return _toString(num) } -initTestEnv() - type ExtendEvent = { target: { value: string | number @@ -100,7 +97,7 @@ export default class AtInputNumber extends React.Component { this.handleError({ type: 'OVER', - errorValue: resultValue! + errorValue: resultValue }) } @@ -143,7 +140,7 @@ export default class AtInputNumber extends React.Component { } = this.props const inputStyle = { - width: width ? `${Taro.pxTransform(width)}` : '' + width: width ? `${pxTransform(width)}` : '' } const inputValue = Number(this.handleValue(value)) const rootCls = classNames( diff --git a/src/components/loading/index.tsx b/src/components/loading/index.tsx index 68a7d300a..30e219e8a 100644 --- a/src/components/loading/index.tsx +++ b/src/components/loading/index.tsx @@ -1,7 +1,7 @@ import PropTypes, { InferProps } from 'prop-types' import React from 'react' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' +import { pxTransform } from '../../common/utils' interface AtLoadingProps { size?: string | number @@ -16,8 +16,8 @@ export default class AtLoading extends React.Component { const { color, size } = this.props const loadingSize = typeof size === 'string' ? size : String(size) const sizeStyle = { - width: size ? `${Taro.pxTransform(parseInt(loadingSize))}` : '', - height: size ? `${Taro.pxTransform(parseInt(loadingSize))}` : '' + width: size ? `${pxTransform(parseInt(loadingSize))}` : '', + height: size ? `${pxTransform(parseInt(loadingSize))}` : '' } const colorStyle = { border: color ? `1px solid ${color}` : '', diff --git a/src/components/nav-bar/index.tsx b/src/components/nav-bar/index.tsx index 3a7e7d75e..8bec1693b 100644 --- a/src/components/nav-bar/index.tsx +++ b/src/components/nav-bar/index.tsx @@ -5,8 +5,7 @@ import React from 'react' import { AtNavBarProps } from 'types/nav-bar' import { Text, View } from '@tarojs/components' import { ITouchEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' -import { mergeStyle } from '../../common/utils' +import { mergeStyle, pxTransform } from '../../common/utils' export default class AtNavBar extends React.Component { public static defaultProps: AtNavBarProps @@ -104,7 +103,7 @@ export default class AtNavBar extends React.Component { style={mergeStyle( { color: leftIconInfo.color, - fontSize: `${Taro.pxTransform( + fontSize: `${pxTransform( parseInt(leftIconInfo.size.toString()) * 2 )}` }, @@ -132,7 +131,7 @@ export default class AtNavBar extends React.Component { style={mergeStyle( { color: rightSecondIconInfo.color, - fontSize: `${Taro.pxTransform( + fontSize: `${pxTransform( parseInt(rightSecondIconInfo.size.toString()) * 2 )}` }, @@ -155,7 +154,7 @@ export default class AtNavBar extends React.Component { style={mergeStyle( { color: rightFirstIconInfo.color, - fontSize: `${Taro.pxTransform( + fontSize: `${pxTransform( parseInt(rightFirstIconInfo.size.toString()) * 2 )}` }, diff --git a/src/components/rate/index.tsx b/src/components/rate/index.tsx index 8ef95340d..1fbbcf1ce 100644 --- a/src/components/rate/index.tsx +++ b/src/components/rate/index.tsx @@ -4,7 +4,7 @@ import React from 'react' import { AtRateProps } from 'types/rate' import { Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' -import Taro from '@tarojs/taro' +import { pxTransform } from '../../common/utils' export default class AtRate extends React.Component { public static defaultProps: AtRateProps @@ -25,7 +25,7 @@ export default class AtRate extends React.Component { } = this.props const iconStyle = { - marginRight: Taro.pxTransform(margin) + marginRight: pxTransform(margin) } const starIconStyle = { fontSize: size ? `${size}px` : '' diff --git a/src/components/textarea/index.tsx b/src/components/textarea/index.tsx index 55187c8f9..e42064443 100644 --- a/src/components/textarea/index.tsx +++ b/src/components/textarea/index.tsx @@ -5,6 +5,7 @@ import { AtTextareaProps } from 'types/textarea' import { Textarea, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' import Taro from '@tarojs/taro' +import { pxTransform } from '../../common/utils' type ExtendEvent = { target: { @@ -72,9 +73,7 @@ export default class AtTextarea extends React.Component { const _maxLength = parseInt(maxLength.toString()) const actualMaxLength = getMaxLength(_maxLength, textOverflowForbidden) - const textareaStyle = height - ? `height:${Taro.pxTransform(Number(height))}` - : '' + const textareaStyle = height ? `height:${pxTransform(Number(height))}` : '' const rootCls = classNames( 'at-textarea', `at-textarea--${ENV}`, From 22ca02c0d6547745098adf5d4eab7167a29f80ab Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Thu, 26 Mar 2020 19:26:41 +0800 Subject: [PATCH 06/54] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20React=20?= =?UTF-8?q?=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When calling super() in (%s), make sure to pass up the same props that your component's constructor was passed. --- src/pages/action/action-sheet/index.tsx | 4 ++-- src/pages/action/activity-indicator/index.tsx | 4 ++-- src/pages/action/modal/index.tsx | 4 ++-- src/pages/action/progress/index.tsx | 4 ++-- src/pages/action/swipe-action/index.tsx | 4 ++-- src/pages/action/toast/index.tsx | 4 ++-- src/pages/advanced/calendar/index.tsx | 4 ++-- src/pages/basic/button/index.tsx | 4 ++-- src/pages/basic/color/index.tsx | 4 ++-- src/pages/basic/icon/index.tsx | 4 ++-- src/pages/form/checkbox/index.tsx | 4 ++-- src/pages/form/form/index.tsx | 4 ++-- src/pages/form/image-picker/index.tsx | 4 ++-- src/pages/form/input-number/index.tsx | 4 ++-- src/pages/form/input/index.tsx | 4 ++-- src/pages/form/picker-view/index.tsx | 4 ++-- src/pages/form/radio/index.tsx | 4 ++-- src/pages/form/range/index.tsx | 4 ++-- src/pages/form/rate/index.tsx | 4 ++-- src/pages/form/search-bar/index.tsx | 4 ++-- src/pages/form/switch/index.tsx | 4 ++-- src/pages/form/textarea/index.tsx | 4 ++-- src/pages/index/index.tsx | 4 ++-- src/pages/layout/accordion/index.tsx | 4 ++-- src/pages/layout/float-layout/index.tsx | 4 ++-- src/pages/layout/grid/index.tsx | 4 ++-- src/pages/navigation/drawer/index.tsx | 4 ++-- src/pages/navigation/indexes/index.tsx | 4 ++-- src/pages/navigation/pagination/index.tsx | 4 ++-- src/pages/navigation/segmented-control/index.tsx | 4 ++-- src/pages/navigation/tabbar/index.tsx | 4 ++-- src/pages/navigation/tabs/index.tsx | 4 ++-- src/pages/panel/index.tsx | 4 ++-- src/pages/view/curtain/index.tsx | 4 ++-- src/pages/view/load-more/index.tsx | 4 ++-- src/pages/view/steps/index.tsx | 4 ++-- src/pages/view/swiper/index.tsx | 4 ++-- src/pages/view/tag/index.tsx | 4 ++-- 38 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/pages/action/action-sheet/index.tsx b/src/pages/action/action-sheet/index.tsx index e15a3a9c6..f6babb231 100644 --- a/src/pages/action/action-sheet/index.tsx +++ b/src/pages/action/action-sheet/index.tsx @@ -20,8 +20,8 @@ export default class ActionSheetPage extends React.Component< navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { isOpened1: false, isOpened2: false, diff --git a/src/pages/action/activity-indicator/index.tsx b/src/pages/action/activity-indicator/index.tsx index 78d09e566..cbd144d72 100644 --- a/src/pages/action/activity-indicator/index.tsx +++ b/src/pages/action/activity-indicator/index.tsx @@ -17,8 +17,8 @@ export default class ActivityIndicatorPage extends React.Component< navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { isOpened: true } diff --git a/src/pages/action/modal/index.tsx b/src/pages/action/modal/index.tsx index 4ce3fbec8..f2f6903c6 100644 --- a/src/pages/action/modal/index.tsx +++ b/src/pages/action/modal/index.tsx @@ -22,8 +22,8 @@ export default class ModalPage extends React.Component<{}, ModalPageState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { isOpened1: false, isOpened2: false, diff --git a/src/pages/action/progress/index.tsx b/src/pages/action/progress/index.tsx index a16893b40..7e39f092c 100644 --- a/src/pages/action/progress/index.tsx +++ b/src/pages/action/progress/index.tsx @@ -19,8 +19,8 @@ export default class ProgressPage extends React.Component< navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { percent: 0 } diff --git a/src/pages/action/swipe-action/index.tsx b/src/pages/action/swipe-action/index.tsx index addae6691..8051b3902 100644 --- a/src/pages/action/swipe-action/index.tsx +++ b/src/pages/action/swipe-action/index.tsx @@ -41,8 +41,8 @@ export default class SwipeActionPage extends React.Component< navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { isOpened2: false, list: [ diff --git a/src/pages/action/toast/index.tsx b/src/pages/action/toast/index.tsx index 8a6e5680b..992b4706e 100644 --- a/src/pages/action/toast/index.tsx +++ b/src/pages/action/toast/index.tsx @@ -29,8 +29,8 @@ export default class ToastPage extends React.Component<{}, ToastPageState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = INIT_STATE } diff --git a/src/pages/advanced/calendar/index.tsx b/src/pages/advanced/calendar/index.tsx index 262216b5d..a946dabad 100644 --- a/src/pages/advanced/calendar/index.tsx +++ b/src/pages/advanced/calendar/index.tsx @@ -26,8 +26,8 @@ export default class Index extends React.Component<{}, IndexState> { navigationBarTitleText: 'Taro日历组件展示' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { now: Date.now(), minDate: '2018/06/11', diff --git a/src/pages/basic/button/index.tsx b/src/pages/basic/button/index.tsx index c1fc191ec..f89cbe1a9 100644 --- a/src/pages/basic/button/index.tsx +++ b/src/pages/basic/button/index.tsx @@ -16,8 +16,8 @@ export default class ButtonPage extends React.Component<{}, ButtonPageState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { isWEAPP: Taro.getEnv() === Taro.ENV_TYPE.WEAPP, isALIPAY: Taro.getEnv() === Taro.ENV_TYPE.ALIPAY diff --git a/src/pages/basic/color/index.tsx b/src/pages/basic/color/index.tsx index 4560e2d12..9982948da 100644 --- a/src/pages/basic/color/index.tsx +++ b/src/pages/basic/color/index.tsx @@ -23,8 +23,8 @@ export default class BasicColor extends React.Component<{}, BasicColorState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { colorData: [ diff --git a/src/pages/basic/icon/index.tsx b/src/pages/basic/icon/index.tsx index 305cc62fe..4758c7eec 100644 --- a/src/pages/basic/icon/index.tsx +++ b/src/pages/basic/icon/index.tsx @@ -27,8 +27,8 @@ export default class IconPage extends React.Component<{}, IconPageState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { icons: ICONS } diff --git a/src/pages/form/checkbox/index.tsx b/src/pages/form/checkbox/index.tsx index 2e04c18b3..8a3295ee0 100644 --- a/src/pages/form/checkbox/index.tsx +++ b/src/pages/form/checkbox/index.tsx @@ -20,8 +20,8 @@ export default class Index extends React.Component<{}, IndexState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { checkedList1: ['list1'], checkedList2: ['list1'], diff --git a/src/pages/form/form/index.tsx b/src/pages/form/form/index.tsx index ed54416cb..b5623b65a 100644 --- a/src/pages/form/form/index.tsx +++ b/src/pages/form/form/index.tsx @@ -20,8 +20,8 @@ export default class PageForm extends React.Component<{}, PageFormState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { value1: '', value2: '', diff --git a/src/pages/form/image-picker/index.tsx b/src/pages/form/image-picker/index.tsx index 70a7bd0f3..da8c88cc2 100644 --- a/src/pages/form/image-picker/index.tsx +++ b/src/pages/form/image-picker/index.tsx @@ -30,8 +30,8 @@ export default class Index extends React.Component<{}, IndexState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { files1: Array.from(dogaImages), files2: Array.from(dogaImages), diff --git a/src/pages/form/input-number/index.tsx b/src/pages/form/input-number/index.tsx index db8453deb..d89a8fe92 100644 --- a/src/pages/form/input-number/index.tsx +++ b/src/pages/form/input-number/index.tsx @@ -15,8 +15,8 @@ export default class Index extends React.Component<{}, IndexState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { number1: 1, number2: 1, diff --git a/src/pages/form/input/index.tsx b/src/pages/form/input/index.tsx index b8cbf839d..7bc626005 100644 --- a/src/pages/form/input/index.tsx +++ b/src/pages/form/input/index.tsx @@ -31,8 +31,8 @@ interface IndexState { } export default class Index extends React.Component<{}, IndexState> { - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { value1: '', value2: '', diff --git a/src/pages/form/picker-view/index.tsx b/src/pages/form/picker-view/index.tsx index 92705a5d5..cbc5edfd6 100644 --- a/src/pages/form/picker-view/index.tsx +++ b/src/pages/form/picker-view/index.tsx @@ -22,8 +22,8 @@ export default class Index extends React.Component<{}, IndexState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) const date = new Date() const years: number[] = [] const months: number[] = [] diff --git a/src/pages/form/radio/index.tsx b/src/pages/form/radio/index.tsx index 39507aaf0..6b219d8a1 100644 --- a/src/pages/form/radio/index.tsx +++ b/src/pages/form/radio/index.tsx @@ -20,8 +20,8 @@ export default class Index extends React.Component<{}, IndexState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { radioValue1: 'option1', radioValue2: 'option1', diff --git a/src/pages/form/range/index.tsx b/src/pages/form/range/index.tsx index f57d4e68f..e534fe895 100644 --- a/src/pages/form/range/index.tsx +++ b/src/pages/form/range/index.tsx @@ -14,8 +14,8 @@ export default class Index extends React.Component<{}, IndexState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { value1: [50, 60], value2: [50, 60] diff --git a/src/pages/form/rate/index.tsx b/src/pages/form/rate/index.tsx index 53a2aef6d..973f927e6 100644 --- a/src/pages/form/rate/index.tsx +++ b/src/pages/form/rate/index.tsx @@ -14,8 +14,8 @@ export default class Index extends React.Component<{}, IndexState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { rateValue1: 3, rateValue2: 3, diff --git a/src/pages/form/search-bar/index.tsx b/src/pages/form/search-bar/index.tsx index 9697bac4b..63d3dda57 100644 --- a/src/pages/form/search-bar/index.tsx +++ b/src/pages/form/search-bar/index.tsx @@ -14,8 +14,8 @@ export default class Index extends React.Component<{}, IndexState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { value1: '', value2: '', diff --git a/src/pages/form/switch/index.tsx b/src/pages/form/switch/index.tsx index 23d8f9843..0375eae39 100644 --- a/src/pages/form/switch/index.tsx +++ b/src/pages/form/switch/index.tsx @@ -14,8 +14,8 @@ export default class Index extends React.Component<{}, IndexState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { switchValue: true } diff --git a/src/pages/form/textarea/index.tsx b/src/pages/form/textarea/index.tsx index e66bf3585..a8166a113 100644 --- a/src/pages/form/textarea/index.tsx +++ b/src/pages/form/textarea/index.tsx @@ -10,8 +10,8 @@ interface IndexState { } export default class Index extends React.Component<{}, IndexState> { - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { value1: '', value2: '', diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 99db88fb7..5e1b58a65 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -26,8 +26,8 @@ export default class Index extends React.Component<{}, IndexState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { list: [ diff --git a/src/pages/layout/accordion/index.tsx b/src/pages/layout/accordion/index.tsx index 5ba9bcc45..26c376b79 100644 --- a/src/pages/layout/accordion/index.tsx +++ b/src/pages/layout/accordion/index.tsx @@ -14,8 +14,8 @@ export default class CardPage extends React.Component<{}, CardPageState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { value1: false, value2: true, diff --git a/src/pages/layout/float-layout/index.tsx b/src/pages/layout/float-layout/index.tsx index 0f258a3af..991cbeda6 100644 --- a/src/pages/layout/float-layout/index.tsx +++ b/src/pages/layout/float-layout/index.tsx @@ -18,8 +18,8 @@ export default class FloatLayoutPage extends React.Component< navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { isOpened1: false, isOpened2: false, diff --git a/src/pages/layout/grid/index.tsx b/src/pages/layout/grid/index.tsx index eafc87dcf..0c7e8b211 100644 --- a/src/pages/layout/grid/index.tsx +++ b/src/pages/layout/grid/index.tsx @@ -11,8 +11,8 @@ interface GridPageState { } export default class GridPage extends React.Component<{}, GridPageState> { - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { data: [ { diff --git a/src/pages/navigation/drawer/index.tsx b/src/pages/navigation/drawer/index.tsx index 91b653add..d586c38c9 100644 --- a/src/pages/navigation/drawer/index.tsx +++ b/src/pages/navigation/drawer/index.tsx @@ -19,8 +19,8 @@ export default class DrawerPage extends React.Component<{}, DrawerPageState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { leftDrawerShow: false, rightDrawerShow: false, diff --git a/src/pages/navigation/indexes/index.tsx b/src/pages/navigation/indexes/index.tsx index 479158796..4754810d4 100644 --- a/src/pages/navigation/indexes/index.tsx +++ b/src/pages/navigation/indexes/index.tsx @@ -14,8 +14,8 @@ export default class Index extends React.Component<{}, IndexesState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { value: '' } diff --git a/src/pages/navigation/pagination/index.tsx b/src/pages/navigation/pagination/index.tsx index c536fe9fb..cc7db440d 100644 --- a/src/pages/navigation/pagination/index.tsx +++ b/src/pages/navigation/pagination/index.tsx @@ -20,8 +20,8 @@ export default class PaginationPage extends React.Component< navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { list: [], current: 1, diff --git a/src/pages/navigation/segmented-control/index.tsx b/src/pages/navigation/segmented-control/index.tsx index 378c7030a..2b9ed2906 100644 --- a/src/pages/navigation/segmented-control/index.tsx +++ b/src/pages/navigation/segmented-control/index.tsx @@ -14,8 +14,8 @@ export default class Index extends React.Component<{}, IndexPageState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { current1: 0, current2: 0 diff --git a/src/pages/navigation/tabbar/index.tsx b/src/pages/navigation/tabbar/index.tsx index 9523b051b..c26757f4c 100644 --- a/src/pages/navigation/tabbar/index.tsx +++ b/src/pages/navigation/tabbar/index.tsx @@ -14,8 +14,8 @@ export default class Index extends React.Component<{}, IndexPageState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { current1: 0, current2: 0, diff --git a/src/pages/navigation/tabs/index.tsx b/src/pages/navigation/tabs/index.tsx index b0a30f767..79b0e59ce 100644 --- a/src/pages/navigation/tabs/index.tsx +++ b/src/pages/navigation/tabs/index.tsx @@ -14,8 +14,8 @@ export default class Index extends React.Component<{}, IndexPageState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { current1: 0, current2: 0, diff --git a/src/pages/panel/index.tsx b/src/pages/panel/index.tsx index 45d75f2b6..ce5d9bd01 100644 --- a/src/pages/panel/index.tsx +++ b/src/pages/panel/index.tsx @@ -32,8 +32,8 @@ export default class PanelBasic extends React.Component<{}, PanelBasicState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { panelNames: { diff --git a/src/pages/view/curtain/index.tsx b/src/pages/view/curtain/index.tsx index 3a57bdb0a..19e6d30f7 100644 --- a/src/pages/view/curtain/index.tsx +++ b/src/pages/view/curtain/index.tsx @@ -23,8 +23,8 @@ export default class TagPage extends React.Component<{}, TagPageState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { isOpened: false, closeBtnPosition: 'bottom' diff --git a/src/pages/view/load-more/index.tsx b/src/pages/view/load-more/index.tsx index 39cdc964e..038ce054e 100644 --- a/src/pages/view/load-more/index.tsx +++ b/src/pages/view/load-more/index.tsx @@ -17,8 +17,8 @@ export default class LoadMorePage extends React.Component< navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { status: 'more' } diff --git a/src/pages/view/steps/index.tsx b/src/pages/view/steps/index.tsx index f25930e5c..de2d1733c 100644 --- a/src/pages/view/steps/index.tsx +++ b/src/pages/view/steps/index.tsx @@ -18,8 +18,8 @@ export default class TimelinePage extends React.Component< navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { current1: 0, current2: 0, diff --git a/src/pages/view/swiper/index.tsx b/src/pages/view/swiper/index.tsx index 6063fa524..13b5f2259 100644 --- a/src/pages/view/swiper/index.tsx +++ b/src/pages/view/swiper/index.tsx @@ -28,8 +28,8 @@ export default class SwiperPage extends React.Component<{}, SwiperPageState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { current: 1, duration: 500, diff --git a/src/pages/view/tag/index.tsx b/src/pages/view/tag/index.tsx index a8696f33c..421a7a626 100644 --- a/src/pages/view/tag/index.tsx +++ b/src/pages/view/tag/index.tsx @@ -23,8 +23,8 @@ export default class TagPage extends React.Component<{}, TagPageState> { navigationBarTitleText: 'Taro UI' } - public constructor() { - super(arguments) + public constructor(props: any) { + super(props) this.state = { tagList: [ { name: 'tag-1', active: false }, From dc1a9fc44beff9e1a25ca93b7ac6ac4fc02cb90b Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Fri, 27 Mar 2020 17:05:58 +0800 Subject: [PATCH 07/54] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B7=B3=E8=BD=AC=E5=92=8C=E5=BE=AA=E7=8E=AFkey?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/basic/color/index.tsx | 7 +++++-- src/pages/panel/index.tsx | 8 ++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/pages/basic/color/index.tsx b/src/pages/basic/color/index.tsx index 9982948da..db9040d7b 100644 --- a/src/pages/basic/color/index.tsx +++ b/src/pages/basic/color/index.tsx @@ -148,8 +148,11 @@ export default class BasicColor extends React.Component<{}, BasicColorState> { {item.type} - {item.data.map(color => ( - + {item.data.map((color: Color, index: number) => ( + { }) } - private gotoComponent = (e: CommonEvent): void => { - const { id, parent } = e.currentTarget.dataset + private gotoComponent(id: string, parent: string): void { Taro.navigateTo({ url: `/pages/${parent.toLowerCase()}/${id.toLowerCase()}/index` }) @@ -332,9 +330,7 @@ export default class PanelBasic extends React.Component<{}, PanelBasicState> { {`${item.id} ${item.name}`} From a34e6eba767d4a06111992d444a0273154ecbb08 Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Fri, 27 Mar 2020 18:57:50 +0800 Subject: [PATCH 08/54] fix: fix or ignore typescript error --- src/common/utils.ts | 7 +------ src/components/accordion/index.tsx | 2 +- src/components/button/index.tsx | 4 ++++ src/components/calendar/body/index.tsx | 2 +- src/components/grid/index.tsx | 4 ++-- src/components/indexes/index.tsx | 4 ++-- src/components/input/index.tsx | 4 ++++ src/components/modal/index.tsx | 2 ++ src/components/noticebar/index.tsx | 2 ++ src/components/pagination/index.tsx | 2 +- src/components/range/index.tsx | 2 +- src/components/swipe-action/index.tsx | 1 - src/components/swipe-action/options/index.tsx | 1 - src/pages/action/swipe-action/index.tsx | 2 +- src/pages/form/input/index.tsx | 6 ++++++ src/pages/index/index.tsx | 6 +++--- src/pages/panel/index.tsx | 2 ++ 17 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/common/utils.ts b/src/common/utils.ts index 9ec93957a..05504cfec 100644 --- a/src/common/utils.ts +++ b/src/common/utils.ts @@ -12,7 +12,6 @@ function delay(delayTime = 25): Promise { } function delayQuerySelector( - self, selectorStr: string, delayTime = 500 ): Promise { @@ -42,11 +41,7 @@ function delayGetScrollOffset({ delayTime = 500 }): Promise { }) } -function delayGetClientRect({ - self, - selectorStr, - delayTime = 500 -}): Promise { +function delayGetClientRect({ selectorStr, delayTime = 500 }): Promise { const selector: SelectorQuery = Taro.createSelectorQuery() return new Promise(resolve => { diff --git a/src/components/accordion/index.tsx b/src/components/accordion/index.tsx index 446b5b784..333251569 100644 --- a/src/components/accordion/index.tsx +++ b/src/components/accordion/index.tsx @@ -37,7 +37,7 @@ export default class AtAccordion extends React.Component< if (!this.isCompleted || !isAnimation) return this.isCompleted = false - delayQuerySelector(this, '.at-accordion__body', 0).then(rect => { + delayQuerySelector('.at-accordion__body', 0).then(rect => { const height = parseInt(rect[0].height.toString()) const startHeight = open ? height : 0 const endHeight = open ? 0 : height diff --git a/src/components/button/index.tsx b/src/components/button/index.tsx index 74bfe0a35..bbc1b12df 100644 --- a/src/components/button/index.tsx +++ b/src/components/button/index.tsx @@ -63,6 +63,8 @@ export default class AtButton extends React.Component< private onSumit(event: CommonEvent): void { if (this.state.isWEAPP || this.state.isWEB) { // TODO: 3.0 this.$scope + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore + // @ts-ignore this.$scope.triggerEvent('submit', event.detail, { bubbles: true, composed: true @@ -73,6 +75,8 @@ export default class AtButton extends React.Component< private onReset(event: CommonEvent): void { if (this.state.isWEAPP || this.state.isWEB) { // TODO: 3.0 this.$scope + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore + // @ts-ignore this.$scope.triggerEvent('reset', event.detail, { bubbles: true, composed: true diff --git a/src/components/calendar/body/index.tsx b/src/components/calendar/body/index.tsx index 40fc1a2db..b5cdb0b3d 100644 --- a/src/components/calendar/body/index.tsx +++ b/src/components/calendar/body/index.tsx @@ -67,7 +67,7 @@ export default class AtCalendarBody extends React.Component< } public componentDidMount(): void { - delayQuerySelector(this, '.at-calendar-slider__main').then(res => { + delayQuerySelector('.at-calendar-slider__main').then(res => { this.maxWidth = res[0].width }) } diff --git a/src/components/grid/index.tsx b/src/components/grid/index.tsx index e0832d12a..4d9ef9901 100644 --- a/src/components/grid/index.tsx +++ b/src/components/grid/index.tsx @@ -4,7 +4,7 @@ import _isFunction from 'lodash/isFunction' import _isObject from 'lodash/isObject' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtGridProps, Item } from 'types/grid' +import { AtGridProps, AtGridItem } from 'types/grid' import { Image, Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' import { mergeStyle } from '../../common/utils' @@ -14,7 +14,7 @@ export default class AtGrid extends React.Component { public static propTypes: InferProps private handleClick = ( - item: Item, + item: AtGridItem, index: number, row: number, event: CommonEvent diff --git a/src/components/indexes/index.tsx b/src/components/indexes/index.tsx index 44356ec27..f8c49ba6c 100644 --- a/src/components/indexes/index.tsx +++ b/src/components/indexes/index.tsx @@ -82,7 +82,7 @@ export default class AtIndexes extends React.Component< const _tipText = idx === 0 ? topKey : list[idx - 1].key if (ENV === Taro.ENV_TYPE.WEB) { - delayQuerySelector(this, '.at-indexes', 0).then(rect => { + delayQuerySelector('.at-indexes', 0).then(rect => { const targetOffsetTop = this.listRef.childNodes[idx].offsetTop const _scrollTop = targetOffsetTop - rect[0].top this.updateState({ @@ -137,7 +137,7 @@ export default class AtIndexes extends React.Component< } private initData(): void { - delayQuerySelector(this, '.at-indexes__menu').then(rect => { + delayQuerySelector('.at-indexes__menu').then(rect => { const len = this.props.list.length this.menuHeight = rect[0].height this.startTop = rect[0].top diff --git a/src/components/input/index.tsx b/src/components/input/index.tsx index 2b075d769..f44582435 100644 --- a/src/components/input/index.tsx +++ b/src/components/input/index.tsx @@ -104,6 +104,8 @@ export default class AtInput extends React.Component { focus, value, required, + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore + // @ts-ignore onKeyboardHeightChange } = this.props const { type, maxLength, disabled, password } = getInputProps(this.props) @@ -162,6 +164,8 @@ export default class AtInput extends React.Component { onFocus={this.onFocus} onBlur={this.onBlur} onConfirm={this.onConfirm} + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore + // @ts-ignore onKeyboardHeightChange={onKeyboardHeightChange} /> {clear && value && ( diff --git a/src/components/modal/index.tsx b/src/components/modal/index.tsx index af4409dbb..7fb7acfd2 100644 --- a/src/components/modal/index.tsx +++ b/src/components/modal/index.tsx @@ -105,6 +105,8 @@ export default class AtModal extends React.Component< {isWEB ? ( ') }} diff --git a/src/components/noticebar/index.tsx b/src/components/noticebar/index.tsx index f0a0eacaa..d959bf615 100644 --- a/src/components/noticebar/index.tsx +++ b/src/components/noticebar/index.tsx @@ -171,6 +171,8 @@ export default class AtNoticebar extends React.Component< { } const createPickerRange = (max: number): number[] => { - const range = new Array(max).fill(0).map((val, index) => index + 1) + const range = new Array(max).fill(0).map((_val, index) => index + 1) return range } diff --git a/src/components/range/index.tsx b/src/components/range/index.tsx index e41465627..1b420c04a 100644 --- a/src/components/range/index.tsx +++ b/src/components/range/index.tsx @@ -104,7 +104,7 @@ export default class AtRange extends React.Component< } private updatePos(): void { - delayQuerySelector(this, '.at-range__container', 0).then(rect => { + delayQuerySelector('.at-range__container', 0).then(rect => { this.width = Math.round(rect[0].width) this.left = Math.round(rect[0].left) }) diff --git a/src/components/swipe-action/index.tsx b/src/components/swipe-action/index.tsx index bca504338..8947acb0b 100644 --- a/src/components/swipe-action/index.tsx +++ b/src/components/swipe-action/index.tsx @@ -59,7 +59,6 @@ export default class AtSwipeAction extends React.Component< private getDomInfo(): Promise { return Promise.all([ delayGetClientRect({ - self: this, delayTime: 0, selectorStr: `#swipeAction-${this.state.componentId}` }), diff --git a/src/components/swipe-action/options/index.tsx b/src/components/swipe-action/options/index.tsx index 8794ad8f3..e2446892a 100644 --- a/src/components/swipe-action/options/index.tsx +++ b/src/components/swipe-action/options/index.tsx @@ -9,7 +9,6 @@ export default class AtSwipeActionOptions extends React.Component< > { private trrigerOptionsDomUpadte(): void { delayQuerySelector( - this, `#swipeActionOptions-${this.props.componentId}`, 100 ).then(res => { diff --git a/src/pages/action/swipe-action/index.tsx b/src/pages/action/swipe-action/index.tsx index 8051b3902..4b9fe6e69 100644 --- a/src/pages/action/swipe-action/index.tsx +++ b/src/pages/action/swipe-action/index.tsx @@ -85,7 +85,7 @@ export default class SwipeActionPage extends React.Component< } private handleClicked = (index: number): void => { - const list = this.state.list.filter((item, key) => key !== index) + const list = this.state.list.filter((_item, key) => key !== index) // console.log(list) this.setState({ list diff --git a/src/pages/form/input/index.tsx b/src/pages/form/input/index.tsx index 7bc626005..1586c218f 100644 --- a/src/pages/form/input/index.tsx +++ b/src/pages/form/input/index.tsx @@ -2,6 +2,8 @@ import React from 'react' import { AtForm, AtInput } from 'taro-ui' import { Image, View } from '@tarojs/components' import { BaseEventOrig } from '@tarojs/components/types/common' +// eslint-disable-next-line @typescript-eslint/ban-ts-ignore +// @ts-ignore import { InputProps } from '@tarojs/components/types/Input' import Taro from '@tarojs/taro' import verificationCode from '../../../assets/images/verification_code.png' @@ -107,6 +109,8 @@ export default class Index extends React.Component<{}, IndexState> { } private handleKeyboardHeightChange( + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore + // @ts-ignore event: BaseEventOrig ): void { Taro.showToast({ @@ -279,6 +283,8 @@ export default class Index extends React.Component<{}, IndexState> { placeholder='监听键盘高度事件' value={this.state.value17} onChange={this.handleInput.bind(this, 'value17')} + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore + // @ts-ignore onKeyboardHeightChange={this.handleKeyboardHeightChange.bind( this )} diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 5e1b58a65..d88b7c60b 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -1,5 +1,5 @@ import React from 'react' -import { CommonEvent, Image, Text, View } from '@tarojs/components' +import { Image, Text, View } from '@tarojs/components' import Taro, { ShareAppMessageReturn } from '@tarojs/taro' import iconAction from '../../assets/images/icon-list-action.png' import iconBasic from '../../assets/images/icon-list-basic.png' @@ -85,7 +85,7 @@ export default class Index extends React.Component<{}, IndexState> { } } - private gotoPanel = (e: CommonEvent, id: string): void => { + private gotoPanel(id: string): void { Taro.navigateTo({ url: `/pages/panel/index?id=${id.toLowerCase()}` }) @@ -108,7 +108,7 @@ export default class Index extends React.Component<{}, IndexState> { data-id={item.id} data-name={item.title} data-list={item.subpages} - onTap={(e: CommonEvent): void => this.gotoPanel(e, item.id)} + onClick={this.gotoPanel.bind(this, item.id)} > diff --git a/src/pages/panel/index.tsx b/src/pages/panel/index.tsx index b41a9458b..921c38cf9 100644 --- a/src/pages/panel/index.tsx +++ b/src/pages/panel/index.tsx @@ -290,6 +290,8 @@ export default class PanelBasic extends React.Component<{}, PanelBasicState> { } public componentDidMount(): void { + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore + // @ts-ignore const { id } = Taro.Current.router.params this.setState({ currentId: id.toLowerCase() || '' From 70f23a521b0bab6d13386787b30a6565c6de2288 Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Fri, 27 Mar 2020 21:10:58 +0800 Subject: [PATCH 09/54] fix: fix tsc error --- src/index.ts | 4 ---- types/swipe-action.d.ts | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/index.ts b/src/index.ts index 1b94acc5b..cfb5682bb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,3 @@ -import './style/index.scss' -import './style/themes/red.scss' -import './style/themes/purple.scss' - export { default as AtActionSheet } from './components/action-sheet' export { default as AtActionSheetItem } from './components/action-sheet/body/item' export { default as AtActivityIndicator } from './components/activity-indicator' diff --git a/types/swipe-action.d.ts b/types/swipe-action.d.ts index 1b00c2908..d8a3f2150 100644 --- a/types/swipe-action.d.ts +++ b/types/swipe-action.d.ts @@ -1,5 +1,4 @@ -import { MouseEvent, ComponentClass } from 'react' -import { SelectorQuery } from '@tarojs/taro' +import { ComponentClass } from 'react' import { CommonEventFunction, CommonEvent @@ -65,7 +64,7 @@ export interface AtSwipeActionState { export interface AtSwipeActionOptionsProps extends AtComponent { componentId: string options: SwipeActionOption[] - onQueryedDom: (res: SelectorQuery.execObject) => void + onQueryedDom: (res: any) => void } declare const AtSwipeAction: ComponentClass From 5da44271a3e1ce28107b18c3f1d5d56c48f31a2b Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Fri, 27 Mar 2020 21:14:57 +0800 Subject: [PATCH 10/54] feat: taro ui next build config --- config/webpack.analyze.js | 8 + config/webpack.config.js | 67 ++++++ package.json | 35 +-- tsconfig.base.json | 17 ++ tsconfig.build.json | 18 ++ tsconfig.json | 22 +- yarn.lock | 474 +++++++++++++++++++++++++++++++++----- 7 files changed, 559 insertions(+), 82 deletions(-) create mode 100644 config/webpack.analyze.js create mode 100644 config/webpack.config.js create mode 100644 tsconfig.base.json create mode 100644 tsconfig.build.json diff --git a/config/webpack.analyze.js b/config/webpack.analyze.js new file mode 100644 index 000000000..e9b15304c --- /dev/null +++ b/config/webpack.analyze.js @@ -0,0 +1,8 @@ +const merge = require('webpack-merge') +const buildConfig = require('./webpack.config') +const BundleAnalyzerPlugin = require('webpack-bundle-analyzer') + .BundleAnalyzerPlugin + +module.exports = merge(buildConfig, { + plugins: [new BundleAnalyzerPlugin()] +}) diff --git a/config/webpack.config.js b/config/webpack.config.js new file mode 100644 index 000000000..a88c003ee --- /dev/null +++ b/config/webpack.config.js @@ -0,0 +1,67 @@ +const path = require('path') +const { CleanWebpackPlugin } = require('clean-webpack-plugin') +const CopyWebpackPlugin = require('copy-webpack-plugin') + +module.exports = { + mode: 'production', + devtool: 'source-map', + entry: path.resolve(__dirname, '..', 'src/index.ts'), + module: { + rules: [ + { + test: /\.ts(x?)$/, + exclude: /node_modules/, + use: [ + { + loader: 'ts-loader' + } + ] + }, + { + test: /\.js(x?)$/, + exclude: /node_modules/, + use: [ + { + loader: 'babel-loader' + } + ] + }, + { + enforce: 'pre', + test: /\.js$/, + loader: 'source-map-loader' + } + ] + }, + output: { + filename: 'index.js', + path: path.resolve(__dirname, '..', 'dist'), + libraryTarget: 'umd', + library: 'taro-ui' + }, + plugins: [ + new CleanWebpackPlugin(), + new CopyWebpackPlugin([ + { + from: path.resolve(__dirname, '..', 'src', 'style'), + to: path.resolve(__dirname, '..', 'dist', 'style') + } + ]) + ], + resolve: { + alias: { + 'taro-ui': path.resolve(__dirname, '..', 'src/index.ts') + }, + extensions: ['.js', '.jsx', '.ts', '.tsx'] + }, + externals: { + react: 'React', + 'react-dom': 'ReactDOM', + '@tarojs/components': '@tarojs/components', + '@tarojs/runtime': '@tarojs/runtime', + '@tarojs/taro': '@tarojs/taro', + '@tarojs/react': '@tarojs/react', + // TODO: Taro 3 bug + vue: 'Vue' + } +} diff --git a/package.json b/package.json index 01b47dbcc..9f78bfa89 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "taro-ui", - "version": "2.3.1", + "version": "3.0.0-alpha.0", "description": "UI KIT for Taro", + "module": "dist/es/index.js", "main": "dist/index.js", - "main:h5": "dist/h5/index.js", "sideEffects": [ "*.scss", "*.css" @@ -16,9 +16,7 @@ ], "files": [ "dist", - "types", - "src/**/interface.ts", - "src/**/*.d.ts" + "types" ], "author": "O2Team ", "homepage": "https://taro-ui.aotu.io", @@ -210,7 +208,9 @@ "build:h5": "taro build --type h5", "build:swan": "taro build --type swan", "build:alipay": "taro build --type alipay", - "build:component": "cross-env TARO_BUILD_TYPE=component taro build --ui", + "build:esmodule": "tsc --project tsconfig.build.json", + "build:webpack": "webpack --config ./config/webpack.config.js", + "build:component": "npm run build:webpack && npm run build:esmodule", "build:h5-static": "npm run build:h5 && node ./build/build-static", "build:doc": "npm run build:h5-static && node ./build/build-docs", "prepublishOnly": "npm run clean && npm run build:component", @@ -219,14 +219,15 @@ "lint:style-fix": "stylelint \"src/**/*.scss\" --syntax scss --fix", "test": "cross-env NODE_ENV=test && jest --coverage", "test:ci": "npm run build:h5 && npm run test", + "test:analyze": "webpack --config ./config/webpack.analyze.js", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0", "clean": "rimraf .temp dist coverage" }, "dependencies": { - "bind-decorator": "^1.0.11", "classnames": "^2.2.6", "dayjs": "^1.7.7", - "lodash": "^4.17.10" + "lodash": "^4.17.10", + "prop-types": "^15.7.2" }, "devDependencies": { "@babel/core": "^7.0.0-rc.1", @@ -253,6 +254,7 @@ "@tarojs/webpack-runner": "^2.0.3", "@types/classnames": "^2.2.9", "@types/react": "^16.9.23", + "@types/react-dom": "^16.9.5", "@types/webpack-env": "^1.13.6", "@typescript-eslint/eslint-plugin": "^2.10.0", "@typescript-eslint/parser": "^2.10.0", @@ -309,28 +311,35 @@ "postcss": "^7.0.2", "postcss-loader": "^3.0.0", "prettier": "^1.19.1", - "prop-types": "^15.7.2", "qrcode.react": "^1.0.0", "react": "^16.13.0", + "react-dom": "^16.13.0", "react-markdown-loader": "^1.1.14", "react-router-dom": "^5.1.2", "regenerator-runtime": "^0.13.3", "rimraf": "^3.0.2", "sass-loader": "^8.0.0", "simulant": "^0.2.2", + "source-map-loader": "^0.2.4", "stylelint": "^13.0.0", "stylelint-config-standard": "^20.0.0", "stylelint-scss": "^3.2.0", "terser": "^4.4.2", - "typescript": "^3.0.1", + "ts-loader": "^6.2.2", + "typescript": "^3.8.3", "url-loader": "^3.0.0", - "webpack": "^4.16.5", + "vue": "^2.6.11", + "webpack": "^4.42.1", + "webpack-bundle-analyzer": "^3.6.1", + "webpack-cli": "^3.3.11", "webpack-dev-server": "^3.1.5", "webpack-merge": "^4.1.3", "yaml-loader": "^0.5.0" }, "peerDependencies": { - "prop-types": ">=15.7.2", - "react": ">=16.13.0" + "@tarojs/components": ">=3.0.0-beta.1", + "@tarojs/react": ">=3.0.0-beta.1", + "react": ">=16.13.0", + "react-dom": ">=16.13.0" } } diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 000000000..98280d887 --- /dev/null +++ b/tsconfig.base.json @@ -0,0 +1,17 @@ +{ + "compilerOptions": { + "allowSyntheticDefaultImports": true, + "experimentalDecorators": true, + "jsx": "react", + "jsxFactory": "React.createElement", + "moduleResolution": "node", + "noImplicitAny": false, + "noUnusedLocals": true, + "noUnusedParameters": true, + "preserveConstEnums": true, + "sourceMap": true, + "strictNullChecks": true, + "resolveJsonModule": true + }, + "compileOnSave": false +} diff --git a/tsconfig.build.json b/tsconfig.build.json new file mode 100644 index 000000000..44f956911 --- /dev/null +++ b/tsconfig.build.json @@ -0,0 +1,18 @@ +{ + "extends": "./tsconfig.base", + "compilerOptions": { + "skipLibCheck": true, + "target": "es2017", + "module": "es6", + "baseUrl": ".", + "outDir": "./dist/es" + }, + "include": [ + "src/common/*", + "src/components/*", + "src/index.ts" + ], + "exclude": [ + "node_modules" + ] +} diff --git a/tsconfig.json b/tsconfig.json index b626e397d..41623a619 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,30 +1,18 @@ { + "extends": "./tsconfig.base", "compilerOptions": { "target": "es2017", "module": "commonjs", - "preserveConstEnums": true, - "moduleResolution": "node", - "experimentalDecorators": true, - "jsxFactory": "React.createElement", - "noImplicitAny": false, - "allowSyntheticDefaultImports": true, - "outDir": "dist", - "noUnusedLocals": true, - "noUnusedParameters": true, - "strictNullChecks": true, - "sourceMap": true, "baseUrl": ".", - "rootDir": ".", - "jsx": "preserve", "typeRoots": [ "node_modules/@types", "global.d.ts", "types" ], - "resolveJsonModule": true, "paths": { - "taro-ui": [ "src/ui.ts" ] + "taro-ui": [ + "src/index.ts" + ] } - }, - "compileOnSave": false + } } diff --git a/yarn.lock b/yarn.lock index 5dc081599..9b59d8871 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2179,6 +2179,21 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== +"@types/react-dom@^16.9.5": + version "16.9.5" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.5.tgz#5de610b04a35d07ffd8f44edad93a71032d9aaa7" + integrity sha512-BX6RQ8s9D+2/gDhxrj8OW+YD4R+8hj7FEM/OJHGNR0KipE1h1mSsf39YeyC81qafkq+N3rU3h3RFbLSwE5VqUg== + dependencies: + "@types/react" "*" + +"@types/react@*": + version "16.9.26" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.26.tgz#1e55803e468f5393413e29033538cc9aaed6cec9" + integrity sha512-dGuSM+B0Pq1MKXYUMlUQWeS6Jj9IhSAUf9v8Ikaimj+YhkBcQrihWBkmyEhK/1fzkJTwZQkhZp5YhmWa2CH+Rw== + dependencies: + "@types/prop-types" "*" + csstype "^2.2.0" + "@types/react@^16.9.23": version "16.9.23" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.23.tgz#1a66c6d468ba11a8943ad958a8cb3e737568271c" @@ -2382,6 +2397,15 @@ "@webassemblyjs/helper-wasm-bytecode" "1.8.5" "@webassemblyjs/wast-parser" "1.8.5" +"@webassemblyjs/ast@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" + integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA== + dependencies: + "@webassemblyjs/helper-module-context" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/wast-parser" "1.9.0" + "@webassemblyjs/floating-point-hex-parser@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313" @@ -2392,6 +2416,11 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721" integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ== +"@webassemblyjs/floating-point-hex-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" + integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== + "@webassemblyjs/helper-api-error@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a" @@ -2402,6 +2431,11 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7" integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA== +"@webassemblyjs/helper-api-error@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" + integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== + "@webassemblyjs/helper-buffer@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b" @@ -2412,6 +2446,11 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204" integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q== +"@webassemblyjs/helper-buffer@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" + integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA== + "@webassemblyjs/helper-code-frame@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b" @@ -2426,6 +2465,13 @@ dependencies: "@webassemblyjs/wast-printer" "1.8.5" +"@webassemblyjs/helper-code-frame@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" + integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA== + dependencies: + "@webassemblyjs/wast-printer" "1.9.0" + "@webassemblyjs/helper-fsm@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181" @@ -2436,6 +2482,11 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452" integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow== +"@webassemblyjs/helper-fsm@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" + integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw== + "@webassemblyjs/helper-module-context@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209" @@ -2449,6 +2500,13 @@ "@webassemblyjs/ast" "1.8.5" mamacro "^0.0.3" +"@webassemblyjs/helper-module-context@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" + integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06" @@ -2459,6 +2517,11 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61" integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ== +"@webassemblyjs/helper-wasm-bytecode@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" + integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== + "@webassemblyjs/helper-wasm-section@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a" @@ -2479,6 +2542,16 @@ "@webassemblyjs/helper-wasm-bytecode" "1.8.5" "@webassemblyjs/wasm-gen" "1.8.5" +"@webassemblyjs/helper-wasm-section@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" + integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/ieee754@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b" @@ -2493,6 +2566,13 @@ dependencies: "@xtuc/ieee754" "^1.2.0" +"@webassemblyjs/ieee754@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" + integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg== + dependencies: + "@xtuc/ieee754" "^1.2.0" + "@webassemblyjs/leb128@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63" @@ -2507,6 +2587,13 @@ dependencies: "@xtuc/long" "4.2.2" +"@webassemblyjs/leb128@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" + integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw== + dependencies: + "@xtuc/long" "4.2.2" + "@webassemblyjs/utf8@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82" @@ -2517,6 +2604,11 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc" integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw== +"@webassemblyjs/utf8@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" + integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== + "@webassemblyjs/wasm-edit@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005" @@ -2545,6 +2637,20 @@ "@webassemblyjs/wasm-parser" "1.8.5" "@webassemblyjs/wast-printer" "1.8.5" +"@webassemblyjs/wasm-edit@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" + integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/helper-wasm-section" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/wasm-opt" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + "@webassemblyjs/wast-printer" "1.9.0" + "@webassemblyjs/wasm-gen@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8" @@ -2567,6 +2673,17 @@ "@webassemblyjs/leb128" "1.8.5" "@webassemblyjs/utf8" "1.8.5" +"@webassemblyjs/wasm-gen@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" + integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/ieee754" "1.9.0" + "@webassemblyjs/leb128" "1.9.0" + "@webassemblyjs/utf8" "1.9.0" + "@webassemblyjs/wasm-opt@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7" @@ -2587,6 +2704,16 @@ "@webassemblyjs/wasm-gen" "1.8.5" "@webassemblyjs/wasm-parser" "1.8.5" +"@webassemblyjs/wasm-opt@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" + integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + "@webassemblyjs/wasm-parser@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a" @@ -2611,6 +2738,18 @@ "@webassemblyjs/leb128" "1.8.5" "@webassemblyjs/utf8" "1.8.5" +"@webassemblyjs/wasm-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" + integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-api-error" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/ieee754" "1.9.0" + "@webassemblyjs/leb128" "1.9.0" + "@webassemblyjs/utf8" "1.9.0" + "@webassemblyjs/wast-parser@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c" @@ -2635,6 +2774,18 @@ "@webassemblyjs/helper-fsm" "1.8.5" "@xtuc/long" "4.2.2" +"@webassemblyjs/wast-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" + integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/floating-point-hex-parser" "1.9.0" + "@webassemblyjs/helper-api-error" "1.9.0" + "@webassemblyjs/helper-code-frame" "1.9.0" + "@webassemblyjs/helper-fsm" "1.9.0" + "@xtuc/long" "4.2.2" + "@webassemblyjs/wast-printer@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813" @@ -2653,6 +2804,15 @@ "@webassemblyjs/wast-parser" "1.8.5" "@xtuc/long" "4.2.2" +"@webassemblyjs/wast-printer@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" + integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/wast-parser" "1.9.0" + "@xtuc/long" "4.2.2" + "@webpack-contrib/schema-utils@^1.0.0-beta.0": version "1.0.0-beta.0" resolved "https://registry.yarnpkg.com/@webpack-contrib/schema-utils/-/schema-utils-1.0.0-beta.0.tgz#bf9638c9464d177b48209e84209e23bee2eb4f65" @@ -2731,6 +2891,11 @@ acorn-walk@^6.0.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== +acorn-walk@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e" + integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ== + acorn@^5.0.0, acorn@^5.5.3, acorn@^5.6.2: version "5.7.4" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" @@ -4140,6 +4305,16 @@ better-scroll@^1.14.1: dependencies: babel-runtime "^6.0.0" +bfj@^6.1.1: + version "6.1.2" + resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz#325c861a822bcb358a41c78a33b8e6e2086dde7f" + integrity sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw== + dependencies: + bluebird "^3.5.5" + check-types "^8.0.3" + hoopy "^0.1.4" + tryer "^1.0.1" + big.js@^3.1.3: version "3.2.0" resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" @@ -4165,11 +4340,6 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c" integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow== -bind-decorator@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/bind-decorator/-/bind-decorator-1.0.11.tgz#e41bc06a1f65dd9cec476c91c5daf3978488252f" - integrity sha1-5BvAah9l3ZzsR2yRxdrzl4SIJS8= - bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" @@ -4778,7 +4948,7 @@ ccount@^1.0.0: resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17" integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw== -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -4836,6 +5006,11 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== +check-types@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552" + integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ== + "chokidar@>=2.0.0 <4.0.0", chokidar@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450" @@ -5199,7 +5374,7 @@ commander@2.17.x: resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.19.0, commander@^2.20.0, commander@~2.20.3: +commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@~2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -5697,6 +5872,17 @@ cross-spawn-async@^2.1.1: lru-cache "^4.0.0" which "^1.2.8" +cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" @@ -5714,17 +5900,6 @@ cross-spawn@^5.0.1: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^6.0.0, cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - cross-spawn@^7.0.0, cross-spawn@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14" @@ -6324,6 +6499,11 @@ detab@^2.0.0: dependencies: repeat-string "^1.5.4" +detect-file@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" + integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= + detect-indent@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" @@ -6557,6 +6737,11 @@ duplexer3@^0.1.4: resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= +duplexer@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" + integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= + duplexify@^3.4.2, duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" @@ -6657,7 +6842,16 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -enhanced-resolve@^4.1.0: +enhanced-resolve@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f" + integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng== + dependencies: + graceful-fs "^4.1.2" + memory-fs "^0.4.0" + tapable "^1.0.0" + +enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66" integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA== @@ -7277,7 +7471,7 @@ expr-parser@^1.0.0: resolved "https://registry.yarnpkg.com/expr-parser/-/expr-parser-1.0.0.tgz#b85be870efce3c764977578d4a505795233f9022" integrity sha512-ncuWTCWH0M5KbaYikXxZ3FG3Q+FTYIEXeXAbxYscdZLFNnR5Le5gRU2r/a/JUZHnxwBDZcxWEWzCoPQlW9Engg== -express@^4.16.2, express@^4.17.1: +express@^4.16.2, express@^4.16.3, express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== @@ -7669,6 +7863,11 @@ fileset@^2.0.2: glob "^7.0.3" minimatch "^3.0.3" +filesize@^3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" + integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg== + fill-range@^2.1.0: version "2.2.4" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" @@ -7792,6 +7991,16 @@ find-yarn-workspace-root@1.2.1: fs-extra "^4.0.3" micromatch "^3.1.4" +findup-sync@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" + integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== + dependencies: + detect-file "^1.0.0" + is-glob "^4.0.0" + micromatch "^3.0.4" + resolve-dir "^1.0.1" + first-chunk-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70" @@ -8299,6 +8508,13 @@ global-dirs@^0.1.0, global-dirs@^0.1.1: dependencies: ini "^1.3.4" +global-modules@2.0.0, global-modules@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== + dependencies: + global-prefix "^3.0.0" + global-modules@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" @@ -8308,13 +8524,6 @@ global-modules@^1.0.0: is-windows "^1.0.1" resolve-dir "^1.0.0" -global-modules@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" - integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== - dependencies: - global-prefix "^3.0.0" - global-prefix@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" @@ -8529,6 +8738,14 @@ gud@^1.0.0: resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0" integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw== +gzip-size@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" + integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA== + dependencies: + duplexer "^0.1.1" + pify "^4.0.1" + handle-thing@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" @@ -8801,6 +9018,11 @@ homedir-polyfill@^1.0.1: dependencies: parse-passwd "^1.0.0" +hoopy@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" + integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== + hosted-git-info@^2.1.4: version "2.8.8" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" @@ -9126,6 +9348,14 @@ import-lazy@^4.0.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== +import-local@2.0.0, import-local@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" + integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== + dependencies: + pkg-dir "^3.0.0" + resolve-cwd "^2.0.0" + import-local@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc" @@ -9134,14 +9364,6 @@ import-local@^1.0.0: pkg-dir "^2.0.0" resolve-cwd "^2.0.0" -import-local@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" - integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== - dependencies: - pkg-dir "^3.0.0" - resolve-cwd "^2.0.0" - imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -9313,7 +9535,7 @@ internal-slot@^1.0.2: has "^1.0.3" side-channel "^1.0.2" -interpret@^1.0.0: +interpret@1.2.0, interpret@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== @@ -10948,6 +11170,15 @@ loader-runner@^2.3.0, loader-runner@^2.4.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== +loader-utils@1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" + integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== + dependencies: + big.js "^5.2.2" + emojis-list "^2.0.0" + json5 "^1.0.1" + loader-utils@^0.2.15, loader-utils@^0.2.16: version "0.2.17" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" @@ -11486,7 +11717,7 @@ mem@^4.0.0: mimic-fn "^2.0.0" p-is-promise "^2.0.0" -memory-fs@^0.4.1, memory-fs@~0.4.1: +memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= @@ -11623,7 +11854,7 @@ micromatch@^2.3.11: parse-glob "^3.0.4" regex-cache "^0.4.2" -micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9: +micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -11642,7 +11873,7 @@ micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.2: +micromatch@^4.0.0, micromatch@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== @@ -11925,7 +12156,7 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: dependencies: minimist "^1.2.5" -mkdirp@~0.5.x: +mkdirp@^0.5.3, mkdirp@~0.5.x: version "0.5.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512" integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw== @@ -12587,6 +12818,11 @@ opencollective-postinstall@^2.0.2: resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== +opener@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed" + integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA== + opn@5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c" @@ -14016,6 +14252,16 @@ react-attr-converter@^0.3.1: resolved "https://registry.yarnpkg.com/react-attr-converter/-/react-attr-converter-0.3.1.tgz#4a2abf6d907b7ddae4d862dfec80e489ce41ad6e" integrity sha512-dSxo2Mn6Zx4HajeCeQNLefwEO4kNtV/0E682R1+ZTyFRPqxDa5zYb5qM/ocqw9Bxr/kFQO0IUiqdV7wdHw+Cdg== +react-dom@^16.13.0: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f" + integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.19.1" + react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1: version "16.13.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" @@ -14667,7 +14913,7 @@ resolve-cwd@^2.0.0: dependencies: resolve-from "^3.0.0" -resolve-dir@^1.0.0: +resolve-dir@^1.0.0, resolve-dir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= @@ -15019,6 +15265,14 @@ scheduler@^0.17.0: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" + integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.4.0, schema-utils@^0.4.4, schema-utils@^0.4.5: version "0.4.7" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" @@ -15481,6 +15735,14 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +source-map-loader@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271" + integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ== + dependencies: + async "^2.5.0" + loader-utils "^1.1.0" + source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -16165,6 +16427,13 @@ sugarss@^2.0.0: dependencies: postcss "^7.0.2" +supports-color@6.1.0, supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== + dependencies: + has-flag "^3.0.0" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -16184,13 +16453,6 @@ supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0: dependencies: has-flag "^3.0.0" -supports-color@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== - dependencies: - has-flag "^3.0.0" - supports-color@^7.0.0, supports-color@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" @@ -16686,6 +16948,22 @@ trough@^1.0.0: dependencies: glob "^7.1.2" +tryer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" + integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== + +ts-loader@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.2.2.tgz#dffa3879b01a1a1e0a4b85e2b8421dc0dfff1c58" + integrity sha512-HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ== + dependencies: + chalk "^2.3.0" + enhanced-resolve "^4.0.0" + loader-utils "^1.0.2" + micromatch "^4.0.0" + semver "^6.0.0" + tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.11.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" @@ -16767,7 +17045,7 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@3.8.3, typescript@^3.0.1, typescript@^3.2.2: +typescript@3.8.3, typescript@^3.0.1, typescript@^3.2.2, typescript@^3.8.3: version "3.8.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== @@ -17228,6 +17506,11 @@ uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +v8-compile-cache@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe" + integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w== + v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e" @@ -17426,6 +17709,11 @@ vue-template-es2015-compiler@^1.9.0: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== +vue@^2.6.11: + version "2.6.11" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5" + integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ== + w3c-hr-time@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -17502,6 +17790,25 @@ webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== +webpack-bundle-analyzer@^3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.1.tgz#bdb637c2304424f2fbff9a950c7be42a839ae73b" + integrity sha512-Nfd8HDwfSx1xBwC+P8QMGvHAOITxNBSvu/J/mCJvOwv+G4VWkU7zir9SSenTtyCi0LnVtmsc7G5SZo1uV+bxRw== + dependencies: + acorn "^7.1.1" + acorn-walk "^7.1.1" + bfj "^6.1.1" + chalk "^2.4.1" + commander "^2.18.0" + ejs "^2.6.1" + express "^4.16.3" + filesize "^3.6.1" + gzip-size "^5.0.0" + lodash "^4.17.15" + mkdirp "^0.5.1" + opener "^1.5.1" + ws "^6.0.0" + webpack-chain@4.9.0: version "4.9.0" resolved "https://registry.yarnpkg.com/webpack-chain/-/webpack-chain-4.9.0.tgz#2f0794d34d79a7cc5db1416f497b76ad33df30ee" @@ -17510,6 +17817,23 @@ webpack-chain@4.9.0: deepmerge "^1.5.2" javascript-stringify "^1.6.0" +webpack-cli@^3.3.11: + version "3.3.11" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz#3bf21889bf597b5d82c38f215135a411edfdc631" + integrity sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g== + dependencies: + chalk "2.4.2" + cross-spawn "6.0.5" + enhanced-resolve "4.1.0" + findup-sync "3.0.0" + global-modules "2.0.0" + import-local "2.0.0" + interpret "1.2.0" + loader-utils "1.2.3" + supports-color "6.1.0" + v8-compile-cache "2.0.3" + yargs "13.2.4" + webpack-dev-middleware@3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890" @@ -17683,7 +18007,7 @@ webpack@4.28.4: watchpack "^1.5.0" webpack-sources "^1.3.0" -webpack@4.42.0, webpack@^4.16.5: +webpack@4.42.0: version "4.42.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8" integrity sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w== @@ -17712,6 +18036,35 @@ webpack@4.42.0, webpack@^4.16.5: watchpack "^1.6.0" webpack-sources "^1.4.1" +webpack@^4.42.1: + version "4.42.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.1.tgz#ae707baf091f5ca3ef9c38b884287cfe8f1983ef" + integrity sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-module-context" "1.9.0" + "@webassemblyjs/wasm-edit" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + acorn "^6.2.1" + ajv "^6.10.2" + ajv-keywords "^3.4.1" + chrome-trace-event "^1.0.2" + enhanced-resolve "^4.1.0" + eslint-scope "^4.0.3" + json-parse-better-errors "^1.0.2" + loader-runner "^2.4.0" + loader-utils "^1.2.3" + memory-fs "^0.4.1" + micromatch "^3.1.10" + mkdirp "^0.5.3" + neo-async "^2.6.1" + node-libs-browser "^2.2.1" + schema-utils "^1.0.0" + tapable "^1.1.3" + terser-webpack-plugin "^1.4.3" + watchpack "^1.6.0" + webpack-sources "^1.4.1" + websocket-driver@>=0.5.1: version "0.7.3" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9" @@ -17923,7 +18276,7 @@ ws@^5.2.0: dependencies: async-limiter "~1.0.0" -ws@^6.2.1: +ws@^6.0.0, ws@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== @@ -18066,7 +18419,7 @@ yargs-parser@^11.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^13.1.2: +yargs-parser@^13.1.0, yargs-parser@^13.1.2: version "13.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== @@ -18140,6 +18493,23 @@ yargs@12.0.5: y18n "^3.2.1 || ^4.0.0" yargs-parser "^11.1.1" +yargs@13.2.4: + version "13.2.4" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83" + integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg== + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + os-locale "^3.1.0" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.0" + yargs@^11.0.0: version "11.1.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766" From cdbcd4717e13307d303c67f44fe1701a05e5266f Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Sat, 28 Mar 2020 22:31:17 +0800 Subject: [PATCH 11/54] chore: release v3.0.0-alpha.0 --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2496d0632..f9a76ef9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +# [3.0.0-alpha.0](https://github.com/nervjs/taro-ui/compare/v2.3.1...v3.0.0-alpha.0) (2020-03-28) + + +### Bug Fixes + +* fix or ignore typescript error ([a34e6eb](https://github.com/nervjs/taro-ui/commit/a34e6eba767d4a06111992d444a0273154ecbb08)) +* fix tsc error ([70f23a5](https://github.com/nervjs/taro-ui/commit/70f23a521b0bab6d13386787b30a6565c6de2288)) +* 使 AtGridItem 支持自定义字段 close [#983](https://github.com/nervjs/taro-ui/issues/983) ([8b25687](https://github.com/nervjs/taro-ui/commit/8b2568762a030d464facc8fe9dd6e447d5fd57ab)) +* 修复 pxTransform 问题 ([ffd80b1](https://github.com/nervjs/taro-ui/commit/ffd80b1358d67ea8551d6ca9115612c4eb9ded6d)) +* 修复 React 警告 ([22ca02c](https://github.com/nervjs/taro-ui/commit/22ca02c0d6547745098adf5d4eab7167a29f80ab)) +* 修复组件和页面的错误 ([a455447](https://github.com/nervjs/taro-ui/commit/a4554470a0f4c21486011eb1d1fd7ead488c1dcb)) +* 修复页面跳转和循环key重复问题 ([dc1a9fc](https://github.com/nervjs/taro-ui/commit/dc1a9fc44beff9e1a25ca93b7ac6ac4fc02cb90b)) +* 更新 AtTextarea 的文档 ([19e3460](https://github.com/nervjs/taro-ui/commit/19e346023547e0040ec15447d950c5e38bd57976)) +* **input-number:** 在微信小程序中可以输入非数字或者不合法数字 [#985](https://github.com/nervjs/taro-ui/issues/985) ([#986](https://github.com/nervjs/taro-ui/issues/986)) ([5606017](https://github.com/nervjs/taro-ui/commit/56060177619497fd9e8a5685914cd7a9d45b78ef)) + + +### Features + +* taro ui next build config ([5da4427](https://github.com/nervjs/taro-ui/commit/5da44271a3e1ce28107b18c3f1d5d56c48f31a2b)) +* 增加 onKeyboardHeightChange 事件支持 close [#974](https://github.com/nervjs/taro-ui/issues/974) ([7c47959](https://github.com/nervjs/taro-ui/commit/7c47959c98450c8b7b2fd535da071b8ac8ebe29f)) + + + ## [2.3.1](https://github.com/nervjs/taro-ui/compare/v2.3.0...v2.3.1) (2020-03-14) From f1193056ae7cf7632ad149a1b7a882bfe3d8879a Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Tue, 31 Mar 2020 23:18:06 +0800 Subject: [PATCH 12/54] feat: replace webpack with rollup --- .eslintignore | 1 + .gitignore | 8 +- config/rollup.config.analyze.js | 6 + config/rollup.config.js | 59 ++++++ .../tsconfig.base.json | 0 .../tsconfig.build.json | 12 +- config/tsconfig.rollup.json | 19 ++ config/webpack.analyze.js | 8 - config/webpack.config.js | 67 ------ package.json | 41 ++-- tsconfig.json | 2 +- yarn.lock | 195 ++++++++++++++++-- 12 files changed, 297 insertions(+), 121 deletions(-) create mode 100644 config/rollup.config.analyze.js create mode 100644 config/rollup.config.js rename tsconfig.base.json => config/tsconfig.base.json (100%) rename tsconfig.build.json => config/tsconfig.build.json (55%) create mode 100644 config/tsconfig.rollup.json delete mode 100644 config/webpack.analyze.js delete mode 100644 config/webpack.config.js diff --git a/.eslintignore b/.eslintignore index 042887b26..9a9065dc0 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,5 +1,6 @@ node_modules/ dist/ +lib/ coverage/ .vscode/ .nyc_output/ diff --git a/.gitignore b/.gitignore index 0af58e56d..7ea8ce4fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -dist/ node_modules/ yarn-error.log @@ -17,3 +16,10 @@ docs/h5/ coverage .idea + +# taro-ui outputs +lib/ +dist/ + +# rollup visualizer file +stats.html diff --git a/config/rollup.config.analyze.js b/config/rollup.config.analyze.js new file mode 100644 index 000000000..56167b6ca --- /dev/null +++ b/config/rollup.config.analyze.js @@ -0,0 +1,6 @@ +import RollupVisualizer from 'rollup-plugin-visualizer' +import defaultConfig from './rollup.config' + +export default Object.assign({}, defaultConfig, { + plugins: [...defaultConfig.plugins, RollupVisualizer()] +}) diff --git a/config/rollup.config.js b/config/rollup.config.js new file mode 100644 index 000000000..126ca4685 --- /dev/null +++ b/config/rollup.config.js @@ -0,0 +1,59 @@ +import NodePath from 'path' +import RollupJson from '@rollup/plugin-json' +import RollupNodeResolve from '@rollup/plugin-node-resolve' +import RollupCommonjs from '@rollup/plugin-commonjs' +import RollupTypescript from 'rollup-plugin-typescript2' +import Package from '../package.json' + +const resolveFile = path => NodePath.resolve(__dirname, '..', path) + +const externalPackages = [ + 'react', + 'react-dom', + '@tarojs/components', + '@tarojs/runtime', + '@tarojs/taro', + '@tarojs/react' +] + +export default { + input: resolveFile(Package.source), + output: [ + { + file: resolveFile(Package.main), + format: 'cjs', + sourcemap: true + }, + { + file: resolveFile(Package.module), + format: 'es', + sourcemap: true + }, + { + file: resolveFile(Package.browser), + format: 'umd', + name: 'taro-ui', + sourcemap: true, + globals: { + react: 'React', + '@tarojs/components': 'components', + '@tarojs/taro': 'Taro' + } + } + ], + external: externalPackages, + plugins: [ + RollupNodeResolve({ + customResolveOptions: { + moduleDirectory: 'node_modules' + } + }), + RollupCommonjs({ + include: /\/node_modules\// + }), + RollupJson(), + RollupTypescript({ + tsconfig: NodePath.resolve(__dirname, 'tsconfig.rollup.json') + }) + ] +} diff --git a/tsconfig.base.json b/config/tsconfig.base.json similarity index 100% rename from tsconfig.base.json rename to config/tsconfig.base.json diff --git a/tsconfig.build.json b/config/tsconfig.build.json similarity index 55% rename from tsconfig.build.json rename to config/tsconfig.build.json index 44f956911..1c4e01c4f 100644 --- a/tsconfig.build.json +++ b/config/tsconfig.build.json @@ -4,15 +4,15 @@ "skipLibCheck": true, "target": "es2017", "module": "es6", - "baseUrl": ".", - "outDir": "./dist/es" + "baseUrl": "../", + "outDir": "../lib" }, "include": [ - "src/common/*", - "src/components/*", - "src/index.ts" + "../src/common/*", + "../src/components/*", + "../src/index.ts" ], "exclude": [ - "node_modules" + "../node_modules/*" ] } diff --git a/config/tsconfig.rollup.json b/config/tsconfig.rollup.json new file mode 100644 index 000000000..5736bb39f --- /dev/null +++ b/config/tsconfig.rollup.json @@ -0,0 +1,19 @@ +{ + "extends": "./tsconfig.base", + "compilerOptions": { + "skipLibCheck": true, + "target": "es5", + "module": "es6", + "downlevelIteration": true, + "baseUrl": "../", + "types": ["node"] + }, + "include": [ + "../src/common/*", + "../src/components/*", + "../src/index.ts" + ], + "exclude": [ + "../node_modules/*" + ] +} diff --git a/config/webpack.analyze.js b/config/webpack.analyze.js deleted file mode 100644 index e9b15304c..000000000 --- a/config/webpack.analyze.js +++ /dev/null @@ -1,8 +0,0 @@ -const merge = require('webpack-merge') -const buildConfig = require('./webpack.config') -const BundleAnalyzerPlugin = require('webpack-bundle-analyzer') - .BundleAnalyzerPlugin - -module.exports = merge(buildConfig, { - plugins: [new BundleAnalyzerPlugin()] -}) diff --git a/config/webpack.config.js b/config/webpack.config.js deleted file mode 100644 index a88c003ee..000000000 --- a/config/webpack.config.js +++ /dev/null @@ -1,67 +0,0 @@ -const path = require('path') -const { CleanWebpackPlugin } = require('clean-webpack-plugin') -const CopyWebpackPlugin = require('copy-webpack-plugin') - -module.exports = { - mode: 'production', - devtool: 'source-map', - entry: path.resolve(__dirname, '..', 'src/index.ts'), - module: { - rules: [ - { - test: /\.ts(x?)$/, - exclude: /node_modules/, - use: [ - { - loader: 'ts-loader' - } - ] - }, - { - test: /\.js(x?)$/, - exclude: /node_modules/, - use: [ - { - loader: 'babel-loader' - } - ] - }, - { - enforce: 'pre', - test: /\.js$/, - loader: 'source-map-loader' - } - ] - }, - output: { - filename: 'index.js', - path: path.resolve(__dirname, '..', 'dist'), - libraryTarget: 'umd', - library: 'taro-ui' - }, - plugins: [ - new CleanWebpackPlugin(), - new CopyWebpackPlugin([ - { - from: path.resolve(__dirname, '..', 'src', 'style'), - to: path.resolve(__dirname, '..', 'dist', 'style') - } - ]) - ], - resolve: { - alias: { - 'taro-ui': path.resolve(__dirname, '..', 'src/index.ts') - }, - extensions: ['.js', '.jsx', '.ts', '.tsx'] - }, - externals: { - react: 'React', - 'react-dom': 'ReactDOM', - '@tarojs/components': '@tarojs/components', - '@tarojs/runtime': '@tarojs/runtime', - '@tarojs/taro': '@tarojs/taro', - '@tarojs/react': '@tarojs/react', - // TODO: Taro 3 bug - vue: 'Vue' - } -} diff --git a/package.json b/package.json index 9f78bfa89..e8812d989 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,10 @@ "name": "taro-ui", "version": "3.0.0-alpha.0", "description": "UI KIT for Taro", - "module": "dist/es/index.js", + "browser": "dist/index.umd.js", + "module": "dist/index.esm.js", "main": "dist/index.js", + "source": "src/index.ts", "sideEffects": [ "*.scss", "*.css" @@ -15,6 +17,7 @@ "ui" ], "files": [ + "lib", "dist", "types" ], @@ -197,31 +200,31 @@ ] }, "scripts": { - "dev:weapp": "npm run build:weapp -- --watch", - "dev:qq": "npm run build:qq -- --watch", - "dev:h5": "npm run build:h5 -- --watch", - "dev:swan": "npm run build:swan -- --watch", - "dev:alipay": "npm run build:alipay -- --watch", - "dev:doc": "npm run build:h5-static && node ./build/dev-server", + "dev:weapp": "yarn run build:weapp -- --watch", + "dev:qq": "yarn run build:qq -- --watch", + "dev:h5": "yarn run build:h5 -- --watch", + "dev:swan": "yarn run build:swan -- --watch", + "dev:alipay": "yarn run build:alipay -- --watch", + "dev:doc": "yarn run build:h5-static && node ./build/dev-server", "build:weapp": "taro build --type weapp", "build:qq": "taro build --type qq", "build:h5": "taro build --type h5", "build:swan": "taro build --type swan", "build:alipay": "taro build --type alipay", - "build:esmodule": "tsc --project tsconfig.build.json", - "build:webpack": "webpack --config ./config/webpack.config.js", - "build:component": "npm run build:webpack && npm run build:esmodule", - "build:h5-static": "npm run build:h5 && node ./build/build-static", - "build:doc": "npm run build:h5-static && node ./build/build-docs", - "prepublishOnly": "npm run clean && npm run build:component", + "build:lib": "tsc --project ./config/tsconfig.build.json", + "build:rollup": "rollup --config ./config/rollup.config.js", + "build:component": "yarn run build:rollup && yarn run build:lib", + "build:h5-static": "yarn run build:h5 && node ./build/build-static", + "build:doc": "yarn run build:h5-static && node ./build/build-docs", + "prepublishOnly": "yarn run clean && yarn run build:component", "lint": "eslint ./src --fix", "lint:style": "stylelint \"src/**/*.scss\" --syntax scss", "lint:style-fix": "stylelint \"src/**/*.scss\" --syntax scss --fix", "test": "cross-env NODE_ENV=test && jest --coverage", - "test:ci": "npm run build:h5 && npm run test", - "test:analyze": "webpack --config ./config/webpack.analyze.js", + "test:ci": "yarn run build:h5 && yarn run test", + "test:analyze": "rollup --config ./config/rollup.config.analyze.js", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0", - "clean": "rimraf .temp dist coverage" + "clean": "rimraf .temp dist lib coverage" }, "dependencies": { "classnames": "^2.2.6", @@ -240,6 +243,9 @@ "@commitlint/cli": "^8.2.0", "@commitlint/config-conventional": "^8.2.0", "@mapbox/jsxtreme-markdown-loader": "^0.8.3", + "@rollup/plugin-commonjs": "^11.0.2", + "@rollup/plugin-json": "^4.0.2", + "@rollup/plugin-node-resolve": "^7.1.1", "@tarojs/cli": "^3.0.0-beta.1", "@tarojs/components": "^3.0.0-beta.1", "@tarojs/mini-runner": "^3.0.0-beta.1", @@ -318,6 +324,9 @@ "react-router-dom": "^5.1.2", "regenerator-runtime": "^0.13.3", "rimraf": "^3.0.2", + "rollup": "^2.3.1", + "rollup-plugin-typescript2": "^0.27.0", + "rollup-plugin-visualizer": "^4.0.2", "sass-loader": "^8.0.0", "simulant": "^0.2.2", "source-map-loader": "^0.2.4", diff --git a/tsconfig.json b/tsconfig.json index 41623a619..9ba206d5c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.base", + "extends": "./config/tsconfig.base", "compilerOptions": { "target": "es2017", "module": "commonjs", diff --git a/yarn.lock b/yarn.lock index 25ecfb2b3..f6bf0c8f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1047,7 +1047,7 @@ globals "^11.1.0" lodash "^4.17.13" -"@babel/traverse@^7.6.3", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0": +"@babel/traverse@^7.6.3", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892" integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w== @@ -1596,6 +1596,42 @@ "@nodelib/fs.scandir" "2.1.3" fastq "^1.6.0" +"@rollup/plugin-commonjs@^11.0.2": + version "11.0.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.2.tgz#837cc6950752327cb90177b608f0928a4e60b582" + integrity sha512-MPYGZr0qdbV5zZj8/2AuomVpnRVXRU5XKXb3HVniwRoRCreGlf5kOE081isNWeiLIi6IYkwTX9zE0/c7V8g81g== + dependencies: + "@rollup/pluginutils" "^3.0.0" + estree-walker "^1.0.1" + is-reference "^1.1.2" + magic-string "^0.25.2" + resolve "^1.11.0" + +"@rollup/plugin-json@^4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.0.2.tgz#482185ee36ac7dd21c346e2dbcc22ffed0c6f2d6" + integrity sha512-t4zJMc98BdH42mBuzjhQA7dKh0t4vMJlUka6Fz0c+iO5IVnWaEMiYBy1uBj9ruHZzXBW23IPDGL9oCzBkQ9Udg== + dependencies: + "@rollup/pluginutils" "^3.0.4" + +"@rollup/plugin-node-resolve@^7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.1.tgz#8c6e59c4b28baf9d223028d0e450e06a485bb2b7" + integrity sha512-14ddhD7TnemeHE97a4rLOhobfYvUVcaYuqTnL8Ti7Jxi9V9Jr5LY7Gko4HZ5k4h4vqQM0gBQt6tsp9xXW94WPA== + dependencies: + "@rollup/pluginutils" "^3.0.6" + "@types/resolve" "0.0.8" + builtin-modules "^3.1.0" + is-module "^1.0.0" + resolve "^1.14.2" + +"@rollup/pluginutils@^3.0.0", "@rollup/pluginutils@^3.0.4", "@rollup/pluginutils@^3.0.6", "@rollup/pluginutils@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.0.8.tgz#4e94d128d94b90699e517ef045422960d18c8fde" + integrity sha512-rYGeAc4sxcZ+kPG/Tw4/fwJODC3IXHYDH4qusdN/b6aLw5LPUbzpecYbEJh4sVQGPFJxd2dBU4kc1H3oy9/bnw== + dependencies: + estree-walker "^1.0.1" + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -2053,6 +2089,11 @@ resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d" integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag== +"@types/estree@0.0.39": + version "0.0.39" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" + integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== + "@types/events@*": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" @@ -2161,6 +2202,13 @@ "@types/tough-cookie" "*" form-data "^2.5.0" +"@types/resolve@0.0.8": + version "0.0.8" + resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194" + integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ== + dependencies: + "@types/node" "*" + "@types/sass@^1.16.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@types/sass/-/sass-1.16.0.tgz#b41ac1c17fa68ffb57d43e2360486ef526b3d57d" @@ -4628,7 +4676,7 @@ buffer@^5.2.0, buffer@^5.2.1, buffer@^5.5.0: base64-js "^1.0.2" ieee754 "^1.1.4" -builtin-modules@^3.0.0: +builtin-modules@^3.0.0, builtin-modules@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484" integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw== @@ -4893,7 +4941,7 @@ caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000859, caniuse-lite@^1.0.300008 resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e" integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ== -caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001036: +caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001030, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001036: version "1.0.30001038" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz#44da3cbca2ab6cb6aa83d1be5d324e17f141caff" integrity sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ== @@ -6752,6 +6800,11 @@ ejs@^2.5.9, ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== +electron-to-chromium@^1.3.363: + version "1.3.391" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.391.tgz#9b7ee2f387814ad7d37addaafe41c8f4c4498d24" + integrity sha512-WOi6loSnDmfICOqGRrgeK7bZeWDAbGjCptDhI5eyJAqSzWfoeRuOOU1rOTZRL29/9AaxTndZB6Uh8YrxRfZJqw== + electron-to-chromium@^1.3.380: version "1.3.386" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.386.tgz#224f97c808da76014096848f80bb9342b6a95cdb" @@ -6935,6 +6988,11 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.3: d "^1.0.1" ext "^1.1.2" +escape-goat@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -7254,6 +7312,11 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== +estree-walker@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" + integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -7909,7 +7972,7 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: make-dir "^2.0.0" pkg-dir "^3.0.0" -find-cache-dir@^3.0.0, find-cache-dir@^3.2.0: +find-cache-dir@^3.0.0, find-cache-dir@^3.2.0, find-cache-dir@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== @@ -8120,6 +8183,15 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== +fs-extra@8.1.0, fs-extra@^8.0.1, fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-extra@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" @@ -8138,15 +8210,6 @@ fs-extra@^5.0.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^8.0.1, fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -9723,6 +9786,11 @@ is-directory@^0.3.1: resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= +is-docker@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b" + integrity sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ== + is-dotfile@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" @@ -9833,6 +9901,11 @@ is-interactive@^1.0.0: resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== +is-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= + is-nan@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.0.tgz#85d1f5482f7051c2019f5673ccebdb06f3b0db03" @@ -9976,6 +10049,13 @@ is-redirect@^1.0.0: resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= +is-reference@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.1.4.tgz#3f95849886ddb70256a3e6d062b1a68c13c51427" + integrity sha512-uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw== + dependencies: + "@types/estree" "0.0.39" + is-regex@^1.0.4, is-regex@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" @@ -10081,6 +10161,11 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= +is-wsl@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d" + integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog== + isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -11467,6 +11552,13 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" +magic-string@^0.25.2: + version "0.25.7" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" + integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA== + dependencies: + sourcemap-codec "^1.4.4" + make-dir@^1.0.0, make-dir@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -12233,6 +12325,11 @@ nan@^2.12.1, nan@^2.13.2, nan@^2.14.0: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== +nanoid@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.0.2.tgz#37e91e6f5277ce22335be473e2a5db1bd96dd026" + integrity sha512-WOjyy/xu3199NlQiQWlx7VbspSFlGtOxa1bRX9ebmXOnp1fje4bJfjPs1wLQ8jZbJUfD+yceJmw879ZSaVJkdQ== + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -12439,6 +12536,11 @@ node-prismjs@^0.1.2: dependencies: prismjs "~1.6.0" +node-releases@^1.1.50: + version "1.1.53" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4" + integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ== + node-releases@^1.1.52: version "1.1.52" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9" @@ -12803,6 +12905,14 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" +open@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz#db551a1af9c7ab4c7af664139930826138531c48" + integrity sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA== + dependencies: + is-docker "^2.0.0" + is-wsl "^2.1.1" + opencollective-postinstall@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" @@ -14103,6 +14213,13 @@ punycode@^1.2.4: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= +pupa@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz#dbdc9ff48ffbea4a26a069b6f9f7abb051008726" + integrity sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA== + dependencies: + escape-goat "^2.0.0" + q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -14982,6 +15099,13 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= +resolve@1.15.1, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.6.0: + version "1.15.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" + integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== + dependencies: + path-parse "^1.0.6" + resolve@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26" @@ -14989,13 +15113,6 @@ resolve@1.8.1: dependencies: path-parse "^1.0.5" -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.6.0: - version "1.15.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" - integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== - dependencies: - path-parse "^1.0.6" - responselike@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -15091,6 +15208,35 @@ rollup-plugin-alias@1.4.0: dependencies: slash "^1.0.0" +rollup-plugin-typescript2@^0.27.0: + version "0.27.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.27.0.tgz#95ff96f9e07d5000a9d2df4d76b548f9a1f83511" + integrity sha512-SRKG/Canve3cxBsqhY1apIBznqnX9X/WU3Lrq3XSwmTmFqccj3+//logLXFEmp+PYFNllSVng+f4zjqRTPKNkA== + dependencies: + "@rollup/pluginutils" "^3.0.8" + find-cache-dir "^3.3.1" + fs-extra "8.1.0" + resolve "1.15.1" + tslib "1.11.1" + +rollup-plugin-visualizer@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/rollup-plugin-visualizer/-/rollup-plugin-visualizer-4.0.2.tgz#659f28dc54ee5b754d91aad5ccb6c575b61ad084" + integrity sha512-thacJQwxsnOqp18yFbXFQnnbQDiYH66L/THIvTaZxasqPavB4Vh45xoEwGtoyxsHj1FR22swhwaL+4bZH5FdoQ== + dependencies: + nanoid "^3.0.1" + open "^7.0.3" + pupa "^2.0.0" + source-map "^0.7.3" + yargs "^15.0.0" + +rollup@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.3.1.tgz#844c5cdf88d212ff7e59212088c37eacc521a2f9" + integrity sha512-BRjzOauORe+R0U0I6SkMTSG22nYmtztR/TaBl0SvbXgc3VAxBDrZoB6HROiK0S5px1pUBnLnjBkbzmVuwC9Q1Q== + optionalDependencies: + fsevents "~2.1.2" + rsvp@^3.3.3: version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" @@ -15793,6 +15939,11 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== +sourcemap-codec@^1.4.4: + version "1.4.8" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== + space-separated-tokens@^1.0.0: version "1.1.5" resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" @@ -16954,7 +17105,7 @@ ts-loader@^6.2.2: micromatch "^4.0.0" semver "^6.0.0" -tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: +tslib@1.11.1, tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.11.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== @@ -18543,7 +18694,7 @@ yargs@^13.1.0, yargs@^13.2.2: y18n "^4.0.0" yargs-parser "^13.1.2" -yargs@^15.0.2: +yargs@^15.0.0, yargs@^15.0.2: version "15.3.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA== From 452239710a96643cbb2bcbb6dad27999bf7cfce3 Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Fri, 3 Apr 2020 20:13:28 +0800 Subject: [PATCH 13/54] chore: copy style files to dist --- config/rollup.config.js | 9 + package.json | 25 +- yarn.lock | 866 +++++++++++++++++----------------------- 3 files changed, 380 insertions(+), 520 deletions(-) diff --git a/config/rollup.config.js b/config/rollup.config.js index 126ca4685..51b9479fe 100644 --- a/config/rollup.config.js +++ b/config/rollup.config.js @@ -3,6 +3,7 @@ import RollupJson from '@rollup/plugin-json' import RollupNodeResolve from '@rollup/plugin-node-resolve' import RollupCommonjs from '@rollup/plugin-commonjs' import RollupTypescript from 'rollup-plugin-typescript2' +import RollupCopy from 'rollup-plugin-copy' import Package from '../package.json' const resolveFile = path => NodePath.resolve(__dirname, '..', path) @@ -54,6 +55,14 @@ export default { RollupJson(), RollupTypescript({ tsconfig: NodePath.resolve(__dirname, 'tsconfig.rollup.json') + }), + RollupCopy({ + targets: [ + { + src: resolveFile('src/style'), + dest: resolveFile('dist') + } + ] }) ] } diff --git a/package.json b/package.json index e8812d989..c871206c5 100644 --- a/package.json +++ b/package.json @@ -233,12 +233,12 @@ "prop-types": "^15.7.2" }, "devDependencies": { - "@babel/core": "^7.0.0-rc.1", - "@babel/plugin-proposal-class-properties": "^7.0.0-beta.55", + "@babel/core": "^7.0.0", + "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-decorators": "^7.8.3", "@babel/plugin-proposal-object-rest-spread": "^7.0.0", - "@babel/plugin-transform-react-jsx": "^7.0.0-beta.55", - "@babel/preset-env": "^7.0.0-beta.55", + "@babel/plugin-transform-react-jsx": "^7.0.0", + "@babel/preset-env": "^7.0.0", "@babel/preset-typescript": "^7.9.0", "@commitlint/cli": "^8.2.0", "@commitlint/config-conventional": "^8.2.0", @@ -246,16 +246,16 @@ "@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-json": "^4.0.2", "@rollup/plugin-node-resolve": "^7.1.1", - "@tarojs/cli": "^3.0.0-beta.1", - "@tarojs/components": "^3.0.0-beta.1", - "@tarojs/mini-runner": "^3.0.0-beta.1", + "@tarojs/cli": "^3.0.0-beta.2", + "@tarojs/components": "^3.0.0-beta.2", + "@tarojs/mini-runner": "^3.0.0-beta.2", "@tarojs/plugin-babel": "^2.0.3", "@tarojs/plugin-csso": "^2.0.3", "@tarojs/plugin-sass": "^2.0.3", "@tarojs/plugin-uglifyjs": "^2.0.3", - "@tarojs/react": "^3.0.0-beta.1", + "@tarojs/react": "^3.0.0-beta.2", "@tarojs/router": "^2.0.3", - "@tarojs/taro": "^3.0.0-beta.1", + "@tarojs/taro": "^3.0.0-beta.2", "@tarojs/taro-h5": "^2.0.3", "@tarojs/webpack-runner": "^2.0.3", "@types/classnames": "^2.2.9", @@ -269,7 +269,7 @@ "babel-core": "^7.0.0-0", "babel-eslint": "^10.0.3", "babel-jest": "23.6.0", - "babel-loader": "^8.0.0-beta.0", + "babel-loader": "^8.0.0", "babel-plugin-syntax-dynamic-import": "^6.18.0", "babel-plugin-transform-class-properties": "^6.24.1", "babel-plugin-transform-decorators-legacy": "^1.3.4", @@ -325,6 +325,7 @@ "regenerator-runtime": "^0.13.3", "rimraf": "^3.0.2", "rollup": "^2.3.1", + "rollup-plugin-copy": "^3.3.0", "rollup-plugin-typescript2": "^0.27.0", "rollup-plugin-visualizer": "^4.0.2", "sass-loader": "^8.0.0", @@ -346,8 +347,8 @@ "yaml-loader": "^0.5.0" }, "peerDependencies": { - "@tarojs/components": ">=3.0.0-beta.1", - "@tarojs/react": ">=3.0.0-beta.1", + "@tarojs/components": ">=3.0.0-beta.2", + "@tarojs/react": ">=3.0.0-beta.2", "react": ">=16.13.0", "react-dom": ">=16.13.0" } diff --git a/yarn.lock b/yarn.lock index f6bf0c8f3..30736ae2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -45,7 +45,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@>=7.2.2", "@babel/core@^7.0.0-rc.1": +"@babel/core@>=7.2.2": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b" integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA== @@ -66,7 +66,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.8.4": +"@babel/core@^7.0.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e" integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w== @@ -99,7 +99,7 @@ source-map "^0.5.0" trim-right "^1.0.1" -"@babel/generator@^7.6.4", "@babel/generator@^7.9.0": +"@babel/generator@^7.6.4", "@babel/generator@^7.8.7", "@babel/generator@^7.9.0": version "7.9.4" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz#12441e90c3b3c4159cdecf312075bf1a8ce2dbce" integrity sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA== @@ -109,7 +109,7 @@ lodash "^4.17.13" source-map "^0.5.0" -"@babel/generator@^7.8.6", "@babel/generator@^7.8.7": +"@babel/generator@^7.8.6": version "7.8.8" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.8.tgz#cdcd58caab730834cee9eeadb729e833b625da3e" integrity sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg== @@ -343,7 +343,7 @@ "@babel/traverse" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helpers@^7.6.2", "@babel/helpers@^7.9.0": +"@babel/helpers@^7.6.2", "@babel/helpers@^7.8.4", "@babel/helpers@^7.9.0": version "7.9.2" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f" integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA== @@ -352,15 +352,6 @@ "@babel/traverse" "^7.9.0" "@babel/types" "^7.9.0" -"@babel/helpers@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73" - integrity sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w== - dependencies: - "@babel/template" "^7.8.3" - "@babel/traverse" "^7.8.4" - "@babel/types" "^7.8.3" - "@babel/highlight@7.0.0-beta.44": version "7.0.0-beta.44" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5" @@ -406,7 +397,7 @@ "@babel/helper-create-class-features-plugin" "^7.5.5" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-proposal-class-properties@^7.0.0-beta.55": +"@babel/plugin-proposal-class-properties@^7.0.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e" integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA== @@ -756,7 +747,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-react-jsx@^7.0.0-beta.55": +"@babel/plugin-transform-react-jsx@^7.0.0": version "7.9.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz#86f576c8540bd06d0e95e0b61ea76d55f6cbd03f" integrity sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw== @@ -890,7 +881,7 @@ js-levenshtein "^1.1.3" semver "^5.5.0" -"@babel/preset-env@^7.0.0-beta.55": +"@babel/preset-env@^7.0.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8" integrity sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ== @@ -1047,7 +1038,7 @@ globals "^11.1.0" lodash "^4.17.13" -"@babel/traverse@^7.6.3", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0": +"@babel/traverse@^7.6.3", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892" integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w== @@ -1071,7 +1062,7 @@ lodash "^4.2.0" to-fast-properties "^2.0.0" -"@babel/types@^7.4.4", "@babel/types@^7.6.3", "@babel/types@^7.9.0": +"@babel/types@^7.4.4", "@babel/types@^7.6.3", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7", "@babel/types@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5" integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng== @@ -1080,7 +1071,7 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" -"@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7": +"@babel/types@^7.7.0": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d" integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw== @@ -1651,21 +1642,13 @@ dependencies: typescript "3.8.3" -"@tarojs/api@3.0.0-beta.1": - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@tarojs/api/-/api-3.0.0-beta.1.tgz#90915f0f3302058b7d9d4ef45d4cdbe2dad2bdf1" - integrity sha512-O8NhPuWsixNe/jT11JiHIzHU027bqNsAqlxF5nDZMehK6C8mwd7EPIIbfXX553j17IOblSBv6V6yh4iHy7oEKw== +"@tarojs/cli@^3.0.0-beta.2": + version "3.0.0-experimental.5" + resolved "https://registry.yarnpkg.com/@tarojs/cli/-/cli-3.0.0-experimental.5.tgz#e269b1215879e4ed032efbfb7fb5a9d9edf570b8" + integrity sha512-Q50jp+VX+jKPtzX67ahvQ+QcWB+3iAQLjeG4QJ3OtOxm8HwJPNEuE+OqAbI+h6MOJXuYo7TDj2IvV5q1GG/psw== dependencies: - "@tarojs/runtime" "3.0.0-beta.1" - -"@tarojs/cli@^3.0.0-beta.1": - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@tarojs/cli/-/cli-3.0.0-beta.1.tgz#17dba1e05b051d40535a541aea3aa4977b39c843" - integrity sha512-0amQeqBi+HD2SioF7V3lzFH1xziAkAYjFsGWQRwMDNzxW9/Fv4jd3PSq/l4RVak+utztI5EApAR3g5XPh104yw== - dependencies: - "@tarojs/taro" "3.0.0-beta.1" - "@tarojs/taroize" "^2.0.4" - "@tarojs/transformer-wx" "^2.0.4" + "@tarojs/taroize" "1.3.22" + "@tarojs/transformer-wx" "1.3.22" "@types/request" "^2.48.1" "@typescript-eslint/parser" "^2.0.0" adm-zip "^0.4.13" @@ -1678,6 +1661,7 @@ babel-plugin-remove-dead-code "^1.3.2" babel-plugin-transform-decorators-legacy "^1.3.4" babel-plugin-transform-define "^1.3.0" + babel-plugin-transform-jsx-to-stylesheet "1.3.22" babel-plugin-transform-react-jsx "^6.24.1" babel-plugin-transform-taroapi "1.3.15" babel-template "^6.26.0" @@ -1695,11 +1679,11 @@ ejs "^2.6.1" envinfo "^6.0.1" eslint "^6.1.0" - eslint-config-taro "3.0.0-beta.1" + eslint-config-taro "^3.0.0-experimental.5" eslint-plugin-import "^2.8.0" eslint-plugin-react "^7.4.0" eslint-plugin-react-hooks "^1.6.1" - eslint-plugin-taro "3.0.0-beta.1" + eslint-plugin-taro "^3.0.0-experimental.5" fbjs "^1.0.0" find-yarn-workspace-root "1.2.1" fs-extra "^5.0.0" @@ -1721,7 +1705,7 @@ postcss-modules-resolve-imports "^1.3.0" postcss-modules-scope "^1.1.0" postcss-modules-values "^1.3.0" - postcss-pxtransform "3.0.0-beta.1" + postcss-pxtransform "1.3.22" postcss-reporter "^6.0.1" postcss-taro-unit-transform "1.2.15" postcss-url "^7.3.2" @@ -1733,8 +1717,10 @@ semver "^5.5.0" shelljs "^0.8.1" stylelint "9.3.0" + stylelint-config-taro-rn "1.3.22" + stylelint-taro-rn "1.3.22" tapable "^1.1.3" - taro-css-to-react-native "^2.0.4" + taro-css-to-react-native "1.3.22" through2 "^2.0.3" vinyl "^2.1.0" vinyl-fs "^3.0.2" @@ -1742,13 +1728,12 @@ xxhashjs "^0.2.2" yauzl "2.10.0" -"@tarojs/components@^3.0.0-beta.1": - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@tarojs/components/-/components-3.0.0-beta.1.tgz#13c011711766a6c9e8aa6f8bf089796c492d2ae0" - integrity sha512-lwutDkRNCham+wD4oq5J8hPzKv/JE0LMcOfJA1+KxzCLhVZkMWc4YSQxoKZUk/UJdRMPii8hCcawrTnG+g4zUg== +"@tarojs/components@^3.0.0-beta.2": + version "3.0.0-experimental.5" + resolved "https://registry.yarnpkg.com/@tarojs/components/-/components-3.0.0-experimental.5.tgz#55a22a8c0375b0badd5dd8e9c8ffbd60871b28f8" + integrity sha512-GiVdf36UxFVxanGN5jHj62x9N2tpH+K2fhDNot9sSiCiErfsczH1D/ysJiomvwCf01MKHnorNClTG7QdRcE2dA== dependencies: "@stencil/core" "^1.8.1" - "@tarojs/taro" "3.0.0-beta.1" better-scroll "^1.14.1" classnames "^2.2.5" intersection-observer "^0.7.0" @@ -1757,19 +1742,18 @@ swiper "4.4.2" weui "^1.1.2" -"@tarojs/mini-runner@^3.0.0-beta.1": - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@tarojs/mini-runner/-/mini-runner-3.0.0-beta.1.tgz#cee6164cb538fd01ff6b9c705b13b89dd59a4fbf" - integrity sha512-uekLuTfzOnZa9vMP12aaD9sVHI1QT/sKIne+PqbWXEoWo14dTdwPcwG2i42St1ChO++bkRZwtU16l/Lof+CX/Q== +"@tarojs/mini-runner@^3.0.0-beta.2": + version "3.0.0-experimental.5" + resolved "https://registry.yarnpkg.com/@tarojs/mini-runner/-/mini-runner-3.0.0-experimental.5.tgz#45b2abc2aa85c87a2a4faedb76704b4d4958c83a" + integrity sha512-lxWFXNrKYj7+9W+uzGYaNE2bXqsm9RhetbnZBTL2yd+kMvGern75bOVYiQTpnpszGyEzYitIriYG0u5fZm7V6g== dependencies: "@babel/core" "7.6.4" "@babel/plugin-proposal-class-properties" "7.5.5" "@babel/preset-env" "7.6.3" - "@tarojs/runner-utils" "3.0.0-beta.1" - "@tarojs/runtime" "3.0.0-beta.1" - "@tarojs/shared" "3.0.0-beta.1" - "@tarojs/taro" "3.0.0-beta.1" - "@tarojs/taro-loader" "3.0.0-beta.1" + "@tarojs/runtime" "^3.0.0-experimental.5" + "@tarojs/shared" "^3.0.0-experimental.5" + "@tarojs/taro" "^3.0.0-experimental.5" + "@tarojs/taro-loader" "^3.0.0-experimental.5" babel-loader "8.0.6" babel-types "^6.26.0" chalk "^2.4.2" @@ -1790,22 +1774,19 @@ miniprogram-simulate "^1.1.5" node-sass "^4.12.0" ora "^3.4.0" - postcss-import "12.0.1" postcss-loader "^3.0.0" postcss-pxtransform "^1.3.2" request "^2.88.0" resolve "^1.11.1" sass-loader "^7.1.0" - sax "1.2.4" stylus "^0.54.7" stylus-loader "^3.0.2" - tapable "1.1.3" - terser-webpack-plugin "2.3.5" + uglifyjs-webpack-plugin "^2.1.3" url-loader "^2.0.0" vm2 "^3.8.4" vue-loader "^15.7.2" vue-template-compiler "^2.6.10" - webpack "4.42.0" + webpack "^4.41.2" webpack-chain "4.9.0" webpack-format-messages "^2.0.5" yauzl "2.10.0" @@ -1839,25 +1820,15 @@ dependencies: uglify-js "^3.3.24" -"@tarojs/react@^3.0.0-beta.1": - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@tarojs/react/-/react-3.0.0-beta.1.tgz#a2c20798a990410e6af2c0174172d9737248f337" - integrity sha512-SQjX3gsatz7HHcH0dALmdztja6Xa/XiLdHYqe5SYlLuOBvCdbvQr5HS+AYfn2IxBBnJxkNGbwLuRj/KKDocmUg== +"@tarojs/react@^3.0.0-beta.2": + version "3.0.0-experimental.5" + resolved "https://registry.yarnpkg.com/@tarojs/react/-/react-3.0.0-experimental.5.tgz#42a33372e1d4eb50a787b4a301b4d69ad9080534" + integrity sha512-6akyXCcbmgNQR9jDhk+40BUqnapppjxainKQ2ghHEMTUI7/skZKYQAQQfDPRPe/FKuTBsK+FtmlQlURmhKBMhw== dependencies: - "@tarojs/runtime" "3.0.0-beta.1" + "@tarojs/runtime" "^3.0.0-experimental.5" react-reconciler "^0.23.0" scheduler "^0.17.0" -"@tarojs/router@3.0.0-beta.1": - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@tarojs/router/-/router-3.0.0-beta.1.tgz#94cdc74b8a07423f63d270e989b1813916cb3797" - integrity sha512-PR3ynfWrhGs79D7YrnmU5/sjpSnjxu2x5vR7NHHbI5IwlNZiCNjJiDOgdyto9w5wJygcFqxKszkh3+fT9BVyyw== - dependencies: - "@tarojs/runtime" "3.0.0-beta.1" - history "^4.10.1" - universal-router "^8.3.0" - url-parse "^1.4.7" - "@tarojs/router@^2.0.3": version "2.0.7" resolved "https://registry.yarnpkg.com/@tarojs/router/-/router-2.0.7.tgz#3f1418d9633999a2f7d02c072fcd2888e480ec92" @@ -1877,26 +1848,15 @@ dependencies: scss-bundle "^3.0.2" -"@tarojs/runner-utils@3.0.0-beta.1": - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@tarojs/runner-utils/-/runner-utils-3.0.0-beta.1.tgz#0c7b86c8eb9a21d3a99deef5464c5294a5a1dfef" - integrity sha512-m73nxkV721EwYDpYYmGuXGWXc/+LkHVL3woyFoYRl4lhfwZHEw37asrORVo8u40kCjC02sNE2uvimh3fvI+ymg== - dependencies: - "@babel/core" "^7.8.4" - chalk "^3.0.0" - fs-extra "^8.1.0" - lodash "^4.17.15" - scss-bundle "^3.0.2" - -"@tarojs/runtime@3.0.0-beta.1": - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@tarojs/runtime/-/runtime-3.0.0-beta.1.tgz#432af62308bcf5735c3ebba50cf04b215854a110" - integrity sha512-p+yoW7Y2/1kuB8+2bianimQLd4cWGhXIYy+O+9gn/s9neQsiXwUL5ps5eXSNLCfMi5et90n0yjaFtGELuJ7sEg== +"@tarojs/runtime@^3.0.0-experimental.5": + version "3.0.0-experimental.5" + resolved "https://registry.yarnpkg.com/@tarojs/runtime/-/runtime-3.0.0-experimental.5.tgz#2a4c7e3ab8f0b21abf818742fb52949cc9f0e17f" + integrity sha512-kEtoAHD074bqco4ZEV7HCV2tSG2gVSayl3FqPV8mBNNmRPtA7yC/ULiY0hZ0N2t8/EvDxFpNx77PcheS9pC21A== -"@tarojs/shared@3.0.0-beta.1": - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@tarojs/shared/-/shared-3.0.0-beta.1.tgz#b38dc418220b5c1e793591557a27ce29ce25d151" - integrity sha512-ayg0NDuy2TfE/B2tykvgLKGmdQGHa3wJ7j8LWt+70ZrhgmEujJ7oX44gMm9hHApM91n6YmPPYG+RM+c2XM7u6Q== +"@tarojs/shared@^3.0.0-experimental.5": + version "3.0.0-experimental.5" + resolved "https://registry.yarnpkg.com/@tarojs/shared/-/shared-3.0.0-experimental.5.tgz#d91554809b2bc670e500ba2084989c216de1044d" + integrity sha512-zDhyGP+7Trtk/ph4mgE5plA0TFgsguG3LfpWLxJePVufoB3tcwHxek1mIvgjrtEyMOVMtMvy4sP/RG4zj3wp5g== "@tarojs/taro-h5@2.0.7", "@tarojs/taro-h5@^2.0.3": version "2.0.7" @@ -1909,25 +1869,10 @@ raf "^3.4.1" whatwg-fetch "^2.0.4" -"@tarojs/taro-h5@3.0.0-beta.1": - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@tarojs/taro-h5/-/taro-h5-3.0.0-beta.1.tgz#7c8742e8e4d7b4c1ac1570e1b220710763f7ebbc" - integrity sha512-rXGL/2h4saU2kgsZv5PCc3v8MKG0cy8UUZaGDiyxJic5v3MVeWCjZU6MWCb5bi7bQyIIKb9KL+Z9iN3X6mBkqA== - dependencies: - "@tarojs/api" "3.0.0-beta.1" - "@tarojs/router" "3.0.0-beta.1" - "@tarojs/runtime" "3.0.0-beta.1" - base64-js "^1.3.0" - jsonp-retry "^1.0.3" - mobile-detect "^1.4.2" - raf "^3.4.1" - unfetch "^4.1.0" - whatwg-fetch "^2.0.4" - -"@tarojs/taro-loader@3.0.0-beta.1": - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@tarojs/taro-loader/-/taro-loader-3.0.0-beta.1.tgz#4a249d9655103498943f732cc21589c7c479d930" - integrity sha512-MJIZ5XMhv6MM0cr90vVib3gLN1IQZBII8IvpYVJkXGlhXXhepYvmSI/CPxBcMYUJD0ddv1ttLjdfdLp5K689FQ== +"@tarojs/taro-loader@^3.0.0-experimental.5": + version "3.0.0-experimental.5" + resolved "https://registry.yarnpkg.com/@tarojs/taro-loader/-/taro-loader-3.0.0-experimental.5.tgz#7d198b9aeea911b76e71d2c74c2e1dec80404185" + integrity sha512-k19eJ64PD2DtQ5wWVEeyYmlzrsyLPs2Osd8Ju7Jx+DoqFMA5K/OfzMgP0JgXjzkv8WX28r5Be/P44vpKLu0BeQ== dependencies: loader-utils "^1.2.3" @@ -1938,18 +1883,17 @@ dependencies: "@tarojs/utils" "2.0.7" -"@tarojs/taro@3.0.0-beta.1", "@tarojs/taro@^3.0.0-beta.1": - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@tarojs/taro/-/taro-3.0.0-beta.1.tgz#669fc4e603f6b70df46cb8f221c4cfcbf69fa404" - integrity sha512-34PY61AuWYseJ5FeLfg6rU2VVl3AARNo2Dx8hm8E/8xogJGD3ipCxEx34JVogU1+GSWB6/J2qEr0hUmv1T6ZIw== +"@tarojs/taro@^3.0.0-beta.2", "@tarojs/taro@^3.0.0-experimental.5": + version "3.0.0-experimental.5" + resolved "https://registry.yarnpkg.com/@tarojs/taro/-/taro-3.0.0-experimental.5.tgz#5fef7aaecb597f7cf5845abfd11ca419e182ecdd" + integrity sha512-vk9Wvbrqin1Yna203PAltbV+R+5Ww56SXxDs2BV5/b7V6RcxGDsrBCNXMBoBrxsQ1WNVMAF5RcMnKFjtAaNC9A== dependencies: - "@tarojs/api" "3.0.0-beta.1" - "@tarojs/taro-h5" "3.0.0-beta.1" + "@tarojs/runtime" "^3.0.0-experimental.5" -"@tarojs/taroize@^2.0.4": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@tarojs/taroize/-/taroize-2.0.7.tgz#3ba95bf56f9079528144dd8614aaa1f9e0102133" - integrity sha512-c1y8Rj6Vbkzis+7UETngyeWlMLhvkDaQVqLUvd3OHtx+ku9qwxiRoeM1cDA80TGiahWaHrEjOSDCPDG6wcBCFA== +"@tarojs/taroize@1.3.22": + version "1.3.22" + resolved "https://registry.yarnpkg.com/@tarojs/taroize/-/taroize-1.3.22.tgz#1ca63a78c4bcb555d2872bd01c2c9538be021571" + integrity sha512-8Y6ftloD3IPT2stytK4N+huSeDgaq2EOE47vNp5+y82KOS0XS7ejTEl5mG0mnLDRW4HFnKxJGJL3VOsKumtYXQ== dependencies: "@babel/code-frame" "^7.0.0" babel-core "^6.26.3" @@ -1963,10 +1907,10 @@ lodash "^4.17.5" typescript "^3.0.1" -"@tarojs/transformer-wx@^2.0.4": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@tarojs/transformer-wx/-/transformer-wx-2.0.7.tgz#9a75ed043b4117fa70125b8443b443fe4fac92f6" - integrity sha512-fuRTHIg/sdecMbyv3SCLzhtah++ZUGRZsimdaG930UkrUnUBYE6JgyECCVsKj/lkTSwaj09+Nzd4h925gywpgA== +"@tarojs/transformer-wx@1.3.22": + version "1.3.22" + resolved "https://registry.yarnpkg.com/@tarojs/transformer-wx/-/transformer-wx-1.3.22.tgz#e915082168e2f494526e6f6e3770551cd95a5aac" + integrity sha512-cJnYai3Gt0lanNScc9jR3Ia1gRcRcr5P3Ctl/F0ndSJyuF02jT+YUweM32awBpNamyX8y62Y7gHyvOBTsxKyew== dependencies: "@babel/code-frame" "^7.0.0-beta.44" babel-core "^6.26.3" @@ -1976,7 +1920,6 @@ babel-helper-remove-or-void "^0.4.3" babel-plugin-danger-remove-unused-import "^1.1.1" babel-plugin-minify-dead-code "^1.3.2" - babel-plugin-preval "^1.6.4" babel-plugin-syntax-dynamic-import "^6.18.0" babel-plugin-transform-class-properties "^6.24.1" babel-plugin-transform-define "^1.3.0" @@ -1988,7 +1931,7 @@ babel-types "^6.26.0" eslint "5.16.0" eslint-plugin-react "7.10.0" - eslint-plugin-taro "2.0.7" + eslint-plugin-taro "1.3.22" html "^1.0.0" lodash "^4.17.5" prettier "^1.14.2" @@ -2170,24 +2113,16 @@ integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== "@types/react-dom@^16.9.5": - version "16.9.5" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.5.tgz#5de610b04a35d07ffd8f44edad93a71032d9aaa7" - integrity sha512-BX6RQ8s9D+2/gDhxrj8OW+YD4R+8hj7FEM/OJHGNR0KipE1h1mSsf39YeyC81qafkq+N3rU3h3RFbLSwE5VqUg== + version "16.9.6" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.6.tgz#9e7f83d90566521cc2083be2277c6712dcaf754c" + integrity sha512-S6ihtlPMDotrlCJE9ST1fRmYrQNNwfgL61UB4I1W7M6kPulUKx9fXAleW5zpdIjUQ4fTaaog8uERezjsGUj9HQ== dependencies: "@types/react" "*" -"@types/react@*": - version "16.9.26" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.26.tgz#1e55803e468f5393413e29033538cc9aaed6cec9" - integrity sha512-dGuSM+B0Pq1MKXYUMlUQWeS6Jj9IhSAUf9v8Ikaimj+YhkBcQrihWBkmyEhK/1fzkJTwZQkhZp5YhmWa2CH+Rw== - dependencies: - "@types/prop-types" "*" - csstype "^2.2.0" - -"@types/react@^16.9.23": - version "16.9.23" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.23.tgz#1a66c6d468ba11a8943ad958a8cb3e737568271c" - integrity sha512-SsGVT4E7L2wLN3tPYLiF20hmZTPGuzaayVunfgXzUn1x4uHVsKH6QDJQ/TdpHqwsTLd4CwrmQ2vOgxN7gE24gw== +"@types/react@*", "@types/react@^16.9.23": + version "16.9.32" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz#f6368625b224604148d1ddf5920e4fefbd98d383" + integrity sha512-fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ== dependencies: "@types/prop-types" "*" csstype "^2.2.0" @@ -2286,11 +2221,11 @@ source-map "^0.6.0" "@typescript-eslint/eslint-plugin@^2.10.0": - version "2.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.25.0.tgz#0b60917332f20dcff54d0eb9be2a9e9f4c9fbd02" - integrity sha512-W2YyMtjmlrOjtXc+FtTelVs9OhuR6OlYc4XKIslJ8PUJOqgYYAPRJhAqkYRQo3G4sjvG8jSodsNycEn4W2gHUw== + version "2.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.26.0.tgz#04c96560c8981421e5a9caad8394192363cc423f" + integrity sha512-4yUnLv40bzfzsXcTAtZyTjbiGUXMrcIJcIMioI22tSOyAxpdXiZ4r7YQUU8Jj6XXrLz9d5aMHPQf5JFR7h27Nw== dependencies: - "@typescript-eslint/experimental-utils" "2.25.0" + "@typescript-eslint/experimental-utils" "2.26.0" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" tsutils "^3.17.1" @@ -2314,7 +2249,17 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^2.0.0", "@typescript-eslint/parser@^2.10.0": +"@typescript-eslint/experimental-utils@2.26.0": + version "2.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz#063390c404d9980767d76274df386c0aa675d91d" + integrity sha512-RELVoH5EYd+JlGprEyojUv9HeKcZqF7nZUGSblyAw1FwOGNnmQIU8kxJ69fttQvEwCsX5D6ECJT8GTozxrDKVQ== + dependencies: + "@types/json-schema" "^7.0.3" + "@typescript-eslint/typescript-estree" "2.26.0" + eslint-scope "^5.0.0" + eslint-utils "^2.0.0" + +"@typescript-eslint/parser@^2.0.0": version "2.24.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.24.0.tgz#2cf0eae6e6dd44d162486ad949c126b887f11eb8" integrity sha512-H2Y7uacwSSg8IbVxdYExSI3T7uM1DzmOn2COGtCahCC3g8YtM1xYAPi2MAHyfPs61VKxP/J/UiSctcRgw4G8aw== @@ -2324,6 +2269,16 @@ "@typescript-eslint/typescript-estree" "2.24.0" eslint-visitor-keys "^1.1.0" +"@typescript-eslint/parser@^2.10.0": + version "2.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.26.0.tgz#385463615818b33acb72a25b39c03579df93d76f" + integrity sha512-+Xj5fucDtdKEVGSh9353wcnseMRkPpEAOY96EEenN7kJVrLqy/EVwtIh3mxcUz8lsFXW1mT5nN5vvEam/a5HiQ== + dependencies: + "@types/eslint-visitor-keys" "^1.0.0" + "@typescript-eslint/experimental-utils" "2.26.0" + "@typescript-eslint/typescript-estree" "2.26.0" + eslint-visitor-keys "^1.1.0" + "@typescript-eslint/parser@^2.x": version "2.25.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.25.0.tgz#abfb3d999084824d9a756d9b9c0f36fba03adb76" @@ -2360,6 +2315,19 @@ semver "^6.3.0" tsutils "^3.17.1" +"@typescript-eslint/typescript-estree@2.26.0": + version "2.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz#d8132cf1ee8a72234f996519a47d8a9118b57d56" + integrity sha512-3x4SyZCLB4zsKsjuhxDLeVJN6W29VwBnYpCsZ7vIdPel9ZqLfIZJgJXO47MNUkurGpQuIBALdPQKtsSnWpE1Yg== + dependencies: + debug "^4.1.1" + eslint-visitor-keys "^1.1.0" + glob "^7.1.6" + is-glob "^4.0.1" + lodash "^4.17.15" + semver "^6.3.0" + tsutils "^3.17.1" + "@vue/component-compiler-utils@^3.1.0": version "3.1.1" resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.1.1.tgz#d4ef8f80292674044ad6211e336a302e4d2a6575" @@ -2384,15 +2352,6 @@ "@webassemblyjs/helper-wasm-bytecode" "1.7.11" "@webassemblyjs/wast-parser" "1.7.11" -"@webassemblyjs/ast@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" - integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ== - dependencies: - "@webassemblyjs/helper-module-context" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/wast-parser" "1.8.5" - "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -2407,11 +2366,6 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313" integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg== -"@webassemblyjs/floating-point-hex-parser@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721" - integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ== - "@webassemblyjs/floating-point-hex-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" @@ -2422,11 +2376,6 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a" integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg== -"@webassemblyjs/helper-api-error@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7" - integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA== - "@webassemblyjs/helper-api-error@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" @@ -2437,11 +2386,6 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b" integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w== -"@webassemblyjs/helper-buffer@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204" - integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q== - "@webassemblyjs/helper-buffer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" @@ -2454,13 +2398,6 @@ dependencies: "@webassemblyjs/wast-printer" "1.7.11" -"@webassemblyjs/helper-code-frame@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e" - integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ== - dependencies: - "@webassemblyjs/wast-printer" "1.8.5" - "@webassemblyjs/helper-code-frame@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" @@ -2473,11 +2410,6 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181" integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A== -"@webassemblyjs/helper-fsm@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452" - integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow== - "@webassemblyjs/helper-fsm@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" @@ -2488,14 +2420,6 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209" integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg== -"@webassemblyjs/helper-module-context@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245" - integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g== - dependencies: - "@webassemblyjs/ast" "1.8.5" - mamacro "^0.0.3" - "@webassemblyjs/helper-module-context@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" @@ -2508,11 +2432,6 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06" integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ== -"@webassemblyjs/helper-wasm-bytecode@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61" - integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ== - "@webassemblyjs/helper-wasm-bytecode@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" @@ -2528,16 +2447,6 @@ "@webassemblyjs/helper-wasm-bytecode" "1.7.11" "@webassemblyjs/wasm-gen" "1.7.11" -"@webassemblyjs/helper-wasm-section@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf" - integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-buffer" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/wasm-gen" "1.8.5" - "@webassemblyjs/helper-wasm-section@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" @@ -2555,13 +2464,6 @@ dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/ieee754@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e" - integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g== - dependencies: - "@xtuc/ieee754" "^1.2.0" - "@webassemblyjs/ieee754@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" @@ -2576,13 +2478,6 @@ dependencies: "@xtuc/long" "4.2.1" -"@webassemblyjs/leb128@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10" - integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A== - dependencies: - "@xtuc/long" "4.2.2" - "@webassemblyjs/leb128@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" @@ -2595,11 +2490,6 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82" integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA== -"@webassemblyjs/utf8@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc" - integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw== - "@webassemblyjs/utf8@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" @@ -2619,20 +2509,6 @@ "@webassemblyjs/wasm-parser" "1.7.11" "@webassemblyjs/wast-printer" "1.7.11" -"@webassemblyjs/wasm-edit@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a" - integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-buffer" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/helper-wasm-section" "1.8.5" - "@webassemblyjs/wasm-gen" "1.8.5" - "@webassemblyjs/wasm-opt" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" - "@webassemblyjs/wast-printer" "1.8.5" - "@webassemblyjs/wasm-edit@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" @@ -2658,17 +2534,6 @@ "@webassemblyjs/leb128" "1.7.11" "@webassemblyjs/utf8" "1.7.11" -"@webassemblyjs/wasm-gen@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc" - integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/ieee754" "1.8.5" - "@webassemblyjs/leb128" "1.8.5" - "@webassemblyjs/utf8" "1.8.5" - "@webassemblyjs/wasm-gen@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" @@ -2690,16 +2555,6 @@ "@webassemblyjs/wasm-gen" "1.7.11" "@webassemblyjs/wasm-parser" "1.7.11" -"@webassemblyjs/wasm-opt@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264" - integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-buffer" "1.8.5" - "@webassemblyjs/wasm-gen" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" - "@webassemblyjs/wasm-opt@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" @@ -2722,18 +2577,6 @@ "@webassemblyjs/leb128" "1.7.11" "@webassemblyjs/utf8" "1.7.11" -"@webassemblyjs/wasm-parser@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d" - integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-api-error" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/ieee754" "1.8.5" - "@webassemblyjs/leb128" "1.8.5" - "@webassemblyjs/utf8" "1.8.5" - "@webassemblyjs/wasm-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" @@ -2758,18 +2601,6 @@ "@webassemblyjs/helper-fsm" "1.7.11" "@xtuc/long" "4.2.1" -"@webassemblyjs/wast-parser@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c" - integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/floating-point-hex-parser" "1.8.5" - "@webassemblyjs/helper-api-error" "1.8.5" - "@webassemblyjs/helper-code-frame" "1.8.5" - "@webassemblyjs/helper-fsm" "1.8.5" - "@xtuc/long" "4.2.2" - "@webassemblyjs/wast-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" @@ -2791,15 +2622,6 @@ "@webassemblyjs/wast-parser" "1.7.11" "@xtuc/long" "4.2.1" -"@webassemblyjs/wast-printer@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc" - integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/wast-parser" "1.8.5" - "@xtuc/long" "4.2.2" - "@webassemblyjs/wast-printer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" @@ -3651,7 +3473,7 @@ babel-loader@7.1.4: loader-utils "^1.0.2" mkdirp "^0.5.1" -babel-loader@8.0.6, babel-loader@^8.0.0-beta.0: +babel-loader@8.0.6: version "8.0.6" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb" integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw== @@ -3661,6 +3483,17 @@ babel-loader@8.0.6, babel-loader@^8.0.0-beta.0: mkdirp "^0.5.1" pify "^4.0.1" +babel-loader@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" + integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw== + dependencies: + find-cache-dir "^2.1.0" + loader-utils "^1.4.0" + mkdirp "^0.5.3" + pify "^4.0.1" + schema-utils "^2.6.5" + babel-messages@^6.23.0, babel-messages@^6.8.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" @@ -3718,7 +3551,7 @@ babel-plugin-minify-dead-code@^1.3.2: dependencies: babel-core "6.10.4" -babel-plugin-preval@1.6.4, babel-plugin-preval@^1.6.4: +babel-plugin-preval@1.6.4: version "1.6.4" resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-1.6.4.tgz#96febe8172b3ca6c3d03ed96eeb0382ba4b18056" integrity sha512-XuNaiZ76CsdWialH2co05YRra9NlsyriTUbJ+56MAcWN9v33drTm5ovBRFuEKVj1dNRhEdBjeEyYtkkaRE8drw== @@ -4049,6 +3882,11 @@ babel-plugin-transform-flow-strip-types@^6.22.0: babel-plugin-syntax-flow "^6.18.0" babel-runtime "^6.22.0" +babel-plugin-transform-jsx-to-stylesheet@1.3.22: + version "1.3.22" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-jsx-to-stylesheet/-/babel-plugin-transform-jsx-to-stylesheet-1.3.22.tgz#c260a6eefa98665e11f684e848a18904bfe7852c" + integrity sha512-tjAfvea/LeOvGhdLPfpqEQMpg6FmHChmoFSQN+QmxZqcdogrVYD6Ems+fRggx/SqSg/7dqvk0jQgoJ6kjUPozw== + babel-plugin-transform-object-rest-spread@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" @@ -4757,30 +4595,6 @@ cacache@^12.0.3: unique-filename "^1.1.1" y18n "^4.0.0" -cacache@^13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c" - integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w== - dependencies: - chownr "^1.1.2" - figgy-pudding "^3.5.1" - fs-minipass "^2.0.0" - glob "^7.1.4" - graceful-fs "^4.2.2" - infer-owner "^1.0.4" - lru-cache "^5.1.1" - minipass "^3.0.0" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - p-map "^3.0.0" - promise-inflight "^1.0.1" - rimraf "^2.7.1" - ssri "^7.0.0" - unique-filename "^1.1.1" - cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -5075,7 +4889,7 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2. optionalDependencies: fsevents "^1.2.7" -chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.3: +chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.3: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -5382,6 +5196,11 @@ color@^3.1.2: color-convert "^1.9.1" color-string "^1.5.2" +colorette@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.1.0.tgz#1f943e5a357fac10b4e0f5aaef3b14cdc1af6ec7" + integrity sha512-6S062WDQUXi6hOfkO/sBPVwE5ASXY4G2+b4atvhJfSsuUUhIaUKlkjLe9692Ipyt5/a+IPF5aVTu3V5gvXq5cg== + colors@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" @@ -6136,9 +5955,9 @@ cssstyle@^2.0.0: cssom "~0.3.6" csstype@^2.2.0: - version "2.6.9" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098" - integrity sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q== + version "2.6.10" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b" + integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w== cuint@^0.2.2: version "0.2.2" @@ -6931,7 +6750,24 @@ error-stack-parser@^1.3.3: dependencies: stackframe "^0.3.1" -es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: +es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.5: + version "1.17.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" + integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.1.5" + is-regex "^1.0.5" + object-inspect "^1.7.0" + object-keys "^1.1.1" + object.assign "^4.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" + +es-abstract@^1.17.2: version "1.17.4" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ== @@ -7027,20 +6863,20 @@ eslint-config-prettier@^6.10.0: dependencies: get-stdin "^6.0.0" -eslint-config-taro@3.0.0-beta.1: - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/eslint-config-taro/-/eslint-config-taro-3.0.0-beta.1.tgz#5ff79d71c779fdf332382b97250f5144d84d6766" - integrity sha512-CHesh4Eu/G47+KvPnvKKqIf22T1hjrZucMgF/i6YT5Lh0IGxM7huvDMBaVT/Z4dEejWHUuShyMiooZ052J+yZg== +eslint-config-taro@^2.0.3: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-taro/-/eslint-config-taro-2.1.0.tgz#6cafcbfc7dc22b18bf57e7f4abf967de283776fc" + integrity sha512-On6n3he7wdKnxf48LM71gasGeLCaD7lzgvzaFfiaHohbSBfAPksXOqF1X4Q07ZLJWp9WnihjDcMEjeF0HSOZrw== dependencies: - "@typescript-eslint/parser" "^2.x" - babel-eslint "^10.0.0" + eslint-plugin-taro "2.1.0" -eslint-config-taro@^2.0.3: - version "2.0.7" - resolved "https://registry.yarnpkg.com/eslint-config-taro/-/eslint-config-taro-2.0.7.tgz#752eeb283a22047f481099904d1e0b9e99a391a1" - integrity sha512-FB8gYm382HONJmOeSv/WlIKyw78Im8B5SjlMFYTDCdA227FSSmLyUwE1ojOar+egV7rOG7N+UrLoo8qhiGF0Tw== +eslint-config-taro@^3.0.0-experimental.5: + version "3.0.0-experimental.5" + resolved "https://registry.yarnpkg.com/eslint-config-taro/-/eslint-config-taro-3.0.0-experimental.5.tgz#82fe19d97341349a52375ccdb861320f5262f1c5" + integrity sha512-CW1cCIwxv+ds97wvGYjM4ykDDxTeeRJ/xTHLE4rqhhpd04jaJmIx3t1I4xOsh4WXFihc4fUYTNAQGdi0d5WruA== dependencies: - eslint-plugin-taro "2.0.7" + "@typescript-eslint/parser" "^2.x" + babel-eslint "^10.0.0" eslint-import-resolver-node@^0.3.2: version "0.3.3" @@ -7051,14 +6887,32 @@ eslint-import-resolver-node@^0.3.2: resolve "^1.13.1" eslint-module-utils@^2.4.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708" - integrity sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q== + version "2.6.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" + integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== dependencies: debug "^2.6.9" pkg-dir "^2.0.0" -eslint-plugin-import@^2.12.0, eslint-plugin-import@^2.8.0: +eslint-plugin-import@^2.12.0: + version "2.20.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d" + integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg== + dependencies: + array-includes "^3.0.3" + array.prototype.flat "^1.2.1" + contains-path "^0.1.0" + debug "^2.6.9" + doctrine "1.5.0" + eslint-import-resolver-node "^0.3.2" + eslint-module-utils "^2.4.1" + has "^1.0.3" + minimatch "^3.0.4" + object.values "^1.1.0" + read-pkg-up "^2.0.0" + resolve "^1.12.0" + +eslint-plugin-import@^2.8.0: version "2.20.1" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3" integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw== @@ -7128,17 +6982,24 @@ eslint-plugin-react@^7.4.0, eslint-plugin-react@^7.8.2: string.prototype.matchall "^4.0.2" xregexp "^4.3.0" -eslint-plugin-taro@2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/eslint-plugin-taro/-/eslint-plugin-taro-2.0.7.tgz#263ae84d57dc578760eed3832837f6e0c1d558a7" - integrity sha512-e5mJGKI79z+fRxKWKDFxS0KbWtkE7R68M0uZoSX/2U7t/ohl6xhRQNoZLdnrYu0vyb5tEIwVbP56EsKSwXkbdw== +eslint-plugin-taro@1.3.22: + version "1.3.22" + resolved "https://registry.yarnpkg.com/eslint-plugin-taro/-/eslint-plugin-taro-1.3.22.tgz#c8c822990e194b6511e5eddd6ef7357fa420c05e" + integrity sha512-he5/XSkjQKjrLguibAtfC+xlq3d9U+DnXmehWvpza0s95W9P9r2hHkSwadM1V7ord3U2rgxchn7hZaOGU1t9uw== dependencies: has "^1.0.1" -eslint-plugin-taro@3.0.0-beta.1: - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-taro/-/eslint-plugin-taro-3.0.0-beta.1.tgz#89565639af690aa884c320b0aef7d06c36b76da8" - integrity sha512-UZH/i0GiaVk7ZnvASNN3o+WaJbhGGeWiasmhjKOsYA/ypIWdSmj/2ODAf2eTipSe/0cvofEsxOJ4geEh3HF/cw== +eslint-plugin-taro@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-taro/-/eslint-plugin-taro-2.1.0.tgz#8f7e45251965e530850f1fd0288e84fc2c82c871" + integrity sha512-MU2D1GiMwoom0Zsg1fu5KYCtkAp1hSoBCLx8vJ/qUQ6XsPQMSQdSOPfPLGCpxpf683nlYMuJem1Mxdd96xRf0Q== + dependencies: + has "^1.0.1" + +eslint-plugin-taro@^3.0.0-experimental.5: + version "3.0.0-experimental.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-taro/-/eslint-plugin-taro-3.0.0-experimental.5.tgz#bf8dffd3232ee5048c7a0c758329de5422d0124f" + integrity sha512-Srx4jmuwLFofVSQPaKEOxNNKyOx3uTkpR0jrfjgXp+wlM8KU7mKoblRCQqxDX+Nc3AaQMfB7caimdrkCky3hAQ== dependencies: has "^1.0.1" @@ -8622,6 +8483,20 @@ globals@^9.18.0: resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== +globby@10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22" + integrity sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A== + dependencies: + "@types/glob" "^7.1.1" + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.0.3" + glob "^7.1.3" + ignore "^5.1.1" + merge2 "^1.2.3" + slash "^3.0.0" + globby@^10.0.1: version "10.0.2" resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" @@ -9023,7 +8898,7 @@ himalaya-wxml@^1.1.0: resolved "https://registry.yarnpkg.com/himalaya-wxml/-/himalaya-wxml-1.1.0.tgz#85d0341af1c5f53f3b021be8e4be890cc8b4d7af" integrity sha512-n1l4NRjr9uIOiGy76t6bi5TO7EDZWTFe875OgygoR9myFXJAYWtrmVG9GY094j1SEazCwxYqhEMbaywLlOArbw== -history@^4.10.1, history@^4.9.0: +history@^4.9.0: version "4.10.1" resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== @@ -9454,7 +9329,7 @@ indexof@0.0.1: resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= -infer-owner@^1.0.3, infer-owner@^1.0.4: +infer-owner@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== @@ -10029,6 +9904,13 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" +is-plain-object@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928" + integrity sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg== + dependencies: + isobject "^4.0.0" + is-posix-bracket@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" @@ -10207,6 +10089,11 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= +isobject@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0" + integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA== + isomorphic-fetch@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" @@ -10620,14 +10507,6 @@ jest-worker@^23.2.0: dependencies: merge-stream "^1.0.1" -jest-worker@^25.1.0: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.1.tgz#209617015c768652646aa33a7828cc2ab472a18a" - integrity sha512-IHnpekk8H/hCUbBlfeaPZzU6v75bqwJp3n4dUrQuQOAgOneI4tx3jV2o8pvlXnDfcRsfkFIUD//HWXpCmR+evQ== - dependencies: - merge-stream "^2.0.0" - supports-color "^7.0.0" - jest@23.6.0: version "23.6.0" resolved "https://registry.yarnpkg.com/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d" @@ -11588,11 +11467,6 @@ makeerror@1.0.x: dependencies: tmpl "1.0.x" -mamacro@^0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" - integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA== - map-age-cleaner@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" @@ -12116,28 +11990,7 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minipass-collect@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" - integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== - dependencies: - minipass "^3.0.0" - -minipass-flush@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" - integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== - dependencies: - minipass "^3.0.0" - -minipass-pipeline@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz#3dcb6bb4a546e32969c7ad710f2c79a86abba93a" - integrity sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA== - dependencies: - minipass "^3.0.0" - -minipass@^3.0.0, minipass@^3.1.1: +minipass@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" integrity sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w== @@ -13102,7 +12955,7 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1, p-limit@^2.2.2: +p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1: version "2.2.2" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== @@ -13434,11 +13287,6 @@ path-to-regexp@^1.7.0: dependencies: isarray "0.0.1" -path-to-regexp@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.2.0.tgz#fa7877ecbc495c601907562222453c43cc204a5f" - integrity sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA== - path-type@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" @@ -13620,16 +13468,6 @@ postcss-html@^0.36.0: dependencies: htmlparser2 "^3.10.0" -postcss-import@12.0.1: - version "12.0.1" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153" - integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw== - dependencies: - postcss "^7.0.1" - postcss-value-parser "^3.2.3" - read-cache "^1.0.0" - resolve "^1.1.7" - postcss-js@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-1.0.1.tgz#ffaf29226e399ea74b5dce02cab1729d7addbc7b" @@ -13796,18 +13634,18 @@ postcss-pxtorem@^4.0.1: object-assign "^4.1.0" postcss "^5.2.10" -postcss-pxtransform@2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/postcss-pxtransform/-/postcss-pxtransform-2.0.7.tgz#f0e62f22819bc8aaf629d821ece04cb90b15ecd8" - integrity sha512-cMzbDZxY9hMtAe3+Xm4SwYRz3+nJ32EjeOOyox94h5o682x3TMdWXuuiPxdrvcCmNfKVqZ8eYpIFe0QgeSafLw== +postcss-pxtransform@1.3.22: + version "1.3.22" + resolved "https://registry.yarnpkg.com/postcss-pxtransform/-/postcss-pxtransform-1.3.22.tgz#68ff2380c0233783178adae9b1de7847fd789cdc" + integrity sha512-vAVcQZID3CiF4Ie+4Y2XOttJJKTZPc84iKWjfToaoJINiTPkl1Ld1KdMT+cNjOZrBjTtDFsa7j1EdOUzfd1UDw== dependencies: postcss "^6.0.16" postcss-pxtorem "^4.0.1" -postcss-pxtransform@3.0.0-beta.1: - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/postcss-pxtransform/-/postcss-pxtransform-3.0.0-beta.1.tgz#0c0e42dc773d4ccae11a75f2757758122daebd26" - integrity sha512-IO2v14khgMve5nImveOfK8FdMXWQ2Ngn6Mr81z5OO+JvbRNY4TcKLFEq4lKMxuIniXqjBp2u0vdwUjnUGZXDJg== +postcss-pxtransform@2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/postcss-pxtransform/-/postcss-pxtransform-2.0.7.tgz#f0e62f22819bc8aaf629d821ece04cb90b15ecd8" + integrity sha512-cMzbDZxY9hMtAe3+Xm4SwYRz3+nJ32EjeOOyox94h5o682x3TMdWXuuiPxdrvcCmNfKVqZ8eYpIFe0QgeSafLw== dependencies: postcss "^6.0.16" postcss-pxtorem "^4.0.1" @@ -14369,11 +14207,16 @@ react-dom@^16.13.0: prop-types "^15.6.2" scheduler "^0.19.1" -react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1: +react-is@^16.6.0, react-is@^16.7.0: version "16.13.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA== +react-is@^16.8.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + react-markdown-loader@^1.1.14: version "1.3.0" resolved "https://registry.yarnpkg.com/react-markdown-loader/-/react-markdown-loader-1.3.0.tgz#1887fa75ea1d01b91ca579155597ea425a731fd4" @@ -14385,6 +14228,11 @@ react-markdown-loader@^1.1.14: node-prismjs "^0.1.2" remarkable "^2.0.0" +react-native-known-styling-properties@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/react-native-known-styling-properties/-/react-native-known-styling-properties-1.0.5.tgz#dd99690d579c5136541e1df836e75088af6e7356" + integrity sha512-PKRW5v9Um2/7mIaUy2fxg3XugP/QyVoqnzpnkY6AUTIlfyC2c/PeEhDwEVJgTotWiFCIj2lUACQ2lsG5zp0NUQ== + react-reconciler@^0.23.0: version "0.23.0" resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.23.0.tgz#5f0bfc35dda030b0220c07de11f93131c5d6db63" @@ -14425,21 +14273,14 @@ react-router@5.1.2: tiny-warning "^1.0.0" react@^16.13.0: - version "16.13.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.13.0.tgz#d046eabcdf64e457bbeed1e792e235e1b9934cf7" - integrity sha512-TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ== + version "16.13.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e" + integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" -read-cache@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" - integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q= - dependencies: - pify "^2.3.0" - read-chunk@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-1.0.1.tgz#5f68cab307e663f19993527d9b589cace4661194" @@ -15099,7 +14940,7 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@1.15.1, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.6.0: +resolve@1.15.1, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.6.0: version "1.15.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== @@ -15172,7 +15013,7 @@ rework@^1.0.1: convert-source-map "^0.3.3" css "^2.0.0" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -15208,6 +15049,17 @@ rollup-plugin-alias@1.4.0: dependencies: slash "^1.0.0" +rollup-plugin-copy@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-copy/-/rollup-plugin-copy-3.3.0.tgz#5ba230047f86b9f703a29288f242948a5580e7b9" + integrity sha512-euDjCUSBXZa06nqnwCNADbkAcYDfzwowfZQkto9K/TFhiH+QG7I4PUsEMwM9tDgomGWJc//z7KLW8t+tZwxADA== + dependencies: + "@types/fs-extra" "^8.0.1" + colorette "^1.1.0" + fs-extra "^8.1.0" + globby "10.0.1" + is-plain-object "^3.0.0" + rollup-plugin-typescript2@^0.27.0: version "0.27.0" resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.27.0.tgz#95ff96f9e07d5000a9d2df4d76b548f9a1f83511" @@ -15231,9 +15083,9 @@ rollup-plugin-visualizer@^4.0.2: yargs "^15.0.0" rollup@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.3.1.tgz#844c5cdf88d212ff7e59212088c37eacc521a2f9" - integrity sha512-BRjzOauORe+R0U0I6SkMTSG22nYmtztR/TaBl0SvbXgc3VAxBDrZoB6HROiK0S5px1pUBnLnjBkbzmVuwC9Q1Q== + version "2.3.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.3.2.tgz#afa68e4f3325bcef4e150d082056bef450bcac60" + integrity sha512-p66+fbfaUUOGE84sHXAOgfeaYQMslgAazoQMp//nlR519R61213EPFgrMZa48j31jNacJwexSAR1Q8V/BwGKBA== optionalDependencies: fsevents "~2.1.2" @@ -15381,7 +15233,7 @@ sax@0.5.x: resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1" integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE= -sax@1.2.4, sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: +sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -15426,7 +15278,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4: +schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.5: version "2.6.5" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a" integrity sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ== @@ -15563,7 +15415,7 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@^1.4.0: +serialize-javascript@^1.4.0, serialize-javascript@^1.7.0: version "1.9.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb" integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A== @@ -16068,14 +15920,6 @@ ssri@^6.0.1: dependencies: figgy-pudding "^3.5.1" -ssri@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz#92c241bf6de82365b5c7fb4bd76e975522e1294d" - integrity sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g== - dependencies: - figgy-pudding "^3.5.1" - minipass "^3.1.1" - stack-utils@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" @@ -16230,21 +16074,39 @@ string.prototype.matchall@^4.0.2: regexp.prototype.flags "^1.3.0" side-channel "^1.0.2" +string.prototype.trimend@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz#ee497fd29768646d84be2c9b819e292439614373" + integrity sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimleft@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" - integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" + integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw== dependencies: define-properties "^1.1.3" - function-bind "^1.1.1" + es-abstract "^1.17.5" + string.prototype.trimstart "^1.0.0" string.prototype.trimright@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" - integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3" + integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg== dependencies: define-properties "^1.1.3" - function-bind "^1.1.1" + es-abstract "^1.17.5" + string.prototype.trimend "^1.0.0" + +string.prototype.trimstart@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz#afe596a7ce9de905496919406c9734845f01a2f2" + integrity sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" @@ -16405,6 +16267,11 @@ stylelint-config-standard@^20.0.0: dependencies: stylelint-config-recommended "^3.0.0" +stylelint-config-taro-rn@1.3.22: + version "1.3.22" + resolved "https://registry.yarnpkg.com/stylelint-config-taro-rn/-/stylelint-config-taro-rn-1.3.22.tgz#da11889c700fb42986e5a0fba5b5ac3a828d9210" + integrity sha512-qNW4CoAjgKM5uZjYgYPfQDUPNJWvvNTT2Dbdw2vP1lDX6pXMdiMCEwTs+p5rO7CMXcMSB9Bz/NnsbFKDrO4alg== + stylelint-scss@^3.2.0: version "3.16.0" resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.16.0.tgz#6928fe57bcfc924110d09847c1f720472a9b7bd6" @@ -16416,6 +16283,13 @@ stylelint-scss@^3.2.0: postcss-selector-parser "^6.0.2" postcss-value-parser "^4.0.2" +stylelint-taro-rn@1.3.22: + version "1.3.22" + resolved "https://registry.yarnpkg.com/stylelint-taro-rn/-/stylelint-taro-rn-1.3.22.tgz#a0b2fc7a8a78acfae3a4956782a9b2d68c871f3c" + integrity sha512-VLlcEdkSjIoU8a+hfm+fMpdN2IojDfdrKfXG7sPDZAPhOq1ao1pUVHQizDi7KcHjwXFqNceZbxasspQXS00gCA== + dependencies: + react-native-known-styling-properties "^1.0.4" + stylelint@9.3.0: version "9.3.0" resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.3.0.tgz#fe176e4e421ac10eac1a6b6d9f28e908eb58c5db" @@ -16594,7 +16468,7 @@ supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0: dependencies: has-flag "^3.0.0" -supports-color@^7.0.0, supports-color@^7.1.0: +supports-color@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== @@ -16651,7 +16525,7 @@ table@^5.2.3, table@^5.4.6: slice-ansi "^2.1.0" string-width "^3.0.0" -tapable@1.1.3, tapable@^1.0.0, tapable@^1.1.0, tapable@^1.1.3: +tapable@^1.0.0, tapable@^1.1.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== @@ -16711,10 +16585,10 @@ tar@^5.0.5: mkdirp "^0.5.0" yallist "^4.0.0" -taro-css-to-react-native@^2.0.4: - version "2.0.7" - resolved "https://registry.yarnpkg.com/taro-css-to-react-native/-/taro-css-to-react-native-2.0.7.tgz#7b9654c8b6adbfc3e4cee33b075853f15be6ffbd" - integrity sha512-oD/oCAq++5WyVHLj+V0/wvZamL4MZPLA0L4eC2NA2fkz/udcFyYVxyuf8IP3G2Lf9WxZNEyJjhC/0v8NplqxqA== +taro-css-to-react-native@1.3.22: + version "1.3.22" + resolved "https://registry.yarnpkg.com/taro-css-to-react-native/-/taro-css-to-react-native-1.3.22.tgz#35688fca25333f55e826714f1aae63983e929853" + integrity sha512-T05nEXMGGcRXUDlKO+Z5o/Msz0DlQ1RZ9uhoz8PFIb3iFvHvw60jLHoXZiJT+bCAC6Ml6WElT4mYioXBOMEHmA== dependencies: camelize "^1.0.0" css "^2.2.4" @@ -16742,21 +16616,6 @@ term-size@^1.2.0: dependencies: execa "^0.7.0" -terser-webpack-plugin@2.3.5: - version "2.3.5" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz#5ad971acce5c517440ba873ea4f09687de2f4a81" - integrity sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w== - dependencies: - cacache "^13.0.1" - find-cache-dir "^3.2.0" - jest-worker "^25.1.0" - p-limit "^2.2.2" - schema-utils "^2.6.4" - serialize-javascript "^2.1.2" - source-map "^0.6.1" - terser "^4.4.3" - webpack-sources "^1.4.3" - terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -16772,7 +16631,7 @@ terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@^4.1.2, terser@^4.4.2, terser@^4.4.3: +terser@^4.1.2: version "4.6.7" resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz#478d7f9394ec1907f0e488c5f6a6a9a2bad55e72" integrity sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g== @@ -16781,6 +16640,15 @@ terser@^4.1.2, terser@^4.4.2, terser@^4.4.3: source-map "~0.6.1" source-map-support "~0.5.12" +terser@^4.4.2: + version "4.6.10" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.10.tgz#90f5bd069ff456ddbc9503b18e52f9c493d3b7c2" + integrity sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + test-exclude@^4.2.1: version "4.2.3" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20" @@ -17225,6 +17093,14 @@ uglify-js@^3.1.4, uglify-js@^3.3.24: commander "~2.20.3" source-map "~0.6.1" +uglify-js@^3.6.0: + version "3.8.1" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.1.tgz#43bb15ce6f545eaa0a64c49fd29375ea09fa0f93" + integrity sha512-W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw== + dependencies: + commander "~2.20.3" + source-map "~0.6.1" + uglifyjs-webpack-plugin@1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz#5eec941b2e9b8538be0a20fc6eda25b14c7c1043" @@ -17239,6 +17115,21 @@ uglifyjs-webpack-plugin@1.2.4: webpack-sources "^1.1.0" worker-farm "^1.5.2" +uglifyjs-webpack-plugin@^2.1.3: + version "2.2.0" + resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.2.0.tgz#e75bc80e7f1937f725954c9b4c5a1e967ea9d0d7" + integrity sha512-mHSkufBmBuJ+KHQhv5H0MXijtsoA1lynJt1lXOaotja8/I0pR4L9oGaPIZw+bQBOFittXZg9OC1sXSGO9D9ZYg== + dependencies: + cacache "^12.0.2" + find-cache-dir "^2.1.0" + is-wsl "^1.1.0" + schema-utils "^1.0.0" + serialize-javascript "^1.7.0" + source-map "^0.6.1" + uglify-js "^3.6.0" + webpack-sources "^1.4.0" + worker-farm "^1.7.0" + unbzip2-stream@^1.0.9: version "1.3.3" resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a" @@ -17259,11 +17150,6 @@ unescape-js@^1.1.1: dependencies: string.fromcodepoint "^0.2.1" -unfetch@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz#6ec2dd0de887e58a4dee83a050ded80ffc4137db" - integrity sha512-crP/n3eAPUJxZXM9T80/yv0YhkTEx2K1D3h7D1AJM6fzsWZrxdyRuLN0JH/dkZh1LNH8LxCnBzoPFCPbb2iGpg== - unherit@^1.0.4: version "1.1.3" resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" @@ -17432,13 +17318,6 @@ unist-util-visit@^1.0.0, unist-util-visit@^1.1.0, unist-util-visit@^1.3.0: dependencies: unist-util-visit-parents "^2.0.0" -universal-router@^8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/universal-router/-/universal-router-8.3.0.tgz#533bce135d7b1abf591421c5d2028d54407a34a0" - integrity sha512-cBkihRoHvRQAjdUnDE1GGuuw/TPAIi8z2pEsSmUVAWLeZdgjHzzAb1+0VOO6NvBOvySItOTQikzaGlRxRdJBnA== - dependencies: - path-to-regexp "^3.1.0" - universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -17548,7 +17427,7 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.3, url-parse@^1.4.7: +url-parse@^1.4.3: version "1.4.7" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== @@ -18119,7 +17998,7 @@ webpack-merge@^4.1.3: dependencies: lodash "^4.17.15" -webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: +webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -18157,36 +18036,7 @@ webpack@4.28.4: watchpack "^1.5.0" webpack-sources "^1.3.0" -webpack@4.42.0: - version "4.42.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8" - integrity sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-module-context" "1.8.5" - "@webassemblyjs/wasm-edit" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" - acorn "^6.2.1" - ajv "^6.10.2" - ajv-keywords "^3.4.1" - chrome-trace-event "^1.0.2" - enhanced-resolve "^4.1.0" - eslint-scope "^4.0.3" - json-parse-better-errors "^1.0.2" - loader-runner "^2.4.0" - loader-utils "^1.2.3" - memory-fs "^0.4.1" - micromatch "^3.1.10" - mkdirp "^0.5.1" - neo-async "^2.6.1" - node-libs-browser "^2.2.1" - schema-utils "^1.0.0" - tapable "^1.1.3" - terser-webpack-plugin "^1.4.3" - watchpack "^1.6.0" - webpack-sources "^1.4.1" - -webpack@^4.42.1: +webpack@^4.41.2, webpack@^4.42.1: version "4.42.1" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.1.tgz#ae707baf091f5ca3ef9c38b884287cfe8f1983ef" integrity sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg== From dac4d82bb7417223f53a6892e36bf0167a6922a7 Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Sat, 4 Apr 2020 22:02:36 +0800 Subject: [PATCH 14/54] chore: release v3.0.0-alpha.1 --- CHANGELOG.md | 9 +++++++++ README.md | 2 ++ package.json | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9a76ef9f..f56fb101a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# [3.0.0-alpha.1](https://github.com/nervjs/taro-ui/compare/v3.0.0-alpha.0...v3.0.0-alpha.1) (2020-04-04) + + +### Features + +* replace webpack with rollup ([f119305](https://github.com/nervjs/taro-ui/commit/f1193056ae7cf7632ad149a1b7a882bfe3d8879a)) + + + # [3.0.0-alpha.0](https://github.com/nervjs/taro-ui/compare/v2.3.1...v3.0.0-alpha.0) (2020-03-28) diff --git a/README.md b/README.md index 04d819e21..ad5fd7484 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ 一款基于 `Taro` 框架开发的多端 UI 组件库 +> Taro UI 3 目前仍在开发中，`alpha` 版本可能会出现较大改动并且不保证功能完整可用，请谨慎使用。 + ## 特性 - 基于 `Taro` 开发 UI 组件 diff --git a/package.json b/package.json index c871206c5..188462d77 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro-ui", - "version": "3.0.0-alpha.0", + "version": "3.0.0-alpha.1", "description": "UI KIT for Taro", "browser": "dist/index.umd.js", "module": "dist/index.esm.js", From 09f5296eda41b990f7ff9ebb5e1e0b848ac94019 Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Sun, 5 Apr 2020 19:15:29 +0800 Subject: [PATCH 15/54] chore: move taro-ui files to packages subfolder --- package.json => packages/taro-ui/package.json | 0 {src => packages/taro-ui/src}/common/component.tsx | 0 {src => packages/taro-ui/src}/common/utils.ts | 0 {src => packages/taro-ui/src}/components/accordion/index.tsx | 0 .../taro-ui/src}/components/action-sheet/body/index.tsx | 0 .../taro-ui/src}/components/action-sheet/body/item/index.tsx | 0 .../taro-ui/src}/components/action-sheet/footer/index.tsx | 0 .../taro-ui/src}/components/action-sheet/header/index.tsx | 0 {src => packages/taro-ui/src}/components/action-sheet/index.tsx | 0 .../taro-ui/src}/components/activity-indicator/index.tsx | 0 {src => packages/taro-ui/src}/components/avatar/index.tsx | 0 {src => packages/taro-ui/src}/components/badge/index.tsx | 0 {src => packages/taro-ui/src}/components/button/index.tsx | 0 {src => packages/taro-ui/src}/components/calendar/body/index.tsx | 0 .../taro-ui/src}/components/calendar/common/constant.ts | 0 .../taro-ui/src}/components/calendar/common/helper.ts | 0 .../taro-ui/src}/components/calendar/common/plugins.ts | 0 .../taro-ui/src}/components/calendar/controller/index.tsx | 0 {src => packages/taro-ui/src}/components/calendar/index.tsx | 0 .../taro-ui/src}/components/calendar/ui/date-list/index.tsx | 0 .../taro-ui/src}/components/calendar/ui/day-list/index.tsx | 0 {src => packages/taro-ui/src}/components/card/index.tsx | 0 {src => packages/taro-ui/src}/components/checkbox/index.tsx | 0 {src => packages/taro-ui/src}/components/countdown/index.scss | 0 {src => packages/taro-ui/src}/components/countdown/index.tsx | 0 {src => packages/taro-ui/src}/components/countdown/item/index.tsx | 0 {src => packages/taro-ui/src}/components/curtain/index.tsx | 0 {src => packages/taro-ui/src}/components/divider/index.tsx | 0 {src => packages/taro-ui/src}/components/drawer/index.tsx | 0 {src => packages/taro-ui/src}/components/fab/index.tsx | 0 {src => packages/taro-ui/src}/components/flex/index.scss | 0 {src => packages/taro-ui/src}/components/flex/index.tsx | 0 {src => packages/taro-ui/src}/components/flex/item/index.scss | 0 {src => packages/taro-ui/src}/components/flex/item/index.tsx | 0 {src => packages/taro-ui/src}/components/float-layout/index.tsx | 0 {src => packages/taro-ui/src}/components/form/index.tsx | 0 {src => packages/taro-ui/src}/components/grid/index.tsx | 0 {src => packages/taro-ui/src}/components/icon/index.tsx | 0 {src => packages/taro-ui/src}/components/image-picker/index.tsx | 0 {src => packages/taro-ui/src}/components/indexes/index.tsx | 0 {src => packages/taro-ui/src}/components/input-number/index.tsx | 0 {src => packages/taro-ui/src}/components/input/index.tsx | 0 {src => packages/taro-ui/src}/components/list/index.tsx | 0 {src => packages/taro-ui/src}/components/list/item/index.tsx | 0 {src => packages/taro-ui/src}/components/load-more/index.tsx | 0 {src => packages/taro-ui/src}/components/loading/index.tsx | 0 {src => packages/taro-ui/src}/components/message/index.tsx | 0 {src => packages/taro-ui/src}/components/modal/action/index.tsx | 0 {src => packages/taro-ui/src}/components/modal/content/index.tsx | 0 {src => packages/taro-ui/src}/components/modal/header/index.tsx | 0 {src => packages/taro-ui/src}/components/modal/index.tsx | 0 {src => packages/taro-ui/src}/components/nav-bar/index.tsx | 0 {src => packages/taro-ui/src}/components/noticebar/index.tsx | 0 {src => packages/taro-ui/src}/components/pagination/index.tsx | 0 {src => packages/taro-ui/src}/components/progress/index.tsx | 0 {src => packages/taro-ui/src}/components/radio/index.tsx | 0 {src => packages/taro-ui/src}/components/range/index.tsx | 0 {src => packages/taro-ui/src}/components/rate/index.tsx | 0 {src => packages/taro-ui/src}/components/search-bar/index.tsx | 0 .../taro-ui/src}/components/segmented-control/index.tsx | 0 {src => packages/taro-ui/src}/components/slider/index.tsx | 0 {src => packages/taro-ui/src}/components/steps/index.tsx | 0 {src => packages/taro-ui/src}/components/swipe-action/index.tsx | 0 .../taro-ui/src}/components/swipe-action/options/index.tsx | 0 {src => packages/taro-ui/src}/components/switch/index.tsx | 0 {src => packages/taro-ui/src}/components/tab-bar/index.tsx | 0 {src => packages/taro-ui/src}/components/tabs-pane/index.tsx | 0 {src => packages/taro-ui/src}/components/tabs/index.tsx | 0 {src => packages/taro-ui/src}/components/tag/index.tsx | 0 {src => packages/taro-ui/src}/components/textarea/index.tsx | 0 {src => packages/taro-ui/src}/components/timeline/index.tsx | 0 {src => packages/taro-ui/src}/components/toast/img.json | 0 {src => packages/taro-ui/src}/components/toast/index.tsx | 0 {src => packages/taro-ui/src}/index.ts | 0 {src => packages/taro-ui/src}/style/components/accordion.scss | 0 {src => packages/taro-ui/src}/style/components/action-sheet.scss | 0 .../taro-ui/src}/style/components/activity-indicator.scss | 0 {src => packages/taro-ui/src}/style/components/article.scss | 0 {src => packages/taro-ui/src}/style/components/avatar.scss | 0 {src => packages/taro-ui/src}/style/components/badge.scss | 0 {src => packages/taro-ui/src}/style/components/button.scss | 0 {src => packages/taro-ui/src}/style/components/calendar.scss | 0 {src => packages/taro-ui/src}/style/components/card.scss | 0 {src => packages/taro-ui/src}/style/components/checkbox.scss | 0 {src => packages/taro-ui/src}/style/components/countdown.scss | 0 {src => packages/taro-ui/src}/style/components/curtain.scss | 0 {src => packages/taro-ui/src}/style/components/divider.scss | 0 {src => packages/taro-ui/src}/style/components/drawer.scss | 0 {src => packages/taro-ui/src}/style/components/fab.scss | 0 {src => packages/taro-ui/src}/style/components/flex.scss | 0 {src => packages/taro-ui/src}/style/components/float-layout.scss | 0 {src => packages/taro-ui/src}/style/components/form.scss | 0 {src => packages/taro-ui/src}/style/components/grid.scss | 0 {src => packages/taro-ui/src}/style/components/icon.scss | 0 {src => packages/taro-ui/src}/style/components/image-picker.scss | 0 {src => packages/taro-ui/src}/style/components/index.scss | 0 {src => packages/taro-ui/src}/style/components/indexes.scss | 0 {src => packages/taro-ui/src}/style/components/input-number.scss | 0 {src => packages/taro-ui/src}/style/components/input.scss | 0 {src => packages/taro-ui/src}/style/components/list.scss | 0 {src => packages/taro-ui/src}/style/components/load-more.scss | 0 {src => packages/taro-ui/src}/style/components/loading.scss | 0 {src => packages/taro-ui/src}/style/components/message.scss | 0 {src => packages/taro-ui/src}/style/components/modal.scss | 0 {src => packages/taro-ui/src}/style/components/nav-bar.scss | 0 {src => packages/taro-ui/src}/style/components/noticebar.scss | 0 {src => packages/taro-ui/src}/style/components/pagination.scss | 0 {src => packages/taro-ui/src}/style/components/progress.scss | 0 {src => packages/taro-ui/src}/style/components/radio.scss | 0 {src => packages/taro-ui/src}/style/components/range.scss | 0 {src => packages/taro-ui/src}/style/components/rate.scss | 0 {src => packages/taro-ui/src}/style/components/search-bar.scss | 0 .../taro-ui/src}/style/components/segmented-control.scss | 0 {src => packages/taro-ui/src}/style/components/slider.scss | 0 {src => packages/taro-ui/src}/style/components/steps.scss | 0 {src => packages/taro-ui/src}/style/components/swipe-action.scss | 0 {src => packages/taro-ui/src}/style/components/switch.scss | 0 {src => packages/taro-ui/src}/style/components/tab-bar.scss | 0 {src => packages/taro-ui/src}/style/components/tabs.scss | 0 {src => packages/taro-ui/src}/style/components/tag.scss | 0 {src => packages/taro-ui/src}/style/components/textarea.scss | 0 {src => packages/taro-ui/src}/style/components/timeline.scss | 0 {src => packages/taro-ui/src}/style/components/toast.scss | 0 {src => packages/taro-ui/src}/style/index.scss | 0 {src => packages/taro-ui/src}/style/mixins/index.scss | 0 .../taro-ui/src}/style/mixins/libs/absolute-center.scss | 0 {src => packages/taro-ui/src}/style/mixins/libs/active.scss | 0 {src => packages/taro-ui/src}/style/mixins/libs/alignhack.scss | 0 {src => packages/taro-ui/src}/style/mixins/libs/border.scss | 0 {src => packages/taro-ui/src}/style/mixins/libs/clearfix.scss | 0 {src => packages/taro-ui/src}/style/mixins/libs/disabled.scss | 0 {src => packages/taro-ui/src}/style/mixins/libs/flex.scss | 0 {src => packages/taro-ui/src}/style/mixins/libs/hairline.scss | 0 {src => packages/taro-ui/src}/style/mixins/libs/line.scss | 0 {src => packages/taro-ui/src}/style/mixins/libs/overlay.scss | 0 {src => packages/taro-ui/src}/style/mixins/libs/placeholder.scss | 0 {src => packages/taro-ui/src}/style/mixins/libs/shade.scss | 0 {src => packages/taro-ui/src}/style/mixins/libs/tint.scss | 0 {src => packages/taro-ui/src}/style/themes/purple.scss | 0 {src => packages/taro-ui/src}/style/themes/red.scss | 0 {src => packages/taro-ui/src}/style/variables/default.scss | 0 {test => packages/taro-ui/test}/__mock__/styleMock.js | 0 .../taro-ui/test}/components/__snapshots__/accordion.test.js.snap | 0 .../test}/components/__snapshots__/action-sheet.test.js.snap | 0 .../components/__snapshots__/activity-indicator.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/avatar.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/badge.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/button.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/card.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/checkbox.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/countdown.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/curtain.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/divider.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/drawer.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/fab.test.js.snap | 0 .../test}/components/__snapshots__/float-layout.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/form.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/grid.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/icon.test.js.snap | 0 .../test}/components/__snapshots__/image-picker.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/indexes.test.js.snap | 0 .../test}/components/__snapshots__/input-number.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/input.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/list.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/load-more.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/loading.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/message.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/modal.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/nav-bar.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/noticebar.test.js.snap | 0 .../test}/components/__snapshots__/pagination.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/progress.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/radio.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/range.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/rate.test.js.snap | 0 .../test}/components/__snapshots__/search-bar.test.js.snap | 0 .../test}/components/__snapshots__/segmented-control.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/slider.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/steps.test.js.snap | 0 .../test}/components/__snapshots__/swipe-action.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/switch.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/tab-bar.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/tabs-pane.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/tabs.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/tag.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/textarea.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/timeline.test.js.snap | 0 .../taro-ui/test}/components/__snapshots__/toast.test.js.snap | 0 {test => packages/taro-ui/test}/components/accordion.test.js | 0 {test => packages/taro-ui/test}/components/action-sheet.test.js | 0 .../taro-ui/test}/components/activity-indicator.test.js | 0 {test => packages/taro-ui/test}/components/avatar.test.js | 0 {test => packages/taro-ui/test}/components/badge.test.js | 0 {test => packages/taro-ui/test}/components/button.test.js | 0 {test => packages/taro-ui/test}/components/calendar.test.js | 0 {test => packages/taro-ui/test}/components/card.test.js | 0 {test => packages/taro-ui/test}/components/checkbox.test.js | 0 {test => packages/taro-ui/test}/components/countdown.test.js | 0 {test => packages/taro-ui/test}/components/curtain.test.js | 0 {test => packages/taro-ui/test}/components/divider.test.js | 0 {test => packages/taro-ui/test}/components/drawer.test.js | 0 {test => packages/taro-ui/test}/components/fab.test.js | 0 {test => packages/taro-ui/test}/components/float-layout.test.js | 0 {test => packages/taro-ui/test}/components/form.test.js | 0 {test => packages/taro-ui/test}/components/grid.test.js | 0 {test => packages/taro-ui/test}/components/icon.test.js | 0 {test => packages/taro-ui/test}/components/image-picker.test.js | 0 {test => packages/taro-ui/test}/components/indexes.test.js | 0 {test => packages/taro-ui/test}/components/input-number.test.js | 0 {test => packages/taro-ui/test}/components/input.test.js | 0 {test => packages/taro-ui/test}/components/list.test.js | 0 {test => packages/taro-ui/test}/components/load-more.test.js | 0 {test => packages/taro-ui/test}/components/loading.test.js | 0 {test => packages/taro-ui/test}/components/message.test.js | 0 {test => packages/taro-ui/test}/components/modal.test.js | 0 {test => packages/taro-ui/test}/components/nav-bar.test.js | 0 {test => packages/taro-ui/test}/components/noticebar.test.js | 0 {test => packages/taro-ui/test}/components/pagination.test.js | 0 {test => packages/taro-ui/test}/components/progress.test.js | 0 {test => packages/taro-ui/test}/components/radio.test.js | 0 {test => packages/taro-ui/test}/components/range.test.js | 0 {test => packages/taro-ui/test}/components/rate.test.js | 0 {test => packages/taro-ui/test}/components/search-bar.test.js | 0 .../taro-ui/test}/components/segmented-control.test.js | 0 {test => packages/taro-ui/test}/components/slider.test.js | 0 {test => packages/taro-ui/test}/components/steps.test.js | 0 {test => packages/taro-ui/test}/components/swipe-action.test.js | 0 {test => packages/taro-ui/test}/components/switch.test.js | 0 {test => packages/taro-ui/test}/components/tab-bar.test.js | 0 {test => packages/taro-ui/test}/components/tabs-pane.test.js | 0 {test => packages/taro-ui/test}/components/tabs.test.js | 0 {test => packages/taro-ui/test}/components/tag.test.js | 0 {test => packages/taro-ui/test}/components/textarea.test.js | 0 {test => packages/taro-ui/test}/components/timeline.test.js | 0 {test => packages/taro-ui/test}/components/toast.test.js | 0 {types => packages/taro-ui/types}/accordion.d.ts | 0 {types => packages/taro-ui/types}/action-sheet.d.ts | 0 {types => packages/taro-ui/types}/activity-indicator.d.ts | 0 {types => packages/taro-ui/types}/avatar.d.ts | 0 {types => packages/taro-ui/types}/badge.d.ts | 0 {types => packages/taro-ui/types}/base.d.ts | 0 {types => packages/taro-ui/types}/button.d.ts | 0 {types => packages/taro-ui/types}/calendar.d.ts | 0 {types => packages/taro-ui/types}/card.d.ts | 0 {types => packages/taro-ui/types}/checkbox.d.ts | 0 {types => packages/taro-ui/types}/countdown.d.ts | 0 {types => packages/taro-ui/types}/curtain.d.ts | 0 {types => packages/taro-ui/types}/divider.d.ts | 0 {types => packages/taro-ui/types}/drawer.d.ts | 0 {types => packages/taro-ui/types}/fab.d.ts | 0 {types => packages/taro-ui/types}/flex.d.ts | 0 {types => packages/taro-ui/types}/float-button.d.ts | 0 {types => packages/taro-ui/types}/float-layout.d.ts | 0 {types => packages/taro-ui/types}/form.d.ts | 0 {types => packages/taro-ui/types}/grid.d.ts | 0 {types => packages/taro-ui/types}/icon.d.ts | 0 {types => packages/taro-ui/types}/image-picker.d.ts | 0 {types => packages/taro-ui/types}/index.d.ts | 0 {types => packages/taro-ui/types}/indexes.d.ts | 0 {types => packages/taro-ui/types}/input-number.d.ts | 0 {types => packages/taro-ui/types}/input.d.ts | 0 {types => packages/taro-ui/types}/list.d.ts | 0 {types => packages/taro-ui/types}/load-more.d.ts | 0 {types => packages/taro-ui/types}/message.d.ts | 0 {types => packages/taro-ui/types}/modal.d.ts | 0 {types => packages/taro-ui/types}/nav-bar.d.ts | 0 {types => packages/taro-ui/types}/noticebar.d.ts | 0 {types => packages/taro-ui/types}/pagination.d.ts | 0 {types => packages/taro-ui/types}/progress.d.ts | 0 {types => packages/taro-ui/types}/radio.d.ts | 0 {types => packages/taro-ui/types}/range.d.ts | 0 {types => packages/taro-ui/types}/rate.d.ts | 0 {types => packages/taro-ui/types}/search-bar.d.ts | 0 {types => packages/taro-ui/types}/segmented-control.d.ts | 0 {types => packages/taro-ui/types}/slider.d.ts | 0 {types => packages/taro-ui/types}/steps.d.ts | 0 {types => packages/taro-ui/types}/swipe-action.d.ts | 0 {types => packages/taro-ui/types}/switch.d.ts | 0 {types => packages/taro-ui/types}/tab-bar.d.ts | 0 {types => packages/taro-ui/types}/tabs-pane.d.ts | 0 {types => packages/taro-ui/types}/tabs.d.ts | 0 {types => packages/taro-ui/types}/tag.d.ts | 0 {types => packages/taro-ui/types}/textarea.d.ts | 0 {types => packages/taro-ui/types}/timeline.d.ts | 0 {types => packages/taro-ui/types}/toast.d.ts | 0 285 files changed, 0 insertions(+), 0 deletions(-) rename package.json => packages/taro-ui/package.json (100%) rename {src => packages/taro-ui/src}/common/component.tsx (100%) rename {src => packages/taro-ui/src}/common/utils.ts (100%) rename {src => packages/taro-ui/src}/components/accordion/index.tsx (100%) rename {src => packages/taro-ui/src}/components/action-sheet/body/index.tsx (100%) rename {src => packages/taro-ui/src}/components/action-sheet/body/item/index.tsx (100%) rename {src => packages/taro-ui/src}/components/action-sheet/footer/index.tsx (100%) rename {src => packages/taro-ui/src}/components/action-sheet/header/index.tsx (100%) rename {src => packages/taro-ui/src}/components/action-sheet/index.tsx (100%) rename {src => packages/taro-ui/src}/components/activity-indicator/index.tsx (100%) rename {src => packages/taro-ui/src}/components/avatar/index.tsx (100%) rename {src => packages/taro-ui/src}/components/badge/index.tsx (100%) rename {src => packages/taro-ui/src}/components/button/index.tsx (100%) rename {src => packages/taro-ui/src}/components/calendar/body/index.tsx (100%) rename {src => packages/taro-ui/src}/components/calendar/common/constant.ts (100%) rename {src => packages/taro-ui/src}/components/calendar/common/helper.ts (100%) rename {src => packages/taro-ui/src}/components/calendar/common/plugins.ts (100%) rename {src => packages/taro-ui/src}/components/calendar/controller/index.tsx (100%) rename {src => packages/taro-ui/src}/components/calendar/index.tsx (100%) rename {src => packages/taro-ui/src}/components/calendar/ui/date-list/index.tsx (100%) rename {src => packages/taro-ui/src}/components/calendar/ui/day-list/index.tsx (100%) rename {src => packages/taro-ui/src}/components/card/index.tsx (100%) rename {src => packages/taro-ui/src}/components/checkbox/index.tsx (100%) rename {src => packages/taro-ui/src}/components/countdown/index.scss (100%) rename {src => packages/taro-ui/src}/components/countdown/index.tsx (100%) rename {src => packages/taro-ui/src}/components/countdown/item/index.tsx (100%) rename {src => packages/taro-ui/src}/components/curtain/index.tsx (100%) rename {src => packages/taro-ui/src}/components/divider/index.tsx (100%) rename {src => packages/taro-ui/src}/components/drawer/index.tsx (100%) rename {src => packages/taro-ui/src}/components/fab/index.tsx (100%) rename {src => packages/taro-ui/src}/components/flex/index.scss (100%) rename {src => packages/taro-ui/src}/components/flex/index.tsx (100%) rename {src => packages/taro-ui/src}/components/flex/item/index.scss (100%) rename {src => packages/taro-ui/src}/components/flex/item/index.tsx (100%) rename {src => packages/taro-ui/src}/components/float-layout/index.tsx (100%) rename {src => packages/taro-ui/src}/components/form/index.tsx (100%) rename {src => packages/taro-ui/src}/components/grid/index.tsx (100%) rename {src => packages/taro-ui/src}/components/icon/index.tsx (100%) rename {src => packages/taro-ui/src}/components/image-picker/index.tsx (100%) rename {src => packages/taro-ui/src}/components/indexes/index.tsx (100%) rename {src => packages/taro-ui/src}/components/input-number/index.tsx (100%) rename {src => packages/taro-ui/src}/components/input/index.tsx (100%) rename {src => packages/taro-ui/src}/components/list/index.tsx (100%) rename {src => packages/taro-ui/src}/components/list/item/index.tsx (100%) rename {src => packages/taro-ui/src}/components/load-more/index.tsx (100%) rename {src => packages/taro-ui/src}/components/loading/index.tsx (100%) rename {src => packages/taro-ui/src}/components/message/index.tsx (100%) rename {src => packages/taro-ui/src}/components/modal/action/index.tsx (100%) rename {src => packages/taro-ui/src}/components/modal/content/index.tsx (100%) rename {src => packages/taro-ui/src}/components/modal/header/index.tsx (100%) rename {src => packages/taro-ui/src}/components/modal/index.tsx (100%) rename {src => packages/taro-ui/src}/components/nav-bar/index.tsx (100%) rename {src => packages/taro-ui/src}/components/noticebar/index.tsx (100%) rename {src => packages/taro-ui/src}/components/pagination/index.tsx (100%) rename {src => packages/taro-ui/src}/components/progress/index.tsx (100%) rename {src => packages/taro-ui/src}/components/radio/index.tsx (100%) rename {src => packages/taro-ui/src}/components/range/index.tsx (100%) rename {src => packages/taro-ui/src}/components/rate/index.tsx (100%) rename {src => packages/taro-ui/src}/components/search-bar/index.tsx (100%) rename {src => packages/taro-ui/src}/components/segmented-control/index.tsx (100%) rename {src => packages/taro-ui/src}/components/slider/index.tsx (100%) rename {src => packages/taro-ui/src}/components/steps/index.tsx (100%) rename {src => packages/taro-ui/src}/components/swipe-action/index.tsx (100%) rename {src => packages/taro-ui/src}/components/swipe-action/options/index.tsx (100%) rename {src => packages/taro-ui/src}/components/switch/index.tsx (100%) rename {src => packages/taro-ui/src}/components/tab-bar/index.tsx (100%) rename {src => packages/taro-ui/src}/components/tabs-pane/index.tsx (100%) rename {src => packages/taro-ui/src}/components/tabs/index.tsx (100%) rename {src => packages/taro-ui/src}/components/tag/index.tsx (100%) rename {src => packages/taro-ui/src}/components/textarea/index.tsx (100%) rename {src => packages/taro-ui/src}/components/timeline/index.tsx (100%) rename {src => packages/taro-ui/src}/components/toast/img.json (100%) rename {src => packages/taro-ui/src}/components/toast/index.tsx (100%) rename {src => packages/taro-ui/src}/index.ts (100%) rename {src => packages/taro-ui/src}/style/components/accordion.scss (100%) rename {src => packages/taro-ui/src}/style/components/action-sheet.scss (100%) rename {src => packages/taro-ui/src}/style/components/activity-indicator.scss (100%) rename {src => packages/taro-ui/src}/style/components/article.scss (100%) rename {src => packages/taro-ui/src}/style/components/avatar.scss (100%) rename {src => packages/taro-ui/src}/style/components/badge.scss (100%) rename {src => packages/taro-ui/src}/style/components/button.scss (100%) rename {src => packages/taro-ui/src}/style/components/calendar.scss (100%) rename {src => packages/taro-ui/src}/style/components/card.scss (100%) rename {src => packages/taro-ui/src}/style/components/checkbox.scss (100%) rename {src => packages/taro-ui/src}/style/components/countdown.scss (100%) rename {src => packages/taro-ui/src}/style/components/curtain.scss (100%) rename {src => packages/taro-ui/src}/style/components/divider.scss (100%) rename {src => packages/taro-ui/src}/style/components/drawer.scss (100%) rename {src => packages/taro-ui/src}/style/components/fab.scss (100%) rename {src => packages/taro-ui/src}/style/components/flex.scss (100%) rename {src => packages/taro-ui/src}/style/components/float-layout.scss (100%) rename {src => packages/taro-ui/src}/style/components/form.scss (100%) rename {src => packages/taro-ui/src}/style/components/grid.scss (100%) rename {src => packages/taro-ui/src}/style/components/icon.scss (100%) rename {src => packages/taro-ui/src}/style/components/image-picker.scss (100%) rename {src => packages/taro-ui/src}/style/components/index.scss (100%) rename {src => packages/taro-ui/src}/style/components/indexes.scss (100%) rename {src => packages/taro-ui/src}/style/components/input-number.scss (100%) rename {src => packages/taro-ui/src}/style/components/input.scss (100%) rename {src => packages/taro-ui/src}/style/components/list.scss (100%) rename {src => packages/taro-ui/src}/style/components/load-more.scss (100%) rename {src => packages/taro-ui/src}/style/components/loading.scss (100%) rename {src => packages/taro-ui/src}/style/components/message.scss (100%) rename {src => packages/taro-ui/src}/style/components/modal.scss (100%) rename {src => packages/taro-ui/src}/style/components/nav-bar.scss (100%) rename {src => packages/taro-ui/src}/style/components/noticebar.scss (100%) rename {src => packages/taro-ui/src}/style/components/pagination.scss (100%) rename {src => packages/taro-ui/src}/style/components/progress.scss (100%) rename {src => packages/taro-ui/src}/style/components/radio.scss (100%) rename {src => packages/taro-ui/src}/style/components/range.scss (100%) rename {src => packages/taro-ui/src}/style/components/rate.scss (100%) rename {src => packages/taro-ui/src}/style/components/search-bar.scss (100%) rename {src => packages/taro-ui/src}/style/components/segmented-control.scss (100%) rename {src => packages/taro-ui/src}/style/components/slider.scss (100%) rename {src => packages/taro-ui/src}/style/components/steps.scss (100%) rename {src => packages/taro-ui/src}/style/components/swipe-action.scss (100%) rename {src => packages/taro-ui/src}/style/components/switch.scss (100%) rename {src => packages/taro-ui/src}/style/components/tab-bar.scss (100%) rename {src => packages/taro-ui/src}/style/components/tabs.scss (100%) rename {src => packages/taro-ui/src}/style/components/tag.scss (100%) rename {src => packages/taro-ui/src}/style/components/textarea.scss (100%) rename {src => packages/taro-ui/src}/style/components/timeline.scss (100%) rename {src => packages/taro-ui/src}/style/components/toast.scss (100%) rename {src => packages/taro-ui/src}/style/index.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/index.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/absolute-center.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/active.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/alignhack.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/border.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/clearfix.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/disabled.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/flex.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/hairline.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/line.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/overlay.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/placeholder.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/shade.scss (100%) rename {src => packages/taro-ui/src}/style/mixins/libs/tint.scss (100%) rename {src => packages/taro-ui/src}/style/themes/purple.scss (100%) rename {src => packages/taro-ui/src}/style/themes/red.scss (100%) rename {src => packages/taro-ui/src}/style/variables/default.scss (100%) rename {test => packages/taro-ui/test}/__mock__/styleMock.js (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/accordion.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/action-sheet.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/activity-indicator.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/avatar.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/badge.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/button.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/card.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/checkbox.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/countdown.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/curtain.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/divider.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/drawer.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/fab.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/float-layout.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/form.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/grid.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/icon.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/image-picker.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/indexes.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/input-number.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/input.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/list.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/load-more.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/loading.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/message.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/modal.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/nav-bar.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/noticebar.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/pagination.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/progress.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/radio.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/range.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/rate.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/search-bar.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/segmented-control.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/slider.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/steps.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/swipe-action.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/switch.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/tab-bar.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/tabs-pane.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/tabs.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/tag.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/textarea.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/timeline.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/__snapshots__/toast.test.js.snap (100%) rename {test => packages/taro-ui/test}/components/accordion.test.js (100%) rename {test => packages/taro-ui/test}/components/action-sheet.test.js (100%) rename {test => packages/taro-ui/test}/components/activity-indicator.test.js (100%) rename {test => packages/taro-ui/test}/components/avatar.test.js (100%) rename {test => packages/taro-ui/test}/components/badge.test.js (100%) rename {test => packages/taro-ui/test}/components/button.test.js (100%) rename {test => packages/taro-ui/test}/components/calendar.test.js (100%) rename {test => packages/taro-ui/test}/components/card.test.js (100%) rename {test => packages/taro-ui/test}/components/checkbox.test.js (100%) rename {test => packages/taro-ui/test}/components/countdown.test.js (100%) rename {test => packages/taro-ui/test}/components/curtain.test.js (100%) rename {test => packages/taro-ui/test}/components/divider.test.js (100%) rename {test => packages/taro-ui/test}/components/drawer.test.js (100%) rename {test => packages/taro-ui/test}/components/fab.test.js (100%) rename {test => packages/taro-ui/test}/components/float-layout.test.js (100%) rename {test => packages/taro-ui/test}/components/form.test.js (100%) rename {test => packages/taro-ui/test}/components/grid.test.js (100%) rename {test => packages/taro-ui/test}/components/icon.test.js (100%) rename {test => packages/taro-ui/test}/components/image-picker.test.js (100%) rename {test => packages/taro-ui/test}/components/indexes.test.js (100%) rename {test => packages/taro-ui/test}/components/input-number.test.js (100%) rename {test => packages/taro-ui/test}/components/input.test.js (100%) rename {test => packages/taro-ui/test}/components/list.test.js (100%) rename {test => packages/taro-ui/test}/components/load-more.test.js (100%) rename {test => packages/taro-ui/test}/components/loading.test.js (100%) rename {test => packages/taro-ui/test}/components/message.test.js (100%) rename {test => packages/taro-ui/test}/components/modal.test.js (100%) rename {test => packages/taro-ui/test}/components/nav-bar.test.js (100%) rename {test => packages/taro-ui/test}/components/noticebar.test.js (100%) rename {test => packages/taro-ui/test}/components/pagination.test.js (100%) rename {test => packages/taro-ui/test}/components/progress.test.js (100%) rename {test => packages/taro-ui/test}/components/radio.test.js (100%) rename {test => packages/taro-ui/test}/components/range.test.js (100%) rename {test => packages/taro-ui/test}/components/rate.test.js (100%) rename {test => packages/taro-ui/test}/components/search-bar.test.js (100%) rename {test => packages/taro-ui/test}/components/segmented-control.test.js (100%) rename {test => packages/taro-ui/test}/components/slider.test.js (100%) rename {test => packages/taro-ui/test}/components/steps.test.js (100%) rename {test => packages/taro-ui/test}/components/swipe-action.test.js (100%) rename {test => packages/taro-ui/test}/components/switch.test.js (100%) rename {test => packages/taro-ui/test}/components/tab-bar.test.js (100%) rename {test => packages/taro-ui/test}/components/tabs-pane.test.js (100%) rename {test => packages/taro-ui/test}/components/tabs.test.js (100%) rename {test => packages/taro-ui/test}/components/tag.test.js (100%) rename {test => packages/taro-ui/test}/components/textarea.test.js (100%) rename {test => packages/taro-ui/test}/components/timeline.test.js (100%) rename {test => packages/taro-ui/test}/components/toast.test.js (100%) rename {types => packages/taro-ui/types}/accordion.d.ts (100%) rename {types => packages/taro-ui/types}/action-sheet.d.ts (100%) rename {types => packages/taro-ui/types}/activity-indicator.d.ts (100%) rename {types => packages/taro-ui/types}/avatar.d.ts (100%) rename {types => packages/taro-ui/types}/badge.d.ts (100%) rename {types => packages/taro-ui/types}/base.d.ts (100%) rename {types => packages/taro-ui/types}/button.d.ts (100%) rename {types => packages/taro-ui/types}/calendar.d.ts (100%) rename {types => packages/taro-ui/types}/card.d.ts (100%) rename {types => packages/taro-ui/types}/checkbox.d.ts (100%) rename {types => packages/taro-ui/types}/countdown.d.ts (100%) rename {types => packages/taro-ui/types}/curtain.d.ts (100%) rename {types => packages/taro-ui/types}/divider.d.ts (100%) rename {types => packages/taro-ui/types}/drawer.d.ts (100%) rename {types => packages/taro-ui/types}/fab.d.ts (100%) rename {types => packages/taro-ui/types}/flex.d.ts (100%) rename {types => packages/taro-ui/types}/float-button.d.ts (100%) rename {types => packages/taro-ui/types}/float-layout.d.ts (100%) rename {types => packages/taro-ui/types}/form.d.ts (100%) rename {types => packages/taro-ui/types}/grid.d.ts (100%) rename {types => packages/taro-ui/types}/icon.d.ts (100%) rename {types => packages/taro-ui/types}/image-picker.d.ts (100%) rename {types => packages/taro-ui/types}/index.d.ts (100%) rename {types => packages/taro-ui/types}/indexes.d.ts (100%) rename {types => packages/taro-ui/types}/input-number.d.ts (100%) rename {types => packages/taro-ui/types}/input.d.ts (100%) rename {types => packages/taro-ui/types}/list.d.ts (100%) rename {types => packages/taro-ui/types}/load-more.d.ts (100%) rename {types => packages/taro-ui/types}/message.d.ts (100%) rename {types => packages/taro-ui/types}/modal.d.ts (100%) rename {types => packages/taro-ui/types}/nav-bar.d.ts (100%) rename {types => packages/taro-ui/types}/noticebar.d.ts (100%) rename {types => packages/taro-ui/types}/pagination.d.ts (100%) rename {types => packages/taro-ui/types}/progress.d.ts (100%) rename {types => packages/taro-ui/types}/radio.d.ts (100%) rename {types => packages/taro-ui/types}/range.d.ts (100%) rename {types => packages/taro-ui/types}/rate.d.ts (100%) rename {types => packages/taro-ui/types}/search-bar.d.ts (100%) rename {types => packages/taro-ui/types}/segmented-control.d.ts (100%) rename {types => packages/taro-ui/types}/slider.d.ts (100%) rename {types => packages/taro-ui/types}/steps.d.ts (100%) rename {types => packages/taro-ui/types}/swipe-action.d.ts (100%) rename {types => packages/taro-ui/types}/switch.d.ts (100%) rename {types => packages/taro-ui/types}/tab-bar.d.ts (100%) rename {types => packages/taro-ui/types}/tabs-pane.d.ts (100%) rename {types => packages/taro-ui/types}/tabs.d.ts (100%) rename {types => packages/taro-ui/types}/tag.d.ts (100%) rename {types => packages/taro-ui/types}/textarea.d.ts (100%) rename {types => packages/taro-ui/types}/timeline.d.ts (100%) rename {types => packages/taro-ui/types}/toast.d.ts (100%) diff --git a/package.json b/packages/taro-ui/package.json similarity index 100% rename from package.json rename to packages/taro-ui/package.json diff --git a/src/common/component.tsx b/packages/taro-ui/src/common/component.tsx similarity index 100% rename from src/common/component.tsx rename to packages/taro-ui/src/common/component.tsx diff --git a/src/common/utils.ts b/packages/taro-ui/src/common/utils.ts similarity index 100% rename from src/common/utils.ts rename to packages/taro-ui/src/common/utils.ts diff --git a/src/components/accordion/index.tsx b/packages/taro-ui/src/components/accordion/index.tsx similarity index 100% rename from src/components/accordion/index.tsx rename to packages/taro-ui/src/components/accordion/index.tsx diff --git a/src/components/action-sheet/body/index.tsx b/packages/taro-ui/src/components/action-sheet/body/index.tsx similarity index 100% rename from src/components/action-sheet/body/index.tsx rename to packages/taro-ui/src/components/action-sheet/body/index.tsx diff --git a/src/components/action-sheet/body/item/index.tsx b/packages/taro-ui/src/components/action-sheet/body/item/index.tsx similarity index 100% rename from src/components/action-sheet/body/item/index.tsx rename to packages/taro-ui/src/components/action-sheet/body/item/index.tsx diff --git a/src/components/action-sheet/footer/index.tsx b/packages/taro-ui/src/components/action-sheet/footer/index.tsx similarity index 100% rename from src/components/action-sheet/footer/index.tsx rename to packages/taro-ui/src/components/action-sheet/footer/index.tsx diff --git a/src/components/action-sheet/header/index.tsx b/packages/taro-ui/src/components/action-sheet/header/index.tsx similarity index 100% rename from src/components/action-sheet/header/index.tsx rename to packages/taro-ui/src/components/action-sheet/header/index.tsx diff --git a/src/components/action-sheet/index.tsx b/packages/taro-ui/src/components/action-sheet/index.tsx similarity index 100% rename from src/components/action-sheet/index.tsx rename to packages/taro-ui/src/components/action-sheet/index.tsx diff --git a/src/components/activity-indicator/index.tsx b/packages/taro-ui/src/components/activity-indicator/index.tsx similarity index 100% rename from src/components/activity-indicator/index.tsx rename to packages/taro-ui/src/components/activity-indicator/index.tsx diff --git a/src/components/avatar/index.tsx b/packages/taro-ui/src/components/avatar/index.tsx similarity index 100% rename from src/components/avatar/index.tsx rename to packages/taro-ui/src/components/avatar/index.tsx diff --git a/src/components/badge/index.tsx b/packages/taro-ui/src/components/badge/index.tsx similarity index 100% rename from src/components/badge/index.tsx rename to packages/taro-ui/src/components/badge/index.tsx diff --git a/src/components/button/index.tsx b/packages/taro-ui/src/components/button/index.tsx similarity index 100% rename from src/components/button/index.tsx rename to packages/taro-ui/src/components/button/index.tsx diff --git a/src/components/calendar/body/index.tsx b/packages/taro-ui/src/components/calendar/body/index.tsx similarity index 100% rename from src/components/calendar/body/index.tsx rename to packages/taro-ui/src/components/calendar/body/index.tsx diff --git a/src/components/calendar/common/constant.ts b/packages/taro-ui/src/components/calendar/common/constant.ts similarity index 100% rename from src/components/calendar/common/constant.ts rename to packages/taro-ui/src/components/calendar/common/constant.ts diff --git a/src/components/calendar/common/helper.ts b/packages/taro-ui/src/components/calendar/common/helper.ts similarity index 100% rename from src/components/calendar/common/helper.ts rename to packages/taro-ui/src/components/calendar/common/helper.ts diff --git a/src/components/calendar/common/plugins.ts b/packages/taro-ui/src/components/calendar/common/plugins.ts similarity index 100% rename from src/components/calendar/common/plugins.ts rename to packages/taro-ui/src/components/calendar/common/plugins.ts diff --git a/src/components/calendar/controller/index.tsx b/packages/taro-ui/src/components/calendar/controller/index.tsx similarity index 100% rename from src/components/calendar/controller/index.tsx rename to packages/taro-ui/src/components/calendar/controller/index.tsx diff --git a/src/components/calendar/index.tsx b/packages/taro-ui/src/components/calendar/index.tsx similarity index 100% rename from src/components/calendar/index.tsx rename to packages/taro-ui/src/components/calendar/index.tsx diff --git a/src/components/calendar/ui/date-list/index.tsx b/packages/taro-ui/src/components/calendar/ui/date-list/index.tsx similarity index 100% rename from src/components/calendar/ui/date-list/index.tsx rename to packages/taro-ui/src/components/calendar/ui/date-list/index.tsx diff --git a/src/components/calendar/ui/day-list/index.tsx b/packages/taro-ui/src/components/calendar/ui/day-list/index.tsx similarity index 100% rename from src/components/calendar/ui/day-list/index.tsx rename to packages/taro-ui/src/components/calendar/ui/day-list/index.tsx diff --git a/src/components/card/index.tsx b/packages/taro-ui/src/components/card/index.tsx similarity index 100% rename from src/components/card/index.tsx rename to packages/taro-ui/src/components/card/index.tsx diff --git a/src/components/checkbox/index.tsx b/packages/taro-ui/src/components/checkbox/index.tsx similarity index 100% rename from src/components/checkbox/index.tsx rename to packages/taro-ui/src/components/checkbox/index.tsx diff --git a/src/components/countdown/index.scss b/packages/taro-ui/src/components/countdown/index.scss similarity index 100% rename from src/components/countdown/index.scss rename to packages/taro-ui/src/components/countdown/index.scss diff --git a/src/components/countdown/index.tsx b/packages/taro-ui/src/components/countdown/index.tsx similarity index 100% rename from src/components/countdown/index.tsx rename to packages/taro-ui/src/components/countdown/index.tsx diff --git a/src/components/countdown/item/index.tsx b/packages/taro-ui/src/components/countdown/item/index.tsx similarity index 100% rename from src/components/countdown/item/index.tsx rename to packages/taro-ui/src/components/countdown/item/index.tsx diff --git a/src/components/curtain/index.tsx b/packages/taro-ui/src/components/curtain/index.tsx similarity index 100% rename from src/components/curtain/index.tsx rename to packages/taro-ui/src/components/curtain/index.tsx diff --git a/src/components/divider/index.tsx b/packages/taro-ui/src/components/divider/index.tsx similarity index 100% rename from src/components/divider/index.tsx rename to packages/taro-ui/src/components/divider/index.tsx diff --git a/src/components/drawer/index.tsx b/packages/taro-ui/src/components/drawer/index.tsx similarity index 100% rename from src/components/drawer/index.tsx rename to packages/taro-ui/src/components/drawer/index.tsx diff --git a/src/components/fab/index.tsx b/packages/taro-ui/src/components/fab/index.tsx similarity index 100% rename from src/components/fab/index.tsx rename to packages/taro-ui/src/components/fab/index.tsx diff --git a/src/components/flex/index.scss b/packages/taro-ui/src/components/flex/index.scss similarity index 100% rename from src/components/flex/index.scss rename to packages/taro-ui/src/components/flex/index.scss diff --git a/src/components/flex/index.tsx b/packages/taro-ui/src/components/flex/index.tsx similarity index 100% rename from src/components/flex/index.tsx rename to packages/taro-ui/src/components/flex/index.tsx diff --git a/src/components/flex/item/index.scss b/packages/taro-ui/src/components/flex/item/index.scss similarity index 100% rename from src/components/flex/item/index.scss rename to packages/taro-ui/src/components/flex/item/index.scss diff --git a/src/components/flex/item/index.tsx b/packages/taro-ui/src/components/flex/item/index.tsx similarity index 100% rename from src/components/flex/item/index.tsx rename to packages/taro-ui/src/components/flex/item/index.tsx diff --git a/src/components/float-layout/index.tsx b/packages/taro-ui/src/components/float-layout/index.tsx similarity index 100% rename from src/components/float-layout/index.tsx rename to packages/taro-ui/src/components/float-layout/index.tsx diff --git a/src/components/form/index.tsx b/packages/taro-ui/src/components/form/index.tsx similarity index 100% rename from src/components/form/index.tsx rename to packages/taro-ui/src/components/form/index.tsx diff --git a/src/components/grid/index.tsx b/packages/taro-ui/src/components/grid/index.tsx similarity index 100% rename from src/components/grid/index.tsx rename to packages/taro-ui/src/components/grid/index.tsx diff --git a/src/components/icon/index.tsx b/packages/taro-ui/src/components/icon/index.tsx similarity index 100% rename from src/components/icon/index.tsx rename to packages/taro-ui/src/components/icon/index.tsx diff --git a/src/components/image-picker/index.tsx b/packages/taro-ui/src/components/image-picker/index.tsx similarity index 100% rename from src/components/image-picker/index.tsx rename to packages/taro-ui/src/components/image-picker/index.tsx diff --git a/src/components/indexes/index.tsx b/packages/taro-ui/src/components/indexes/index.tsx similarity index 100% rename from src/components/indexes/index.tsx rename to packages/taro-ui/src/components/indexes/index.tsx diff --git a/src/components/input-number/index.tsx b/packages/taro-ui/src/components/input-number/index.tsx similarity index 100% rename from src/components/input-number/index.tsx rename to packages/taro-ui/src/components/input-number/index.tsx diff --git a/src/components/input/index.tsx b/packages/taro-ui/src/components/input/index.tsx similarity index 100% rename from src/components/input/index.tsx rename to packages/taro-ui/src/components/input/index.tsx diff --git a/src/components/list/index.tsx b/packages/taro-ui/src/components/list/index.tsx similarity index 100% rename from src/components/list/index.tsx rename to packages/taro-ui/src/components/list/index.tsx diff --git a/src/components/list/item/index.tsx b/packages/taro-ui/src/components/list/item/index.tsx similarity index 100% rename from src/components/list/item/index.tsx rename to packages/taro-ui/src/components/list/item/index.tsx diff --git a/src/components/load-more/index.tsx b/packages/taro-ui/src/components/load-more/index.tsx similarity index 100% rename from src/components/load-more/index.tsx rename to packages/taro-ui/src/components/load-more/index.tsx diff --git a/src/components/loading/index.tsx b/packages/taro-ui/src/components/loading/index.tsx similarity index 100% rename from src/components/loading/index.tsx rename to packages/taro-ui/src/components/loading/index.tsx diff --git a/src/components/message/index.tsx b/packages/taro-ui/src/components/message/index.tsx similarity index 100% rename from src/components/message/index.tsx rename to packages/taro-ui/src/components/message/index.tsx diff --git a/src/components/modal/action/index.tsx b/packages/taro-ui/src/components/modal/action/index.tsx similarity index 100% rename from src/components/modal/action/index.tsx rename to packages/taro-ui/src/components/modal/action/index.tsx diff --git a/src/components/modal/content/index.tsx b/packages/taro-ui/src/components/modal/content/index.tsx similarity index 100% rename from src/components/modal/content/index.tsx rename to packages/taro-ui/src/components/modal/content/index.tsx diff --git a/src/components/modal/header/index.tsx b/packages/taro-ui/src/components/modal/header/index.tsx similarity index 100% rename from src/components/modal/header/index.tsx rename to packages/taro-ui/src/components/modal/header/index.tsx diff --git a/src/components/modal/index.tsx b/packages/taro-ui/src/components/modal/index.tsx similarity index 100% rename from src/components/modal/index.tsx rename to packages/taro-ui/src/components/modal/index.tsx diff --git a/src/components/nav-bar/index.tsx b/packages/taro-ui/src/components/nav-bar/index.tsx similarity index 100% rename from src/components/nav-bar/index.tsx rename to packages/taro-ui/src/components/nav-bar/index.tsx diff --git a/src/components/noticebar/index.tsx b/packages/taro-ui/src/components/noticebar/index.tsx similarity index 100% rename from src/components/noticebar/index.tsx rename to packages/taro-ui/src/components/noticebar/index.tsx diff --git a/src/components/pagination/index.tsx b/packages/taro-ui/src/components/pagination/index.tsx similarity index 100% rename from src/components/pagination/index.tsx rename to packages/taro-ui/src/components/pagination/index.tsx diff --git a/src/components/progress/index.tsx b/packages/taro-ui/src/components/progress/index.tsx similarity index 100% rename from src/components/progress/index.tsx rename to packages/taro-ui/src/components/progress/index.tsx diff --git a/src/components/radio/index.tsx b/packages/taro-ui/src/components/radio/index.tsx similarity index 100% rename from src/components/radio/index.tsx rename to packages/taro-ui/src/components/radio/index.tsx diff --git a/src/components/range/index.tsx b/packages/taro-ui/src/components/range/index.tsx similarity index 100% rename from src/components/range/index.tsx rename to packages/taro-ui/src/components/range/index.tsx diff --git a/src/components/rate/index.tsx b/packages/taro-ui/src/components/rate/index.tsx similarity index 100% rename from src/components/rate/index.tsx rename to packages/taro-ui/src/components/rate/index.tsx diff --git a/src/components/search-bar/index.tsx b/packages/taro-ui/src/components/search-bar/index.tsx similarity index 100% rename from src/components/search-bar/index.tsx rename to packages/taro-ui/src/components/search-bar/index.tsx diff --git a/src/components/segmented-control/index.tsx b/packages/taro-ui/src/components/segmented-control/index.tsx similarity index 100% rename from src/components/segmented-control/index.tsx rename to packages/taro-ui/src/components/segmented-control/index.tsx diff --git a/src/components/slider/index.tsx b/packages/taro-ui/src/components/slider/index.tsx similarity index 100% rename from src/components/slider/index.tsx rename to packages/taro-ui/src/components/slider/index.tsx diff --git a/src/components/steps/index.tsx b/packages/taro-ui/src/components/steps/index.tsx similarity index 100% rename from src/components/steps/index.tsx rename to packages/taro-ui/src/components/steps/index.tsx diff --git a/src/components/swipe-action/index.tsx b/packages/taro-ui/src/components/swipe-action/index.tsx similarity index 100% rename from src/components/swipe-action/index.tsx rename to packages/taro-ui/src/components/swipe-action/index.tsx diff --git a/src/components/swipe-action/options/index.tsx b/packages/taro-ui/src/components/swipe-action/options/index.tsx similarity index 100% rename from src/components/swipe-action/options/index.tsx rename to packages/taro-ui/src/components/swipe-action/options/index.tsx diff --git a/src/components/switch/index.tsx b/packages/taro-ui/src/components/switch/index.tsx similarity index 100% rename from src/components/switch/index.tsx rename to packages/taro-ui/src/components/switch/index.tsx diff --git a/src/components/tab-bar/index.tsx b/packages/taro-ui/src/components/tab-bar/index.tsx similarity index 100% rename from src/components/tab-bar/index.tsx rename to packages/taro-ui/src/components/tab-bar/index.tsx diff --git a/src/components/tabs-pane/index.tsx b/packages/taro-ui/src/components/tabs-pane/index.tsx similarity index 100% rename from src/components/tabs-pane/index.tsx rename to packages/taro-ui/src/components/tabs-pane/index.tsx diff --git a/src/components/tabs/index.tsx b/packages/taro-ui/src/components/tabs/index.tsx similarity index 100% rename from src/components/tabs/index.tsx rename to packages/taro-ui/src/components/tabs/index.tsx diff --git a/src/components/tag/index.tsx b/packages/taro-ui/src/components/tag/index.tsx similarity index 100% rename from src/components/tag/index.tsx rename to packages/taro-ui/src/components/tag/index.tsx diff --git a/src/components/textarea/index.tsx b/packages/taro-ui/src/components/textarea/index.tsx similarity index 100% rename from src/components/textarea/index.tsx rename to packages/taro-ui/src/components/textarea/index.tsx diff --git a/src/components/timeline/index.tsx b/packages/taro-ui/src/components/timeline/index.tsx similarity index 100% rename from src/components/timeline/index.tsx rename to packages/taro-ui/src/components/timeline/index.tsx diff --git a/src/components/toast/img.json b/packages/taro-ui/src/components/toast/img.json similarity index 100% rename from src/components/toast/img.json rename to packages/taro-ui/src/components/toast/img.json diff --git a/src/components/toast/index.tsx b/packages/taro-ui/src/components/toast/index.tsx similarity index 100% rename from src/components/toast/index.tsx rename to packages/taro-ui/src/components/toast/index.tsx diff --git a/src/index.ts b/packages/taro-ui/src/index.ts similarity index 100% rename from src/index.ts rename to packages/taro-ui/src/index.ts diff --git a/src/style/components/accordion.scss b/packages/taro-ui/src/style/components/accordion.scss similarity index 100% rename from src/style/components/accordion.scss rename to packages/taro-ui/src/style/components/accordion.scss diff --git a/src/style/components/action-sheet.scss b/packages/taro-ui/src/style/components/action-sheet.scss similarity index 100% rename from src/style/components/action-sheet.scss rename to packages/taro-ui/src/style/components/action-sheet.scss diff --git a/src/style/components/activity-indicator.scss b/packages/taro-ui/src/style/components/activity-indicator.scss similarity index 100% rename from src/style/components/activity-indicator.scss rename to packages/taro-ui/src/style/components/activity-indicator.scss diff --git a/src/style/components/article.scss b/packages/taro-ui/src/style/components/article.scss similarity index 100% rename from src/style/components/article.scss rename to packages/taro-ui/src/style/components/article.scss diff --git a/src/style/components/avatar.scss b/packages/taro-ui/src/style/components/avatar.scss similarity index 100% rename from src/style/components/avatar.scss rename to packages/taro-ui/src/style/components/avatar.scss diff --git a/src/style/components/badge.scss b/packages/taro-ui/src/style/components/badge.scss similarity index 100% rename from src/style/components/badge.scss rename to packages/taro-ui/src/style/components/badge.scss diff --git a/src/style/components/button.scss b/packages/taro-ui/src/style/components/button.scss similarity index 100% rename from src/style/components/button.scss rename to packages/taro-ui/src/style/components/button.scss diff --git a/src/style/components/calendar.scss b/packages/taro-ui/src/style/components/calendar.scss similarity index 100% rename from src/style/components/calendar.scss rename to packages/taro-ui/src/style/components/calendar.scss diff --git a/src/style/components/card.scss b/packages/taro-ui/src/style/components/card.scss similarity index 100% rename from src/style/components/card.scss rename to packages/taro-ui/src/style/components/card.scss diff --git a/src/style/components/checkbox.scss b/packages/taro-ui/src/style/components/checkbox.scss similarity index 100% rename from src/style/components/checkbox.scss rename to packages/taro-ui/src/style/components/checkbox.scss diff --git a/src/style/components/countdown.scss b/packages/taro-ui/src/style/components/countdown.scss similarity index 100% rename from src/style/components/countdown.scss rename to packages/taro-ui/src/style/components/countdown.scss diff --git a/src/style/components/curtain.scss b/packages/taro-ui/src/style/components/curtain.scss similarity index 100% rename from src/style/components/curtain.scss rename to packages/taro-ui/src/style/components/curtain.scss diff --git a/src/style/components/divider.scss b/packages/taro-ui/src/style/components/divider.scss similarity index 100% rename from src/style/components/divider.scss rename to packages/taro-ui/src/style/components/divider.scss diff --git a/src/style/components/drawer.scss b/packages/taro-ui/src/style/components/drawer.scss similarity index 100% rename from src/style/components/drawer.scss rename to packages/taro-ui/src/style/components/drawer.scss diff --git a/src/style/components/fab.scss b/packages/taro-ui/src/style/components/fab.scss similarity index 100% rename from src/style/components/fab.scss rename to packages/taro-ui/src/style/components/fab.scss diff --git a/src/style/components/flex.scss b/packages/taro-ui/src/style/components/flex.scss similarity index 100% rename from src/style/components/flex.scss rename to packages/taro-ui/src/style/components/flex.scss diff --git a/src/style/components/float-layout.scss b/packages/taro-ui/src/style/components/float-layout.scss similarity index 100% rename from src/style/components/float-layout.scss rename to packages/taro-ui/src/style/components/float-layout.scss diff --git a/src/style/components/form.scss b/packages/taro-ui/src/style/components/form.scss similarity index 100% rename from src/style/components/form.scss rename to packages/taro-ui/src/style/components/form.scss diff --git a/src/style/components/grid.scss b/packages/taro-ui/src/style/components/grid.scss similarity index 100% rename from src/style/components/grid.scss rename to packages/taro-ui/src/style/components/grid.scss diff --git a/src/style/components/icon.scss b/packages/taro-ui/src/style/components/icon.scss similarity index 100% rename from src/style/components/icon.scss rename to packages/taro-ui/src/style/components/icon.scss diff --git a/src/style/components/image-picker.scss b/packages/taro-ui/src/style/components/image-picker.scss similarity index 100% rename from src/style/components/image-picker.scss rename to packages/taro-ui/src/style/components/image-picker.scss diff --git a/src/style/components/index.scss b/packages/taro-ui/src/style/components/index.scss similarity index 100% rename from src/style/components/index.scss rename to packages/taro-ui/src/style/components/index.scss diff --git a/src/style/components/indexes.scss b/packages/taro-ui/src/style/components/indexes.scss similarity index 100% rename from src/style/components/indexes.scss rename to packages/taro-ui/src/style/components/indexes.scss diff --git a/src/style/components/input-number.scss b/packages/taro-ui/src/style/components/input-number.scss similarity index 100% rename from src/style/components/input-number.scss rename to packages/taro-ui/src/style/components/input-number.scss diff --git a/src/style/components/input.scss b/packages/taro-ui/src/style/components/input.scss similarity index 100% rename from src/style/components/input.scss rename to packages/taro-ui/src/style/components/input.scss diff --git a/src/style/components/list.scss b/packages/taro-ui/src/style/components/list.scss similarity index 100% rename from src/style/components/list.scss rename to packages/taro-ui/src/style/components/list.scss diff --git a/src/style/components/load-more.scss b/packages/taro-ui/src/style/components/load-more.scss similarity index 100% rename from src/style/components/load-more.scss rename to packages/taro-ui/src/style/components/load-more.scss diff --git a/src/style/components/loading.scss b/packages/taro-ui/src/style/components/loading.scss similarity index 100% rename from src/style/components/loading.scss rename to packages/taro-ui/src/style/components/loading.scss diff --git a/src/style/components/message.scss b/packages/taro-ui/src/style/components/message.scss similarity index 100% rename from src/style/components/message.scss rename to packages/taro-ui/src/style/components/message.scss diff --git a/src/style/components/modal.scss b/packages/taro-ui/src/style/components/modal.scss similarity index 100% rename from src/style/components/modal.scss rename to packages/taro-ui/src/style/components/modal.scss diff --git a/src/style/components/nav-bar.scss b/packages/taro-ui/src/style/components/nav-bar.scss similarity index 100% rename from src/style/components/nav-bar.scss rename to packages/taro-ui/src/style/components/nav-bar.scss diff --git a/src/style/components/noticebar.scss b/packages/taro-ui/src/style/components/noticebar.scss similarity index 100% rename from src/style/components/noticebar.scss rename to packages/taro-ui/src/style/components/noticebar.scss diff --git a/src/style/components/pagination.scss b/packages/taro-ui/src/style/components/pagination.scss similarity index 100% rename from src/style/components/pagination.scss rename to packages/taro-ui/src/style/components/pagination.scss diff --git a/src/style/components/progress.scss b/packages/taro-ui/src/style/components/progress.scss similarity index 100% rename from src/style/components/progress.scss rename to packages/taro-ui/src/style/components/progress.scss diff --git a/src/style/components/radio.scss b/packages/taro-ui/src/style/components/radio.scss similarity index 100% rename from src/style/components/radio.scss rename to packages/taro-ui/src/style/components/radio.scss diff --git a/src/style/components/range.scss b/packages/taro-ui/src/style/components/range.scss similarity index 100% rename from src/style/components/range.scss rename to packages/taro-ui/src/style/components/range.scss diff --git a/src/style/components/rate.scss b/packages/taro-ui/src/style/components/rate.scss similarity index 100% rename from src/style/components/rate.scss rename to packages/taro-ui/src/style/components/rate.scss diff --git a/src/style/components/search-bar.scss b/packages/taro-ui/src/style/components/search-bar.scss similarity index 100% rename from src/style/components/search-bar.scss rename to packages/taro-ui/src/style/components/search-bar.scss diff --git a/src/style/components/segmented-control.scss b/packages/taro-ui/src/style/components/segmented-control.scss similarity index 100% rename from src/style/components/segmented-control.scss rename to packages/taro-ui/src/style/components/segmented-control.scss diff --git a/src/style/components/slider.scss b/packages/taro-ui/src/style/components/slider.scss similarity index 100% rename from src/style/components/slider.scss rename to packages/taro-ui/src/style/components/slider.scss diff --git a/src/style/components/steps.scss b/packages/taro-ui/src/style/components/steps.scss similarity index 100% rename from src/style/components/steps.scss rename to packages/taro-ui/src/style/components/steps.scss diff --git a/src/style/components/swipe-action.scss b/packages/taro-ui/src/style/components/swipe-action.scss similarity index 100% rename from src/style/components/swipe-action.scss rename to packages/taro-ui/src/style/components/swipe-action.scss diff --git a/src/style/components/switch.scss b/packages/taro-ui/src/style/components/switch.scss similarity index 100% rename from src/style/components/switch.scss rename to packages/taro-ui/src/style/components/switch.scss diff --git a/src/style/components/tab-bar.scss b/packages/taro-ui/src/style/components/tab-bar.scss similarity index 100% rename from src/style/components/tab-bar.scss rename to packages/taro-ui/src/style/components/tab-bar.scss diff --git a/src/style/components/tabs.scss b/packages/taro-ui/src/style/components/tabs.scss similarity index 100% rename from src/style/components/tabs.scss rename to packages/taro-ui/src/style/components/tabs.scss diff --git a/src/style/components/tag.scss b/packages/taro-ui/src/style/components/tag.scss similarity index 100% rename from src/style/components/tag.scss rename to packages/taro-ui/src/style/components/tag.scss diff --git a/src/style/components/textarea.scss b/packages/taro-ui/src/style/components/textarea.scss similarity index 100% rename from src/style/components/textarea.scss rename to packages/taro-ui/src/style/components/textarea.scss diff --git a/src/style/components/timeline.scss b/packages/taro-ui/src/style/components/timeline.scss similarity index 100% rename from src/style/components/timeline.scss rename to packages/taro-ui/src/style/components/timeline.scss diff --git a/src/style/components/toast.scss b/packages/taro-ui/src/style/components/toast.scss similarity index 100% rename from src/style/components/toast.scss rename to packages/taro-ui/src/style/components/toast.scss diff --git a/src/style/index.scss b/packages/taro-ui/src/style/index.scss similarity index 100% rename from src/style/index.scss rename to packages/taro-ui/src/style/index.scss diff --git a/src/style/mixins/index.scss b/packages/taro-ui/src/style/mixins/index.scss similarity index 100% rename from src/style/mixins/index.scss rename to packages/taro-ui/src/style/mixins/index.scss diff --git a/src/style/mixins/libs/absolute-center.scss b/packages/taro-ui/src/style/mixins/libs/absolute-center.scss similarity index 100% rename from src/style/mixins/libs/absolute-center.scss rename to packages/taro-ui/src/style/mixins/libs/absolute-center.scss diff --git a/src/style/mixins/libs/active.scss b/packages/taro-ui/src/style/mixins/libs/active.scss similarity index 100% rename from src/style/mixins/libs/active.scss rename to packages/taro-ui/src/style/mixins/libs/active.scss diff --git a/src/style/mixins/libs/alignhack.scss b/packages/taro-ui/src/style/mixins/libs/alignhack.scss similarity index 100% rename from src/style/mixins/libs/alignhack.scss rename to packages/taro-ui/src/style/mixins/libs/alignhack.scss diff --git a/src/style/mixins/libs/border.scss b/packages/taro-ui/src/style/mixins/libs/border.scss similarity index 100% rename from src/style/mixins/libs/border.scss rename to packages/taro-ui/src/style/mixins/libs/border.scss diff --git a/src/style/mixins/libs/clearfix.scss b/packages/taro-ui/src/style/mixins/libs/clearfix.scss similarity index 100% rename from src/style/mixins/libs/clearfix.scss rename to packages/taro-ui/src/style/mixins/libs/clearfix.scss diff --git a/src/style/mixins/libs/disabled.scss b/packages/taro-ui/src/style/mixins/libs/disabled.scss similarity index 100% rename from src/style/mixins/libs/disabled.scss rename to packages/taro-ui/src/style/mixins/libs/disabled.scss diff --git a/src/style/mixins/libs/flex.scss b/packages/taro-ui/src/style/mixins/libs/flex.scss similarity index 100% rename from src/style/mixins/libs/flex.scss rename to packages/taro-ui/src/style/mixins/libs/flex.scss diff --git a/src/style/mixins/libs/hairline.scss b/packages/taro-ui/src/style/mixins/libs/hairline.scss similarity index 100% rename from src/style/mixins/libs/hairline.scss rename to packages/taro-ui/src/style/mixins/libs/hairline.scss diff --git a/src/style/mixins/libs/line.scss b/packages/taro-ui/src/style/mixins/libs/line.scss similarity index 100% rename from src/style/mixins/libs/line.scss rename to packages/taro-ui/src/style/mixins/libs/line.scss diff --git a/src/style/mixins/libs/overlay.scss b/packages/taro-ui/src/style/mixins/libs/overlay.scss similarity index 100% rename from src/style/mixins/libs/overlay.scss rename to packages/taro-ui/src/style/mixins/libs/overlay.scss diff --git a/src/style/mixins/libs/placeholder.scss b/packages/taro-ui/src/style/mixins/libs/placeholder.scss similarity index 100% rename from src/style/mixins/libs/placeholder.scss rename to packages/taro-ui/src/style/mixins/libs/placeholder.scss diff --git a/src/style/mixins/libs/shade.scss b/packages/taro-ui/src/style/mixins/libs/shade.scss similarity index 100% rename from src/style/mixins/libs/shade.scss rename to packages/taro-ui/src/style/mixins/libs/shade.scss diff --git a/src/style/mixins/libs/tint.scss b/packages/taro-ui/src/style/mixins/libs/tint.scss similarity index 100% rename from src/style/mixins/libs/tint.scss rename to packages/taro-ui/src/style/mixins/libs/tint.scss diff --git a/src/style/themes/purple.scss b/packages/taro-ui/src/style/themes/purple.scss similarity index 100% rename from src/style/themes/purple.scss rename to packages/taro-ui/src/style/themes/purple.scss diff --git a/src/style/themes/red.scss b/packages/taro-ui/src/style/themes/red.scss similarity index 100% rename from src/style/themes/red.scss rename to packages/taro-ui/src/style/themes/red.scss diff --git a/src/style/variables/default.scss b/packages/taro-ui/src/style/variables/default.scss similarity index 100% rename from src/style/variables/default.scss rename to packages/taro-ui/src/style/variables/default.scss diff --git a/test/__mock__/styleMock.js b/packages/taro-ui/test/__mock__/styleMock.js similarity index 100% rename from test/__mock__/styleMock.js rename to packages/taro-ui/test/__mock__/styleMock.js diff --git a/test/components/__snapshots__/accordion.test.js.snap b/packages/taro-ui/test/components/__snapshots__/accordion.test.js.snap similarity index 100% rename from test/components/__snapshots__/accordion.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/accordion.test.js.snap diff --git a/test/components/__snapshots__/action-sheet.test.js.snap b/packages/taro-ui/test/components/__snapshots__/action-sheet.test.js.snap similarity index 100% rename from test/components/__snapshots__/action-sheet.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/action-sheet.test.js.snap diff --git a/test/components/__snapshots__/activity-indicator.test.js.snap b/packages/taro-ui/test/components/__snapshots__/activity-indicator.test.js.snap similarity index 100% rename from test/components/__snapshots__/activity-indicator.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/activity-indicator.test.js.snap diff --git a/test/components/__snapshots__/avatar.test.js.snap b/packages/taro-ui/test/components/__snapshots__/avatar.test.js.snap similarity index 100% rename from test/components/__snapshots__/avatar.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/avatar.test.js.snap diff --git a/test/components/__snapshots__/badge.test.js.snap b/packages/taro-ui/test/components/__snapshots__/badge.test.js.snap similarity index 100% rename from test/components/__snapshots__/badge.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/badge.test.js.snap diff --git a/test/components/__snapshots__/button.test.js.snap b/packages/taro-ui/test/components/__snapshots__/button.test.js.snap similarity index 100% rename from test/components/__snapshots__/button.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/button.test.js.snap diff --git a/test/components/__snapshots__/card.test.js.snap b/packages/taro-ui/test/components/__snapshots__/card.test.js.snap similarity index 100% rename from test/components/__snapshots__/card.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/card.test.js.snap diff --git a/test/components/__snapshots__/checkbox.test.js.snap b/packages/taro-ui/test/components/__snapshots__/checkbox.test.js.snap similarity index 100% rename from test/components/__snapshots__/checkbox.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/checkbox.test.js.snap diff --git a/test/components/__snapshots__/countdown.test.js.snap b/packages/taro-ui/test/components/__snapshots__/countdown.test.js.snap similarity index 100% rename from test/components/__snapshots__/countdown.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/countdown.test.js.snap diff --git a/test/components/__snapshots__/curtain.test.js.snap b/packages/taro-ui/test/components/__snapshots__/curtain.test.js.snap similarity index 100% rename from test/components/__snapshots__/curtain.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/curtain.test.js.snap diff --git a/test/components/__snapshots__/divider.test.js.snap b/packages/taro-ui/test/components/__snapshots__/divider.test.js.snap similarity index 100% rename from test/components/__snapshots__/divider.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/divider.test.js.snap diff --git a/test/components/__snapshots__/drawer.test.js.snap b/packages/taro-ui/test/components/__snapshots__/drawer.test.js.snap similarity index 100% rename from test/components/__snapshots__/drawer.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/drawer.test.js.snap diff --git a/test/components/__snapshots__/fab.test.js.snap b/packages/taro-ui/test/components/__snapshots__/fab.test.js.snap similarity index 100% rename from test/components/__snapshots__/fab.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/fab.test.js.snap diff --git a/test/components/__snapshots__/float-layout.test.js.snap b/packages/taro-ui/test/components/__snapshots__/float-layout.test.js.snap similarity index 100% rename from test/components/__snapshots__/float-layout.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/float-layout.test.js.snap diff --git a/test/components/__snapshots__/form.test.js.snap b/packages/taro-ui/test/components/__snapshots__/form.test.js.snap similarity index 100% rename from test/components/__snapshots__/form.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/form.test.js.snap diff --git a/test/components/__snapshots__/grid.test.js.snap b/packages/taro-ui/test/components/__snapshots__/grid.test.js.snap similarity index 100% rename from test/components/__snapshots__/grid.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/grid.test.js.snap diff --git a/test/components/__snapshots__/icon.test.js.snap b/packages/taro-ui/test/components/__snapshots__/icon.test.js.snap similarity index 100% rename from test/components/__snapshots__/icon.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/icon.test.js.snap diff --git a/test/components/__snapshots__/image-picker.test.js.snap b/packages/taro-ui/test/components/__snapshots__/image-picker.test.js.snap similarity index 100% rename from test/components/__snapshots__/image-picker.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/image-picker.test.js.snap diff --git a/test/components/__snapshots__/indexes.test.js.snap b/packages/taro-ui/test/components/__snapshots__/indexes.test.js.snap similarity index 100% rename from test/components/__snapshots__/indexes.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/indexes.test.js.snap diff --git a/test/components/__snapshots__/input-number.test.js.snap b/packages/taro-ui/test/components/__snapshots__/input-number.test.js.snap similarity index 100% rename from test/components/__snapshots__/input-number.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/input-number.test.js.snap diff --git a/test/components/__snapshots__/input.test.js.snap b/packages/taro-ui/test/components/__snapshots__/input.test.js.snap similarity index 100% rename from test/components/__snapshots__/input.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/input.test.js.snap diff --git a/test/components/__snapshots__/list.test.js.snap b/packages/taro-ui/test/components/__snapshots__/list.test.js.snap similarity index 100% rename from test/components/__snapshots__/list.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/list.test.js.snap diff --git a/test/components/__snapshots__/load-more.test.js.snap b/packages/taro-ui/test/components/__snapshots__/load-more.test.js.snap similarity index 100% rename from test/components/__snapshots__/load-more.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/load-more.test.js.snap diff --git a/test/components/__snapshots__/loading.test.js.snap b/packages/taro-ui/test/components/__snapshots__/loading.test.js.snap similarity index 100% rename from test/components/__snapshots__/loading.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/loading.test.js.snap diff --git a/test/components/__snapshots__/message.test.js.snap b/packages/taro-ui/test/components/__snapshots__/message.test.js.snap similarity index 100% rename from test/components/__snapshots__/message.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/message.test.js.snap diff --git a/test/components/__snapshots__/modal.test.js.snap b/packages/taro-ui/test/components/__snapshots__/modal.test.js.snap similarity index 100% rename from test/components/__snapshots__/modal.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/modal.test.js.snap diff --git a/test/components/__snapshots__/nav-bar.test.js.snap b/packages/taro-ui/test/components/__snapshots__/nav-bar.test.js.snap similarity index 100% rename from test/components/__snapshots__/nav-bar.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/nav-bar.test.js.snap diff --git a/test/components/__snapshots__/noticebar.test.js.snap b/packages/taro-ui/test/components/__snapshots__/noticebar.test.js.snap similarity index 100% rename from test/components/__snapshots__/noticebar.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/noticebar.test.js.snap diff --git a/test/components/__snapshots__/pagination.test.js.snap b/packages/taro-ui/test/components/__snapshots__/pagination.test.js.snap similarity index 100% rename from test/components/__snapshots__/pagination.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/pagination.test.js.snap diff --git a/test/components/__snapshots__/progress.test.js.snap b/packages/taro-ui/test/components/__snapshots__/progress.test.js.snap similarity index 100% rename from test/components/__snapshots__/progress.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/progress.test.js.snap diff --git a/test/components/__snapshots__/radio.test.js.snap b/packages/taro-ui/test/components/__snapshots__/radio.test.js.snap similarity index 100% rename from test/components/__snapshots__/radio.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/radio.test.js.snap diff --git a/test/components/__snapshots__/range.test.js.snap b/packages/taro-ui/test/components/__snapshots__/range.test.js.snap similarity index 100% rename from test/components/__snapshots__/range.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/range.test.js.snap diff --git a/test/components/__snapshots__/rate.test.js.snap b/packages/taro-ui/test/components/__snapshots__/rate.test.js.snap similarity index 100% rename from test/components/__snapshots__/rate.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/rate.test.js.snap diff --git a/test/components/__snapshots__/search-bar.test.js.snap b/packages/taro-ui/test/components/__snapshots__/search-bar.test.js.snap similarity index 100% rename from test/components/__snapshots__/search-bar.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/search-bar.test.js.snap diff --git a/test/components/__snapshots__/segmented-control.test.js.snap b/packages/taro-ui/test/components/__snapshots__/segmented-control.test.js.snap similarity index 100% rename from test/components/__snapshots__/segmented-control.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/segmented-control.test.js.snap diff --git a/test/components/__snapshots__/slider.test.js.snap b/packages/taro-ui/test/components/__snapshots__/slider.test.js.snap similarity index 100% rename from test/components/__snapshots__/slider.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/slider.test.js.snap diff --git a/test/components/__snapshots__/steps.test.js.snap b/packages/taro-ui/test/components/__snapshots__/steps.test.js.snap similarity index 100% rename from test/components/__snapshots__/steps.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/steps.test.js.snap diff --git a/test/components/__snapshots__/swipe-action.test.js.snap b/packages/taro-ui/test/components/__snapshots__/swipe-action.test.js.snap similarity index 100% rename from test/components/__snapshots__/swipe-action.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/swipe-action.test.js.snap diff --git a/test/components/__snapshots__/switch.test.js.snap b/packages/taro-ui/test/components/__snapshots__/switch.test.js.snap similarity index 100% rename from test/components/__snapshots__/switch.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/switch.test.js.snap diff --git a/test/components/__snapshots__/tab-bar.test.js.snap b/packages/taro-ui/test/components/__snapshots__/tab-bar.test.js.snap similarity index 100% rename from test/components/__snapshots__/tab-bar.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/tab-bar.test.js.snap diff --git a/test/components/__snapshots__/tabs-pane.test.js.snap b/packages/taro-ui/test/components/__snapshots__/tabs-pane.test.js.snap similarity index 100% rename from test/components/__snapshots__/tabs-pane.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/tabs-pane.test.js.snap diff --git a/test/components/__snapshots__/tabs.test.js.snap b/packages/taro-ui/test/components/__snapshots__/tabs.test.js.snap similarity index 100% rename from test/components/__snapshots__/tabs.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/tabs.test.js.snap diff --git a/test/components/__snapshots__/tag.test.js.snap b/packages/taro-ui/test/components/__snapshots__/tag.test.js.snap similarity index 100% rename from test/components/__snapshots__/tag.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/tag.test.js.snap diff --git a/test/components/__snapshots__/textarea.test.js.snap b/packages/taro-ui/test/components/__snapshots__/textarea.test.js.snap similarity index 100% rename from test/components/__snapshots__/textarea.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/textarea.test.js.snap diff --git a/test/components/__snapshots__/timeline.test.js.snap b/packages/taro-ui/test/components/__snapshots__/timeline.test.js.snap similarity index 100% rename from test/components/__snapshots__/timeline.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/timeline.test.js.snap diff --git a/test/components/__snapshots__/toast.test.js.snap b/packages/taro-ui/test/components/__snapshots__/toast.test.js.snap similarity index 100% rename from test/components/__snapshots__/toast.test.js.snap rename to packages/taro-ui/test/components/__snapshots__/toast.test.js.snap diff --git a/test/components/accordion.test.js b/packages/taro-ui/test/components/accordion.test.js similarity index 100% rename from test/components/accordion.test.js rename to packages/taro-ui/test/components/accordion.test.js diff --git a/test/components/action-sheet.test.js b/packages/taro-ui/test/components/action-sheet.test.js similarity index 100% rename from test/components/action-sheet.test.js rename to packages/taro-ui/test/components/action-sheet.test.js diff --git a/test/components/activity-indicator.test.js b/packages/taro-ui/test/components/activity-indicator.test.js similarity index 100% rename from test/components/activity-indicator.test.js rename to packages/taro-ui/test/components/activity-indicator.test.js diff --git a/test/components/avatar.test.js b/packages/taro-ui/test/components/avatar.test.js similarity index 100% rename from test/components/avatar.test.js rename to packages/taro-ui/test/components/avatar.test.js diff --git a/test/components/badge.test.js b/packages/taro-ui/test/components/badge.test.js similarity index 100% rename from test/components/badge.test.js rename to packages/taro-ui/test/components/badge.test.js diff --git a/test/components/button.test.js b/packages/taro-ui/test/components/button.test.js similarity index 100% rename from test/components/button.test.js rename to packages/taro-ui/test/components/button.test.js diff --git a/test/components/calendar.test.js b/packages/taro-ui/test/components/calendar.test.js similarity index 100% rename from test/components/calendar.test.js rename to packages/taro-ui/test/components/calendar.test.js diff --git a/test/components/card.test.js b/packages/taro-ui/test/components/card.test.js similarity index 100% rename from test/components/card.test.js rename to packages/taro-ui/test/components/card.test.js diff --git a/test/components/checkbox.test.js b/packages/taro-ui/test/components/checkbox.test.js similarity index 100% rename from test/components/checkbox.test.js rename to packages/taro-ui/test/components/checkbox.test.js diff --git a/test/components/countdown.test.js b/packages/taro-ui/test/components/countdown.test.js similarity index 100% rename from test/components/countdown.test.js rename to packages/taro-ui/test/components/countdown.test.js diff --git a/test/components/curtain.test.js b/packages/taro-ui/test/components/curtain.test.js similarity index 100% rename from test/components/curtain.test.js rename to packages/taro-ui/test/components/curtain.test.js diff --git a/test/components/divider.test.js b/packages/taro-ui/test/components/divider.test.js similarity index 100% rename from test/components/divider.test.js rename to packages/taro-ui/test/components/divider.test.js diff --git a/test/components/drawer.test.js b/packages/taro-ui/test/components/drawer.test.js similarity index 100% rename from test/components/drawer.test.js rename to packages/taro-ui/test/components/drawer.test.js diff --git a/test/components/fab.test.js b/packages/taro-ui/test/components/fab.test.js similarity index 100% rename from test/components/fab.test.js rename to packages/taro-ui/test/components/fab.test.js diff --git a/test/components/float-layout.test.js b/packages/taro-ui/test/components/float-layout.test.js similarity index 100% rename from test/components/float-layout.test.js rename to packages/taro-ui/test/components/float-layout.test.js diff --git a/test/components/form.test.js b/packages/taro-ui/test/components/form.test.js similarity index 100% rename from test/components/form.test.js rename to packages/taro-ui/test/components/form.test.js diff --git a/test/components/grid.test.js b/packages/taro-ui/test/components/grid.test.js similarity index 100% rename from test/components/grid.test.js rename to packages/taro-ui/test/components/grid.test.js diff --git a/test/components/icon.test.js b/packages/taro-ui/test/components/icon.test.js similarity index 100% rename from test/components/icon.test.js rename to packages/taro-ui/test/components/icon.test.js diff --git a/test/components/image-picker.test.js b/packages/taro-ui/test/components/image-picker.test.js similarity index 100% rename from test/components/image-picker.test.js rename to packages/taro-ui/test/components/image-picker.test.js diff --git a/test/components/indexes.test.js b/packages/taro-ui/test/components/indexes.test.js similarity index 100% rename from test/components/indexes.test.js rename to packages/taro-ui/test/components/indexes.test.js diff --git a/test/components/input-number.test.js b/packages/taro-ui/test/components/input-number.test.js similarity index 100% rename from test/components/input-number.test.js rename to packages/taro-ui/test/components/input-number.test.js diff --git a/test/components/input.test.js b/packages/taro-ui/test/components/input.test.js similarity index 100% rename from test/components/input.test.js rename to packages/taro-ui/test/components/input.test.js diff --git a/test/components/list.test.js b/packages/taro-ui/test/components/list.test.js similarity index 100% rename from test/components/list.test.js rename to packages/taro-ui/test/components/list.test.js diff --git a/test/components/load-more.test.js b/packages/taro-ui/test/components/load-more.test.js similarity index 100% rename from test/components/load-more.test.js rename to packages/taro-ui/test/components/load-more.test.js diff --git a/test/components/loading.test.js b/packages/taro-ui/test/components/loading.test.js similarity index 100% rename from test/components/loading.test.js rename to packages/taro-ui/test/components/loading.test.js diff --git a/test/components/message.test.js b/packages/taro-ui/test/components/message.test.js similarity index 100% rename from test/components/message.test.js rename to packages/taro-ui/test/components/message.test.js diff --git a/test/components/modal.test.js b/packages/taro-ui/test/components/modal.test.js similarity index 100% rename from test/components/modal.test.js rename to packages/taro-ui/test/components/modal.test.js diff --git a/test/components/nav-bar.test.js b/packages/taro-ui/test/components/nav-bar.test.js similarity index 100% rename from test/components/nav-bar.test.js rename to packages/taro-ui/test/components/nav-bar.test.js diff --git a/test/components/noticebar.test.js b/packages/taro-ui/test/components/noticebar.test.js similarity index 100% rename from test/components/noticebar.test.js rename to packages/taro-ui/test/components/noticebar.test.js diff --git a/test/components/pagination.test.js b/packages/taro-ui/test/components/pagination.test.js similarity index 100% rename from test/components/pagination.test.js rename to packages/taro-ui/test/components/pagination.test.js diff --git a/test/components/progress.test.js b/packages/taro-ui/test/components/progress.test.js similarity index 100% rename from test/components/progress.test.js rename to packages/taro-ui/test/components/progress.test.js diff --git a/test/components/radio.test.js b/packages/taro-ui/test/components/radio.test.js similarity index 100% rename from test/components/radio.test.js rename to packages/taro-ui/test/components/radio.test.js diff --git a/test/components/range.test.js b/packages/taro-ui/test/components/range.test.js similarity index 100% rename from test/components/range.test.js rename to packages/taro-ui/test/components/range.test.js diff --git a/test/components/rate.test.js b/packages/taro-ui/test/components/rate.test.js similarity index 100% rename from test/components/rate.test.js rename to packages/taro-ui/test/components/rate.test.js diff --git a/test/components/search-bar.test.js b/packages/taro-ui/test/components/search-bar.test.js similarity index 100% rename from test/components/search-bar.test.js rename to packages/taro-ui/test/components/search-bar.test.js diff --git a/test/components/segmented-control.test.js b/packages/taro-ui/test/components/segmented-control.test.js similarity index 100% rename from test/components/segmented-control.test.js rename to packages/taro-ui/test/components/segmented-control.test.js diff --git a/test/components/slider.test.js b/packages/taro-ui/test/components/slider.test.js similarity index 100% rename from test/components/slider.test.js rename to packages/taro-ui/test/components/slider.test.js diff --git a/test/components/steps.test.js b/packages/taro-ui/test/components/steps.test.js similarity index 100% rename from test/components/steps.test.js rename to packages/taro-ui/test/components/steps.test.js diff --git a/test/components/swipe-action.test.js b/packages/taro-ui/test/components/swipe-action.test.js similarity index 100% rename from test/components/swipe-action.test.js rename to packages/taro-ui/test/components/swipe-action.test.js diff --git a/test/components/switch.test.js b/packages/taro-ui/test/components/switch.test.js similarity index 100% rename from test/components/switch.test.js rename to packages/taro-ui/test/components/switch.test.js diff --git a/test/components/tab-bar.test.js b/packages/taro-ui/test/components/tab-bar.test.js similarity index 100% rename from test/components/tab-bar.test.js rename to packages/taro-ui/test/components/tab-bar.test.js diff --git a/test/components/tabs-pane.test.js b/packages/taro-ui/test/components/tabs-pane.test.js similarity index 100% rename from test/components/tabs-pane.test.js rename to packages/taro-ui/test/components/tabs-pane.test.js diff --git a/test/components/tabs.test.js b/packages/taro-ui/test/components/tabs.test.js similarity index 100% rename from test/components/tabs.test.js rename to packages/taro-ui/test/components/tabs.test.js diff --git a/test/components/tag.test.js b/packages/taro-ui/test/components/tag.test.js similarity index 100% rename from test/components/tag.test.js rename to packages/taro-ui/test/components/tag.test.js diff --git a/test/components/textarea.test.js b/packages/taro-ui/test/components/textarea.test.js similarity index 100% rename from test/components/textarea.test.js rename to packages/taro-ui/test/components/textarea.test.js diff --git a/test/components/timeline.test.js b/packages/taro-ui/test/components/timeline.test.js similarity index 100% rename from test/components/timeline.test.js rename to packages/taro-ui/test/components/timeline.test.js diff --git a/test/components/toast.test.js b/packages/taro-ui/test/components/toast.test.js similarity index 100% rename from test/components/toast.test.js rename to packages/taro-ui/test/components/toast.test.js diff --git a/types/accordion.d.ts b/packages/taro-ui/types/accordion.d.ts similarity index 100% rename from types/accordion.d.ts rename to packages/taro-ui/types/accordion.d.ts diff --git a/types/action-sheet.d.ts b/packages/taro-ui/types/action-sheet.d.ts similarity index 100% rename from types/action-sheet.d.ts rename to packages/taro-ui/types/action-sheet.d.ts diff --git a/types/activity-indicator.d.ts b/packages/taro-ui/types/activity-indicator.d.ts similarity index 100% rename from types/activity-indicator.d.ts rename to packages/taro-ui/types/activity-indicator.d.ts diff --git a/types/avatar.d.ts b/packages/taro-ui/types/avatar.d.ts similarity index 100% rename from types/avatar.d.ts rename to packages/taro-ui/types/avatar.d.ts diff --git a/types/badge.d.ts b/packages/taro-ui/types/badge.d.ts similarity index 100% rename from types/badge.d.ts rename to packages/taro-ui/types/badge.d.ts diff --git a/types/base.d.ts b/packages/taro-ui/types/base.d.ts similarity index 100% rename from types/base.d.ts rename to packages/taro-ui/types/base.d.ts diff --git a/types/button.d.ts b/packages/taro-ui/types/button.d.ts similarity index 100% rename from types/button.d.ts rename to packages/taro-ui/types/button.d.ts diff --git a/types/calendar.d.ts b/packages/taro-ui/types/calendar.d.ts similarity index 100% rename from types/calendar.d.ts rename to packages/taro-ui/types/calendar.d.ts diff --git a/types/card.d.ts b/packages/taro-ui/types/card.d.ts similarity index 100% rename from types/card.d.ts rename to packages/taro-ui/types/card.d.ts diff --git a/types/checkbox.d.ts b/packages/taro-ui/types/checkbox.d.ts similarity index 100% rename from types/checkbox.d.ts rename to packages/taro-ui/types/checkbox.d.ts diff --git a/types/countdown.d.ts b/packages/taro-ui/types/countdown.d.ts similarity index 100% rename from types/countdown.d.ts rename to packages/taro-ui/types/countdown.d.ts diff --git a/types/curtain.d.ts b/packages/taro-ui/types/curtain.d.ts similarity index 100% rename from types/curtain.d.ts rename to packages/taro-ui/types/curtain.d.ts diff --git a/types/divider.d.ts b/packages/taro-ui/types/divider.d.ts similarity index 100% rename from types/divider.d.ts rename to packages/taro-ui/types/divider.d.ts diff --git a/types/drawer.d.ts b/packages/taro-ui/types/drawer.d.ts similarity index 100% rename from types/drawer.d.ts rename to packages/taro-ui/types/drawer.d.ts diff --git a/types/fab.d.ts b/packages/taro-ui/types/fab.d.ts similarity index 100% rename from types/fab.d.ts rename to packages/taro-ui/types/fab.d.ts diff --git a/types/flex.d.ts b/packages/taro-ui/types/flex.d.ts similarity index 100% rename from types/flex.d.ts rename to packages/taro-ui/types/flex.d.ts diff --git a/types/float-button.d.ts b/packages/taro-ui/types/float-button.d.ts similarity index 100% rename from types/float-button.d.ts rename to packages/taro-ui/types/float-button.d.ts diff --git a/types/float-layout.d.ts b/packages/taro-ui/types/float-layout.d.ts similarity index 100% rename from types/float-layout.d.ts rename to packages/taro-ui/types/float-layout.d.ts diff --git a/types/form.d.ts b/packages/taro-ui/types/form.d.ts similarity index 100% rename from types/form.d.ts rename to packages/taro-ui/types/form.d.ts diff --git a/types/grid.d.ts b/packages/taro-ui/types/grid.d.ts similarity index 100% rename from types/grid.d.ts rename to packages/taro-ui/types/grid.d.ts diff --git a/types/icon.d.ts b/packages/taro-ui/types/icon.d.ts similarity index 100% rename from types/icon.d.ts rename to packages/taro-ui/types/icon.d.ts diff --git a/types/image-picker.d.ts b/packages/taro-ui/types/image-picker.d.ts similarity index 100% rename from types/image-picker.d.ts rename to packages/taro-ui/types/image-picker.d.ts diff --git a/types/index.d.ts b/packages/taro-ui/types/index.d.ts similarity index 100% rename from types/index.d.ts rename to packages/taro-ui/types/index.d.ts diff --git a/types/indexes.d.ts b/packages/taro-ui/types/indexes.d.ts similarity index 100% rename from types/indexes.d.ts rename to packages/taro-ui/types/indexes.d.ts diff --git a/types/input-number.d.ts b/packages/taro-ui/types/input-number.d.ts similarity index 100% rename from types/input-number.d.ts rename to packages/taro-ui/types/input-number.d.ts diff --git a/types/input.d.ts b/packages/taro-ui/types/input.d.ts similarity index 100% rename from types/input.d.ts rename to packages/taro-ui/types/input.d.ts diff --git a/types/list.d.ts b/packages/taro-ui/types/list.d.ts similarity index 100% rename from types/list.d.ts rename to packages/taro-ui/types/list.d.ts diff --git a/types/load-more.d.ts b/packages/taro-ui/types/load-more.d.ts similarity index 100% rename from types/load-more.d.ts rename to packages/taro-ui/types/load-more.d.ts diff --git a/types/message.d.ts b/packages/taro-ui/types/message.d.ts similarity index 100% rename from types/message.d.ts rename to packages/taro-ui/types/message.d.ts diff --git a/types/modal.d.ts b/packages/taro-ui/types/modal.d.ts similarity index 100% rename from types/modal.d.ts rename to packages/taro-ui/types/modal.d.ts diff --git a/types/nav-bar.d.ts b/packages/taro-ui/types/nav-bar.d.ts similarity index 100% rename from types/nav-bar.d.ts rename to packages/taro-ui/types/nav-bar.d.ts diff --git a/types/noticebar.d.ts b/packages/taro-ui/types/noticebar.d.ts similarity index 100% rename from types/noticebar.d.ts rename to packages/taro-ui/types/noticebar.d.ts diff --git a/types/pagination.d.ts b/packages/taro-ui/types/pagination.d.ts similarity index 100% rename from types/pagination.d.ts rename to packages/taro-ui/types/pagination.d.ts diff --git a/types/progress.d.ts b/packages/taro-ui/types/progress.d.ts similarity index 100% rename from types/progress.d.ts rename to packages/taro-ui/types/progress.d.ts diff --git a/types/radio.d.ts b/packages/taro-ui/types/radio.d.ts similarity index 100% rename from types/radio.d.ts rename to packages/taro-ui/types/radio.d.ts diff --git a/types/range.d.ts b/packages/taro-ui/types/range.d.ts similarity index 100% rename from types/range.d.ts rename to packages/taro-ui/types/range.d.ts diff --git a/types/rate.d.ts b/packages/taro-ui/types/rate.d.ts similarity index 100% rename from types/rate.d.ts rename to packages/taro-ui/types/rate.d.ts diff --git a/types/search-bar.d.ts b/packages/taro-ui/types/search-bar.d.ts similarity index 100% rename from types/search-bar.d.ts rename to packages/taro-ui/types/search-bar.d.ts diff --git a/types/segmented-control.d.ts b/packages/taro-ui/types/segmented-control.d.ts similarity index 100% rename from types/segmented-control.d.ts rename to packages/taro-ui/types/segmented-control.d.ts diff --git a/types/slider.d.ts b/packages/taro-ui/types/slider.d.ts similarity index 100% rename from types/slider.d.ts rename to packages/taro-ui/types/slider.d.ts diff --git a/types/steps.d.ts b/packages/taro-ui/types/steps.d.ts similarity index 100% rename from types/steps.d.ts rename to packages/taro-ui/types/steps.d.ts diff --git a/types/swipe-action.d.ts b/packages/taro-ui/types/swipe-action.d.ts similarity index 100% rename from types/swipe-action.d.ts rename to packages/taro-ui/types/swipe-action.d.ts diff --git a/types/switch.d.ts b/packages/taro-ui/types/switch.d.ts similarity index 100% rename from types/switch.d.ts rename to packages/taro-ui/types/switch.d.ts diff --git a/types/tab-bar.d.ts b/packages/taro-ui/types/tab-bar.d.ts similarity index 100% rename from types/tab-bar.d.ts rename to packages/taro-ui/types/tab-bar.d.ts diff --git a/types/tabs-pane.d.ts b/packages/taro-ui/types/tabs-pane.d.ts similarity index 100% rename from types/tabs-pane.d.ts rename to packages/taro-ui/types/tabs-pane.d.ts diff --git a/types/tabs.d.ts b/packages/taro-ui/types/tabs.d.ts similarity index 100% rename from types/tabs.d.ts rename to packages/taro-ui/types/tabs.d.ts diff --git a/types/tag.d.ts b/packages/taro-ui/types/tag.d.ts similarity index 100% rename from types/tag.d.ts rename to packages/taro-ui/types/tag.d.ts diff --git a/types/textarea.d.ts b/packages/taro-ui/types/textarea.d.ts similarity index 100% rename from types/textarea.d.ts rename to packages/taro-ui/types/textarea.d.ts diff --git a/types/timeline.d.ts b/packages/taro-ui/types/timeline.d.ts similarity index 100% rename from types/timeline.d.ts rename to packages/taro-ui/types/timeline.d.ts diff --git a/types/toast.d.ts b/packages/taro-ui/types/toast.d.ts similarity index 100% rename from types/toast.d.ts rename to packages/taro-ui/types/toast.d.ts From 5737848934f5defb9a07a95d5390a326a198025e Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Sun, 5 Apr 2020 19:20:49 +0800 Subject: [PATCH 16/54] chore: move demo files to packages subfolder --- {src => packages/taro-ui-demo/src}/app.config.js | 0 {src => packages/taro-ui-demo/src}/app.scss | 0 {src => packages/taro-ui-demo/src}/app.tsx | 0 .../taro-ui-demo/src}/assets/images/curtain.png | Bin .../src}/assets/images/icon-list-action.png | Bin .../src}/assets/images/icon-list-basic.png | Bin .../src}/assets/images/icon-list-form.png | Bin .../src}/assets/images/icon-list-hoc.png | Bin .../src}/assets/images/icon-list-layout.png | Bin .../src}/assets/images/icon-list-navigation.png | Bin .../src}/assets/images/icon-list-view.png | Bin .../taro-ui-demo/src}/assets/images/logo_taro.png | Bin .../src}/assets/images/verification_code.png | Bin {config => packages/taro-ui-demo/src/config}/dev.js | 0 .../taro-ui-demo/src/config}/index.js | 0 .../taro-ui-demo/src/config}/prod.js | 0 .../src/config}/rollup.config.analyze.js | 0 .../taro-ui-demo/src/config}/rollup.config.js | 0 .../taro-ui-demo/src/config}/tsconfig.base.json | 0 .../taro-ui-demo/src/config}/tsconfig.build.json | 0 .../taro-ui-demo/src/config}/tsconfig.rollup.json | 0 {src => packages/taro-ui-demo/src}/index.html | 0 .../src}/pages/action/action-sheet/index.scss | 0 .../src}/pages/action/action-sheet/index.tsx | 0 .../src}/pages/action/activity-indicator/index.scss | 0 .../src}/pages/action/activity-indicator/index.tsx | 0 .../src}/pages/action/message/index.scss | 0 .../src}/pages/action/message/index.tsx | 0 .../taro-ui-demo/src}/pages/action/modal/index.scss | 0 .../taro-ui-demo/src}/pages/action/modal/index.tsx | 0 .../src}/pages/action/progress/index.scss | 0 .../src}/pages/action/progress/index.tsx | 0 .../src}/pages/action/swipe-action/index.scss | 0 .../src}/pages/action/swipe-action/index.tsx | 0 .../taro-ui-demo/src}/pages/action/toast/index.scss | 0 .../taro-ui-demo/src}/pages/action/toast/index.tsx | 0 .../src}/pages/advanced/calendar/index.scss | 0 .../src}/pages/advanced/calendar/index.tsx | 0 .../taro-ui-demo/src}/pages/basic/button/index.scss | 0 .../taro-ui-demo/src}/pages/basic/button/index.tsx | 0 .../taro-ui-demo/src}/pages/basic/color/index.scss | 0 .../taro-ui-demo/src}/pages/basic/color/index.tsx | 0 .../taro-ui-demo/src}/pages/basic/icon/icons.ts | 0 .../taro-ui-demo/src}/pages/basic/icon/index.scss | 0 .../taro-ui-demo/src}/pages/basic/icon/index.tsx | 0 .../taro-ui-demo/src}/pages/basic/typo/index.scss | 0 .../taro-ui-demo/src}/pages/basic/typo/index.tsx | 0 .../src}/pages/components/doc-header/index.scss | 0 .../src}/pages/components/doc-header/index.tsx | 0 .../src}/pages/form/checkbox/index.scss | 0 .../taro-ui-demo/src}/pages/form/checkbox/index.tsx | 0 .../taro-ui-demo/src}/pages/form/form/index.scss | 0 .../taro-ui-demo/src}/pages/form/form/index.tsx | 0 .../src}/pages/form/image-picker/index.scss | 0 .../src}/pages/form/image-picker/index.tsx | 0 .../src}/pages/form/input-number/index.scss | 0 .../src}/pages/form/input-number/index.tsx | 0 .../taro-ui-demo/src}/pages/form/input/index.scss | 0 .../taro-ui-demo/src}/pages/form/input/index.tsx | 0 .../src}/pages/form/picker-view/index.scss | 0 .../src}/pages/form/picker-view/index.tsx | 0 .../taro-ui-demo/src}/pages/form/picker/index.scss | 0 .../taro-ui-demo/src}/pages/form/picker/index.tsx | 0 .../taro-ui-demo/src}/pages/form/radio/index.scss | 0 .../taro-ui-demo/src}/pages/form/radio/index.tsx | 0 .../taro-ui-demo/src}/pages/form/range/index.scss | 0 .../taro-ui-demo/src}/pages/form/range/index.tsx | 0 .../taro-ui-demo/src}/pages/form/rate/index.scss | 0 .../taro-ui-demo/src}/pages/form/rate/index.tsx | 0 .../src}/pages/form/search-bar/index.scss | 0 .../src}/pages/form/search-bar/index.tsx | 0 .../taro-ui-demo/src}/pages/form/slider/index.scss | 0 .../taro-ui-demo/src}/pages/form/slider/index.tsx | 0 .../taro-ui-demo/src}/pages/form/switch/index.scss | 0 .../taro-ui-demo/src}/pages/form/switch/index.tsx | 0 .../src}/pages/form/textarea/index.scss | 0 .../taro-ui-demo/src}/pages/form/textarea/index.tsx | 0 .../taro-ui-demo/src}/pages/index/index.config.js | 0 .../taro-ui-demo/src}/pages/index/index.scss | 0 .../taro-ui-demo/src}/pages/index/index.tsx | 0 .../src}/pages/layout/accordion/index.scss | 0 .../src}/pages/layout/accordion/index.tsx | 0 .../taro-ui-demo/src}/pages/layout/card/index.scss | 0 .../taro-ui-demo/src}/pages/layout/card/index.tsx | 0 .../taro-ui-demo/src}/pages/layout/flex/index.scss | 0 .../taro-ui-demo/src}/pages/layout/flex/index.tsx | 0 .../src}/pages/layout/float-layout/index.scss | 0 .../src}/pages/layout/float-layout/index.tsx | 0 .../taro-ui-demo/src}/pages/layout/grid/index.scss | 0 .../taro-ui-demo/src}/pages/layout/grid/index.tsx | 0 .../taro-ui-demo/src}/pages/layout/list/index.scss | 0 .../taro-ui-demo/src}/pages/layout/list/index.tsx | 0 .../src}/pages/navigation/drawer/index.scss | 0 .../src}/pages/navigation/drawer/index.tsx | 0 .../src}/pages/navigation/indexes/index.scss | 0 .../src}/pages/navigation/indexes/index.tsx | 0 .../src}/pages/navigation/indexes/mock-data.ts | 0 .../src}/pages/navigation/navbar/index.scss | 0 .../src}/pages/navigation/navbar/index.tsx | 0 .../src}/pages/navigation/pagination/index.scss | 0 .../src}/pages/navigation/pagination/index.tsx | 0 .../pages/navigation/segmented-control/index.scss | 0 .../pages/navigation/segmented-control/index.tsx | 0 .../src}/pages/navigation/tabbar/index.scss | 0 .../src}/pages/navigation/tabbar/index.tsx | 0 .../src}/pages/navigation/tabs/index.scss | 0 .../src}/pages/navigation/tabs/index.tsx | 0 .../taro-ui-demo/src}/pages/panel/index.scss | 0 .../taro-ui-demo/src}/pages/panel/index.tsx | 0 .../taro-ui-demo/src}/pages/theme/index.scss | 0 .../taro-ui-demo/src}/pages/theme/index.tsx | 0 .../taro-ui-demo/src}/pages/view/article/index.scss | 0 .../taro-ui-demo/src}/pages/view/article/index.tsx | 0 .../taro-ui-demo/src}/pages/view/avatar/index.scss | 0 .../taro-ui-demo/src}/pages/view/avatar/index.tsx | 0 .../taro-ui-demo/src}/pages/view/badge/index.scss | 0 .../taro-ui-demo/src}/pages/view/badge/index.tsx | 0 .../src}/pages/view/countdown/index.scss | 0 .../src}/pages/view/countdown/index.tsx | 0 .../taro-ui-demo/src}/pages/view/curtain/index.scss | 0 .../taro-ui-demo/src}/pages/view/curtain/index.tsx | 0 .../taro-ui-demo/src}/pages/view/divider/index.scss | 0 .../taro-ui-demo/src}/pages/view/divider/index.tsx | 0 .../src}/pages/view/load-more/index.scss | 0 .../src}/pages/view/load-more/index.tsx | 0 .../src}/pages/view/noticebar/index.scss | 0 .../src}/pages/view/noticebar/index.tsx | 0 .../taro-ui-demo/src}/pages/view/steps/index.scss | 0 .../taro-ui-demo/src}/pages/view/steps/index.tsx | 0 .../taro-ui-demo/src}/pages/view/swiper/index.scss | 0 .../taro-ui-demo/src}/pages/view/swiper/index.tsx | 0 .../taro-ui-demo/src}/pages/view/tag/index.scss | 0 .../taro-ui-demo/src}/pages/view/tag/index.tsx | 0 .../src}/pages/view/timeline/index.scss | 0 .../taro-ui-demo/src}/pages/view/timeline/index.tsx | 0 {src => packages/taro-ui-demo/src}/ui.ts | 0 .../taro-ui-demo/tsconfig.json | 0 137 files changed, 0 insertions(+), 0 deletions(-) rename {src => packages/taro-ui-demo/src}/app.config.js (100%) rename {src => packages/taro-ui-demo/src}/app.scss (100%) rename {src => packages/taro-ui-demo/src}/app.tsx (100%) rename {src => packages/taro-ui-demo/src}/assets/images/curtain.png (100%) rename {src => packages/taro-ui-demo/src}/assets/images/icon-list-action.png (100%) rename {src => packages/taro-ui-demo/src}/assets/images/icon-list-basic.png (100%) rename {src => packages/taro-ui-demo/src}/assets/images/icon-list-form.png (100%) rename {src => packages/taro-ui-demo/src}/assets/images/icon-list-hoc.png (100%) rename {src => packages/taro-ui-demo/src}/assets/images/icon-list-layout.png (100%) rename {src => packages/taro-ui-demo/src}/assets/images/icon-list-navigation.png (100%) rename {src => packages/taro-ui-demo/src}/assets/images/icon-list-view.png (100%) rename {src => packages/taro-ui-demo/src}/assets/images/logo_taro.png (100%) rename {src => packages/taro-ui-demo/src}/assets/images/verification_code.png (100%) rename {config => packages/taro-ui-demo/src/config}/dev.js (100%) rename {config => packages/taro-ui-demo/src/config}/index.js (100%) rename {config => packages/taro-ui-demo/src/config}/prod.js (100%) rename {config => packages/taro-ui-demo/src/config}/rollup.config.analyze.js (100%) rename {config => packages/taro-ui-demo/src/config}/rollup.config.js (100%) rename {config => packages/taro-ui-demo/src/config}/tsconfig.base.json (100%) rename {config => packages/taro-ui-demo/src/config}/tsconfig.build.json (100%) rename {config => packages/taro-ui-demo/src/config}/tsconfig.rollup.json (100%) rename {src => packages/taro-ui-demo/src}/index.html (100%) rename {src => packages/taro-ui-demo/src}/pages/action/action-sheet/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/action/action-sheet/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/action/activity-indicator/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/action/activity-indicator/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/action/message/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/action/message/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/action/modal/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/action/modal/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/action/progress/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/action/progress/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/action/swipe-action/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/action/swipe-action/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/action/toast/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/action/toast/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/advanced/calendar/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/advanced/calendar/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/basic/button/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/basic/button/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/basic/color/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/basic/color/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/basic/icon/icons.ts (100%) rename {src => packages/taro-ui-demo/src}/pages/basic/icon/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/basic/icon/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/basic/typo/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/basic/typo/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/components/doc-header/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/components/doc-header/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/checkbox/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/checkbox/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/form/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/form/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/image-picker/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/image-picker/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/input-number/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/input-number/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/input/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/input/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/picker-view/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/picker-view/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/picker/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/picker/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/radio/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/radio/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/range/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/range/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/rate/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/rate/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/search-bar/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/search-bar/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/slider/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/slider/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/switch/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/switch/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/form/textarea/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/form/textarea/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/index/index.config.js (100%) rename {src => packages/taro-ui-demo/src}/pages/index/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/index/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/layout/accordion/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/layout/accordion/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/layout/card/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/layout/card/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/layout/flex/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/layout/flex/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/layout/float-layout/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/layout/float-layout/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/layout/grid/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/layout/grid/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/layout/list/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/layout/list/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/drawer/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/drawer/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/indexes/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/indexes/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/indexes/mock-data.ts (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/navbar/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/navbar/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/pagination/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/pagination/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/segmented-control/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/segmented-control/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/tabbar/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/tabbar/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/tabs/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/navigation/tabs/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/panel/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/panel/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/theme/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/theme/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/view/article/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/view/article/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/view/avatar/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/view/avatar/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/view/badge/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/view/badge/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/view/countdown/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/view/countdown/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/view/curtain/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/view/curtain/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/view/divider/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/view/divider/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/view/load-more/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/view/load-more/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/view/noticebar/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/view/noticebar/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/view/steps/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/view/steps/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/view/swiper/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/view/swiper/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/view/tag/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/view/tag/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/pages/view/timeline/index.scss (100%) rename {src => packages/taro-ui-demo/src}/pages/view/timeline/index.tsx (100%) rename {src => packages/taro-ui-demo/src}/ui.ts (100%) rename tsconfig.json => packages/taro-ui-demo/tsconfig.json (100%) diff --git a/src/app.config.js b/packages/taro-ui-demo/src/app.config.js similarity index 100% rename from src/app.config.js rename to packages/taro-ui-demo/src/app.config.js diff --git a/src/app.scss b/packages/taro-ui-demo/src/app.scss similarity index 100% rename from src/app.scss rename to packages/taro-ui-demo/src/app.scss diff --git a/src/app.tsx b/packages/taro-ui-demo/src/app.tsx similarity index 100% rename from src/app.tsx rename to packages/taro-ui-demo/src/app.tsx diff --git a/src/assets/images/curtain.png b/packages/taro-ui-demo/src/assets/images/curtain.png similarity index 100% rename from src/assets/images/curtain.png rename to packages/taro-ui-demo/src/assets/images/curtain.png diff --git a/src/assets/images/icon-list-action.png b/packages/taro-ui-demo/src/assets/images/icon-list-action.png similarity index 100% rename from src/assets/images/icon-list-action.png rename to packages/taro-ui-demo/src/assets/images/icon-list-action.png diff --git a/src/assets/images/icon-list-basic.png b/packages/taro-ui-demo/src/assets/images/icon-list-basic.png similarity index 100% rename from src/assets/images/icon-list-basic.png rename to packages/taro-ui-demo/src/assets/images/icon-list-basic.png diff --git a/src/assets/images/icon-list-form.png b/packages/taro-ui-demo/src/assets/images/icon-list-form.png similarity index 100% rename from src/assets/images/icon-list-form.png rename to packages/taro-ui-demo/src/assets/images/icon-list-form.png diff --git a/src/assets/images/icon-list-hoc.png b/packages/taro-ui-demo/src/assets/images/icon-list-hoc.png similarity index 100% rename from src/assets/images/icon-list-hoc.png rename to packages/taro-ui-demo/src/assets/images/icon-list-hoc.png diff --git a/src/assets/images/icon-list-layout.png b/packages/taro-ui-demo/src/assets/images/icon-list-layout.png similarity index 100% rename from src/assets/images/icon-list-layout.png rename to packages/taro-ui-demo/src/assets/images/icon-list-layout.png diff --git a/src/assets/images/icon-list-navigation.png b/packages/taro-ui-demo/src/assets/images/icon-list-navigation.png similarity index 100% rename from src/assets/images/icon-list-navigation.png rename to packages/taro-ui-demo/src/assets/images/icon-list-navigation.png diff --git a/src/assets/images/icon-list-view.png b/packages/taro-ui-demo/src/assets/images/icon-list-view.png similarity index 100% rename from src/assets/images/icon-list-view.png rename to packages/taro-ui-demo/src/assets/images/icon-list-view.png diff --git a/src/assets/images/logo_taro.png b/packages/taro-ui-demo/src/assets/images/logo_taro.png similarity index 100% rename from src/assets/images/logo_taro.png rename to packages/taro-ui-demo/src/assets/images/logo_taro.png diff --git a/src/assets/images/verification_code.png b/packages/taro-ui-demo/src/assets/images/verification_code.png similarity index 100% rename from src/assets/images/verification_code.png rename to packages/taro-ui-demo/src/assets/images/verification_code.png diff --git a/config/dev.js b/packages/taro-ui-demo/src/config/dev.js similarity index 100% rename from config/dev.js rename to packages/taro-ui-demo/src/config/dev.js diff --git a/config/index.js b/packages/taro-ui-demo/src/config/index.js similarity index 100% rename from config/index.js rename to packages/taro-ui-demo/src/config/index.js diff --git a/config/prod.js b/packages/taro-ui-demo/src/config/prod.js similarity index 100% rename from config/prod.js rename to packages/taro-ui-demo/src/config/prod.js diff --git a/config/rollup.config.analyze.js b/packages/taro-ui-demo/src/config/rollup.config.analyze.js similarity index 100% rename from config/rollup.config.analyze.js rename to packages/taro-ui-demo/src/config/rollup.config.analyze.js diff --git a/config/rollup.config.js b/packages/taro-ui-demo/src/config/rollup.config.js similarity index 100% rename from config/rollup.config.js rename to packages/taro-ui-demo/src/config/rollup.config.js diff --git a/config/tsconfig.base.json b/packages/taro-ui-demo/src/config/tsconfig.base.json similarity index 100% rename from config/tsconfig.base.json rename to packages/taro-ui-demo/src/config/tsconfig.base.json diff --git a/config/tsconfig.build.json b/packages/taro-ui-demo/src/config/tsconfig.build.json similarity index 100% rename from config/tsconfig.build.json rename to packages/taro-ui-demo/src/config/tsconfig.build.json diff --git a/config/tsconfig.rollup.json b/packages/taro-ui-demo/src/config/tsconfig.rollup.json similarity index 100% rename from config/tsconfig.rollup.json rename to packages/taro-ui-demo/src/config/tsconfig.rollup.json diff --git a/src/index.html b/packages/taro-ui-demo/src/index.html similarity index 100% rename from src/index.html rename to packages/taro-ui-demo/src/index.html diff --git a/src/pages/action/action-sheet/index.scss b/packages/taro-ui-demo/src/pages/action/action-sheet/index.scss similarity index 100% rename from src/pages/action/action-sheet/index.scss rename to packages/taro-ui-demo/src/pages/action/action-sheet/index.scss diff --git a/src/pages/action/action-sheet/index.tsx b/packages/taro-ui-demo/src/pages/action/action-sheet/index.tsx similarity index 100% rename from src/pages/action/action-sheet/index.tsx rename to packages/taro-ui-demo/src/pages/action/action-sheet/index.tsx diff --git a/src/pages/action/activity-indicator/index.scss b/packages/taro-ui-demo/src/pages/action/activity-indicator/index.scss similarity index 100% rename from src/pages/action/activity-indicator/index.scss rename to packages/taro-ui-demo/src/pages/action/activity-indicator/index.scss diff --git a/src/pages/action/activity-indicator/index.tsx b/packages/taro-ui-demo/src/pages/action/activity-indicator/index.tsx similarity index 100% rename from src/pages/action/activity-indicator/index.tsx rename to packages/taro-ui-demo/src/pages/action/activity-indicator/index.tsx diff --git a/src/pages/action/message/index.scss b/packages/taro-ui-demo/src/pages/action/message/index.scss similarity index 100% rename from src/pages/action/message/index.scss rename to packages/taro-ui-demo/src/pages/action/message/index.scss diff --git a/src/pages/action/message/index.tsx b/packages/taro-ui-demo/src/pages/action/message/index.tsx similarity index 100% rename from src/pages/action/message/index.tsx rename to packages/taro-ui-demo/src/pages/action/message/index.tsx diff --git a/src/pages/action/modal/index.scss b/packages/taro-ui-demo/src/pages/action/modal/index.scss similarity index 100% rename from src/pages/action/modal/index.scss rename to packages/taro-ui-demo/src/pages/action/modal/index.scss diff --git a/src/pages/action/modal/index.tsx b/packages/taro-ui-demo/src/pages/action/modal/index.tsx similarity index 100% rename from src/pages/action/modal/index.tsx rename to packages/taro-ui-demo/src/pages/action/modal/index.tsx diff --git a/src/pages/action/progress/index.scss b/packages/taro-ui-demo/src/pages/action/progress/index.scss similarity index 100% rename from src/pages/action/progress/index.scss rename to packages/taro-ui-demo/src/pages/action/progress/index.scss diff --git a/src/pages/action/progress/index.tsx b/packages/taro-ui-demo/src/pages/action/progress/index.tsx similarity index 100% rename from src/pages/action/progress/index.tsx rename to packages/taro-ui-demo/src/pages/action/progress/index.tsx diff --git a/src/pages/action/swipe-action/index.scss b/packages/taro-ui-demo/src/pages/action/swipe-action/index.scss similarity index 100% rename from src/pages/action/swipe-action/index.scss rename to packages/taro-ui-demo/src/pages/action/swipe-action/index.scss diff --git a/src/pages/action/swipe-action/index.tsx b/packages/taro-ui-demo/src/pages/action/swipe-action/index.tsx similarity index 100% rename from src/pages/action/swipe-action/index.tsx rename to packages/taro-ui-demo/src/pages/action/swipe-action/index.tsx diff --git a/src/pages/action/toast/index.scss b/packages/taro-ui-demo/src/pages/action/toast/index.scss similarity index 100% rename from src/pages/action/toast/index.scss rename to packages/taro-ui-demo/src/pages/action/toast/index.scss diff --git a/src/pages/action/toast/index.tsx b/packages/taro-ui-demo/src/pages/action/toast/index.tsx similarity index 100% rename from src/pages/action/toast/index.tsx rename to packages/taro-ui-demo/src/pages/action/toast/index.tsx diff --git a/src/pages/advanced/calendar/index.scss b/packages/taro-ui-demo/src/pages/advanced/calendar/index.scss similarity index 100% rename from src/pages/advanced/calendar/index.scss rename to packages/taro-ui-demo/src/pages/advanced/calendar/index.scss diff --git a/src/pages/advanced/calendar/index.tsx b/packages/taro-ui-demo/src/pages/advanced/calendar/index.tsx similarity index 100% rename from src/pages/advanced/calendar/index.tsx rename to packages/taro-ui-demo/src/pages/advanced/calendar/index.tsx diff --git a/src/pages/basic/button/index.scss b/packages/taro-ui-demo/src/pages/basic/button/index.scss similarity index 100% rename from src/pages/basic/button/index.scss rename to packages/taro-ui-demo/src/pages/basic/button/index.scss diff --git a/src/pages/basic/button/index.tsx b/packages/taro-ui-demo/src/pages/basic/button/index.tsx similarity index 100% rename from src/pages/basic/button/index.tsx rename to packages/taro-ui-demo/src/pages/basic/button/index.tsx diff --git a/src/pages/basic/color/index.scss b/packages/taro-ui-demo/src/pages/basic/color/index.scss similarity index 100% rename from src/pages/basic/color/index.scss rename to packages/taro-ui-demo/src/pages/basic/color/index.scss diff --git a/src/pages/basic/color/index.tsx b/packages/taro-ui-demo/src/pages/basic/color/index.tsx similarity index 100% rename from src/pages/basic/color/index.tsx rename to packages/taro-ui-demo/src/pages/basic/color/index.tsx diff --git a/src/pages/basic/icon/icons.ts b/packages/taro-ui-demo/src/pages/basic/icon/icons.ts similarity index 100% rename from src/pages/basic/icon/icons.ts rename to packages/taro-ui-demo/src/pages/basic/icon/icons.ts diff --git a/src/pages/basic/icon/index.scss b/packages/taro-ui-demo/src/pages/basic/icon/index.scss similarity index 100% rename from src/pages/basic/icon/index.scss rename to packages/taro-ui-demo/src/pages/basic/icon/index.scss diff --git a/src/pages/basic/icon/index.tsx b/packages/taro-ui-demo/src/pages/basic/icon/index.tsx similarity index 100% rename from src/pages/basic/icon/index.tsx rename to packages/taro-ui-demo/src/pages/basic/icon/index.tsx diff --git a/src/pages/basic/typo/index.scss b/packages/taro-ui-demo/src/pages/basic/typo/index.scss similarity index 100% rename from src/pages/basic/typo/index.scss rename to packages/taro-ui-demo/src/pages/basic/typo/index.scss diff --git a/src/pages/basic/typo/index.tsx b/packages/taro-ui-demo/src/pages/basic/typo/index.tsx similarity index 100% rename from src/pages/basic/typo/index.tsx rename to packages/taro-ui-demo/src/pages/basic/typo/index.tsx diff --git a/src/pages/components/doc-header/index.scss b/packages/taro-ui-demo/src/pages/components/doc-header/index.scss similarity index 100% rename from src/pages/components/doc-header/index.scss rename to packages/taro-ui-demo/src/pages/components/doc-header/index.scss diff --git a/src/pages/components/doc-header/index.tsx b/packages/taro-ui-demo/src/pages/components/doc-header/index.tsx similarity index 100% rename from src/pages/components/doc-header/index.tsx rename to packages/taro-ui-demo/src/pages/components/doc-header/index.tsx diff --git a/src/pages/form/checkbox/index.scss b/packages/taro-ui-demo/src/pages/form/checkbox/index.scss similarity index 100% rename from src/pages/form/checkbox/index.scss rename to packages/taro-ui-demo/src/pages/form/checkbox/index.scss diff --git a/src/pages/form/checkbox/index.tsx b/packages/taro-ui-demo/src/pages/form/checkbox/index.tsx similarity index 100% rename from src/pages/form/checkbox/index.tsx rename to packages/taro-ui-demo/src/pages/form/checkbox/index.tsx diff --git a/src/pages/form/form/index.scss b/packages/taro-ui-demo/src/pages/form/form/index.scss similarity index 100% rename from src/pages/form/form/index.scss rename to packages/taro-ui-demo/src/pages/form/form/index.scss diff --git a/src/pages/form/form/index.tsx b/packages/taro-ui-demo/src/pages/form/form/index.tsx similarity index 100% rename from src/pages/form/form/index.tsx rename to packages/taro-ui-demo/src/pages/form/form/index.tsx diff --git a/src/pages/form/image-picker/index.scss b/packages/taro-ui-demo/src/pages/form/image-picker/index.scss similarity index 100% rename from src/pages/form/image-picker/index.scss rename to packages/taro-ui-demo/src/pages/form/image-picker/index.scss diff --git a/src/pages/form/image-picker/index.tsx b/packages/taro-ui-demo/src/pages/form/image-picker/index.tsx similarity index 100% rename from src/pages/form/image-picker/index.tsx rename to packages/taro-ui-demo/src/pages/form/image-picker/index.tsx diff --git a/src/pages/form/input-number/index.scss b/packages/taro-ui-demo/src/pages/form/input-number/index.scss similarity index 100% rename from src/pages/form/input-number/index.scss rename to packages/taro-ui-demo/src/pages/form/input-number/index.scss diff --git a/src/pages/form/input-number/index.tsx b/packages/taro-ui-demo/src/pages/form/input-number/index.tsx similarity index 100% rename from src/pages/form/input-number/index.tsx rename to packages/taro-ui-demo/src/pages/form/input-number/index.tsx diff --git a/src/pages/form/input/index.scss b/packages/taro-ui-demo/src/pages/form/input/index.scss similarity index 100% rename from src/pages/form/input/index.scss rename to packages/taro-ui-demo/src/pages/form/input/index.scss diff --git a/src/pages/form/input/index.tsx b/packages/taro-ui-demo/src/pages/form/input/index.tsx similarity index 100% rename from src/pages/form/input/index.tsx rename to packages/taro-ui-demo/src/pages/form/input/index.tsx diff --git a/src/pages/form/picker-view/index.scss b/packages/taro-ui-demo/src/pages/form/picker-view/index.scss similarity index 100% rename from src/pages/form/picker-view/index.scss rename to packages/taro-ui-demo/src/pages/form/picker-view/index.scss diff --git a/src/pages/form/picker-view/index.tsx b/packages/taro-ui-demo/src/pages/form/picker-view/index.tsx similarity index 100% rename from src/pages/form/picker-view/index.tsx rename to packages/taro-ui-demo/src/pages/form/picker-view/index.tsx diff --git a/src/pages/form/picker/index.scss b/packages/taro-ui-demo/src/pages/form/picker/index.scss similarity index 100% rename from src/pages/form/picker/index.scss rename to packages/taro-ui-demo/src/pages/form/picker/index.scss diff --git a/src/pages/form/picker/index.tsx b/packages/taro-ui-demo/src/pages/form/picker/index.tsx similarity index 100% rename from src/pages/form/picker/index.tsx rename to packages/taro-ui-demo/src/pages/form/picker/index.tsx diff --git a/src/pages/form/radio/index.scss b/packages/taro-ui-demo/src/pages/form/radio/index.scss similarity index 100% rename from src/pages/form/radio/index.scss rename to packages/taro-ui-demo/src/pages/form/radio/index.scss diff --git a/src/pages/form/radio/index.tsx b/packages/taro-ui-demo/src/pages/form/radio/index.tsx similarity index 100% rename from src/pages/form/radio/index.tsx rename to packages/taro-ui-demo/src/pages/form/radio/index.tsx diff --git a/src/pages/form/range/index.scss b/packages/taro-ui-demo/src/pages/form/range/index.scss similarity index 100% rename from src/pages/form/range/index.scss rename to packages/taro-ui-demo/src/pages/form/range/index.scss diff --git a/src/pages/form/range/index.tsx b/packages/taro-ui-demo/src/pages/form/range/index.tsx similarity index 100% rename from src/pages/form/range/index.tsx rename to packages/taro-ui-demo/src/pages/form/range/index.tsx diff --git a/src/pages/form/rate/index.scss b/packages/taro-ui-demo/src/pages/form/rate/index.scss similarity index 100% rename from src/pages/form/rate/index.scss rename to packages/taro-ui-demo/src/pages/form/rate/index.scss diff --git a/src/pages/form/rate/index.tsx b/packages/taro-ui-demo/src/pages/form/rate/index.tsx similarity index 100% rename from src/pages/form/rate/index.tsx rename to packages/taro-ui-demo/src/pages/form/rate/index.tsx diff --git a/src/pages/form/search-bar/index.scss b/packages/taro-ui-demo/src/pages/form/search-bar/index.scss similarity index 100% rename from src/pages/form/search-bar/index.scss rename to packages/taro-ui-demo/src/pages/form/search-bar/index.scss diff --git a/src/pages/form/search-bar/index.tsx b/packages/taro-ui-demo/src/pages/form/search-bar/index.tsx similarity index 100% rename from src/pages/form/search-bar/index.tsx rename to packages/taro-ui-demo/src/pages/form/search-bar/index.tsx diff --git a/src/pages/form/slider/index.scss b/packages/taro-ui-demo/src/pages/form/slider/index.scss similarity index 100% rename from src/pages/form/slider/index.scss rename to packages/taro-ui-demo/src/pages/form/slider/index.scss diff --git a/src/pages/form/slider/index.tsx b/packages/taro-ui-demo/src/pages/form/slider/index.tsx similarity index 100% rename from src/pages/form/slider/index.tsx rename to packages/taro-ui-demo/src/pages/form/slider/index.tsx diff --git a/src/pages/form/switch/index.scss b/packages/taro-ui-demo/src/pages/form/switch/index.scss similarity index 100% rename from src/pages/form/switch/index.scss rename to packages/taro-ui-demo/src/pages/form/switch/index.scss diff --git a/src/pages/form/switch/index.tsx b/packages/taro-ui-demo/src/pages/form/switch/index.tsx similarity index 100% rename from src/pages/form/switch/index.tsx rename to packages/taro-ui-demo/src/pages/form/switch/index.tsx diff --git a/src/pages/form/textarea/index.scss b/packages/taro-ui-demo/src/pages/form/textarea/index.scss similarity index 100% rename from src/pages/form/textarea/index.scss rename to packages/taro-ui-demo/src/pages/form/textarea/index.scss diff --git a/src/pages/form/textarea/index.tsx b/packages/taro-ui-demo/src/pages/form/textarea/index.tsx similarity index 100% rename from src/pages/form/textarea/index.tsx rename to packages/taro-ui-demo/src/pages/form/textarea/index.tsx diff --git a/src/pages/index/index.config.js b/packages/taro-ui-demo/src/pages/index/index.config.js similarity index 100% rename from src/pages/index/index.config.js rename to packages/taro-ui-demo/src/pages/index/index.config.js diff --git a/src/pages/index/index.scss b/packages/taro-ui-demo/src/pages/index/index.scss similarity index 100% rename from src/pages/index/index.scss rename to packages/taro-ui-demo/src/pages/index/index.scss diff --git a/src/pages/index/index.tsx b/packages/taro-ui-demo/src/pages/index/index.tsx similarity index 100% rename from src/pages/index/index.tsx rename to packages/taro-ui-demo/src/pages/index/index.tsx diff --git a/src/pages/layout/accordion/index.scss b/packages/taro-ui-demo/src/pages/layout/accordion/index.scss similarity index 100% rename from src/pages/layout/accordion/index.scss rename to packages/taro-ui-demo/src/pages/layout/accordion/index.scss diff --git a/src/pages/layout/accordion/index.tsx b/packages/taro-ui-demo/src/pages/layout/accordion/index.tsx similarity index 100% rename from src/pages/layout/accordion/index.tsx rename to packages/taro-ui-demo/src/pages/layout/accordion/index.tsx diff --git a/src/pages/layout/card/index.scss b/packages/taro-ui-demo/src/pages/layout/card/index.scss similarity index 100% rename from src/pages/layout/card/index.scss rename to packages/taro-ui-demo/src/pages/layout/card/index.scss diff --git a/src/pages/layout/card/index.tsx b/packages/taro-ui-demo/src/pages/layout/card/index.tsx similarity index 100% rename from src/pages/layout/card/index.tsx rename to packages/taro-ui-demo/src/pages/layout/card/index.tsx diff --git a/src/pages/layout/flex/index.scss b/packages/taro-ui-demo/src/pages/layout/flex/index.scss similarity index 100% rename from src/pages/layout/flex/index.scss rename to packages/taro-ui-demo/src/pages/layout/flex/index.scss diff --git a/src/pages/layout/flex/index.tsx b/packages/taro-ui-demo/src/pages/layout/flex/index.tsx similarity index 100% rename from src/pages/layout/flex/index.tsx rename to packages/taro-ui-demo/src/pages/layout/flex/index.tsx diff --git a/src/pages/layout/float-layout/index.scss b/packages/taro-ui-demo/src/pages/layout/float-layout/index.scss similarity index 100% rename from src/pages/layout/float-layout/index.scss rename to packages/taro-ui-demo/src/pages/layout/float-layout/index.scss diff --git a/src/pages/layout/float-layout/index.tsx b/packages/taro-ui-demo/src/pages/layout/float-layout/index.tsx similarity index 100% rename from src/pages/layout/float-layout/index.tsx rename to packages/taro-ui-demo/src/pages/layout/float-layout/index.tsx diff --git a/src/pages/layout/grid/index.scss b/packages/taro-ui-demo/src/pages/layout/grid/index.scss similarity index 100% rename from src/pages/layout/grid/index.scss rename to packages/taro-ui-demo/src/pages/layout/grid/index.scss diff --git a/src/pages/layout/grid/index.tsx b/packages/taro-ui-demo/src/pages/layout/grid/index.tsx similarity index 100% rename from src/pages/layout/grid/index.tsx rename to packages/taro-ui-demo/src/pages/layout/grid/index.tsx diff --git a/src/pages/layout/list/index.scss b/packages/taro-ui-demo/src/pages/layout/list/index.scss similarity index 100% rename from src/pages/layout/list/index.scss rename to packages/taro-ui-demo/src/pages/layout/list/index.scss diff --git a/src/pages/layout/list/index.tsx b/packages/taro-ui-demo/src/pages/layout/list/index.tsx similarity index 100% rename from src/pages/layout/list/index.tsx rename to packages/taro-ui-demo/src/pages/layout/list/index.tsx diff --git a/src/pages/navigation/drawer/index.scss b/packages/taro-ui-demo/src/pages/navigation/drawer/index.scss similarity index 100% rename from src/pages/navigation/drawer/index.scss rename to packages/taro-ui-demo/src/pages/navigation/drawer/index.scss diff --git a/src/pages/navigation/drawer/index.tsx b/packages/taro-ui-demo/src/pages/navigation/drawer/index.tsx similarity index 100% rename from src/pages/navigation/drawer/index.tsx rename to packages/taro-ui-demo/src/pages/navigation/drawer/index.tsx diff --git a/src/pages/navigation/indexes/index.scss b/packages/taro-ui-demo/src/pages/navigation/indexes/index.scss similarity index 100% rename from src/pages/navigation/indexes/index.scss rename to packages/taro-ui-demo/src/pages/navigation/indexes/index.scss diff --git a/src/pages/navigation/indexes/index.tsx b/packages/taro-ui-demo/src/pages/navigation/indexes/index.tsx similarity index 100% rename from src/pages/navigation/indexes/index.tsx rename to packages/taro-ui-demo/src/pages/navigation/indexes/index.tsx diff --git a/src/pages/navigation/indexes/mock-data.ts b/packages/taro-ui-demo/src/pages/navigation/indexes/mock-data.ts similarity index 100% rename from src/pages/navigation/indexes/mock-data.ts rename to packages/taro-ui-demo/src/pages/navigation/indexes/mock-data.ts diff --git a/src/pages/navigation/navbar/index.scss b/packages/taro-ui-demo/src/pages/navigation/navbar/index.scss similarity index 100% rename from src/pages/navigation/navbar/index.scss rename to packages/taro-ui-demo/src/pages/navigation/navbar/index.scss diff --git a/src/pages/navigation/navbar/index.tsx b/packages/taro-ui-demo/src/pages/navigation/navbar/index.tsx similarity index 100% rename from src/pages/navigation/navbar/index.tsx rename to packages/taro-ui-demo/src/pages/navigation/navbar/index.tsx diff --git a/src/pages/navigation/pagination/index.scss b/packages/taro-ui-demo/src/pages/navigation/pagination/index.scss similarity index 100% rename from src/pages/navigation/pagination/index.scss rename to packages/taro-ui-demo/src/pages/navigation/pagination/index.scss diff --git a/src/pages/navigation/pagination/index.tsx b/packages/taro-ui-demo/src/pages/navigation/pagination/index.tsx similarity index 100% rename from src/pages/navigation/pagination/index.tsx rename to packages/taro-ui-demo/src/pages/navigation/pagination/index.tsx diff --git a/src/pages/navigation/segmented-control/index.scss b/packages/taro-ui-demo/src/pages/navigation/segmented-control/index.scss similarity index 100% rename from src/pages/navigation/segmented-control/index.scss rename to packages/taro-ui-demo/src/pages/navigation/segmented-control/index.scss diff --git a/src/pages/navigation/segmented-control/index.tsx b/packages/taro-ui-demo/src/pages/navigation/segmented-control/index.tsx similarity index 100% rename from src/pages/navigation/segmented-control/index.tsx rename to packages/taro-ui-demo/src/pages/navigation/segmented-control/index.tsx diff --git a/src/pages/navigation/tabbar/index.scss b/packages/taro-ui-demo/src/pages/navigation/tabbar/index.scss similarity index 100% rename from src/pages/navigation/tabbar/index.scss rename to packages/taro-ui-demo/src/pages/navigation/tabbar/index.scss diff --git a/src/pages/navigation/tabbar/index.tsx b/packages/taro-ui-demo/src/pages/navigation/tabbar/index.tsx similarity index 100% rename from src/pages/navigation/tabbar/index.tsx rename to packages/taro-ui-demo/src/pages/navigation/tabbar/index.tsx diff --git a/src/pages/navigation/tabs/index.scss b/packages/taro-ui-demo/src/pages/navigation/tabs/index.scss similarity index 100% rename from src/pages/navigation/tabs/index.scss rename to packages/taro-ui-demo/src/pages/navigation/tabs/index.scss diff --git a/src/pages/navigation/tabs/index.tsx b/packages/taro-ui-demo/src/pages/navigation/tabs/index.tsx similarity index 100% rename from src/pages/navigation/tabs/index.tsx rename to packages/taro-ui-demo/src/pages/navigation/tabs/index.tsx diff --git a/src/pages/panel/index.scss b/packages/taro-ui-demo/src/pages/panel/index.scss similarity index 100% rename from src/pages/panel/index.scss rename to packages/taro-ui-demo/src/pages/panel/index.scss diff --git a/src/pages/panel/index.tsx b/packages/taro-ui-demo/src/pages/panel/index.tsx similarity index 100% rename from src/pages/panel/index.tsx rename to packages/taro-ui-demo/src/pages/panel/index.tsx diff --git a/src/pages/theme/index.scss b/packages/taro-ui-demo/src/pages/theme/index.scss similarity index 100% rename from src/pages/theme/index.scss rename to packages/taro-ui-demo/src/pages/theme/index.scss diff --git a/src/pages/theme/index.tsx b/packages/taro-ui-demo/src/pages/theme/index.tsx similarity index 100% rename from src/pages/theme/index.tsx rename to packages/taro-ui-demo/src/pages/theme/index.tsx diff --git a/src/pages/view/article/index.scss b/packages/taro-ui-demo/src/pages/view/article/index.scss similarity index 100% rename from src/pages/view/article/index.scss rename to packages/taro-ui-demo/src/pages/view/article/index.scss diff --git a/src/pages/view/article/index.tsx b/packages/taro-ui-demo/src/pages/view/article/index.tsx similarity index 100% rename from src/pages/view/article/index.tsx rename to packages/taro-ui-demo/src/pages/view/article/index.tsx diff --git a/src/pages/view/avatar/index.scss b/packages/taro-ui-demo/src/pages/view/avatar/index.scss similarity index 100% rename from src/pages/view/avatar/index.scss rename to packages/taro-ui-demo/src/pages/view/avatar/index.scss diff --git a/src/pages/view/avatar/index.tsx b/packages/taro-ui-demo/src/pages/view/avatar/index.tsx similarity index 100% rename from src/pages/view/avatar/index.tsx rename to packages/taro-ui-demo/src/pages/view/avatar/index.tsx diff --git a/src/pages/view/badge/index.scss b/packages/taro-ui-demo/src/pages/view/badge/index.scss similarity index 100% rename from src/pages/view/badge/index.scss rename to packages/taro-ui-demo/src/pages/view/badge/index.scss diff --git a/src/pages/view/badge/index.tsx b/packages/taro-ui-demo/src/pages/view/badge/index.tsx similarity index 100% rename from src/pages/view/badge/index.tsx rename to packages/taro-ui-demo/src/pages/view/badge/index.tsx diff --git a/src/pages/view/countdown/index.scss b/packages/taro-ui-demo/src/pages/view/countdown/index.scss similarity index 100% rename from src/pages/view/countdown/index.scss rename to packages/taro-ui-demo/src/pages/view/countdown/index.scss diff --git a/src/pages/view/countdown/index.tsx b/packages/taro-ui-demo/src/pages/view/countdown/index.tsx similarity index 100% rename from src/pages/view/countdown/index.tsx rename to packages/taro-ui-demo/src/pages/view/countdown/index.tsx diff --git a/src/pages/view/curtain/index.scss b/packages/taro-ui-demo/src/pages/view/curtain/index.scss similarity index 100% rename from src/pages/view/curtain/index.scss rename to packages/taro-ui-demo/src/pages/view/curtain/index.scss diff --git a/src/pages/view/curtain/index.tsx b/packages/taro-ui-demo/src/pages/view/curtain/index.tsx similarity index 100% rename from src/pages/view/curtain/index.tsx rename to packages/taro-ui-demo/src/pages/view/curtain/index.tsx diff --git a/src/pages/view/divider/index.scss b/packages/taro-ui-demo/src/pages/view/divider/index.scss similarity index 100% rename from src/pages/view/divider/index.scss rename to packages/taro-ui-demo/src/pages/view/divider/index.scss diff --git a/src/pages/view/divider/index.tsx b/packages/taro-ui-demo/src/pages/view/divider/index.tsx similarity index 100% rename from src/pages/view/divider/index.tsx rename to packages/taro-ui-demo/src/pages/view/divider/index.tsx diff --git a/src/pages/view/load-more/index.scss b/packages/taro-ui-demo/src/pages/view/load-more/index.scss similarity index 100% rename from src/pages/view/load-more/index.scss rename to packages/taro-ui-demo/src/pages/view/load-more/index.scss diff --git a/src/pages/view/load-more/index.tsx b/packages/taro-ui-demo/src/pages/view/load-more/index.tsx similarity index 100% rename from src/pages/view/load-more/index.tsx rename to packages/taro-ui-demo/src/pages/view/load-more/index.tsx diff --git a/src/pages/view/noticebar/index.scss b/packages/taro-ui-demo/src/pages/view/noticebar/index.scss similarity index 100% rename from src/pages/view/noticebar/index.scss rename to packages/taro-ui-demo/src/pages/view/noticebar/index.scss diff --git a/src/pages/view/noticebar/index.tsx b/packages/taro-ui-demo/src/pages/view/noticebar/index.tsx similarity index 100% rename from src/pages/view/noticebar/index.tsx rename to packages/taro-ui-demo/src/pages/view/noticebar/index.tsx diff --git a/src/pages/view/steps/index.scss b/packages/taro-ui-demo/src/pages/view/steps/index.scss similarity index 100% rename from src/pages/view/steps/index.scss rename to packages/taro-ui-demo/src/pages/view/steps/index.scss diff --git a/src/pages/view/steps/index.tsx b/packages/taro-ui-demo/src/pages/view/steps/index.tsx similarity index 100% rename from src/pages/view/steps/index.tsx rename to packages/taro-ui-demo/src/pages/view/steps/index.tsx diff --git a/src/pages/view/swiper/index.scss b/packages/taro-ui-demo/src/pages/view/swiper/index.scss similarity index 100% rename from src/pages/view/swiper/index.scss rename to packages/taro-ui-demo/src/pages/view/swiper/index.scss diff --git a/src/pages/view/swiper/index.tsx b/packages/taro-ui-demo/src/pages/view/swiper/index.tsx similarity index 100% rename from src/pages/view/swiper/index.tsx rename to packages/taro-ui-demo/src/pages/view/swiper/index.tsx diff --git a/src/pages/view/tag/index.scss b/packages/taro-ui-demo/src/pages/view/tag/index.scss similarity index 100% rename from src/pages/view/tag/index.scss rename to packages/taro-ui-demo/src/pages/view/tag/index.scss diff --git a/src/pages/view/tag/index.tsx b/packages/taro-ui-demo/src/pages/view/tag/index.tsx similarity index 100% rename from src/pages/view/tag/index.tsx rename to packages/taro-ui-demo/src/pages/view/tag/index.tsx diff --git a/src/pages/view/timeline/index.scss b/packages/taro-ui-demo/src/pages/view/timeline/index.scss similarity index 100% rename from src/pages/view/timeline/index.scss rename to packages/taro-ui-demo/src/pages/view/timeline/index.scss diff --git a/src/pages/view/timeline/index.tsx b/packages/taro-ui-demo/src/pages/view/timeline/index.tsx similarity index 100% rename from src/pages/view/timeline/index.tsx rename to packages/taro-ui-demo/src/pages/view/timeline/index.tsx diff --git a/src/ui.ts b/packages/taro-ui-demo/src/ui.ts similarity index 100% rename from src/ui.ts rename to packages/taro-ui-demo/src/ui.ts diff --git a/tsconfig.json b/packages/taro-ui-demo/tsconfig.json similarity index 100% rename from tsconfig.json rename to packages/taro-ui-demo/tsconfig.json From 4cbbc728ad715fe0cf8ee266da52e6b65d8b6182 Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Sun, 5 Apr 2020 20:00:18 +0800 Subject: [PATCH 17/54] chore: move out eslint stylelint commitlint config --- .eslintrc.json | 105 +++++++++++++++++++++ .stylelintrc.json | 17 ++++ commitlint.config.js | 13 +++ packages/taro-ui/package.json | 171 ---------------------------------- 4 files changed, 135 insertions(+), 171 deletions(-) create mode 100644 .eslintrc.json create mode 100644 .stylelintrc.json create mode 100644 commitlint.config.js diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 000000000..86abb7f59 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,105 @@ +{ + "extends": [ + "o2team", + "plugin:react/recommended", + "plugin:prettier/recommended" + ], + "parser": "babel-eslint", + "plugins": [ + "react" + ], + "env": { + "jest": true + }, + "rules": { + "class-methods-use-this": "off", + "prefer-rest-params": "off", + "arrow-body-style": "warn", + "taro/custom-component-children": "off", + "no-unused-vars": [ + "error", + { + "varsIgnorePattern": "React" + } + ], + "no-console": [ + "error", + { + "allow": [ + "warn", + "error" + ] + } + ] + }, + "overrides": [ + { + "files": [ + "build/*.js" + ], + "rules": { + "import/no-commonjs": "off" + } + }, + { + "files": [ + "test/**/*.test.js", + "test/**/test.js" + ], + "rules": { + "taro/no-stateless-component": "off", + "react/react-in-jsx-scope": "off", + "react/no-find-dom-node": "off", + "no-unused-vars": [ + "error", + { + "varsIgnorePattern": "Nerv" + } + ] + } + }, + { + "files": [ + "**/*.ts", + "**/*.tsx" + ], + "parser": "@typescript-eslint/parser", + "plugins": [ + "react", + "@typescript-eslint" + ], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended", + "plugin:react/recommended", + "plugin:prettier/recommended" + ], + "env": { + "jest": true + }, + "rules": { + "@typescript-eslint/no-explicit-any": [ + "off" + ], + "@typescript-eslint/member-delimiter-style": [ + "off" + ], + "class-methods-use-this": "off", + "prefer-rest-params": "off", + "arrow-body-style": "warn", + "react/jsx-filename-extension": [ + 2, + { + "extensions": [ + ".js", + ".jsx", + ".ts", + ".tsx" + ] + } + ] + } + } + ] +} diff --git a/.stylelintrc.json b/.stylelintrc.json new file mode 100644 index 000000000..e2280600b --- /dev/null +++ b/.stylelintrc.json @@ -0,0 +1,17 @@ +{ + "extends": "stylelint-config-standard", + "plugins": [ + "stylelint-scss" + ], + "rules": { + "declaration-colon-newline-after": null, + "at-rule-no-unknown": null, + "color-hex-case": null, + "block-closing-brace-newline-after": null, + "at-rule-empty-line-before": null, + "number-no-trailing-zeros": null, + "no-empty-source": null, + "unit-case": null, + "scss/at-rule-no-unknown": true + } +} diff --git a/commitlint.config.js b/commitlint.config.js new file mode 100644 index 000000000..7990a7647 --- /dev/null +++ b/commitlint.config.js @@ -0,0 +1,13 @@ +module.exports = { + extends: ['@commitlint/config-conventional'], + rules: { + 'type-empty': [2, 'never'], + 'type-case': [2, 'always', 'lower-case'], + 'subject-empty': [2, 'never'], + 'type-enum': [ + 2, + 'always', + ['feat', 'fix', 'docs', 'style', 'refactor', 'test', 'chore'] + ] + } +} diff --git a/packages/taro-ui/package.json b/packages/taro-ui/package.json index 188462d77..67d71c1bd 100644 --- a/packages/taro-ui/package.json +++ b/packages/taro-ui/package.json @@ -28,177 +28,6 @@ "url": "git@github.com:nervjs/taro-ui.git" }, "license": "MIT", - "eslintConfig": { - "extends": [ - "o2team", - "plugin:react/recommended", - "plugin:prettier/recommended" - ], - "parser": "babel-eslint", - "plugins": [ - "react" - ], - "env": { - "jest": true - }, - "rules": { - "class-methods-use-this": "off", - "prefer-rest-params": "off", - "arrow-body-style": "warn", - "taro/custom-component-children": "off", - "no-unused-vars": [ - "error", - { - "varsIgnorePattern": "React" - } - ], - "no-console": [ - "error", - { - "allow": [ - "warn", - "error" - ] - } - ] - }, - "overrides": [ - { - "files": [ - "build/*.js" - ], - "rules": { - "import/no-commonjs": "off" - } - }, - { - "files": [ - "test/**/*.test.js", - "test/**/test.js" - ], - "rules": { - "taro/no-stateless-component": "off", - "react/react-in-jsx-scope": "off", - "react/no-find-dom-node": "off", - "no-unused-vars": [ - "error", - { - "varsIgnorePattern": "Nerv" - } - ] - } - }, - { - "files": [ - "**/*.ts", - "**/*.tsx" - ], - "parser": "@typescript-eslint/parser", - "plugins": [ - "react", - "@typescript-eslint" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/eslint-recommended", - "plugin:@typescript-eslint/recommended", - "plugin:react/recommended", - "plugin:prettier/recommended" - ], - "env": { - "jest": true - }, - "rules": { - "@typescript-eslint/no-explicit-any": [ - "off" - ], - "@typescript-eslint/member-delimiter-style": [ - "off" - ], - "class-methods-use-this": "off", - "prefer-rest-params": "off", - "arrow-body-style": "warn", - "react/jsx-filename-extension": [ - 2, - { - "extensions": [ - ".js", - ".jsx", - ".ts", - ".tsx" - ] - } - ] - } - } - ] - }, - "stylelint": { - "extends": "stylelint-config-standard", - "plugins": [ - "stylelint-scss" - ], - "rules": { - "declaration-colon-newline-after": null, - "at-rule-no-unknown": null, - "color-hex-case": null, - "block-closing-brace-newline-after": null, - "at-rule-empty-line-before": null, - "number-no-trailing-zeros": null, - "no-empty-source": null, - "unit-case": null, - "scss/at-rule-no-unknown": true - } - }, - "commitlint": { - "extends": [ - "@commitlint/config-conventional" - ], - "rules": { - "type-empty": [ - 2, - "never" - ], - "type-case": [ - 2, - "always", - "lower-case" - ], - "subject-empty": [ - 2, - "never" - ], - "type-enum": [ - 2, - "always", - [ - "feat", - "fix", - "docs", - "style", - "refactor", - "test", - "chore" - ] - ] - } - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged", - "commit-msg": "commitlint -E HUSKY_GIT_PARAMS" - } - }, - "lint-staged": { - "*.{js,jsx,ts,tsx}": [ - "eslint --quiet --cache --fix", - "git add" - ], - "src/**/*.scss": [ - "stylelint --syntax scss --fix", - "git add" - ] - }, "scripts": { "dev:weapp": "yarn run build:weapp -- --watch", "dev:qq": "yarn run build:qq -- --watch", From 6789283135b9723e6c6c42c279451a09f4489bff Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Mon, 6 Apr 2020 02:34:53 +0800 Subject: [PATCH 18/54] chore: add config file for taro-ui and taro-ui-demo --- packages/taro-ui-demo/.eslintrc.js | 7 ++ packages/taro-ui-demo/babel.config.js | 10 +++ packages/taro-ui-demo/config/dev.js | 8 +++ packages/taro-ui-demo/config/index.js | 64 +++++++++++++++++++ packages/taro-ui-demo/config/prod.js | 17 +++++ .../taro-ui-demo/global.d.ts | 15 +++++ packages/taro-ui-demo/package.json | 61 ++++++++++++++++++ .../src/{app.config.js => app.config.ts} | 2 +- .../{index.config.js => index.config.ts} | 0 packages/taro-ui-demo/tsconfig.json | 38 +++++++---- .../src => taro-ui}/config/dev.js | 0 .../src => taro-ui}/config/index.js | 0 .../src => taro-ui}/config/prod.js | 0 .../config/rollup.config.analyze.js | 0 .../src => taro-ui}/config/rollup.config.js | 0 .../src => taro-ui}/config/tsconfig.base.json | 0 .../config/tsconfig.build.json | 0 .../config/tsconfig.rollup.json | 0 18 files changed, 209 insertions(+), 13 deletions(-) create mode 100644 packages/taro-ui-demo/.eslintrc.js create mode 100644 packages/taro-ui-demo/babel.config.js create mode 100644 packages/taro-ui-demo/config/dev.js create mode 100644 packages/taro-ui-demo/config/index.js create mode 100644 packages/taro-ui-demo/config/prod.js rename global.d.ts => packages/taro-ui-demo/global.d.ts (54%) create mode 100644 packages/taro-ui-demo/package.json rename packages/taro-ui-demo/src/{app.config.js => app.config.ts} (98%) rename packages/taro-ui-demo/src/pages/index/{index.config.js => index.config.ts} (100%) rename packages/{taro-ui-demo/src => taro-ui}/config/dev.js (100%) rename packages/{taro-ui-demo/src => taro-ui}/config/index.js (100%) rename packages/{taro-ui-demo/src => taro-ui}/config/prod.js (100%) rename packages/{taro-ui-demo/src => taro-ui}/config/rollup.config.analyze.js (100%) rename packages/{taro-ui-demo/src => taro-ui}/config/rollup.config.js (100%) rename packages/{taro-ui-demo/src => taro-ui}/config/tsconfig.base.json (100%) rename packages/{taro-ui-demo/src => taro-ui}/config/tsconfig.build.json (100%) rename packages/{taro-ui-demo/src => taro-ui}/config/tsconfig.rollup.json (100%) diff --git a/packages/taro-ui-demo/.eslintrc.js b/packages/taro-ui-demo/.eslintrc.js new file mode 100644 index 000000000..4aee84def --- /dev/null +++ b/packages/taro-ui-demo/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + 'extends': [ + // add more generic rulesets here, such as: + // 'eslint:recommended', + 'taro/react' + ] +} diff --git a/packages/taro-ui-demo/babel.config.js b/packages/taro-ui-demo/babel.config.js new file mode 100644 index 000000000..f3acb812f --- /dev/null +++ b/packages/taro-ui-demo/babel.config.js @@ -0,0 +1,10 @@ +// babel-preset-taro 更多选项和默认值： +// https://github.com/NervJS/taro/blob/next/packages/babel-preset-taro/README.md +module.exports = { + presets: [ + ['taro', { + framework: 'react', + ts: true + }] + ] +} diff --git a/packages/taro-ui-demo/config/dev.js b/packages/taro-ui-demo/config/dev.js new file mode 100644 index 000000000..703c6d37c --- /dev/null +++ b/packages/taro-ui-demo/config/dev.js @@ -0,0 +1,8 @@ +module.exports = { + env: { + NODE_ENV: '"development"' + }, + defineConstants: {}, + weapp: {}, + h5: {} +} diff --git a/packages/taro-ui-demo/config/index.js b/packages/taro-ui-demo/config/index.js new file mode 100644 index 000000000..d1b1c6d62 --- /dev/null +++ b/packages/taro-ui-demo/config/index.js @@ -0,0 +1,64 @@ +const config = { + projectName: 'taro-ui-demo', + date: '2020-4-5', + designWidth: 750, + deviceRatio: { + 640: 2.34 / 2, + 750: 1, + 828: 1.81 / 2 + }, + sourceRoot: 'src', + outputRoot: 'dist', + plugins: [], + defineConstants: {}, + copy: { + patterns: [], + options: {} + }, + framework: 'react', + mini: { + postcss: { + pxtransform: { + enable: true, + config: {} + }, + url: { + enable: true, + config: { + limit: 1024 // 设定转换尺寸上限 + } + }, + cssModules: { + enable: false, // 默认为 false，如需使用 css modules 功能，则设为 true + config: { + namingPattern: 'module', // 转换模式，取值为 global/module + generateScopedName: '[name]__[local]___[hash:base64:5]' + } + } + } + }, + h5: { + publicPath: '/', + staticDirectory: 'static', + postcss: { + autoprefixer: { + enable: true, + config: {} + }, + cssModules: { + enable: false, // 默认为 false，如需使用 css modules 功能，则设为 true + config: { + namingPattern: 'module', // 转换模式，取值为 global/module + generateScopedName: '[name]__[local]___[hash:base64:5]' + } + } + } + } +} + +module.exports = function(merge) { + if (process.env.NODE_ENV === 'development') { + return merge({}, config, require('./dev')) + } + return merge({}, config, require('./prod')) +} diff --git a/packages/taro-ui-demo/config/prod.js b/packages/taro-ui-demo/config/prod.js new file mode 100644 index 000000000..76c074300 --- /dev/null +++ b/packages/taro-ui-demo/config/prod.js @@ -0,0 +1,17 @@ +module.exports = { + env: { + NODE_ENV: '"production"' + }, + defineConstants: {}, + weapp: {}, + h5: { + /** + * 如果h5端编译后体积过大，可以使用webpack-bundle-analyzer插件对打包体积进行分析。 + * 参考代码如下： + * webpackChain (chain) { + * chain.plugin('analyzer') + * .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, []) + * } + */ + } +} diff --git a/global.d.ts b/packages/taro-ui-demo/global.d.ts similarity index 54% rename from global.d.ts rename to packages/taro-ui-demo/global.d.ts index c4b131fd5..8703ef7bc 100644 --- a/global.d.ts +++ b/packages/taro-ui-demo/global.d.ts @@ -8,3 +8,18 @@ declare module '*.less' declare module '*.scss' declare module '*.sass' declare module '*.styl' + +declare const process: { + env: { + TARO_ENV: + | 'weapp' + | 'swan' + | 'alipay' + | 'h5' + | 'rn' + | 'tt' + | 'quickapp' + | 'qq' + [key: string]: any + } +} diff --git a/packages/taro-ui-demo/package.json b/packages/taro-ui-demo/package.json new file mode 100644 index 000000000..f96234c20 --- /dev/null +++ b/packages/taro-ui-demo/package.json @@ -0,0 +1,61 @@ +{ + "name": "taro-ui-demo", + "version": "1.0.0", + "private": true, + "description": "Taro UI demo", + "templateInfo": { + "name": "default", + "typescript": true, + "css": "sass" + }, + "scripts": { + "build:weapp": "taro build --type weapp", + "build:swan": "taro build --type swan", + "build:alipay": "taro build --type alipay", + "build:tt": "taro build --type tt", + "build:h5": "taro build --type h5", + "build:rn": "taro build --type rn", + "build:qq": "taro build --type qq", + "build:quickapp": "taro build --type quickapp", + "dev:weapp": "npm run build:weapp -- --watch", + "dev:swan": "npm run build:swan -- --watch", + "dev:alipay": "npm run build:alipay -- --watch", + "dev:tt": "npm run build:tt -- --watch", + "dev:h5": "npm run build:h5 -- --watch", + "dev:rn": "npm run build:rn -- --watch", + "dev:qq": "npm run build:qq -- --watch", + "dev:quickapp": "npm run build:quickapp -- --watch" + }, + "browserslist": [ + "last 3 versions", + "Android >= 4.1", + "ios >= 8" + ], + "author": "", + "dependencies": { + "@babel/runtime": "^7.7.7", + "@tarojs/components": "3.0.0-beta.2", + "@tarojs/runtime": "3.0.0-beta.2", + "@tarojs/taro": "3.0.0-beta.2", + "@tarojs/react": "3.0.0-beta.2", + "react-dom": "^16.10.0", + "react": "^16.10.0" + }, + "devDependencies": { + "@types/webpack-env": "^1.13.6", + "@types/react": "^16.0.0", + "@tarojs/mini-runner": "3.0.0-beta.2", + "@babel/core": "^7.8.0", + "@tarojs/webpack-runner": "3.0.0-beta.2", + "babel-preset-taro": "3.0.0-beta.2", + "eslint-config-taro": "3.0.0-beta.2", + "eslint": "^6.8.0", + "eslint-plugin-react": "^7.8.2", + "eslint-plugin-import": "^2.12.0", + "eslint-plugin-react-hooks": "^1.6.1", + "stylelint": "9.3.0", + "@typescript-eslint/parser": "^2.x", + "@typescript-eslint/eslint-plugin": "^2.x", + "typescript": "^3.7.0" + } +} diff --git a/packages/taro-ui-demo/src/app.config.js b/packages/taro-ui-demo/src/app.config.ts similarity index 98% rename from packages/taro-ui-demo/src/app.config.js rename to packages/taro-ui-demo/src/app.config.ts index 48a97d6b8..aef7d2dc0 100644 --- a/packages/taro-ui-demo/src/app.config.js +++ b/packages/taro-ui-demo/src/app.config.ts @@ -58,7 +58,7 @@ export default { window: { backgroundTextStyle: 'light', navigationBarBackgroundColor: '#fff', - navigationBarTitleText: 'WeChat', + navigationBarTitleText: 'Taro UI', navigationBarTextStyle: 'black' } } diff --git a/packages/taro-ui-demo/src/pages/index/index.config.js b/packages/taro-ui-demo/src/pages/index/index.config.ts similarity index 100% rename from packages/taro-ui-demo/src/pages/index/index.config.js rename to packages/taro-ui-demo/src/pages/index/index.config.ts diff --git a/packages/taro-ui-demo/tsconfig.json b/packages/taro-ui-demo/tsconfig.json index 9ba206d5c..97b50bb70 100644 --- a/packages/taro-ui-demo/tsconfig.json +++ b/packages/taro-ui-demo/tsconfig.json @@ -1,18 +1,32 @@ { - "extends": "./config/tsconfig.base", + "compileOnSave": false, "compilerOptions": { - "target": "es2017", - "module": "commonjs", + "allowJs": true, + "allowSyntheticDefaultImports": true, "baseUrl": ".", + "experimentalDecorators": true, + "jsx": "react", + "jsxFactory": "React.createElement", + "module": "commonjs", + "moduleResolution": "node", + "noImplicitAny": false, + "noUnusedLocals": true, + "noUnusedParameters": true, + "outDir": "lib", + "preserveConstEnums": true, + "removeComments": false, + "resolveJsonModule": true, + "rootDir": ".", + "sourceMap": true, + "strictNullChecks": true, + "target": "es2017", "typeRoots": [ "node_modules/@types", - "global.d.ts", - "types" - ], - "paths": { - "taro-ui": [ - "src/index.ts" - ] - } - } + "global.d.ts" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] } diff --git a/packages/taro-ui-demo/src/config/dev.js b/packages/taro-ui/config/dev.js similarity index 100% rename from packages/taro-ui-demo/src/config/dev.js rename to packages/taro-ui/config/dev.js diff --git a/packages/taro-ui-demo/src/config/index.js b/packages/taro-ui/config/index.js similarity index 100% rename from packages/taro-ui-demo/src/config/index.js rename to packages/taro-ui/config/index.js diff --git a/packages/taro-ui-demo/src/config/prod.js b/packages/taro-ui/config/prod.js similarity index 100% rename from packages/taro-ui-demo/src/config/prod.js rename to packages/taro-ui/config/prod.js diff --git a/packages/taro-ui-demo/src/config/rollup.config.analyze.js b/packages/taro-ui/config/rollup.config.analyze.js similarity index 100% rename from packages/taro-ui-demo/src/config/rollup.config.analyze.js rename to packages/taro-ui/config/rollup.config.analyze.js diff --git a/packages/taro-ui-demo/src/config/rollup.config.js b/packages/taro-ui/config/rollup.config.js similarity index 100% rename from packages/taro-ui-demo/src/config/rollup.config.js rename to packages/taro-ui/config/rollup.config.js diff --git a/packages/taro-ui-demo/src/config/tsconfig.base.json b/packages/taro-ui/config/tsconfig.base.json similarity index 100% rename from packages/taro-ui-demo/src/config/tsconfig.base.json rename to packages/taro-ui/config/tsconfig.base.json diff --git a/packages/taro-ui-demo/src/config/tsconfig.build.json b/packages/taro-ui/config/tsconfig.build.json similarity index 100% rename from packages/taro-ui-demo/src/config/tsconfig.build.json rename to packages/taro-ui/config/tsconfig.build.json diff --git a/packages/taro-ui-demo/src/config/tsconfig.rollup.json b/packages/taro-ui/config/tsconfig.rollup.json similarity index 100% rename from packages/taro-ui-demo/src/config/tsconfig.rollup.json rename to packages/taro-ui/config/tsconfig.rollup.json From f30a432c0af114da5669208f13772cd3e6e9a34a Mon Sep 17 00:00:00 2001 From: Garfield Lee Date: Mon, 6 Apr 2020 04:55:51 +0800 Subject: [PATCH 19/54] refactor: resolve types import path --- packages/taro-ui/src/components/accordion/index.tsx | 2 +- .../src/components/action-sheet/body/index.tsx | 2 +- .../src/components/action-sheet/body/item/index.tsx | 2 +- .../src/components/action-sheet/footer/index.tsx | 2 +- .../src/components/action-sheet/header/index.tsx | 2 +- .../taro-ui/src/components/action-sheet/index.tsx | 5 ++++- .../src/components/activity-indicator/index.tsx | 2 +- packages/taro-ui/src/components/avatar/index.tsx | 2 +- packages/taro-ui/src/components/badge/index.tsx | 2 +- packages/taro-ui/src/components/button/index.tsx | 2 +- .../taro-ui/src/components/calendar/body/index.tsx | 12 ++++++------ .../taro-ui/src/components/calendar/common/helper.ts | 6 +++--- .../src/components/calendar/common/plugins.ts | 10 +++------- .../src/components/calendar/controller/index.tsx | 4 ++-- packages/taro-ui/src/components/calendar/index.tsx | 12 ++++-------- .../src/components/calendar/ui/date-list/index.tsx | 2 +- packages/taro-ui/src/components/card/index.tsx | 2 +- packages/taro-ui/src/components/checkbox/index.tsx | 2 +- packages/taro-ui/src/components/countdown/index.tsx | 2 +- .../taro-ui/src/components/countdown/item/index.tsx | 2 +- packages/taro-ui/src/components/curtain/index.tsx | 2 +- packages/taro-ui/src/components/divider/index.tsx | 2 +- packages/taro-ui/src/components/drawer/index.tsx | 2 +- packages/taro-ui/src/components/fab/index.tsx | 2 +- packages/taro-ui/src/components/flex/item/index.tsx | 2 +- .../taro-ui/src/components/float-layout/index.tsx | 5 ++++- packages/taro-ui/src/components/form/index.tsx | 2 +- packages/taro-ui/src/components/grid/index.tsx | 10 +++++----- packages/taro-ui/src/components/icon/index.tsx | 2 +- .../taro-ui/src/components/image-picker/index.tsx | 2 +- packages/taro-ui/src/components/indexes/index.tsx | 6 +++--- .../taro-ui/src/components/input-number/index.tsx | 2 +- packages/taro-ui/src/components/input/index.tsx | 7 ++++--- packages/taro-ui/src/components/list/index.tsx | 2 +- packages/taro-ui/src/components/list/item/index.tsx | 7 ++++--- packages/taro-ui/src/components/load-more/index.tsx | 2 +- packages/taro-ui/src/components/message/index.tsx | 2 +- .../taro-ui/src/components/modal/action/index.tsx | 2 +- .../taro-ui/src/components/modal/content/index.tsx | 2 +- .../taro-ui/src/components/modal/header/index.tsx | 2 +- packages/taro-ui/src/components/modal/index.tsx | 2 +- packages/taro-ui/src/components/nav-bar/index.tsx | 2 +- packages/taro-ui/src/components/noticebar/index.tsx | 2 +- packages/taro-ui/src/components/pagination/index.tsx | 2 +- packages/taro-ui/src/components/progress/index.tsx | 2 +- packages/taro-ui/src/components/radio/index.tsx | 2 +- packages/taro-ui/src/components/range/index.tsx | 2 +- packages/taro-ui/src/components/rate/index.tsx | 2 +- packages/taro-ui/src/components/search-bar/index.tsx | 8 ++++---- .../src/components/segmented-control/index.tsx | 2 +- packages/taro-ui/src/components/slider/index.tsx | 2 +- packages/taro-ui/src/components/steps/index.tsx | 2 +- .../taro-ui/src/components/swipe-action/index.tsx | 6 +++--- .../src/components/swipe-action/options/index.tsx | 2 +- packages/taro-ui/src/components/switch/index.tsx | 2 +- packages/taro-ui/src/components/tab-bar/index.tsx | 2 +- packages/taro-ui/src/components/tabs-pane/index.tsx | 2 +- packages/taro-ui/src/components/tabs/index.tsx | 2 +- packages/taro-ui/src/components/tag/index.tsx | 2 +- packages/taro-ui/src/components/textarea/index.tsx | 2 +- packages/taro-ui/src/components/timeline/index.tsx | 2 +- packages/taro-ui/src/components/toast/index.tsx | 2 +- 62 files changed, 98 insertions(+), 98 deletions(-) diff --git a/packages/taro-ui/src/components/accordion/index.tsx b/packages/taro-ui/src/components/accordion/index.tsx index 333251569..9d1aa3dd5 100644 --- a/packages/taro-ui/src/components/accordion/index.tsx +++ b/packages/taro-ui/src/components/accordion/index.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtAccordionProps, AtAccordionState } from 'types/accordion' import { Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' +import { AtAccordionProps, AtAccordionState } from '../../../types/accordion' import { delayQuerySelector } from '../../common/utils' export default class AtAccordion extends React.Component< diff --git a/packages/taro-ui/src/components/action-sheet/body/index.tsx b/packages/taro-ui/src/components/action-sheet/body/index.tsx index bc246753d..4a9740ddb 100644 --- a/packages/taro-ui/src/components/action-sheet/body/index.tsx +++ b/packages/taro-ui/src/components/action-sheet/body/index.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import React from 'react' -import { AtActionSheetBodyProps } from 'types/action-sheet' import { View } from '@tarojs/components' +import { AtActionSheetBodyProps } from '../../../../types/action-sheet' export default class AtActionSheetBody extends React.Component< AtActionSheetBodyProps diff --git a/packages/taro-ui/src/components/action-sheet/body/item/index.tsx b/packages/taro-ui/src/components/action-sheet/body/item/index.tsx index 61420c0f4..f65b92934 100644 --- a/packages/taro-ui/src/components/action-sheet/body/item/index.tsx +++ b/packages/taro-ui/src/components/action-sheet/body/item/index.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtActionSheetItemProps } from 'types/action-sheet' import { View } from '@tarojs/components' +import { AtActionSheetItemProps } from '../../../../../types/action-sheet' export default class AtActionSheetItem extends React.Component< AtActionSheetItemProps diff --git a/packages/taro-ui/src/components/action-sheet/footer/index.tsx b/packages/taro-ui/src/components/action-sheet/footer/index.tsx index 9d4f66029..a3616a9da 100644 --- a/packages/taro-ui/src/components/action-sheet/footer/index.tsx +++ b/packages/taro-ui/src/components/action-sheet/footer/index.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtActionSheetFooterProps } from 'types/action-sheet' import { View } from '@tarojs/components' +import { AtActionSheetFooterProps } from '../../../../types/action-sheet' export default class AtActionSheetFooter extends React.Component< AtActionSheetFooterProps diff --git a/packages/taro-ui/src/components/action-sheet/header/index.tsx b/packages/taro-ui/src/components/action-sheet/header/index.tsx index d6fbd8c86..c91c85212 100644 --- a/packages/taro-ui/src/components/action-sheet/header/index.tsx +++ b/packages/taro-ui/src/components/action-sheet/header/index.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import React from 'react' -import { AtActionSheetHeaderProps } from 'types/action-sheet' import { View } from '@tarojs/components' +import { AtActionSheetHeaderProps } from '../../../../types/action-sheet' export default class AtActionSheetHeader extends React.Component< AtActionSheetHeaderProps diff --git a/packages/taro-ui/src/components/action-sheet/index.tsx b/packages/taro-ui/src/components/action-sheet/index.tsx index c47aeaea3..929bb6f47 100644 --- a/packages/taro-ui/src/components/action-sheet/index.tsx +++ b/packages/taro-ui/src/components/action-sheet/index.tsx @@ -1,9 +1,12 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtActionSheetProps, AtActionSheetState } from 'types/action-sheet' import { View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' +import { + AtActionSheetProps, + AtActionSheetState +} from '../../../types/action-sheet' import AtActionSheetBody from './body/index' import AtActionSheetFooter from './footer/index' import AtActionSheetHeader from './header/index' diff --git a/packages/taro-ui/src/components/activity-indicator/index.tsx b/packages/taro-ui/src/components/activity-indicator/index.tsx index d18a7a816..319015eeb 100644 --- a/packages/taro-ui/src/components/activity-indicator/index.tsx +++ b/packages/taro-ui/src/components/activity-indicator/index.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtActivityIndicatorProps } from 'types/activity-indicator' import { Text, View } from '@tarojs/components' +import { AtActivityIndicatorProps } from '../../../types/activity-indicator' import AtLoading from '../loading/index' export default class AtActivityIndicator extends React.Component< diff --git a/packages/taro-ui/src/components/avatar/index.tsx b/packages/taro-ui/src/components/avatar/index.tsx index 440a5fa93..a522c3ed4 100644 --- a/packages/taro-ui/src/components/avatar/index.tsx +++ b/packages/taro-ui/src/components/avatar/index.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtAvatarProps, AtAvatarState } from 'types/avatar' import { Image, OpenData, Text, View } from '@tarojs/components' import Taro from '@tarojs/taro' +import { AtAvatarProps, AtAvatarState } from '../../../types/avatar' const SIZE_CLASS = { large: 'large', diff --git a/packages/taro-ui/src/components/badge/index.tsx b/packages/taro-ui/src/components/badge/index.tsx index 5d2a9b916..4cdb14252 100644 --- a/packages/taro-ui/src/components/badge/index.tsx +++ b/packages/taro-ui/src/components/badge/index.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtBadgeProps } from 'types/badge' import { View } from '@tarojs/components' +import { AtBadgeProps } from '../../../types/badge' export default class AtBadge extends React.Component { public static defaultProps: AtBadgeProps diff --git a/packages/taro-ui/src/components/button/index.tsx b/packages/taro-ui/src/components/button/index.tsx index bbc1b12df..56143a7df 100644 --- a/packages/taro-ui/src/components/button/index.tsx +++ b/packages/taro-ui/src/components/button/index.tsx @@ -1,10 +1,10 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtButtonProps, AtButtonState } from 'types/button' import { Button, Form, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' import Taro from '@tarojs/taro' +import { AtButtonProps, AtButtonState } from '../../../types/button' import AtLoading from '../loading/index' const SIZE_CLASS = { diff --git a/packages/taro-ui/src/components/calendar/body/index.tsx b/packages/taro-ui/src/components/calendar/body/index.tsx index 383c5fc9f..d99245572 100644 --- a/packages/taro-ui/src/components/calendar/body/index.tsx +++ b/packages/taro-ui/src/components/calendar/body/index.tsx @@ -1,18 +1,18 @@ import classnames from 'classnames' import dayjs from 'dayjs' import React from 'react' -import { - AtCalendarBodyListGroup, - AtCalendarBodyProps, - AtCalendarBodyState, - Calendar -} from 'types/calendar' import { Swiper, SwiperItem, View } from '@tarojs/components' import { BaseEventOrig, ITouch, ITouchEvent } from '@tarojs/components/types/common' +import { + AtCalendarBodyListGroup, + AtCalendarBodyProps, + AtCalendarBodyState, + Calendar +} from '../../../../types/calendar' import { delayQuerySelector } from '../../../common/utils' import generateCalendarGroup from '../common/helper' import AtCalendarDateList from '../ui/date-list/index' diff --git a/packages/taro-ui/src/components/calendar/common/helper.ts b/packages/taro-ui/src/components/calendar/common/helper.ts index f8fb46ef4..fa439c7eb 100644 --- a/packages/taro-ui/src/components/calendar/common/helper.ts +++ b/packages/taro-ui/src/components/calendar/common/helper.ts @@ -1,6 +1,6 @@ import dayjs, { Dayjs } from 'dayjs' import _flow from 'lodash/flow' -import { Calendar } from 'types/calendar' +import { Calendar } from '../../../../types/calendar' import * as constant from './constant' import plugins from './plugins' @@ -11,7 +11,7 @@ function getFullItem( options: Calendar.GroupOptions, selectedDate: Calendar.SelectedDate, isShowStatus?: boolean -) { +): any { if (!isShowStatus) return item const bindedPlugins = plugins.map(fn => @@ -30,7 +30,7 @@ export default function generateCalendarGroup( selectedDate: Calendar.SelectedDate, isShowStatus?: boolean ) => Calendar.ListInfo { - return function( + return function ( generateDate: number, selectedDate: Calendar.SelectedDate, isShowStatus?: boolean diff --git a/packages/taro-ui/src/components/calendar/common/plugins.ts b/packages/taro-ui/src/components/calendar/common/plugins.ts index 93babeeff..76e16ee8d 100644 --- a/packages/taro-ui/src/components/calendar/common/plugins.ts +++ b/packages/taro-ui/src/components/calendar/common/plugins.ts @@ -1,6 +1,6 @@ import dayjs from 'dayjs' import _isEmpty from 'lodash/isEmpty' -import { Calendar } from 'types/calendar' +import { Calendar } from '../../../../types/calendar' interface PluginArg { options: Calendar.GroupOptions @@ -42,9 +42,7 @@ export function handleMarks( const { marks } = options const markList = marks.filter(mark => - dayjs(mark.value) - .startOf('day') - .isSame(_value) + dayjs(mark.value).startOf('day').isSame(_value) ) item.marks = markList.slice(0, 1) @@ -112,9 +110,7 @@ export function handleValid( if (!_isEmpty(validDates)) { const isInclude = validDates.some(date => - dayjs(date.value) - .startOf('day') - .isSame(_value) + dayjs(date.value).startOf('day').isSame(_value) ) item.isDisabled = !isInclude diff --git a/packages/taro-ui/src/components/calendar/controller/index.tsx b/packages/taro-ui/src/components/calendar/controller/index.tsx index 96efcfea1..65098d4d8 100644 --- a/packages/taro-ui/src/components/calendar/controller/index.tsx +++ b/packages/taro-ui/src/components/calendar/controller/index.tsx @@ -1,11 +1,11 @@ import classnames from 'classnames' import dayjs, { Dayjs } from 'dayjs' import React from 'react' +import { Picker, Text, View } from '@tarojs/components' import { AtCalendarControllerProps, AtCalendarControllerState -} from 'types/calendar' -import { Picker, Text, View } from '@tarojs/components' +} from '../../../../types/calendar' export default class AtCalendarController extends React.Component< AtCalendarControllerProps, diff --git a/packages/taro-ui/src/components/calendar/index.tsx b/packages/taro-ui/src/components/calendar/index.tsx index 49fffca44..ca522abc1 100644 --- a/packages/taro-ui/src/components/calendar/index.tsx +++ b/packages/taro-ui/src/components/calendar/index.tsx @@ -1,15 +1,15 @@ import classnames from 'classnames' import dayjs, { Dayjs } from 'dayjs' import React from 'react' +import { View } from '@tarojs/components' +import { BaseEventOrig } from '@tarojs/components/types/common' import { AtCalendarDefaultProps, AtCalendarProps, AtCalendarPropsWithDefaults, AtCalendarState, Calendar -} from 'types/calendar' -import { View } from '@tarojs/components' -import { BaseEventOrig } from '@tarojs/components/types/common' +} from '../../../types/calendar' import AtCalendarBody from './body/index' import AtCalendarController from './controller/index' @@ -145,11 +145,7 @@ export default class AtCalendar extends React.Component< start = dayjsStart.startOf('day').valueOf() generateDateValue = dayjsStart.startOf('month').valueOf() - end = cEnd - ? dayjs(cEnd) - .startOf('day') - .valueOf() - : start + end = cEnd ? dayjs(cEnd).startOf('day').valueOf() : start } else { const dayjsStart = dayjs(currentDate as Calendar.DateArg) diff --git a/packages/taro-ui/src/components/calendar/ui/date-list/index.tsx b/packages/taro-ui/src/components/calendar/ui/date-list/index.tsx index 523ab100d..eaffdba0e 100644 --- a/packages/taro-ui/src/components/calendar/ui/date-list/index.tsx +++ b/packages/taro-ui/src/components/calendar/ui/date-list/index.tsx @@ -1,7 +1,7 @@ import classnames from 'classnames' import React from 'react' -import { Calendar } from 'types/calendar' import { Text, View } from '@tarojs/components' +import { Calendar } from '../../../../../types/calendar' import * as constant from '../../common/constant' const MAP: { [key: number]: string } = { diff --git a/packages/taro-ui/src/components/card/index.tsx b/packages/taro-ui/src/components/card/index.tsx index f4e38e911..528cec57b 100644 --- a/packages/taro-ui/src/components/card/index.tsx +++ b/packages/taro-ui/src/components/card/index.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtCardProps } from 'types/card' import { Image, Text, View } from '@tarojs/components' +import { AtCardProps } from '../../../types/card' export default class AtCard extends React.Component { public static defaultProps: AtCardProps diff --git a/packages/taro-ui/src/components/checkbox/index.tsx b/packages/taro-ui/src/components/checkbox/index.tsx index 16a64d505..eb9c331c0 100644 --- a/packages/taro-ui/src/components/checkbox/index.tsx +++ b/packages/taro-ui/src/components/checkbox/index.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtCheckboxProps } from 'types/checkbox' import { Text, View } from '@tarojs/components' +import { AtCheckboxProps } from '../../../types/checkbox' export default class AtCheckbox extends React.Component> { public static defaultProps: AtCheckboxProps diff --git a/packages/taro-ui/src/components/countdown/index.tsx b/packages/taro-ui/src/components/countdown/index.tsx index 75186e9b6..49073c8a8 100644 --- a/packages/taro-ui/src/components/countdown/index.tsx +++ b/packages/taro-ui/src/components/countdown/index.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtCountDownProps, AtCountdownState } from 'types/countdown' import { View } from '@tarojs/components' +import { AtCountDownProps, AtCountdownState } from '../../../types/countdown' import AtCountdownItem from './item' type TimeObject = { diff --git a/packages/taro-ui/src/components/countdown/item/index.tsx b/packages/taro-ui/src/components/countdown/item/index.tsx index 83157b633..acc6c4788 100644 --- a/packages/taro-ui/src/components/countdown/item/index.tsx +++ b/packages/taro-ui/src/components/countdown/item/index.tsx @@ -1,7 +1,7 @@ import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtCountdownItemProps } from 'types/countdown' import { Text, View } from '@tarojs/components' +import { AtCountdownItemProps } from '../../../../types/countdown' export default class AtCountdownItem extends React.Component< AtCountdownItemProps diff --git a/packages/taro-ui/src/components/curtain/index.tsx b/packages/taro-ui/src/components/curtain/index.tsx index 5a0429cef..74e1e9a85 100644 --- a/packages/taro-ui/src/components/curtain/index.tsx +++ b/packages/taro-ui/src/components/curtain/index.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtCurtainProps } from 'types/curtain' import { View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' +import { AtCurtainProps } from '../../../types/curtain' export default class AtCurtain extends React.Component { public static defaultProps: AtCurtainProps diff --git a/packages/taro-ui/src/components/divider/index.tsx b/packages/taro-ui/src/components/divider/index.tsx index 9e7cd55b4..55497b052 100644 --- a/packages/taro-ui/src/components/divider/index.tsx +++ b/packages/taro-ui/src/components/divider/index.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtDividerProps } from 'types/divider' import { View } from '@tarojs/components' +import { AtDividerProps } from '../../../types/divider' import { mergeStyle, pxTransform } from '../../common/utils' export default class AtDivider extends React.Component { diff --git a/packages/taro-ui/src/components/drawer/index.tsx b/packages/taro-ui/src/components/drawer/index.tsx index b034e7672..6578792d2 100644 --- a/packages/taro-ui/src/components/drawer/index.tsx +++ b/packages/taro-ui/src/components/drawer/index.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtDrawerProps, AtDrawerState } from 'types/drawer' import { View } from '@tarojs/components' +import { AtDrawerProps, AtDrawerState } from '../../../types/drawer' import AtList from '../list/index' import AtListItem from '../list/item/index' diff --git a/packages/taro-ui/src/components/fab/index.tsx b/packages/taro-ui/src/components/fab/index.tsx index d0610c4c9..430eb6632 100644 --- a/packages/taro-ui/src/components/fab/index.tsx +++ b/packages/taro-ui/src/components/fab/index.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtFabProps } from 'types/fab' import { View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' +import { AtFabProps } from '../../../types/fab' export default class AtFab extends React.Component { public static defaultProps: AtFabProps diff --git a/packages/taro-ui/src/components/flex/item/index.tsx b/packages/taro-ui/src/components/flex/item/index.tsx index a80673fb6..d5cae7f30 100644 --- a/packages/taro-ui/src/components/flex/item/index.tsx +++ b/packages/taro-ui/src/components/flex/item/index.tsx @@ -2,8 +2,8 @@ import classNames from 'classnames' import _forEach from 'lodash/forEach' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtFlexItemProps } from 'types/flex' import { View } from '@tarojs/components' +import { AtFlexItemProps } from '../../../../types/flex' export default class AtFlexItem extends React.Component { public static propTypes: InferProps diff --git a/packages/taro-ui/src/components/float-layout/index.tsx b/packages/taro-ui/src/components/float-layout/index.tsx index 533058b56..771ee960b 100644 --- a/packages/taro-ui/src/components/float-layout/index.tsx +++ b/packages/taro-ui/src/components/float-layout/index.tsx @@ -1,9 +1,12 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtFloatLayoutProps, AtFloatLayoutState } from 'types/float-layout' import { ScrollView, Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' +import { + AtFloatLayoutProps, + AtFloatLayoutState +} from '../../../types/float-layout' import { handleTouchScroll } from '../../common/utils' export default class AtFloatLayout extends React.Component< diff --git a/packages/taro-ui/src/components/form/index.tsx b/packages/taro-ui/src/components/form/index.tsx index 02962db93..cea4dc011 100644 --- a/packages/taro-ui/src/components/form/index.tsx +++ b/packages/taro-ui/src/components/form/index.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtFormProps } from 'types/form' import { Form } from '@tarojs/components' +import { AtFormProps } from '../../../types/form' export default class AtForm extends React.Component { public static defaultProps: AtFormProps diff --git a/packages/taro-ui/src/components/grid/index.tsx b/packages/taro-ui/src/components/grid/index.tsx index 258a6498e..69a1cb01a 100644 --- a/packages/taro-ui/src/components/grid/index.tsx +++ b/packages/taro-ui/src/components/grid/index.tsx @@ -2,9 +2,9 @@ import classNames from 'classnames' import _chunk from 'lodash/chunk' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtGridItem, AtGridProps } from 'types/grid' import { Image, Text, View } from '@tarojs/components' import { CommonEvent } from '@tarojs/components/types/common' +import { AtGridItem, AtGridProps } from '../../../types/grid' import { mergeStyle } from '../../common/utils' export default class AtGrid extends React.Component { @@ -70,10 +70,10 @@ export default class AtGrid extends React.Component { className={classNames( childItem.iconInfo.prefixClass || 'at-icon', { - [`${childItem.iconInfo.prefixClass || - 'at-icon'}-${ - childItem.iconInfo.value - }`]: childItem.iconInfo.value + [`${ + childItem.iconInfo.prefixClass || 'at-icon' + }-${childItem.iconInfo.value}`]: childItem + .iconInfo.value }, childItem.iconInfo.className )} diff --git a/packages/taro-ui/src/components/icon/index.tsx b/packages/taro-ui/src/components/icon/index.tsx index eed56346b..607850932 100644 --- a/packages/taro-ui/src/components/icon/index.tsx +++ b/packages/taro-ui/src/components/icon/index.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtIconProps } from 'types/icon' import { Text } from '@tarojs/components' +import { AtIconProps } from '../../../types/icon' import { mergeStyle, pxTransform } from '../../common/utils' export default class AtIcon extends React.Component { diff --git a/packages/taro-ui/src/components/image-picker/index.tsx b/packages/taro-ui/src/components/image-picker/index.tsx index 71835f77e..413f19e44 100644 --- a/packages/taro-ui/src/components/image-picker/index.tsx +++ b/packages/taro-ui/src/components/image-picker/index.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtImagePickerProps, File } from 'types/image-picker' import { Image, View } from '@tarojs/components' import Taro from '@tarojs/taro' +import { AtImagePickerProps, File } from '../../../types/image-picker' import { uuid } from '../../common/utils' interface MatrixFile extends Partial { diff --git a/packages/taro-ui/src/components/indexes/index.tsx b/packages/taro-ui/src/components/indexes/index.tsx index 9a9478045..8e8f5d4c1 100644 --- a/packages/taro-ui/src/components/indexes/index.tsx +++ b/packages/taro-ui/src/components/indexes/index.tsx @@ -1,15 +1,15 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtIndexesProps, AtIndexesState, Item } from 'types/indexes' import { ScrollView, View } from '@tarojs/components' import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common' import Taro from '@tarojs/taro' +import { AtIndexesProps, AtIndexesState, Item } from '../../../types/indexes' import { delayQuerySelector, isTest, - uuid, - pxTransform + pxTransform, + uuid } from '../../common/utils' import AtList from '../list/index' import AtListItem from '../list/item/index' diff --git a/packages/taro-ui/src/components/input-number/index.tsx b/packages/taro-ui/src/components/input-number/index.tsx index cacdb0874..bf36688a7 100644 --- a/packages/taro-ui/src/components/input-number/index.tsx +++ b/packages/taro-ui/src/components/input-number/index.tsx @@ -2,9 +2,9 @@ import classNames from 'classnames' import _toString from 'lodash/toString' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtInputNumberProps, InputError } from 'types/input-number' import { Input, Text, View } from '@tarojs/components' import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common' +import { AtInputNumberProps, InputError } from '../../../types/input-number' import { pxTransform } from '../../common/utils' // TODO: Check all types diff --git a/packages/taro-ui/src/components/input/index.tsx b/packages/taro-ui/src/components/input/index.tsx index f44582435..937facf9a 100644 --- a/packages/taro-ui/src/components/input/index.tsx +++ b/packages/taro-ui/src/components/input/index.tsx @@ -1,10 +1,10 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import React from 'react' -import { AtInputProps } from 'types/input' import { Input, Label, Text, View } from '@tarojs/components' import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common' import { InputProps } from '@tarojs/components/types/Input' +import { AtInputProps } from '../../../types/input' type PickAtInputProps = Pick< AtInputProps, @@ -132,8 +132,9 @@ export default class AtInput extends React.Component { {title && (