From 44cf60a9d23c79622ae392fbeef5003f698ea4ba Mon Sep 17 00:00:00 2001 From: "feichao.sfc" Date: Wed, 20 May 2020 12:03:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=87=E7=BA=A7=20rollup=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=20transform=20=E7=9A=84=20default=20export=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20named=20export=EF=BC=8C=E7=BB=95=E8=BF=87?= =?UTF-8?q?=20rollup/rollup#2737?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/biz/common-transforms/autoRowSpan.ts | 2 +- src/biz/common-transforms/buildTree.ts | 2 +- src/biz/common-transforms/columnHover.tsx | 2 +- src/biz/common-transforms/columnRangeHover.ts | 2 +- src/biz/common-transforms/columnResize.tsx | 2 +- src/biz/common-transforms/flatten.ts | 2 +- src/biz/common-transforms/index.ts | 20 ++++---- src/biz/common-transforms/orderField.ts | 2 +- src/biz/common-transforms/sort.tsx | 2 +- src/biz/common-transforms/tips.tsx | 2 +- src/biz/common-transforms/treeMode.tsx | 2 +- yarn.lock | 50 +++++++++++-------- 12 files changed, 49 insertions(+), 41 deletions(-) diff --git a/src/biz/common-transforms/autoRowSpan.ts b/src/biz/common-transforms/autoRowSpan.ts index afd31d794..5cd157e56 100644 --- a/src/biz/common-transforms/autoRowSpan.ts +++ b/src/biz/common-transforms/autoRowSpan.ts @@ -8,7 +8,7 @@ function isIdentity(x: any, y: any) { return x === y } -export default function autoRowSpan(): TableTransform { +export function autoRowSpan(): TableTransform { return transformColumn((col, { dataSource, range }) => { if (!col.features?.autoRowSpan) { return col diff --git a/src/biz/common-transforms/buildTree.ts b/src/biz/common-transforms/buildTree.ts index 7718915fc..dc354268f 100644 --- a/src/biz/common-transforms/buildTree.ts +++ b/src/biz/common-transforms/buildTree.ts @@ -1,7 +1,7 @@ import { TableTransform } from '../interfaces' import { buildTree as _buildTree } from '../utils' -export default function buildTree(idProp: string, parentIdProp: string): TableTransform { +export function buildTree(idProp: string, parentIdProp: string): TableTransform { return ({ columns, dataSource }) => { return { columns, dataSource: _buildTree(idProp, parentIdProp, dataSource) } } diff --git a/src/biz/common-transforms/columnHover.tsx b/src/biz/common-transforms/columnHover.tsx index 9e9b94a62..4610ce5e4 100644 --- a/src/biz/common-transforms/columnHover.tsx +++ b/src/biz/common-transforms/columnHover.tsx @@ -9,7 +9,7 @@ export interface ColumnHoverOptions { onChangeHoverColIndex(nextColIndex: number): void } -export default function columnHover({ +export function columnHover({ hoverColor = '#f5f5f5', hoverColIndex, onChangeHoverColIndex, diff --git a/src/biz/common-transforms/columnRangeHover.ts b/src/biz/common-transforms/columnRangeHover.ts index 8d6a12755..cf20e368b 100644 --- a/src/biz/common-transforms/columnRangeHover.ts +++ b/src/biz/common-transforms/columnRangeHover.ts @@ -52,7 +52,7 @@ export interface ColumnRangeHoverOptions { onChangeHoverRange(nextColIndexRange: HoverRange): void } -export default function columnRangeHover({ +export function columnRangeHover({ hoverColor = '#f5f5f5', headerHoverColor = '#ddd', hoverRange, diff --git a/src/biz/common-transforms/columnResize.tsx b/src/biz/common-transforms/columnResize.tsx index 3038ef2ef..5bcb611bc 100644 --- a/src/biz/common-transforms/columnResize.tsx +++ b/src/biz/common-transforms/columnResize.tsx @@ -38,7 +38,7 @@ export interface ColumnResizeOptions { disableUserSelectWhenResizing?: boolean } -export default function columnResize({ +export function columnResize({ sizes, onChangeSizes, minSize = 40, diff --git a/src/biz/common-transforms/flatten.ts b/src/biz/common-transforms/flatten.ts index 16773af54..3f475324f 100644 --- a/src/biz/common-transforms/flatten.ts +++ b/src/biz/common-transforms/flatten.ts @@ -2,7 +2,7 @@ import { isLeafNode } from '../../common-utils' import { TableTransform } from '../interfaces' import { transformColumn } from '../utils' -export default function flatten(): TableTransform { +export function flatten(): TableTransform { return transformColumn((column) => { if (isLeafNode(column)) { return column diff --git a/src/biz/common-transforms/index.ts b/src/biz/common-transforms/index.ts index ca336b68c..127e57b89 100644 --- a/src/biz/common-transforms/index.ts +++ b/src/biz/common-transforms/index.ts @@ -1,11 +1,11 @@ -export { default as autoRowSpan } from './autoRowSpan' -export { default as buildTree } from './buildTree' -export { default as columnHover, ColumnHoverOptions } from './columnHover' -export { default as columnRangeHover, ColumnRangeHoverOptions, HoverRange } from './columnRangeHover' -export { default as columnResize, ColumnResizeOptions } from './columnResize' -export { default as flatten } from './flatten' -export { default as orderField } from './orderField' -export { default as sort, SortHeaderCellProps, SortOptions } from './sort' -export { default as tips, TipsOptions } from './tips' -export { default as treeMode, treeMetaSymbol, TreeModeOptions } from './treeMode' +export { autoRowSpan } from './autoRowSpan' +export { buildTree } from './buildTree' +export { columnHover, ColumnHoverOptions } from './columnHover' +export { columnRangeHover, ColumnRangeHoverOptions, HoverRange } from './columnRangeHover' +export { columnResize, ColumnResizeOptions } from './columnResize' +export { flatten } from './flatten' +export { orderField } from './orderField' +export { sort, SortHeaderCellProps, SortOptions } from './sort' +export { tips, TipsOptions } from './tips' +export { treeMode, treeMetaSymbol, TreeModeOptions } from './treeMode' export { default as visible } from './visible' diff --git a/src/biz/common-transforms/orderField.ts b/src/biz/common-transforms/orderField.ts index 13221c66c..6de1af556 100644 --- a/src/biz/common-transforms/orderField.ts +++ b/src/biz/common-transforms/orderField.ts @@ -1,7 +1,7 @@ import { TableTransform } from '../interfaces' import { transformColumn } from '../utils' -export default function orderField(startOrder = 1): TableTransform { +export function orderField(startOrder = 1): TableTransform { return transformColumn((column) => { if (column.features?.order || column.features?.orderField) { return { diff --git a/src/biz/common-transforms/sort.tsx b/src/biz/common-transforms/sort.tsx index dfa60fca9..c090ce0cf 100644 --- a/src/biz/common-transforms/sort.tsx +++ b/src/biz/common-transforms/sort.tsx @@ -123,7 +123,7 @@ export interface SortOptions { keepDataSource?: boolean } -export default function sort({ +export function sort({ sorts: inputSorts, onChangeSorts: inputOnChangeSorts, orders = ['desc', 'asc', 'none'], diff --git a/src/biz/common-transforms/tips.tsx b/src/biz/common-transforms/tips.tsx index aa19e5925..767e7ab5a 100644 --- a/src/biz/common-transforms/tips.tsx +++ b/src/biz/common-transforms/tips.tsx @@ -23,7 +23,7 @@ export interface TipsOptions { Balloon: any } -export default function tips({ Balloon }: TipsOptions): TableTransform { +export function tips({ Balloon }: TipsOptions): TableTransform { return transformColumn((col) => { if (!col.features?.tips) { return col diff --git a/src/biz/common-transforms/treeMode.tsx b/src/biz/common-transforms/treeMode.tsx index 199422e4a..449af6ece 100644 --- a/src/biz/common-transforms/treeMode.tsx +++ b/src/biz/common-transforms/treeMode.tsx @@ -42,7 +42,7 @@ export interface TreeModeOptions { isLeafNode?(node: any, nodeMeta: { depth: number; expanded: boolean; rowKey: string }): boolean } -export default function treeMode({ +export function treeMode({ onChangeOpenKeys, openKeys, primaryKey, diff --git a/yarn.lock b/yarn.lock index 371e9e288..86ee425dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2309,9 +2309,9 @@ integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= "@types/lodash@^4.14.149": - version "4.14.151" - resolved "https://registry.npm.taobao.org/@types/lodash/download/@types/lodash-4.14.151.tgz#7d58cac32bedb0ec37cb7f99094a167d6176c9d5" - integrity sha1-fVjKwyvtsOw3y3+ZCUoWfWF2ydU= + version "4.14.152" + resolved "https://registry.npm.taobao.org/@types/lodash/download/@types/lodash-4.14.152.tgz#7e7679250adce14e749304cdb570969f77ec997c" + integrity sha1-fnZ5JQrc4U50kwTNtXCWn3fsmXw= "@types/markdown-to-jsx@^6.9.1": version "6.11.0" @@ -4275,12 +4275,12 @@ commander@^5.0.0: commander@~2.14.1: version "2.14.1" - resolved "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1584148356834&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" + resolved "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" integrity sha1-IjUSPjevjKPGXfRbAm29NXsBuao= commander@~2.17.1: version "2.17.1" - resolved "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1584148356834&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" + resolved "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha1-vXerfebelCBc6sxy8XFtKfIKd78= commondir@^1.0.1: @@ -9659,10 +9659,17 @@ react-transition-group@^4.3.0: loose-envify "^1.4.0" prop-types "^15.6.2" +react-universal-interface@^0.6.0: + version "0.6.0" + resolved "https://registry.npm.taobao.org/react-universal-interface/download/react-universal-interface-0.6.0.tgz#b65cbf7d71a2f3f7dd9705d8e4f06748539bd465" + integrity sha1-tly/fXGi8/fdlwXY5PBnSFOb1GU= + dependencies: + tslib "^1.9.3" + react-use@^14.1.1: - version "14.2.0" - resolved "https://registry.npm.taobao.org/react-use/download/react-use-14.2.0.tgz#abac033fae5e358599b7e38084ff11b02e5d4868" - integrity sha1-q6wDP65eNYWZt+OAhP8RsC5dSGg= + version "14.3.0" + resolved "https://registry.npm.taobao.org/react-use/download/react-use-14.3.0.tgz#aa794db42108e15363be5c04db35a57acf8ecb6b" + integrity sha1-qnlNtCEI4VNjvlwE2zWles+Oy2s= dependencies: "@types/js-cookie" "2.2.6" "@xobotyi/scrollbar-width" "1.9.5" @@ -9671,6 +9678,7 @@ react-use@^14.1.1: fast-shallow-equal "^1.0.0" js-cookie "^2.2.1" nano-css "^5.2.1" + react-universal-interface "^0.6.0" resize-observer-polyfill "^1.5.1" screenfull "^5.0.0" set-harmonic-interval "^1.0.1" @@ -10139,9 +10147,9 @@ rollup-pluginutils@^2.8.1: estree-walker "^0.6.1" rollup@^2.3.1: - version "2.10.2" - resolved "https://registry.npm.taobao.org/rollup/download/rollup-2.10.2.tgz#9adfcf8ab36861b5b0f8ca7b436f5866e3e9e200" - integrity sha1-mt/PirNoYbWw+Mp7Q29YZuPp4gA= + version "2.10.5" + resolved "https://registry.npm.taobao.org/rollup/download/rollup-2.10.5.tgz#a2e6735fbcbd64453f8aa5d7b5ec1b421974f92c" + integrity sha1-ouZzX7y9ZEU/iqXXtewbQhl0+Sw= optionalDependencies: fsevents "~2.1.2" @@ -10620,7 +10628,7 @@ sprintf-js@~1.0.2: ssf@~0.10.3: version "0.10.3" - resolved "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz#8eae1fc29c90a552e7921208f81892d6f77acb2b" + resolved "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz?cache=0&sync_timestamp=1589000555952&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssf%2Fdownload%2Fssf-0.10.3.tgz#8eae1fc29c90a552e7921208f81892d6f77acb2b" integrity sha1-jq4fwpyQpVLnkhII+BiS1vd6yys= dependencies: frac "~1.1.2" @@ -10941,7 +10949,7 @@ style-to-object@^0.2.1: stylis@3.5.0: version "3.5.0" - resolved "https://registry.npm.taobao.org/stylis/download/stylis-3.5.0.tgz?cache=0&sync_timestamp=1587645902896&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstylis%2Fdownload%2Fstylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1" + resolved "https://registry.npm.taobao.org/stylis/download/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1" integrity sha1-AW+iOWY9d/ho/vW2fPIBxLfHAeE= supports-color@^2.0.0: @@ -11314,12 +11322,12 @@ tsconfig-paths@^3.4.0: minimist "^1.2.0" strip-bom "^3.0.0" -tslib@1.11.2, tslib@^1.10.0: +tslib@1.11.2: version "1.11.2" resolved "https://registry.npm.taobao.org/tslib/download/tslib-1.11.2.tgz#9c79d83272c9a7aaf166f73915c9667ecdde3cc9" integrity sha1-nHnYMnLJp6rxZvc5Fclmfs3ePMk= -tslib@^1.9.0: +tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.3: version "1.13.0" resolved "https://registry.npm.taobao.org/tslib/download/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" integrity sha1-yIHhPMcBWJTtkUhi0nZDb6mkcEM= @@ -11382,9 +11390,9 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= typescript@^3.8.3: - version "3.9.2" - resolved "https://registry.npm.taobao.org/typescript/download/typescript-3.9.2.tgz#64e9c8e9be6ea583c54607677dd4680a1cf35db9" - integrity sha1-ZOnI6b5upYPFRgdnfdRoChzzXbk= + version "3.9.3" + resolved "https://registry.npm.taobao.org/typescript/download/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a" + integrity sha1-06yIg6l8JhOeQt9ek+7s4z1hC4o= ua-parser-js@^0.7.18: version "0.7.21" @@ -12013,9 +12021,9 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" xlsx@^0.16.0: - version "0.16.0" - resolved "https://registry.npm.taobao.org/xlsx/download/xlsx-0.16.0.tgz#2a86ba433ca198f7e87343da86a831d48d713943" - integrity sha1-Koa6QzyhmPfoc0Pahqgx1I1xOUM= + version "0.16.1" + resolved "https://registry.npm.taobao.org/xlsx/download/xlsx-0.16.1.tgz#fb1a59d2c4a540a08556492ec786f98f973f1260" + integrity sha1-+xpZ0sSlQKCFVkkux4b5j5c/EmA= dependencies: adler-32 "~1.2.0" cfb "^1.1.4"