From 3c793fab16981f708378830375554c1a3774d15e Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sun, 19 Apr 2020 14:55:28 +0800 Subject: [PATCH 001/151] feat(cli): allow style type commit message --- packages/vant-cli/src/commands/commit-lint.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant-cli/src/commands/commit-lint.ts b/packages/vant-cli/src/commands/commit-lint.ts index d2297d733..6937cc3f3 100644 --- a/packages/vant-cli/src/commands/commit-lint.ts +++ b/packages/vant-cli/src/commands/commit-lint.ts @@ -1,7 +1,7 @@ import { readFileSync } from 'fs-extra'; import { consola } from '../common/logger'; -const commitRE = /^(revert: )?(fix|feat|docs|perf|test|types|build|chore|refactor|breaking change)(\(.+\))?: .{1,50}/; +const commitRE = /^(revert: )?(fix|feat|docs|perf|test|types|style|build|chore|refactor|breaking change)(\(.+\))?: .{1,50}/; const mergeRE = /Merge branch /; export function commitLint() { From 963af7c24ed8b5cc0b13f0c0db0fe14a8328e832 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sun, 19 Apr 2020 14:56:16 +0800 Subject: [PATCH 002/151] chore: release @vant/cli@2.4.1 --- packages/vant-cli/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json index dd75cedc1..9fc034085 100644 --- a/packages/vant-cli/package.json +++ b/packages/vant-cli/package.json @@ -1,6 +1,6 @@ { "name": "@vant/cli", - "version": "2.4.0", + "version": "2.4.1", "description": "", "main": "lib/index.js", "typings": "lib/index.d.ts", From 6a992793b4d5e628e6b70164e47dc8ace55ce3d2 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sun, 19 Apr 2020 14:58:35 +0800 Subject: [PATCH 003/151] docs(cli): changelog v2.4.1 --- package.json | 2 +- packages/vant-cli/changelog.md | 44 +- yarn.lock | 1402 ++++++++++++++++++-------------- 3 files changed, 840 insertions(+), 608 deletions(-) diff --git a/package.json b/package.json index 8a0a4dd69..72f5ff1f2 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ }, "devDependencies": { "@ls-lint/ls-lint": "^1.8.0", - "@vant/cli": "^2.4.0", + "@vant/cli": "^2.4.1", "prettier": "^2.0.4", "vue": "^2.6.11", "vue-template-compiler": "^2.6.11" diff --git a/packages/vant-cli/changelog.md b/packages/vant-cli/changelog.md index 2d83ac219..db7f4a801 100644 --- a/packages/vant-cli/changelog.md +++ b/packages/vant-cli/changelog.md @@ -1,19 +1,25 @@ # 更新日志 -### [v2.4.0] +### v2.4.1 + +`2020-04-19` + +- 支持 style 类型的 commit message + +### v2.4.0 `2020-04-02` - 升级 prettier v2 - 升级 html-webpack-plugin v4 -### [v2.3.1] +### v2.3.1 `2020-03-29` - 优化网站导航栏在大屏上的适配 ([#5928](https://github.com/youzan/vant/pull/5928)) -### [v2.3.0] +### v2.3.0 `2020-03-25` @@ -22,26 +28,26 @@ - clean 命令现在会移除而不是清空文件夹 ([#5895](https://github.com/youzan/vant/issues/5895)) - 升级 @vant/markdown-vetur 2.0.0 -### [v2.2.8] +### v2.2.8 `2020-03-20` - 修复构建 changelog 可能失败的问题 -### [v2.2.7] +### v2.2.7 `2020-03-19` - 新增 process.env.VANT_CLI_VERSION 环境变量 -### [v2.2.6] +### v2.2.6 `2020-03-18` - 升级 commander 5 - 修复右侧预览 iframe 链接可能错误的问题 -### [v2.2.5] +### v2.2.5 `2020-03-08` @@ -49,38 +55,38 @@ - 优化代码块与底部文字之间的间距 - 修复 create-vant-cli-app 初始化时报错的问题 -### [v2.2.4] +### v2.2.4 `2020-02-14` - 修复在 windows 上构建出的样式入口文件路径错误的问题 ([#5655](https://github.com/youzan/vant/pull/5655) -### [v2.2.3] +### v2.2.3 `2020-02-13` - 链接颜色调整为蓝色 -### [v2.2.2] +### v2.2.2 `2020-02-05` - 修复在 windows 上获取 markdown 路径错误的问题 ([#5626](https://github.com/youzan/vant/pull/5626)) -### [v2.2.1] +### v2.2.1 `2020-02-04` - 升级 babel@7.8 - 修复切换版本时跳转 undefined 的问题 ([#5620](https://github.com/youzan/vant/pull/5620)) -### [v2.2.0] +### v2.2.0 `2020-01-19` - 升级 @vant/eslint-config@2.0.0 -### [v2.1.8] +### v2.1.8 `2020-01-18` @@ -89,14 +95,14 @@ - 优化站点导航栏颜色 - 优化站点代码块颜色 -### [v2.1.7] +### v2.1.7 `2020-01-15` - 优化 help 命令  - 优化控制台输出信息 -### [v2.1.6] +### v2.1.6 `2020-01-12` @@ -105,14 +111,14 @@ - 优化文档站点的 meta 字段 - 新增 API 文档中的版本标签样式 -### [v2.1.5] +### v2.1.5 `2020-01-10` - 修复编译时未替换 import 语句中的 CSS 后缀的问题 - 升级 husky 版本到 4.0 -### [v2.1.4] +### v2.1.4 `2020-01-06` @@ -120,7 +126,7 @@ - 锁死 @vue/test-utils 版本为 1.0.0-beta.29 -### [v2.1.3] +### v2.1.3 `2020-01-06` @@ -129,7 +135,7 @@ - 增加 cache-loader，提高构建速度 - 调整 jest setup 文件执行时机，延迟至 env 初始化后执行 -### [v2.1.2] +### v2.1.2 `2020-01-05` diff --git a/yarn.lock b/yarn.lock index c2fe7a12c..da8097772 100644 --- a/yarn.lock +++ b/yarn.lock @@ -48,7 +48,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.9.0": +"@babel/core@>=7.9.0", "@babel/core@^7.9.0": version "7.9.0" resolved "https://registry.npm.taobao.org/@babel/core/download/@babel/core-7.9.0.tgz?cache=0&sync_timestamp=1584746134268&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fcore%2Fdownload%2F%40babel%2Fcore-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e" integrity sha1-rJd7U4t34TL/cG87ik260JwDxW4= @@ -105,15 +105,6 @@ "@babel/helper-explode-assignable-expression" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helper-call-delegate@^7.8.7": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz#28a279c2e6c622a6233da548127f980751324cab" - integrity sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ== - dependencies: - "@babel/helper-hoist-variables" "^7.8.3" - "@babel/traverse" "^7.8.3" - "@babel/types" "^7.8.7" - "@babel/helper-compilation-targets@^7.8.7": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde" @@ -181,6 +172,15 @@ "@babel/template" "^7.8.3" "@babel/types" "^7.8.3" +"@babel/helper-function-name@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c" + integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw== + dependencies: + "@babel/helper-get-function-arity" "^7.8.3" + "@babel/template" "^7.8.3" + "@babel/types" "^7.9.5" + "@babel/helper-get-function-arity@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5" @@ -295,6 +295,11 @@ resolved "https://registry.npm.taobao.org/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed" integrity sha1-rVNWKn/Cmzuakbv30QOX/RRjRu0= +"@babel/helper-validator-identifier@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80" + integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g== + "@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" @@ -383,13 +388,14 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-numeric-separator" "^7.8.3" -"@babel/plugin-proposal-object-rest-spread@^7.9.0": - version "7.9.0" - resolved "https://registry.npm.taobao.org/@babel/plugin-proposal-object-rest-spread/download/@babel/plugin-proposal-object-rest-spread-7.9.0.tgz#a28993699fc13df165995362693962ba6b061d6f" - integrity sha1-oomTaZ/BPfFlmVNiaTliumsGHW8= +"@babel/plugin-proposal-object-rest-spread@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz#3fd65911306d8746014ec0d0cf78f0e39a149116" + integrity sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg== dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-transform-parameters" "^7.9.5" "@babel/plugin-proposal-optional-catch-binding@^7.8.3": version "7.8.3" @@ -423,20 +429,27 @@ "@babel/helper-create-regexp-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-async-generators@^7.8.0": +"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4": 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== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-bigint@^7.0.0": +"@babel/plugin-syntax-bigint@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-class-properties@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz#6cb933a8872c8d359bfde69bbeaae5162fd1e8f7" + integrity sha512-UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg== + 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" @@ -444,7 +457,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-json-strings@^7.8.0": +"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3": 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== @@ -458,7 +471,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0": +"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz#3995d7d7ffff432f6ddc742b47e730c054599897" + integrity sha512-Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== @@ -472,21 +492,21 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0": +"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": 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.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3": 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== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-chaining@^7.8.0": +"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== @@ -538,14 +558,14 @@ "@babel/helper-plugin-utils" "^7.8.3" lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.9.0": - version "7.9.2" - resolved "https://registry.npm.taobao.org/@babel/plugin-transform-classes/download/@babel/plugin-transform-classes-7.9.2.tgz?cache=0&sync_timestamp=1584800073528&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-transform-classes%2Fdownload%2F%40babel%2Fplugin-transform-classes-7.9.2.tgz#8603fc3cc449e31fdbdbc257f67717536a11af8d" - integrity sha1-hgP8PMRJ4x/b28JX9ncXU2oRr40= +"@babel/plugin-transform-classes@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c" + integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg== 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-function-name" "^7.9.5" "@babel/helper-optimise-call-expression" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-replace-supers" "^7.8.6" @@ -559,10 +579,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-destructuring@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz#20ddfbd9e4676906b1056ee60af88590cc7aaa0b" - integrity sha512-H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ== +"@babel/plugin-transform-destructuring@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50" + integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q== dependencies: "@babel/helper-plugin-utils" "^7.8.3" @@ -694,12 +714,11 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-replace-supers" "^7.8.3" -"@babel/plugin-transform-parameters@^7.8.7": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.7.tgz#66fa2f1de4129b4e0447509223ac71bda4955395" - integrity sha512-brYWaEPTRimOctz2NDA3jnBbDi7SVN2T4wYuu0aqSzxC3nozFZngGaw29CJ9ZPweB7k+iFmZuoG3IVPIcXmD2g== +"@babel/plugin-transform-parameters@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795" + integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA== dependencies: - "@babel/helper-call-delegate" "^7.8.7" "@babel/helper-get-function-arity" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" @@ -788,10 +807,10 @@ "@babel/helper-create-regexp-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/preset-env@^7.9.0": - version "7.9.0" - resolved "https://registry.npm.taobao.org/@babel/preset-env/download/@babel/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8" - integrity sha1-pfxCSA6VCuj12fjyu8A/UnIt86g= +"@babel/preset-env@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f" + integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ== dependencies: "@babel/compat-data" "^7.9.0" "@babel/helper-compilation-targets" "^7.8.7" @@ -802,7 +821,7 @@ "@babel/plugin-proposal-json-strings" "^7.8.3" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3" "@babel/plugin-proposal-numeric-separator" "^7.8.3" - "@babel/plugin-proposal-object-rest-spread" "^7.9.0" + "@babel/plugin-proposal-object-rest-spread" "^7.9.5" "@babel/plugin-proposal-optional-catch-binding" "^7.8.3" "@babel/plugin-proposal-optional-chaining" "^7.9.0" "@babel/plugin-proposal-unicode-property-regex" "^7.8.3" @@ -819,9 +838,9 @@ "@babel/plugin-transform-async-to-generator" "^7.8.3" "@babel/plugin-transform-block-scoped-functions" "^7.8.3" "@babel/plugin-transform-block-scoping" "^7.8.3" - "@babel/plugin-transform-classes" "^7.9.0" + "@babel/plugin-transform-classes" "^7.9.5" "@babel/plugin-transform-computed-properties" "^7.8.3" - "@babel/plugin-transform-destructuring" "^7.8.3" + "@babel/plugin-transform-destructuring" "^7.9.5" "@babel/plugin-transform-dotall-regex" "^7.8.3" "@babel/plugin-transform-duplicate-keys" "^7.8.3" "@babel/plugin-transform-exponentiation-operator" "^7.8.3" @@ -836,7 +855,7 @@ "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3" "@babel/plugin-transform-new-target" "^7.8.3" "@babel/plugin-transform-object-super" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.8.7" + "@babel/plugin-transform-parameters" "^7.9.5" "@babel/plugin-transform-property-literals" "^7.8.3" "@babel/plugin-transform-regenerator" "^7.8.7" "@babel/plugin-transform-reserved-words" "^7.8.3" @@ -847,7 +866,7 @@ "@babel/plugin-transform-typeof-symbol" "^7.8.4" "@babel/plugin-transform-unicode-regex" "^7.8.3" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.9.0" + "@babel/types" "^7.9.5" browserslist "^4.9.1" core-js-compat "^3.6.2" invariant "^2.2.2" @@ -937,6 +956,15 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@babel/types@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444" + integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg== + dependencies: + "@babel/helper-validator-identifier" "^7.9.5" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -970,43 +998,43 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^25.2.3": - version "25.2.3" - resolved "https://registry.npm.taobao.org/@jest/console/download/@jest/console-25.2.3.tgz#38ac19b916ff61457173799239472659e1a67c39" - integrity sha1-OKwZuRb/YUVxc3mSOUcmWeGmfDk= +"@jest/console@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.3.0.tgz#33b56b81238427bf3ebe3f7b3378d2f79cdbd409" + integrity sha512-LvSDNqpmZIZyweFaEQ6wKY7CbexPitlsLHGJtcooNECo0An/w49rFhjCJzu6efeb6+a3ee946xss1Jcd9r03UQ== dependencies: - "@jest/source-map" "^25.2.1" + "@jest/source-map" "^25.2.6" chalk "^3.0.0" - jest-util "^25.2.3" + jest-util "^25.3.0" slash "^3.0.0" -"@jest/core@^25.2.4": - version "25.2.4" - resolved "https://registry.npm.taobao.org/@jest/core/download/@jest/core-25.2.4.tgz#382ef80369d3311f1df79db1ee19e958ae95cdad" - integrity sha1-OC74A2nTMR8d952x7hnpWK6Vza0= +"@jest/core@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.3.0.tgz#80f97a7a8b59dde741a24f30871cc26d0197d426" + integrity sha512-+D5a/tFf6pA/Gqft2DLBp/yeSRgXhlJ+Wpst0X/ZkfTRP54qDR3C61VfHwaex+GzZBiTcE9vQeoZ2v5T10+Mqw== dependencies: - "@jest/console" "^25.2.3" - "@jest/reporters" "^25.2.4" - "@jest/test-result" "^25.2.4" - "@jest/transform" "^25.2.4" - "@jest/types" "^25.2.3" + "@jest/console" "^25.3.0" + "@jest/reporters" "^25.3.0" + "@jest/test-result" "^25.3.0" + "@jest/transform" "^25.3.0" + "@jest/types" "^25.3.0" ansi-escapes "^4.2.1" chalk "^3.0.0" exit "^0.1.2" graceful-fs "^4.2.3" - jest-changed-files "^25.2.3" - jest-config "^25.2.4" - jest-haste-map "^25.2.3" - jest-message-util "^25.2.4" - jest-regex-util "^25.2.1" - jest-resolve "^25.2.3" - jest-resolve-dependencies "^25.2.4" - jest-runner "^25.2.4" - jest-runtime "^25.2.4" - jest-snapshot "^25.2.4" - jest-util "^25.2.3" - jest-validate "^25.2.3" - jest-watcher "^25.2.4" + jest-changed-files "^25.3.0" + jest-config "^25.3.0" + jest-haste-map "^25.3.0" + jest-message-util "^25.3.0" + jest-regex-util "^25.2.6" + jest-resolve "^25.3.0" + jest-resolve-dependencies "^25.3.0" + jest-runner "^25.3.0" + jest-runtime "^25.3.0" + jest-snapshot "^25.3.0" + jest-util "^25.3.0" + jest-validate "^25.3.0" + jest-watcher "^25.3.0" micromatch "^4.0.2" p-each-series "^2.1.0" realpath-native "^2.0.0" @@ -1014,36 +1042,36 @@ slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^25.2.4": - version "25.2.4" - resolved "https://registry.npm.taobao.org/@jest/environment/download/@jest/environment-25.2.4.tgz#74f4d8dd87b427434d0b822cde37bc0e78f3e28b" - integrity sha1-dPTY3Ye0J0NNC4Is3je8Dnjz4os= +"@jest/environment@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.3.0.tgz#587f28ddb4b0dfe97404d3d4a4c9dbfa0245fb2e" + integrity sha512-vgooqwJTHLLak4fE+TaCGeYP7Tz1Y3CKOsNxR1sE0V3nx3KRUHn3NUnt+wbcfd5yQWKZQKAfW6wqbuwQLrXo3g== dependencies: - "@jest/fake-timers" "^25.2.4" - "@jest/types" "^25.2.3" - jest-mock "^25.2.3" + "@jest/fake-timers" "^25.3.0" + "@jest/types" "^25.3.0" + jest-mock "^25.3.0" -"@jest/fake-timers@^25.2.4": - version "25.2.4" - resolved "https://registry.npm.taobao.org/@jest/fake-timers/download/@jest/fake-timers-25.2.4.tgz#6821b6edde74fda2a42467ae92cc93095d4c9527" - integrity sha1-aCG27d50/aKkJGeuksyTCV1MlSc= +"@jest/fake-timers@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.3.0.tgz#995aad36d5c8984165ca5db12e740ab8dbf7042a" + integrity sha512-NHAj7WbsyR3qBJPpBwSwqaq2WluIvUQsyzpJTN7XDVk7VnlC/y1BAnaYZL3vbPIP8Nhm0Ae5DJe0KExr/SdMJQ== dependencies: - "@jest/types" "^25.2.3" - jest-message-util "^25.2.4" - jest-mock "^25.2.3" - jest-util "^25.2.3" + "@jest/types" "^25.3.0" + jest-message-util "^25.3.0" + jest-mock "^25.3.0" + jest-util "^25.3.0" lolex "^5.0.0" -"@jest/reporters@^25.2.4": - version "25.2.4" - resolved "https://registry.npm.taobao.org/@jest/reporters/download/@jest/reporters-25.2.4.tgz#aa01c20aab217150d3a6080d5c98ce0bf34b17ed" - integrity sha1-qgHCCqshcVDTpggNXJjOC/NLF+0= +"@jest/reporters@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.3.0.tgz#7f39f0e6911561cc5112a1b54656de18faee269b" + integrity sha512-1u0ZBygs0C9DhdYgLCrRfZfNKQa+9+J7Uo+Z9z0RWLHzgsxhoG32lrmMOtUw48yR6bLNELdvzormwUqSk4H4Vg== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^25.2.3" - "@jest/test-result" "^25.2.4" - "@jest/transform" "^25.2.4" - "@jest/types" "^25.2.3" + "@jest/console" "^25.3.0" + "@jest/test-result" "^25.3.0" + "@jest/transform" "^25.3.0" + "@jest/types" "^25.3.0" chalk "^3.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -1052,11 +1080,11 @@ istanbul-lib-instrument "^4.0.0" istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" - istanbul-reports "^3.0.0" - jest-haste-map "^25.2.3" - jest-resolve "^25.2.3" - jest-util "^25.2.3" - jest-worker "^25.2.1" + istanbul-reports "^3.0.2" + jest-haste-map "^25.3.0" + jest-resolve "^25.3.0" + jest-util "^25.3.0" + jest-worker "^25.2.6" slash "^3.0.0" source-map "^0.6.0" string-length "^3.1.0" @@ -1065,51 +1093,50 @@ optionalDependencies: node-notifier "^6.0.0" -"@jest/source-map@^25.2.1": - version "25.2.1" - resolved "https://registry.npm.taobao.org/@jest/source-map/download/@jest/source-map-25.2.1.tgz?cache=0&sync_timestamp=1585215547315&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40jest%2Fsource-map%2Fdownload%2F%40jest%2Fsource-map-25.2.1.tgz#b62ecf8ae76170b08eff8859b56eb7576df34ab8" - integrity sha1-ti7PiudhcLCO/4hZtW63V23zSrg= +"@jest/source-map@^25.2.6": + version "25.2.6" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.2.6.tgz#0ef2209514c6d445ebccea1438c55647f22abb4c" + integrity sha512-VuIRZF8M2zxYFGTEhkNSvQkUKafQro4y+mwUxy5ewRqs5N/ynSFUODYp3fy1zCnbCMy1pz3k+u57uCqx8QRSQQ== dependencies: callsites "^3.0.0" graceful-fs "^4.2.3" source-map "^0.6.0" -"@jest/test-result@^25.2.4": - version "25.2.4" - resolved "https://registry.npm.taobao.org/@jest/test-result/download/@jest/test-result-25.2.4.tgz#8fc9eac58e82eb2a82e4058e68c3814f98f59cf5" - integrity sha1-j8nqxY6C6yqC5AWOaMOBT5j1nPU= +"@jest/test-result@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.3.0.tgz#137fab5e5c6fed36e5d40735d1eb029325e3bf06" + integrity sha512-mqrGuiiPXl1ap09Mydg4O782F3ouDQfsKqtQzIjitpwv3t1cHDwCto21jThw6WRRE+dKcWQvLG70GpyLJICfGw== dependencies: - "@jest/console" "^25.2.3" - "@jest/transform" "^25.2.4" - "@jest/types" "^25.2.3" + "@jest/console" "^25.3.0" + "@jest/types" "^25.3.0" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^25.2.4": - version "25.2.4" - resolved "https://registry.npm.taobao.org/@jest/test-sequencer/download/@jest/test-sequencer-25.2.4.tgz#28364aeddec140c696324114f63570f3de536c87" - integrity sha1-KDZK7d7BQMaWMkEU9jVw895TbIc= +"@jest/test-sequencer@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.3.0.tgz#271ad5f2b8f8137d092ccedc87e16a50f8676209" + integrity sha512-Xvns3xbji7JCvVcDGvqJ/pf4IpmohPODumoPEZJ0/VgC5gI4XaNVIBET2Dq5Czu6Gk3xFcmhtthh/MBOTljdNg== dependencies: - "@jest/test-result" "^25.2.4" - jest-haste-map "^25.2.3" - jest-runner "^25.2.4" - jest-runtime "^25.2.4" + "@jest/test-result" "^25.3.0" + jest-haste-map "^25.3.0" + jest-runner "^25.3.0" + jest-runtime "^25.3.0" -"@jest/transform@^25.2.4": - version "25.2.4" - resolved "https://registry.npm.taobao.org/@jest/transform/download/@jest/transform-25.2.4.tgz#34336f37f13f62f7d1f5b93d5d150ba9eb3e11b9" - integrity sha1-NDNvN/E/YvfR9bk9XRULqes+Ebk= +"@jest/transform@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.3.0.tgz#083c5447d5307d9b9494d6968115b647460e71f1" + integrity sha512-W01p8kTDvvEX6kd0tJc7Y5VdYyFaKwNWy1HQz6Jqlhu48z/8Gxp+yFCDVj+H8Rc7ezl3Mg0hDaGuFVkmHOqirg== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^25.2.3" + "@jest/types" "^25.3.0" babel-plugin-istanbul "^6.0.0" chalk "^3.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.3" - jest-haste-map "^25.2.3" - jest-regex-util "^25.2.1" - jest-util "^25.2.3" + jest-haste-map "^25.3.0" + jest-regex-util "^25.2.6" + jest-util "^25.3.0" micromatch "^4.0.2" pirates "^4.0.1" realpath-native "^2.0.0" @@ -1117,20 +1144,10 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.1.0.tgz#b26831916f0d7c381e11dbb5e103a72aed1b4395" - integrity sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^15.0.0" - chalk "^3.0.0" - -"@jest/types@^25.2.3": - version "25.2.3" - resolved "https://registry.npm.taobao.org/@jest/types/download/@jest/types-25.2.3.tgz#035c4fb94e2da472f359ff9a211915d59987f6b6" - integrity sha1-A1xPuU4tpHLzWf+aIRkV1ZmH9rY= +"@jest/types@^25.3.0": + version "25.3.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.3.0.tgz#88f94b277a1d028fd7117bc1f74451e0fc2131e7" + integrity sha512-UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^1.1.1" @@ -1223,22 +1240,22 @@ "@octokit/types" "^2.0.0" universal-user-agent "^4.0.0" -"@octokit/plugin-paginate-rest@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.0.2.tgz#fee7a81a4cc7d03784aaf9225499dd6e27f6d01e" - integrity sha512-HzODcSUt9mjErly26TlTOGZrhf9bmF/FEDQ2zln1izhgmIV6ulsjsHmgmR4VZ0wzVr/m52Eb6U2XuyS8fkcR1A== +"@octokit/plugin-paginate-rest@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.1.0.tgz#915e1052510c3fa4b9855f72b77bf9c2c7368cbc" + integrity sha512-7+/7urDH8cy6DmTwkewysf7/Or9dFtwZK7aQOc/IImjyeHJy+C8CEKOPo7L5Qb+66HyAr/4p/zV76LMVMuiRtA== dependencies: - "@octokit/types" "^2.0.1" + "@octokit/types" "^2.9.0" "@octokit/plugin-request-log@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz#eef87a431300f6148c39a7f75f8cfeb218b2547e" integrity sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw== -"@octokit/plugin-rest-endpoint-methods@3.4.0": - version "3.4.0" - resolved "https://registry.npm.taobao.org/@octokit/plugin-rest-endpoint-methods/download/@octokit/plugin-rest-endpoint-methods-3.4.0.tgz#27b1dac7fba4d0d6e488967919b6a5bd3595ffbc" - integrity sha1-J7Hax/uk0NbkiJZ5GbalvTWV/7w= +"@octokit/plugin-rest-endpoint-methods@3.5.2": + version "3.5.2" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-3.5.2.tgz#5926c3806d883fff8df749b47ac4e2a38ec67e2b" + integrity sha512-i5GlEWm7k/SzBr7QrIOuas/1nNgr4JcmgM14TAKULVkv4L5mOY+pcVIUMU3qdYhFyblBFhigujav5seMnkqBnQ== dependencies: "@octokit/types" "^2.0.1" deprecation "^2.3.1" @@ -1266,15 +1283,15 @@ once "^1.4.0" universal-user-agent "^5.0.0" -"@octokit/rest@17.1.4": - version "17.1.4" - resolved "https://registry.npm.taobao.org/@octokit/rest/download/@octokit/rest-17.1.4.tgz?cache=0&sync_timestamp=1585274530415&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40octokit%2Frest%2Fdownload%2F%40octokit%2Frest-17.1.4.tgz#b03eb97635de62b48428f998ad1cb9244edd2d10" - integrity sha1-sD65djXeYrSEKPmYrRy5JE7dLRA= +"@octokit/rest@17.3.0": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-17.3.0.tgz#7ad3f4f3c1fdfc5ec6a2e8ba3f891ce52b50b315" + integrity sha512-zqvsnWUEldmF3sCmGGlQ2u+NDQMpF5O4gnwefnGt6yJcN6eGWDYJJvRD/wQ1/nALXU0XABhQElBgR/0wNoprsA== dependencies: "@octokit/core" "^2.4.3" - "@octokit/plugin-paginate-rest" "^2.0.0" + "@octokit/plugin-paginate-rest" "^2.1.0" "@octokit/plugin-request-log" "^1.0.0" - "@octokit/plugin-rest-endpoint-methods" "3.4.0" + "@octokit/plugin-rest-endpoint-methods" "3.5.2" "@octokit/types@^2.0.0", "@octokit/types@^2.0.1": version "2.3.1" @@ -1283,6 +1300,13 @@ dependencies: "@types/node" ">= 8" +"@octokit/types@^2.9.0": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.10.0.tgz#65ace1b0eb5bcbc80a287bb3ae50ee6e3d58448b" + integrity sha512-0/NN22MgQvNNgMjTwzWUzcIfFfks3faqiP1D1oQQz49KYeOWc+KkRG9ASbAPurrAnOaDiqnnuDYzhNT9cq4e8Q== + dependencies: + "@types/node" ">= 8" + "@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" @@ -1307,6 +1331,21 @@ dependencies: type-detect "4.0.8" +"@stylelint/postcss-css-in-js@^0.37.1": + version "0.37.1" + resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.1.tgz#41e5e7660f73d88227610e18c6ebb262d56ac125" + integrity sha512-UMf2Rni3JGKi3ZwYRGMYJ5ipOA5ENJSKMtYA/pE1ZLURwdh7B5+z2r73RmWvub+N0UuH1Lo+TGfCgYwPvqpXNw== + dependencies: + "@babel/core" ">=7.9.0" + +"@stylelint/postcss-markdown@^0.36.1": + version "0.36.1" + resolved "https://registry.yarnpkg.com/@stylelint/postcss-markdown/-/postcss-markdown-0.36.1.tgz#829b87e6c0f108014533d9d7b987dc9efb6632e8" + integrity sha512-iDxMBWk9nB2BPi1VFQ+Dc5+XpvODBHw2n3tYpaBZuEAFQlbtF9If0Qh5LTTwSi/XwdbJ2jt+0dis3i8omyggpw== + dependencies: + remark "^12.0.0" + unist-util-find-all-after "^3.0.1" + "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" @@ -1331,10 +1370,10 @@ resolved "https://registry.npm.taobao.org/@types/anymatch/download/@types/anymatch-1.3.1.tgz?cache=0&sync_timestamp=1580841236934&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fanymatch%2Fdownload%2F%40types%2Fanymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" integrity sha1-M2utwb7sudrMOL6izzKt9ieoQho= -"@types/babel__core@^7.1.0": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.6.tgz#16ff42a5ae203c9af1c6e190ed1f30f83207b610" - integrity sha512-tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg== +"@types/babel__core@^7.1.7": + version "7.1.7" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89" + integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -1428,13 +1467,13 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" -"@types/jest@^25.1.4": - version "25.1.4" - resolved "https://registry.npm.taobao.org/@types/jest/download/@types/jest-25.1.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fjest%2Fdownload%2F%40types%2Fjest-25.1.4.tgz#9e9f1e59dda86d3fd56afce71d1ea1b331f6f760" - integrity sha1-np8eWd2obT/VavznHR6hszH292A= +"@types/jest@^25.2.1": + version "25.2.1" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.1.tgz#9544cd438607955381c1bdbdb97767a249297db5" + integrity sha512-msra1bCaAeEdkSyA0CZ6gW1ukMIvZ5YoJkdXw/qhQdsuuDlFTcEUrUw8CLCPt2rVRUfXlClVvK2gvPs9IokZaA== dependencies: - jest-diff "^25.1.0" - pretty-format "^25.1.0" + jest-diff "^25.2.1" + pretty-format "^25.2.1" "@types/json-schema@^7.0.3": version "7.0.4" @@ -1604,30 +1643,30 @@ semver "^6.3.0" tsutils "^3.17.1" -"@vant/cli@^2.4.0": - version "2.4.0" - resolved "https://registry.npm.taobao.org/@vant/cli/download/@vant/cli-2.4.0.tgz#81da8c3e1f628834a067af1259bee87649942113" - integrity sha1-gdqMPh9iiDSgZ68SWb7odkmUIRM= +"@vant/cli@^2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@vant/cli/-/cli-2.4.1.tgz#a7ecab8a79bf0a18e0cd709789761bf4b1ede145" + integrity sha512-e1IkLRTPJPDtXmloRfhOko3v0t2nbICyY1VR20s6cdbawQz+8klFTicKDrRBsWEJwo2MOBdhdJGrfs0nnz46jQ== dependencies: "@babel/core" "^7.9.0" "@babel/plugin-syntax-jsx" "^7.8.3" "@babel/plugin-transform-object-assign" "^7.8.3" "@babel/plugin-transform-runtime" "^7.9.0" - "@babel/preset-env" "^7.9.0" + "@babel/preset-env" "^7.9.5" "@babel/preset-typescript" "^7.9.0" "@nuxt/friendly-errors-webpack-plugin" "^2.5.0" - "@types/jest" "^25.1.4" + "@types/jest" "^25.2.1" "@vant/eslint-config" "^2.0.0" "@vant/markdown-loader" "^2.3.0" - "@vant/markdown-vetur" "^2.0.0" - "@vant/stylelint-config" "^1.2.1" + "@vant/markdown-vetur" "^2.0.1" + "@vant/stylelint-config" "^1.3.0" "@vant/touch-emulator" "^1.2.0" "@vue/babel-preset-jsx" "^1.1.2" - "@vue/component-compiler-utils" "^3.1.1" + "@vue/component-compiler-utils" "^3.1.2" "@vue/test-utils" "1.0.0-beta.29" address "^1.1.2" - autoprefixer "^9.7.5" - babel-jest "^25.2.4" + autoprefixer "^9.7.6" + babel-jest "^25.3.0" babel-loader "^8.1.0" babel-plugin-import "^1.13.0" cache-loader "^4.1.0" @@ -1638,30 +1677,30 @@ consola "^2.11.3" conventional-changelog "^3.1.18" cross-env "^7.0.2" - css-loader "^3.4.2" + css-loader "^3.5.2" eslint "^6.8.0" fast-glob "^3.2.2" - gh-pages "2.0.1" + gh-pages "^2.2.0" hash-sum "^2.0.0" - html-webpack-plugin "4.0.4" - husky "^4.2.3" - jest "^25.2.4" + html-webpack-plugin "4.2.0" + husky "^4.2.5" + jest "^25.3.0" jest-canvas-mock "^2.2.0" jest-serializer-vue "^2.0.2" less "^3.11.1" less-loader "^5.0.0" - lint-staged "^10.1.1" + lint-staged "^10.1.3" lodash "^4.17.15" ora "^4.0.3" portfinder "^1.0.25" postcss "^7.0.27" postcss-loader "^3.0.0" - prettier "^2.0.2" - release-it "^13.5.1" + prettier "^2.0.4" + release-it "^13.5.2" sass "^1.26.3" sass-loader "^8.0.2" style-loader "^1.1.3" - stylelint "^13.2.1" + stylelint "^13.3.1" typescript "^3.8.3" vue-jest "4.0.0-beta.2" vue-loader "^15.9.1" @@ -1700,15 +1739,15 @@ markdown-it-anchor "^5.2.5" transliteration "^2.1.7" -"@vant/markdown-vetur@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@vant/markdown-vetur/-/markdown-vetur-2.0.0.tgz#19cb9b089fbd04dfb2b74c3edb497297086229e0" - integrity sha512-XcAcVOIUhuYbD5nmKjv4y9WxuP/YytDJi17xn1SwJe2gjIKNMli/gc2oNN2v8npCaCZAaDWpAUTXYy7XefdH9Q== +"@vant/markdown-vetur@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@vant/markdown-vetur/-/markdown-vetur-2.0.1.tgz#cb0c2d33b5e5606e1dc7f3e6531c18b39d6e57a3" + integrity sha512-OhNFTQhCBlK+qIxfyw9unqU77Kf7gd5EsTUXPqg23lALWwpJiVb0IKGwxnYTZ9i7JAzTAho7oIGt7GQ0hhyvow== dependencies: fast-glob "^3.2.2" fs-extra "^9.0.0" -"@vant/stylelint-config@^1.2.1": +"@vant/stylelint-config@^1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@vant/stylelint-config/-/stylelint-config-1.3.0.tgz#702cb87a8698185904aea56ada967064e6821aa4" integrity sha512-XxU8lDPjKnmVkvYPfygH9SyB0nJdpuUgISSkWO6CrlaDdDekYQPSGpBJu+9SWGCxsa7F0sjAYVkyDmij9c53kg== @@ -1802,7 +1841,7 @@ source-map "~0.6.1" vue-template-es2015-compiler "^1.9.0" -"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.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== @@ -1817,6 +1856,22 @@ source-map "~0.6.1" vue-template-es2015-compiler "^1.9.0" +"@vue/component-compiler-utils@^3.1.2": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.1.2.tgz#8213a5ff3202f9f2137fe55370f9e8b9656081c3" + integrity sha512-QLq9z8m79mCinpaEeSURhnNCN6djxpHw0lpP/bodMlt5kALfONpryMthvnrQOlTcIKoF+VoPi+lPHUYeDFPXug== + 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" + source-map "~0.6.1" + vue-template-es2015-compiler "^1.9.0" + optionalDependencies: + prettier "^1.18.2" + "@vue/test-utils@1.0.0-beta.29": version "1.0.0-beta.29" resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.29.tgz#c942cf25e891cf081b6a03332b4ae1ef430726f0" @@ -2350,7 +2405,7 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@^9.0.0, autoprefixer@^9.7.4: +autoprefixer@^9.0.0: version "9.7.4" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz#f8bf3e06707d047f0641d87aee8cfb174b2a5378" integrity sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g== @@ -2363,13 +2418,13 @@ autoprefixer@^9.0.0, autoprefixer@^9.7.4: postcss "^7.0.26" postcss-value-parser "^4.0.2" -autoprefixer@^9.7.5: - version "9.7.5" - resolved "https://registry.npm.taobao.org/autoprefixer/download/autoprefixer-9.7.5.tgz#8df10b9ff9b5814a8d411a5cfbab9c793c392376" - integrity sha1-jfELn/m1gUqNQRpc+6uceTw5I3Y= +autoprefixer@^9.7.6: + version "9.7.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz#63ac5bbc0ce7934e6997207d5bb00d68fa8293a4" + integrity sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ== dependencies: - browserslist "^4.11.0" - caniuse-lite "^1.0.30001036" + browserslist "^4.11.1" + caniuse-lite "^1.0.30001039" chalk "^2.4.2" normalize-range "^0.1.2" num2fraction "^1.2.2" @@ -2386,16 +2441,16 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== -babel-jest@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/babel-jest/download/babel-jest-25.2.4.tgz#b21b68d3af8f161c3e6e501e91f0dea8e652e344" - integrity sha1-shto06+PFhw+blAekfDeqOZS40Q= +babel-jest@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.3.0.tgz#999d0c19e8427f66b796bf9ea233eedf087b957c" + integrity sha512-qiXeX1Cmw4JZ5yQ4H57WpkO0MZ61Qj+YnsVUwAMnDV5ls+yHon11XjarDdgP7H8lTmiEi6biiZA8y3Tmvx6pCg== dependencies: - "@jest/transform" "^25.2.4" - "@jest/types" "^25.2.3" - "@types/babel__core" "^7.1.0" + "@jest/transform" "^25.3.0" + "@jest/types" "^25.3.0" + "@types/babel__core" "^7.1.7" babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^25.2.1" + babel-preset-jest "^25.3.0" chalk "^3.0.0" slash "^3.0.0" @@ -2436,21 +2491,36 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^25.2.1: - version "25.2.1" - resolved "https://registry.npm.taobao.org/babel-plugin-jest-hoist/download/babel-plugin-jest-hoist-25.2.1.tgz#d0003a1f3d5caa281e1107fe03bbf16b799f9955" - integrity sha1-0AA6Hz1cqigeEQf+A7vxa3mfmVU= +babel-plugin-jest-hoist@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.6.tgz#2af07632b8ac7aad7d414c1e58425d5fc8e84909" + integrity sha512-qE2xjMathybYxjiGFJg0mLFrz0qNp83aNZycWDY/SuHiZNq+vQfRQtuINqyXyue1ELd8Rd+1OhFSLjms8msMbw== dependencies: "@types/babel__traverse" "^7.0.6" -babel-preset-jest@^25.2.1: - version "25.2.1" - resolved "https://registry.npm.taobao.org/babel-preset-jest/download/babel-preset-jest-25.2.1.tgz#4ccd0e577f69aa11b71806edfe8b25a5c3ac93a2" - integrity sha1-TM0OV39pqhG3GAbt/oslpcOsk6I= +babel-preset-current-node-syntax@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6" + integrity sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw== dependencies: - "@babel/plugin-syntax-bigint" "^7.0.0" - "@babel/plugin-syntax-object-rest-spread" "^7.0.0" - babel-plugin-jest-hoist "^25.2.1" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-bigint" "^7.8.3" + "@babel/plugin-syntax-class-properties" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + +babel-preset-jest@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.3.0.tgz#9ab40aee52a19bdc52b8b1ec2403d5914ac3d86b" + integrity sha512-tjdvLKNMwDI9r+QWz9sZUQGTq1dpoxjUqFUpEasAc7MOtHg9XuLT2fx0udFG+k1nvMV0WvHHVAN7VmCZ+1Zxbw== + dependencies: + babel-plugin-jest-hoist "^25.2.6" + babel-preset-current-node-syntax "^0.1.2" bail@^1.0.0: version "1.0.5" @@ -2683,10 +2753,10 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.11.0: +browserslist@^4.11.1: version "4.11.1" - resolved "https://registry.npm.taobao.org/browserslist/download/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b" - integrity sha1-kvhV7ojW4FDn5zEdmHmSAU8aHxs= + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b" + integrity sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g== dependencies: caniuse-lite "^1.0.30001038" electron-to-chromium "^1.3.390" @@ -2924,11 +2994,16 @@ caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001030: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001032.tgz#b8d224914e2cd7f507085583d4e38144c652bce4" integrity sha512-8joOm7BwcpEN4BfVHtfh0hBXSAPVYk+eUIcNntGtMkUWy/6AKRCDZINCLe3kB1vHhT2vBxBF85Hh9VlPXi/qjA== -caniuse-lite@^1.0.30001036, caniuse-lite@^1.0.30001038: +caniuse-lite@^1.0.30001038: version "1.0.30001038" resolved "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001038.tgz?cache=0&sync_timestamp=1585200836620&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001038.tgz#44da3cbca2ab6cb6aa83d1be5d324e17f141caff" integrity sha1-RNo8vKKrbLaqg9G+XTJOF/FByv8= +caniuse-lite@^1.0.30001039: + version "1.0.30001043" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001043.tgz#1b561de27aefbe6ff99e41866b8d7d87840c513b" + integrity sha512-MrBDRPJPDBYwACtSQvxg9+fkna5jPXhJlKmuxenl/ml9uf8LHKlDmLpElu+zTW/bEz7lC1m0wTDD7jiIB+hgFg== + capture-exit@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" @@ -2946,10 +3021,10 @@ ccount@^1.0.0: resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17" integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw== -chalk@3.0.0, chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== +chalk@4.0.0, chalk@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72" + integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -2974,6 +3049,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4 escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + changelog-filename-regex@^1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/changelog-filename-regex/-/changelog-filename-regex-1.1.2.tgz#19e98e38248cff0c1cf3ae3bf51bfb22c48592d6" @@ -3284,7 +3367,7 @@ compare-func@^1.3.1: array-ify "^1.0.0" dot-prop "^3.0.0" -compare-versions@^3.5.1: +compare-versions@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== @@ -3701,23 +3784,24 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -css-loader@^3.4.2: - version "3.4.2" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz#d3fdb3358b43f233b78501c5ed7b1c6da6133202" - integrity sha512-jYq4zdZT0oS0Iykt+fqnzVLRIeiPWhka+7BqPn+oSIpWJAHak5tmB/WZrJ2a21JhCeFyNnnlroSl8c+MtVndzA== +css-loader@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.2.tgz#6483ae56f48a7f901fbe07dde2fc96b01eafab3c" + integrity sha512-hDL0DPopg6zQQSRlZm0hyeaqIRnL0wbWjay9BZxoiJBpbfOW4WHfbaYQhwnDmEa0kZUc1CJ3IFo15ot1yULMIQ== dependencies: camelcase "^5.3.1" cssesc "^3.0.0" icss-utils "^4.1.1" loader-utils "^1.2.3" normalize-path "^3.0.0" - postcss "^7.0.23" + postcss "^7.0.27" postcss-modules-extract-imports "^2.0.0" postcss-modules-local-by-default "^3.0.2" - postcss-modules-scope "^2.1.1" + postcss-modules-scope "^2.2.0" postcss-modules-values "^3.0.0" - postcss-value-parser "^4.0.2" - schema-utils "^2.6.0" + postcss-value-parser "^4.0.3" + schema-utils "^2.6.5" + semver "^6.3.0" css-select@^1.1.0: version "1.2.0" @@ -4034,15 +4118,10 @@ detect-repo-changelog@1.0.1: lodash.find "^4.6.0" pify "^2.3.0" -diff-sequences@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.1.0.tgz#fd29a46f1c913fd66c22645dc75bffbe43051f32" - integrity sha512-nFIfVk5B/NStCsJ+zaPO4vYuLjlzQ6uFvPxzYyHlejNZ/UGa7G/n7peOXVrVNvRuyfstt+mZQYGpjxg9Z6N8Kw== - -diff-sequences@^25.2.1: - version "25.2.1" - resolved "https://registry.npm.taobao.org/diff-sequences/download/diff-sequences-25.2.1.tgz#fcfe8aa07dd9b0c648396a478dabca8e76c6ab27" - integrity sha1-/P6KoH3ZsMZIOWpHjavKjnbGqyc= +diff-sequences@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" + integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== diffie-hellman@^5.0.0: version "5.0.3" @@ -4666,17 +4745,17 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expect@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/expect/download/expect-25.2.4.tgz#b66e0777c861034ebc21730bb34e1839d5d46806" - integrity sha1-tm4Hd8hhA068IXMLs04YOdXUaAY= +expect@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-25.3.0.tgz#5fd36e51befd05afb7184bc954f8a4792d184c71" + integrity sha512-buboTXML2h/L0Kh44Ys2Cx49mX20ISc5KDirkxIs3Q9AJv0kazweUAbukegr+nHDOvFRKmxdojjIHCjqAceYfg== dependencies: - "@jest/types" "^25.2.3" + "@jest/types" "^25.3.0" ansi-styles "^4.0.0" - jest-get-type "^25.2.1" - jest-matcher-utils "^25.2.3" - jest-message-util "^25.2.4" - jest-regex-util "^25.2.1" + jest-get-type "^25.2.6" + jest-matcher-utils "^25.3.0" + jest-message-util "^25.3.0" + jest-regex-util "^25.2.6" express@^4.17.1: version "4.17.1" @@ -5090,12 +5169,12 @@ front-matter@^3.0.2: dependencies: js-yaml "^3.13.1" -fs-extra@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== +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.1.2" + graceful-fs "^4.2.0" jsonfile "^4.0.0" universalify "^0.1.0" @@ -5219,19 +5298,17 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -gh-pages@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-2.0.1.tgz#aefe47a43b8d9d2aa3130576b33fe95641e29a2f" - integrity sha512-uFlk3bukljeiWKQ2XvPfjcSi/ou7IfoDf2p+Fj672saLAr8bnOdFVqI/JSgrSgInKpCg5BksxEwGUl++dbg8Dg== +gh-pages@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-2.2.0.tgz#74ebeaca8d2b9a11279dcbd4a39ddfff3e6caa24" + integrity sha512-c+yPkNOPMFGNisYg9r4qvsMIjVYikJv7ImFOhPIVPt0+AcRUamZ7zkGRLHz7FKB0xrlZ+ddSOJsZv9XAFVXLmA== dependencies: async "^2.6.1" commander "^2.18.0" email-addresses "^3.0.1" filenamify-url "^1.0.0" - fs-extra "^7.0.0" + fs-extra "^8.1.0" globby "^6.1.0" - graceful-fs "^4.1.11" - rimraf "^2.6.2" git-raw-commits@2.0.0: version "2.0.0" @@ -5391,13 +5468,20 @@ globjoin@^0.1.4: resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM= -gonzales-pe@^4.2.3, gonzales-pe@^4.2.4: +gonzales-pe@^4.2.3: version "4.2.4" resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.4.tgz#356ae36a312c46fe0f1026dd6cb539039f8500d2" integrity sha512-v0Ts/8IsSbh9n1OJRnSfa7Nlxi4AkXIsWB6vPept8FDbL4bXn3FNuxjYtO/nmBGu7GDkL9MFeGebeSu6l55EPQ== dependencies: minimist "1.1.x" +gonzales-pe@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3" + integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ== + dependencies: + minimist "^1.2.5" + got@10.7.0: version "10.7.0" resolved "https://registry.npm.taobao.org/got/download/got-10.7.0.tgz?cache=0&sync_timestamp=1585075500832&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgot%2Fdownload%2Fgot-10.7.0.tgz#62889dbcd6cca32cd6a154cc2d0c6895121d091f" @@ -5645,10 +5729,10 @@ html-tags@^3.1.0: resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg== -html-webpack-plugin@4.0.4: - version "4.0.4" - resolved "https://registry.npm.taobao.org/html-webpack-plugin/download/html-webpack-plugin-4.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhtml-webpack-plugin%2Fdownload%2Fhtml-webpack-plugin-4.0.4.tgz#90cdfb168094e93e047174d9baca098ec5540636" - integrity sha1-kM37FoCU6T4EcXTZusoJjsVUBjY= +html-webpack-plugin@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.2.0.tgz#ea46f15b620d4c1c8c73ea399395c81208e9f823" + integrity sha512-zL7LYTuq/fcJX6vV6tmmvFR508Bd9e6kvVGbS76YAjZ2CPVRzsjkvDYs/SshPevpolSdTWgaDV39D6k6oQoVFw== dependencies: "@types/html-minifier-terser" "^5.0.0" "@types/tapable" "^1.0.5" @@ -5782,14 +5866,14 @@ humanize-url@^1.0.0: normalize-url "^1.0.0" strip-url-auth "^1.0.0" -husky@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.3.tgz#3b18d2ee5febe99e27f2983500202daffbc3151e" - integrity sha512-VxTsSTRwYveKXN4SaH1/FefRJYCtx+wx04sSVcOpD7N2zjoHxa+cEJ07Qg5NmV3HAK+IRKOyNVpi2YBIVccIfQ== +husky@^4.2.5: + version "4.2.5" + resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.5.tgz#2b4f7622673a71579f901d9885ed448394b5fa36" + integrity sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ== dependencies: - chalk "^3.0.0" + chalk "^4.0.0" ci-info "^2.0.0" - compare-versions "^3.5.1" + compare-versions "^3.6.0" cosmiconfig "^6.0.0" find-versions "^3.2.0" opencollective-postinstall "^2.0.2" @@ -6159,7 +6243,7 @@ is-date-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== -is-decimal@^1.0.0: +is-decimal@^1.0.0, is-decimal@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw== @@ -6326,6 +6410,11 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= +is-plain-obj@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== + is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -6521,10 +6610,10 @@ istanbul-lib-source-maps@^4.0.0: istanbul-lib-coverage "^3.0.0" source-map "^0.6.1" -istanbul-reports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.0.tgz#d4d16d035db99581b6194e119bbf36c963c5eb70" - integrity sha512-2osTcC8zcOSUkImzN2EWQta3Vdi4WjjKw99P2yWx5mLnigAM0Rd5uYFn1cf2i/Ois45GkNjaoTqc5CxgMSX80A== +istanbul-reports@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" + integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" @@ -6537,142 +6626,127 @@ jest-canvas-mock@^2.2.0: cssfontparser "^1.2.1" parse-color "^1.0.0" -jest-changed-files@^25.2.3: - version "25.2.3" - resolved "https://registry.npm.taobao.org/jest-changed-files/download/jest-changed-files-25.2.3.tgz#ad19deef9e47ba37efb432d2c9a67dfd97cc78af" - integrity sha1-rRne755HujfvtDLSyaZ9/ZfMeK8= +jest-changed-files@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.3.0.tgz#85d8de6f4bd13dafda9d7f1e3f2565fc0e183c78" + integrity sha512-eqd5hyLbUjIVvLlJ3vQ/MoPxsxfESVXG9gvU19XXjKzxr+dXmZIqCXiY0OiYaibwlHZBJl2Vebkc0ADEMzCXew== dependencies: - "@jest/types" "^25.2.3" + "@jest/types" "^25.3.0" execa "^3.2.0" throat "^5.0.0" -jest-cli@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/jest-cli/download/jest-cli-25.2.4.tgz#021c2383904696597abc060dcb133c82ebd8bfcc" - integrity sha1-Ahwjg5BGlll6vAYNyxM8guvYv8w= +jest-cli@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.3.0.tgz#d9e11f5700cc5946583cf0d01a9bdebceed448d2" + integrity sha512-XpNQPlW1tzpP7RGG8dxpkRegYDuLjzSiENu92+CYM87nEbmEPb3b4+yo8xcsHOnj0AG7DUt9b3uG8LuHI3MDzw== dependencies: - "@jest/core" "^25.2.4" - "@jest/test-result" "^25.2.4" - "@jest/types" "^25.2.3" + "@jest/core" "^25.3.0" + "@jest/test-result" "^25.3.0" + "@jest/types" "^25.3.0" chalk "^3.0.0" exit "^0.1.2" import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^25.2.4" - jest-util "^25.2.3" - jest-validate "^25.2.3" + jest-config "^25.3.0" + jest-util "^25.3.0" + jest-validate "^25.3.0" prompts "^2.0.1" realpath-native "^2.0.0" yargs "^15.3.1" -jest-config@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/jest-config/download/jest-config-25.2.4.tgz#f4f33238979f225683179c89d1e402893008975d" - integrity sha1-9PMyOJefIlaDF5yJ0eQCiTAIl10= +jest-config@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.3.0.tgz#112b5e2f2e57dec4501dd2fe979044c06fb1317e" + integrity sha512-CmF1JnNWFmoCSPC4tnU52wnVBpuxHjilA40qH/03IHxIevkjUInSMwaDeE6ACfxMPTLidBGBCO3EbxvzPbo8wA== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^25.2.4" - "@jest/types" "^25.2.3" - babel-jest "^25.2.4" + "@jest/test-sequencer" "^25.3.0" + "@jest/types" "^25.3.0" + babel-jest "^25.3.0" chalk "^3.0.0" deepmerge "^4.2.2" glob "^7.1.1" - jest-environment-jsdom "^25.2.4" - jest-environment-node "^25.2.4" - jest-get-type "^25.2.1" - jest-jasmine2 "^25.2.4" - jest-regex-util "^25.2.1" - jest-resolve "^25.2.3" - jest-util "^25.2.3" - jest-validate "^25.2.3" + jest-environment-jsdom "^25.3.0" + jest-environment-node "^25.3.0" + jest-get-type "^25.2.6" + jest-jasmine2 "^25.3.0" + jest-regex-util "^25.2.6" + jest-resolve "^25.3.0" + jest-util "^25.3.0" + jest-validate "^25.3.0" micromatch "^4.0.2" - pretty-format "^25.2.3" + pretty-format "^25.3.0" realpath-native "^2.0.0" -jest-diff@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.1.0.tgz#58b827e63edea1bc80c1de952b80cec9ac50e1ad" - integrity sha512-nepXgajT+h017APJTreSieh4zCqnSHEJ1iT8HDlewu630lSJ4Kjjr9KNzm+kzGwwcpsDE6Snx1GJGzzsefaEHw== +jest-diff@^25.2.1, jest-diff@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.3.0.tgz#0d7d6f5d6171e5dacde9e05be47b3615e147c26f" + integrity sha512-vyvs6RPoVdiwARwY4kqFWd4PirPLm2dmmkNzKqo38uZOzJvLee87yzDjIZLmY1SjM3XR5DwsUH+cdQ12vgqi1w== dependencies: chalk "^3.0.0" - diff-sequences "^25.1.0" - jest-get-type "^25.1.0" - pretty-format "^25.1.0" + diff-sequences "^25.2.6" + jest-get-type "^25.2.6" + pretty-format "^25.3.0" -jest-diff@^25.2.3: - version "25.2.3" - resolved "https://registry.npm.taobao.org/jest-diff/download/jest-diff-25.2.3.tgz#54d601a0a754ef26e808a8c8dbadd278c215aa3f" - integrity sha1-VNYBoKdU7yboCKjI263SeMIVqj8= - dependencies: - chalk "^3.0.0" - diff-sequences "^25.2.1" - jest-get-type "^25.2.1" - pretty-format "^25.2.3" - -jest-docblock@^25.2.3: - version "25.2.3" - resolved "https://registry.npm.taobao.org/jest-docblock/download/jest-docblock-25.2.3.tgz#ac45280c43d59e7139f9fbe5896c6e0320c01ebb" - integrity sha1-rEUoDEPVnnE5+fvliWxuAyDAHrs= +jest-docblock@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.3.0.tgz#8b777a27e3477cd77a168c05290c471a575623ef" + integrity sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg== dependencies: detect-newline "^3.0.0" -jest-each@^25.2.3: - version "25.2.3" - resolved "https://registry.npm.taobao.org/jest-each/download/jest-each-25.2.3.tgz#64067ba1508ebbd07e9b126c173ab371e8e6309d" - integrity sha1-ZAZ7oVCOu9B+mxJsFzqzcejmMJ0= +jest-each@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.3.0.tgz#a319eecf1f6076164ab86f99ca166a55b96c0bd4" + integrity sha512-aBfS4VOf/Qs95yUlX6d6WBv0szvOcTkTTyCIaLuQGj4bSHsT+Wd9dDngVHrCe5uytxpN8VM+NAloI6nbPjXfXw== dependencies: - "@jest/types" "^25.2.3" + "@jest/types" "^25.3.0" chalk "^3.0.0" - jest-get-type "^25.2.1" - jest-util "^25.2.3" - pretty-format "^25.2.3" + jest-get-type "^25.2.6" + jest-util "^25.3.0" + pretty-format "^25.3.0" -jest-environment-jsdom@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/jest-environment-jsdom/download/jest-environment-jsdom-25.2.4.tgz#f2783541d0538b1bc43641703372cea6a2e83611" - integrity sha1-8ng1QdBTixvENkFwM3LOpqLoNhE= +jest-environment-jsdom@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.3.0.tgz#c493ab8c41f28001520c70ef67dd88b88be6af05" + integrity sha512-jdE4bQN+k2QEZ9sWOxsqDJvMzbdFSCN/4tw8X0TQaCqyzKz58PyEf41oIr4WO7ERdp7WaJGBSUKF7imR3UW1lg== dependencies: - "@jest/environment" "^25.2.4" - "@jest/fake-timers" "^25.2.4" - "@jest/types" "^25.2.3" - jest-mock "^25.2.3" - jest-util "^25.2.3" + "@jest/environment" "^25.3.0" + "@jest/fake-timers" "^25.3.0" + "@jest/types" "^25.3.0" + jest-mock "^25.3.0" + jest-util "^25.3.0" jsdom "^15.2.1" -jest-environment-node@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/jest-environment-node/download/jest-environment-node-25.2.4.tgz#dc211dfb0d8b66dfc1965a8f846e72e54ff0c430" - integrity sha1-3CEd+w2LZt/BllqPhG5y5U/wxDA= +jest-environment-node@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.3.0.tgz#9845f0e63991e8498448cb0ae804935689533db9" + integrity sha512-XO09S29Nx1NU7TiMPHMoDIkxoGBuKSTbE+sHp0gXbeLDXhIdhysUI25kOqFFSD9AuDgvPvxWCXrvNqiFsOH33g== dependencies: - "@jest/environment" "^25.2.4" - "@jest/fake-timers" "^25.2.4" - "@jest/types" "^25.2.3" - jest-mock "^25.2.3" - jest-util "^25.2.3" + "@jest/environment" "^25.3.0" + "@jest/fake-timers" "^25.3.0" + "@jest/types" "^25.3.0" + jest-mock "^25.3.0" + jest-util "^25.3.0" semver "^6.3.0" -jest-get-type@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.1.0.tgz#1cfe5fc34f148dc3a8a3b7275f6b9ce9e2e8a876" - integrity sha512-yWkBnT+5tMr8ANB6V+OjmrIJufHtCAqI5ic2H40v+tRqxDmE0PGnIiTyvRWFOMtmVHYpwRqyazDbTnhpjsGvLw== +jest-get-type@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" + integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig== -jest-get-type@^25.2.1: - version "25.2.1" - resolved "https://registry.npm.taobao.org/jest-get-type/download/jest-get-type-25.2.1.tgz?cache=0&sync_timestamp=1585215279267&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjest-get-type%2Fdownload%2Fjest-get-type-25.2.1.tgz#6c83de603c41b1627e6964da2f5454e6aa3c13a6" - integrity sha1-bIPeYDxBsWJ+aWTaL1RU5qo8E6Y= - -jest-haste-map@^25.2.3: - version "25.2.3" - resolved "https://registry.npm.taobao.org/jest-haste-map/download/jest-haste-map-25.2.3.tgz#2649392b5af191f0167a27bfb62e5d96d7eaaade" - integrity sha1-Jkk5K1rxkfAWeie/ti5dltfqqt4= +jest-haste-map@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.3.0.tgz#b7683031c9c9ddc0521d311564108b244b11e4c6" + integrity sha512-LjXaRa+F8wwtSxo9G+hHD/Cp63PPQzvaBL9XCVoJD2rrcJO0Zr2+YYzAFWWYJ5GlPUkoaJFJtOuk0sL6MJY80A== dependencies: - "@jest/types" "^25.2.3" + "@jest/types" "^25.3.0" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.3" - jest-serializer "^25.2.1" - jest-util "^25.2.3" - jest-worker "^25.2.1" + jest-serializer "^25.2.6" + jest-util "^25.3.0" + jest-worker "^25.2.6" micromatch "^4.0.2" sane "^4.0.3" walker "^1.0.7" @@ -6680,150 +6754,149 @@ jest-haste-map@^25.2.3: optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/jest-jasmine2/download/jest-jasmine2-25.2.4.tgz#5f77de83e1027f0c7588137055a80da773872374" - integrity sha1-X3feg+ECfwx1iBNwVagNp3OHI3Q= +jest-jasmine2@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.3.0.tgz#16ae4f68adef65fb45001b26c864bcbcbf972830" + integrity sha512-NCYOGE6+HNzYFSui52SefgpsnIzvxjn6KAgqw66BdRp37xpMD/4kujDHLNW5bS5i53os5TcMn6jYrzQRO8VPrQ== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^25.2.4" - "@jest/source-map" "^25.2.1" - "@jest/test-result" "^25.2.4" - "@jest/types" "^25.2.3" + "@jest/environment" "^25.3.0" + "@jest/source-map" "^25.2.6" + "@jest/test-result" "^25.3.0" + "@jest/types" "^25.3.0" chalk "^3.0.0" co "^4.6.0" - expect "^25.2.4" + expect "^25.3.0" is-generator-fn "^2.0.0" - jest-each "^25.2.3" - jest-matcher-utils "^25.2.3" - jest-message-util "^25.2.4" - jest-runtime "^25.2.4" - jest-snapshot "^25.2.4" - jest-util "^25.2.3" - pretty-format "^25.2.3" + jest-each "^25.3.0" + jest-matcher-utils "^25.3.0" + jest-message-util "^25.3.0" + jest-runtime "^25.3.0" + jest-snapshot "^25.3.0" + jest-util "^25.3.0" + pretty-format "^25.3.0" throat "^5.0.0" -jest-leak-detector@^25.2.3: - version "25.2.3" - resolved "https://registry.npm.taobao.org/jest-leak-detector/download/jest-leak-detector-25.2.3.tgz#4cf39f137925e0061c04c24ca65cae36465f0238" - integrity sha1-TPOfE3kl4AYcBMJMplyuNkZfAjg= +jest-leak-detector@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.3.0.tgz#5b6bf04903b35be56038915a55f47291771f769f" + integrity sha512-jk7k24dMIfk8LUSQQGN8PyOy9+J0NAfHZWiDmUDYVMctY8FLJQ1eQ8+PjMoN8PgwhLIggUqgYJnyRFvUz3jLRw== dependencies: - jest-get-type "^25.2.1" - pretty-format "^25.2.3" + jest-get-type "^25.2.6" + pretty-format "^25.3.0" -jest-matcher-utils@^25.2.3: - version "25.2.3" - resolved "https://registry.npm.taobao.org/jest-matcher-utils/download/jest-matcher-utils-25.2.3.tgz#59285bd6d6c810debc9caa585ed985e46a3f28fd" - integrity sha1-WShb1tbIEN68nKpYXtmF5Go/KP0= +jest-matcher-utils@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.3.0.tgz#76765788a26edaa8bc5f0100aea52ae383559648" + integrity sha512-ZBUJ2fchNIZt+fyzkuCFBb8SKaU//Rln45augfUtbHaGyVxCO++ANARdBK9oPGXU3hEDgyy7UHnOP/qNOJXFUg== dependencies: chalk "^3.0.0" - jest-diff "^25.2.3" - jest-get-type "^25.2.1" - pretty-format "^25.2.3" + jest-diff "^25.3.0" + jest-get-type "^25.2.6" + pretty-format "^25.3.0" -jest-message-util@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/jest-message-util/download/jest-message-util-25.2.4.tgz#b1441b9c82f5c11fc661303cbf200a2f136a7762" - integrity sha1-sUQbnIL1wR/GYTA8vyAKLxNqd2I= +jest-message-util@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.3.0.tgz#e3836826fe5ca538a337b87d9bd2648190867f85" + integrity sha512-5QNy9Id4WxJbRITEbA1T1kem9bk7y2fD0updZMSTNHtbEDnYOGLDPAuFBhFgVmOZpv0n6OMdVkK+WhyXEPCcOw== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/test-result" "^25.2.4" - "@jest/types" "^25.2.3" + "@jest/types" "^25.3.0" "@types/stack-utils" "^1.0.1" chalk "^3.0.0" micromatch "^4.0.2" slash "^3.0.0" stack-utils "^1.0.1" -jest-mock@^25.2.3: - version "25.2.3" - resolved "https://registry.npm.taobao.org/jest-mock/download/jest-mock-25.2.3.tgz#b37a581f59d61bd91db27a99bf7eb8b3e5e993d5" - integrity sha1-s3pYH1nWG9kdsnqZv364s+Xpk9U= +jest-mock@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.3.0.tgz#d72644509e40987a732a9a2534a1054f4649402c" + integrity sha512-yRn6GbuqB4j3aYu+Z1ezwRiZfp0o9om5uOcBovVtkcRLeBCNP5mT0ysdenUsxAHnQUgGwPOE1wwhtQYe6NKirQ== dependencies: - "@jest/types" "^25.2.3" + "@jest/types" "^25.3.0" jest-pnp-resolver@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a" integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ== -jest-regex-util@^25.2.1: - version "25.2.1" - resolved "https://registry.npm.taobao.org/jest-regex-util/download/jest-regex-util-25.2.1.tgz?cache=0&sync_timestamp=1585215279331&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjest-regex-util%2Fdownload%2Fjest-regex-util-25.2.1.tgz#db64b0d15cd3642c93b7b9627801d7c518600584" - integrity sha1-22Sw0VzTZCyTt7lieAHXxRhgBYQ= +jest-regex-util@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.6.tgz#d847d38ba15d2118d3b06390056028d0f2fd3964" + integrity sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw== -jest-resolve-dependencies@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/jest-resolve-dependencies/download/jest-resolve-dependencies-25.2.4.tgz#2d904400387d74a366dff54badb40a2b3210e733" - integrity sha1-LZBEADh9dKNm3/VLrbQKKzIQ5zM= +jest-resolve-dependencies@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.3.0.tgz#b0e4ae053dd44ddacc18c6ee12b5b7c28e445a90" + integrity sha512-bDUlLYmHW+f7J7KgcY2lkq8EMRqKonRl0XoD4Wp5SJkgAxKJnsaIOlrrVNTfXYf+YOu3VCjm/Ac2hPF2nfsCIA== dependencies: - "@jest/types" "^25.2.3" - jest-regex-util "^25.2.1" - jest-snapshot "^25.2.4" + "@jest/types" "^25.3.0" + jest-regex-util "^25.2.6" + jest-snapshot "^25.3.0" -jest-resolve@^25.2.3: - version "25.2.3" - resolved "https://registry.npm.taobao.org/jest-resolve/download/jest-resolve-25.2.3.tgz#ababeaf2bb948cb6d2dea8453759116da0fb7842" - integrity sha1-q6vq8ruUjLbS3qhFN1kRbaD7eEI= +jest-resolve@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.3.0.tgz#cb90a5bbea54a02eccdbbf4126a819595dcf91d6" + integrity sha512-IHoQAAybulsJ+ZgWis+ekYKDAoFkVH5Nx/znpb41zRtpxj4fr2WNV9iDqavdSm8GIpMlsfZxbC/fV9DhW0q9VQ== dependencies: - "@jest/types" "^25.2.3" + "@jest/types" "^25.3.0" browser-resolve "^1.11.3" chalk "^3.0.0" jest-pnp-resolver "^1.2.1" realpath-native "^2.0.0" resolve "^1.15.1" -jest-runner@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/jest-runner/download/jest-runner-25.2.4.tgz#d0daf7c56b4a83b6b675863d5cdcd502c960f9a1" - integrity sha1-0Nr3xWtKg7a2dYY9XNzVAslg+aE= +jest-runner@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.3.0.tgz#673ef2ac79d2810eb6b2c1a3f82398375a3d1174" + integrity sha512-csDqSC9qGHYWDrzrElzEgFbteztFeZJmKhSgY5jlCIcN0+PhActzRNku0DA1Xa1HxGOb0/AfbP1EGJlP4fGPtA== dependencies: - "@jest/console" "^25.2.3" - "@jest/environment" "^25.2.4" - "@jest/test-result" "^25.2.4" - "@jest/types" "^25.2.3" + "@jest/console" "^25.3.0" + "@jest/environment" "^25.3.0" + "@jest/test-result" "^25.3.0" + "@jest/types" "^25.3.0" chalk "^3.0.0" exit "^0.1.2" graceful-fs "^4.2.3" - jest-config "^25.2.4" - jest-docblock "^25.2.3" - jest-haste-map "^25.2.3" - jest-jasmine2 "^25.2.4" - jest-leak-detector "^25.2.3" - jest-message-util "^25.2.4" - jest-resolve "^25.2.3" - jest-runtime "^25.2.4" - jest-util "^25.2.3" - jest-worker "^25.2.1" + jest-config "^25.3.0" + jest-docblock "^25.3.0" + jest-haste-map "^25.3.0" + jest-jasmine2 "^25.3.0" + jest-leak-detector "^25.3.0" + jest-message-util "^25.3.0" + jest-resolve "^25.3.0" + jest-runtime "^25.3.0" + jest-util "^25.3.0" + jest-worker "^25.2.6" source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/jest-runtime/download/jest-runtime-25.2.4.tgz#c66a421e115944426b377a7fd331f6c0902cfa56" - integrity sha1-xmpCHhFZREJrN3p/0zH2wJAs+lY= +jest-runtime@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.3.0.tgz#af4d40dbcc590fa5de9910cb6a120a13d131050b" + integrity sha512-gn5KYB1wxXRM3nfw8fVpthFu60vxQUCr+ShGq41+ZBFF3DRHZRKj3HDWVAVB4iTNBj2y04QeAo5cZ/boYaPg0w== dependencies: - "@jest/console" "^25.2.3" - "@jest/environment" "^25.2.4" - "@jest/source-map" "^25.2.1" - "@jest/test-result" "^25.2.4" - "@jest/transform" "^25.2.4" - "@jest/types" "^25.2.3" + "@jest/console" "^25.3.0" + "@jest/environment" "^25.3.0" + "@jest/source-map" "^25.2.6" + "@jest/test-result" "^25.3.0" + "@jest/transform" "^25.3.0" + "@jest/types" "^25.3.0" "@types/yargs" "^15.0.0" chalk "^3.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.3" - jest-config "^25.2.4" - jest-haste-map "^25.2.3" - jest-message-util "^25.2.4" - jest-mock "^25.2.3" - jest-regex-util "^25.2.1" - jest-resolve "^25.2.3" - jest-snapshot "^25.2.4" - jest-util "^25.2.3" - jest-validate "^25.2.3" + jest-config "^25.3.0" + jest-haste-map "^25.3.0" + jest-message-util "^25.3.0" + jest-mock "^25.3.0" + jest-regex-util "^25.2.6" + jest-resolve "^25.3.0" + jest-snapshot "^25.3.0" + jest-util "^25.3.0" + jest-validate "^25.3.0" realpath-native "^2.0.0" slash "^3.0.0" strip-bom "^4.0.0" @@ -6836,81 +6909,81 @@ jest-serializer-vue@^2.0.2: dependencies: pretty "2.0.0" -jest-serializer@^25.2.1: - version "25.2.1" - resolved "https://registry.npm.taobao.org/jest-serializer/download/jest-serializer-25.2.1.tgz#51727a5fc04256f461abe0fa024a022ba165877a" - integrity sha1-UXJ6X8BCVvRhq+D6AkoCK6Flh3o= +jest-serializer@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.2.6.tgz#3bb4cc14fe0d8358489dbbefbb8a4e708ce039b7" + integrity sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ== -jest-snapshot@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/jest-snapshot/download/jest-snapshot-25.2.4.tgz#08d4517579c864df4280bcc948ceea34327a4ded" - integrity sha1-CNRRdXnIZN9CgLzJSM7qNDJ6Te0= +jest-snapshot@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.3.0.tgz#d4feb457494f4aaedcc83fbbf1ca21808fc3df71" + integrity sha512-GGpR6Oro2htJPKh5RX4PR1xwo5jCEjtvSPLW1IS7N85y+2bWKbiknHpJJRKSdGXghElb5hWaeQASJI4IiRayGg== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^25.2.3" + "@jest/types" "^25.3.0" "@types/prettier" "^1.19.0" chalk "^3.0.0" - expect "^25.2.4" - jest-diff "^25.2.3" - jest-get-type "^25.2.1" - jest-matcher-utils "^25.2.3" - jest-message-util "^25.2.4" - jest-resolve "^25.2.3" + expect "^25.3.0" + jest-diff "^25.3.0" + jest-get-type "^25.2.6" + jest-matcher-utils "^25.3.0" + jest-message-util "^25.3.0" + jest-resolve "^25.3.0" make-dir "^3.0.0" natural-compare "^1.4.0" - pretty-format "^25.2.3" + pretty-format "^25.3.0" semver "^6.3.0" -jest-util@^25.2.3: - version "25.2.3" - resolved "https://registry.npm.taobao.org/jest-util/download/jest-util-25.2.3.tgz#0abf95a1d6b96f2de5a3ecd61b36c40a182dc256" - integrity sha1-Cr+Voda5by3lo+zWGzbEChgtwlY= +jest-util@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.3.0.tgz#e3b0064165818f10d78514696fd25efba82cf049" + integrity sha512-dc625P/KS/CpWTJJJxKc4bA3A6c+PJGBAqS8JTJqx4HqPoKNqXg/Ec8biL2Z1TabwK7E7Ilf0/ukSEXM1VwzNA== dependencies: - "@jest/types" "^25.2.3" + "@jest/types" "^25.3.0" chalk "^3.0.0" is-ci "^2.0.0" make-dir "^3.0.0" -jest-validate@^25.2.3: - version "25.2.3" - resolved "https://registry.npm.taobao.org/jest-validate/download/jest-validate-25.2.3.tgz#ecb0f093cf8ae71d15075fb48439b6f78f1fcb5a" - integrity sha1-7LDwk8+K5x0VB1+0hDm2948fy1o= +jest-validate@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.3.0.tgz#eb95fdee0039647bcd5d4be641b21e4a142a880c" + integrity sha512-3WuXgIZ4HXUvW6gk9twFFkT9j6zUorKnF2oEY8VEsHb7x5LGvVlN3WUsbqazVKuyXwvikO2zFJ/YTySMsMje2w== dependencies: - "@jest/types" "^25.2.3" + "@jest/types" "^25.3.0" camelcase "^5.3.1" chalk "^3.0.0" - jest-get-type "^25.2.1" + jest-get-type "^25.2.6" leven "^3.1.0" - pretty-format "^25.2.3" + pretty-format "^25.3.0" -jest-watcher@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/jest-watcher/download/jest-watcher-25.2.4.tgz#dda85b914d470fa4145164a8f70bda4f208bafb6" - integrity sha1-3ahbkU1HD6QUUWSo9wvaTyCLr7Y= +jest-watcher@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.3.0.tgz#fd03fd5ca52f02bd3161ab177466bf1bfdd34e5c" + integrity sha512-dtFkfidFCS9Ucv8azOg2hkiY3sgJEHeTLtGFHS+jfBEE7eRtrO6+2r1BokyDkaG2FOD7485r/SgpC1MFAENfeA== dependencies: - "@jest/test-result" "^25.2.4" - "@jest/types" "^25.2.3" + "@jest/test-result" "^25.3.0" + "@jest/types" "^25.3.0" ansi-escapes "^4.2.1" chalk "^3.0.0" - jest-util "^25.2.3" + jest-util "^25.3.0" string-length "^3.1.0" -jest-worker@^25.2.1: - version "25.2.1" - resolved "https://registry.npm.taobao.org/jest-worker/download/jest-worker-25.2.1.tgz#209617015c768652646aa33a7828cc2ab472a18a" - integrity sha1-IJYXAVx2hlJkaqM6eCjMKrRyoYo= +jest-worker@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.6.tgz#d1292625326794ce187c38f51109faced3846c58" + integrity sha512-FJn9XDUSxcOR4cwDzRfL1z56rUofNTFs539FGASpd50RHdb6EVkhxQqktodW2mI49l+W3H+tFJDotCHUQF6dmA== dependencies: merge-stream "^2.0.0" supports-color "^7.0.0" -jest@^25.2.4: - version "25.2.4" - resolved "https://registry.npm.taobao.org/jest/download/jest-25.2.4.tgz#d10941948a2b57eb7accc2e7ae78af4a0e11b40a" - integrity sha1-0QlBlIorV+t6zMLnrnivSg4RtAo= +jest@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-25.3.0.tgz#7a5e59741d94b8662664c77a9f346246d6bf228b" + integrity sha512-iKd5ShQSHzFT5IL/6h5RZJhApgqXSoPxhp5HEi94v6OAw9QkF8T7X+liEU2eEHJ1eMFYTHmeWLrpBWulsDpaUg== dependencies: - "@jest/core" "^25.2.4" + "@jest/core" "^25.3.0" import-local "^3.0.2" - jest-cli "^25.2.4" + jest-cli "^25.3.0" js-beautify@^1.6.12: version "1.10.3" @@ -7210,10 +7283,10 @@ linkify-it@^2.0.0: dependencies: uc.micro "^1.0.1" -lint-staged@^10.1.1: - version "10.1.1" - resolved "https://registry.npm.taobao.org/lint-staged/download/lint-staged-10.1.1.tgz#1c8569b66d684e6e3553cd760c03053f41fca152" - integrity sha1-HIVptm1oTm41U812DAMFP0H8oVI= +lint-staged@^10.1.3: + version "10.1.5" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.1.5.tgz#de21ee7c4a91d75e5135b100b963f65e61645230" + integrity sha512-Etn83be+CiG674kIkE4pOyjtpssXfdmuAPhOehy5w4bOVMnQJ5DsiWq5CShpZj38NA+UdJSsMMkqhb3hB72kOg== dependencies: chalk "^3.0.0" commander "^4.0.1" @@ -7572,6 +7645,13 @@ markdown-table@^1.1.0: resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.3.tgz#9fcb69bcfdb8717bfd0398c6ec2d93036ef8de60" integrity sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q== +markdown-table@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b" + integrity sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A== + dependencies: + repeat-string "^1.0.0" + mathml-tag-names@^2.0.1, mathml-tag-names@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" @@ -7593,6 +7673,13 @@ mdast-util-compact@^1.0.0: dependencies: unist-util-visit "^1.1.0" +mdast-util-compact@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz#cabc69a2f43103628326f35b1acf735d55c99490" + integrity sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA== + dependencies: + unist-util-visit "^2.0.0" + mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -7674,10 +7761,10 @@ meow@^5.0.0: trim-newlines "^2.0.0" yargs-parser "^10.0.0" -meow@^6.0.1: +meow@^6.1.0: version "6.1.0" - resolved "https://registry.npm.taobao.org/meow/download/meow-6.1.0.tgz#4ff4641818d3502afcddc631f94cb6971a581cb3" - integrity sha1-T/RkGBjTUCr83cYx+Uy2lxpYHLM= + resolved "https://registry.yarnpkg.com/meow/-/meow-6.1.0.tgz#4ff4641818d3502afcddc631f94cb6971a581cb3" + integrity sha512-iIAoeI01v6pmSfObAAWFoITAA4GgiT45m4SmJgoxtZfvI0fyZwhV4d0lTwiUXvAKIPlma05Feb2Xngl52Mj5Cg== dependencies: "@types/minimist" "^1.2.0" camelcase-keys "^6.1.1" @@ -8557,6 +8644,18 @@ parse-entities@^1.0.2, parse-entities@^1.1.0: is-decimal "^1.0.0" is-hexadecimal "^1.0.0" +parse-entities@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8" + integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ== + dependencies: + character-entities "^1.0.0" + character-entities-legacy "^1.0.0" + character-reference-invalid "^1.0.0" + is-alphanumerical "^1.0.0" + is-decimal "^1.0.0" + is-hexadecimal "^1.0.0" + parse-github-repo-url@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50" @@ -8829,7 +8928,7 @@ postcss-html@^0.36.0: dependencies: htmlparser2 "^3.10.0" -postcss-jsx@^0.36.0, postcss-jsx@^0.36.4: +postcss-jsx@^0.36.0: version "0.36.4" resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.36.4.tgz#37a68f300a39e5748d547f19a747b3257240bd50" integrity sha512-jwO/7qWUvYuWYnpOb0+4bIIgJt7003pgU3P6nETBLaOyBXuTD55ho21xnals5nBrlpTIFodyd3/jBi6UO3dHvA== @@ -8891,10 +8990,10 @@ postcss-modules-local-by-default@^3.0.2: postcss-selector-parser "^6.0.2" postcss-value-parser "^4.0.0" -postcss-modules-scope@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz#33d4fc946602eb5e9355c4165d68a10727689dba" - integrity sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ== +postcss-modules-scope@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" + integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== dependencies: postcss "^7.0.6" postcss-selector-parser "^6.0.0" @@ -8922,7 +9021,7 @@ postcss-resolve-nested-selector@^0.1.1: resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4= -postcss-safe-parser@^4.0.0, postcss-safe-parser@^4.0.1: +postcss-safe-parser@^4.0.0, postcss-safe-parser@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz#a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96" integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g== @@ -8937,12 +9036,12 @@ postcss-sass@^0.3.5: gonzales-pe "^4.2.3" postcss "^7.0.1" -postcss-sass@^0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.4.2.tgz#7d1f8ddf6960d329de28fb3ff43c9c42013646bc" - integrity sha512-hcRgnd91OQ6Ot9R90PE/khUDCJHG8Uxxd3F7Y0+9VHjBiJgNv7sK5FxyHMCBtoLmmkzVbSj3M3OlqUfLJpq0CQ== +postcss-sass@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.4.4.tgz#91f0f3447b45ce373227a98b61f8d8f0785285a3" + integrity sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg== dependencies: - gonzales-pe "^4.2.4" + gonzales-pe "^4.3.0" postcss "^7.0.21" postcss-scss@^2.0.0: @@ -9010,7 +9109,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d" integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg== -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.23, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7: +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7: version "7.0.27" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9" integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ== @@ -9044,11 +9143,6 @@ prettier@^1.18.2: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== -prettier@^2.0.2: - version "2.0.2" - resolved "https://registry.npm.taobao.org/prettier/download/prettier-2.0.2.tgz?cache=0&sync_timestamp=1585003590220&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fprettier%2Fdownload%2Fprettier-2.0.2.tgz#1ba8f3eb92231e769b7fcd7cb73ae1b6b74ade08" - integrity sha1-G6jz65IjHnabf818tzrhtrdK3gg= - prettier@^2.0.4: version "2.0.4" resolved "https://registry.npm.taobao.org/prettier/download/prettier-2.0.4.tgz?cache=0&sync_timestamp=1586174218833&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fprettier%2Fdownload%2Fprettier-2.0.4.tgz#2d1bae173e355996ee355ec9830a7a1ee05457ef" @@ -9062,22 +9156,12 @@ pretty-error@^2.1.1: renderkid "^2.0.1" utila "~0.4" -pretty-format@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.1.0.tgz#ed869bdaec1356fc5ae45de045e2c8ec7b07b0c8" - integrity sha512-46zLRSGLd02Rp+Lhad9zzuNZ+swunitn8zIpfD2B4OPCRLXbM87RJT2aBLBWYOznNUML/2l/ReMyWNC80PJBUQ== +pretty-format@^25.2.1, pretty-format@^25.3.0: + version "25.3.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.3.0.tgz#d0a4f988ff4a6cd350342fdabbb809aeb4d49ad5" + integrity sha512-wToHwF8bkQknIcFkBqNfKu4+UZqnrLn/Vr+wwKQwwvPzkBfDDKp/qIabFqdgtoi5PEnM8LFByVsOrHoa3SpTVA== dependencies: - "@jest/types" "^25.1.0" - ansi-regex "^5.0.0" - ansi-styles "^4.0.0" - react-is "^16.12.0" - -pretty-format@^25.2.3: - version "25.2.3" - resolved "https://registry.npm.taobao.org/pretty-format/download/pretty-format-25.2.3.tgz#ba6e9603a0d80fa2e470b1fed55de1f9bfd81421" - integrity sha1-um6WA6DYD6LkcLH+1V3h+b/YFCE= - dependencies: - "@jest/types" "^25.2.3" + "@jest/types" "^25.3.0" ansi-regex "^5.0.0" ansi-styles "^4.0.0" react-is "^16.12.0" @@ -9585,15 +9669,15 @@ relateurl@^0.2.7: resolved "https://registry.npm.taobao.org/relateurl/download/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= -release-it@^13.5.1: - version "13.5.1" - resolved "https://registry.npm.taobao.org/release-it/download/release-it-13.5.1.tgz#459b9e624c4b03391cdaab78e84cd14e373700c8" - integrity sha1-RZueYkxLAzkc2qt46EzRTjc3AMg= +release-it@^13.5.2: + version "13.5.4" + resolved "https://registry.yarnpkg.com/release-it/-/release-it-13.5.4.tgz#545cc9c2ef8ceeb0af69dfdd25385676c38a52b9" + integrity sha512-zRA4BgM/ld90tbjNIIck8gw5L/EKMe7vg3lmg878pVhArg/0h/x6yU5BTbfx9ixd+yh/7qNow7LbkQX2/8GU9g== dependencies: "@iarna/toml" "2.2.3" - "@octokit/rest" "17.1.4" + "@octokit/rest" "17.3.0" async-retry "1.3.1" - chalk "3.0.0" + chalk "4.0.0" cosmiconfig "6.0.0" debug "4.1.1" deprecated-obj "1.0.1" @@ -9612,15 +9696,15 @@ release-it@^13.5.1: ora "4.0.3" os-name "3.1.0" parse-json "5.0.0" - semver "7.1.3" + semver "7.3.2" shelljs "0.8.3" supports-color "7.1.0" update-notifier "4.1.0" url-join "4.0.1" - uuid "7.0.2" + uuid "7.0.3" window-size "1.1.1" yaml "1.8.3" - yargs-parser "18.1.2" + yargs-parser "18.1.3" remark-parse@^6.0.0: version "6.0.3" @@ -9643,6 +9727,28 @@ remark-parse@^6.0.0: vfile-location "^2.0.0" xtend "^4.0.1" +remark-parse@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.0.tgz#0aaae4b49e607ee7e972a6cf688026f46bbf6d1a" + integrity sha512-Ck14G1Ns/GEPXhSw6m1Uv28kMtVk63e59NyL+QlhBBwBdIUXROM6MPfBehPhW6TW2d73batMdZsKwuxl5i3tEA== + dependencies: + ccount "^1.0.0" + collapse-white-space "^1.0.2" + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + is-word-character "^1.0.0" + markdown-escapes "^1.0.0" + parse-entities "^2.0.0" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + trim "0.0.1" + trim-trailing-lines "^1.0.0" + unherit "^1.0.4" + unist-util-remove-position "^2.0.0" + vfile-location "^3.0.0" + xtend "^4.0.1" + remark-stringify@^6.0.0: version "6.0.4" resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-6.0.4.tgz#16ac229d4d1593249018663c7bddf28aafc4e088" @@ -9663,6 +9769,26 @@ remark-stringify@^6.0.0: unherit "^1.0.4" xtend "^4.0.1" +remark-stringify@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-8.0.0.tgz#33423ab8bf3076fb197f4cf582aaaf866b531625" + integrity sha512-cABVYVloFH+2ZI5bdqzoOmemcz/ZuhQSH6W6ZNYnLojAUUn3xtX7u+6BpnYp35qHoGr2NFBsERV14t4vCIeW8w== + dependencies: + ccount "^1.0.0" + is-alphanumeric "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + longest-streak "^2.0.1" + markdown-escapes "^1.0.0" + markdown-table "^2.0.0" + mdast-util-compact "^2.0.0" + parse-entities "^2.0.0" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + stringify-entities "^3.0.0" + unherit "^1.0.4" + xtend "^4.0.1" + remark@^10.0.1: version "10.0.1" resolved "https://registry.yarnpkg.com/remark/-/remark-10.0.1.tgz#3058076dc41781bf505d8978c291485fe47667df" @@ -9672,6 +9798,15 @@ remark@^10.0.1: remark-stringify "^6.0.0" unified "^7.0.0" +remark@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/remark/-/remark-12.0.0.tgz#d1c145c07341c9232f93b2f8539d56da15a2548c" + integrity sha512-oX4lMIS0csgk8AEbzY0h2jdR0ngiCHOpwwpxjmRa5TqAkeknY+tkhjRJGZqnCmvyuWh55/0SW5WY3R3nn3PH9A== + dependencies: + remark-parse "^8.0.0" + remark-stringify "^8.0.0" + unified "^9.0.0" + 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" @@ -9693,7 +9828,7 @@ repeat-element@^1.1.2: resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== -repeat-string@^1.5.4, repeat-string@^1.6.1: +repeat-string@^1.0.0, repeat-string@^1.5.4, repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= @@ -9870,7 +10005,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@^2.5.4, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -9994,7 +10129,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.0.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4: +schema-utils@^2.0.0, schema-utils@^2.6.1, schema-utils@^2.6.4: version "2.6.4" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53" integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ== @@ -10049,10 +10184,10 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@7.1.3: - version "7.1.3" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6" - integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA== +semver@7.3.2: + version "7.3.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" + integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" @@ -10603,6 +10738,17 @@ stringify-entities@^1.0.1: is-alphanumerical "^1.0.0" is-hexadecimal "^1.0.0" +stringify-entities@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-3.0.0.tgz#455abe501f8b7859ba5726a25a8872333c65b0a7" + integrity sha512-h7NJJIssprqlyjHT2eQt2W1F+MCcNmwPGlKb0bWEdET/3N44QN3QbUF/ueKCgAssyKRZ3Br9rQ7FcXjHr0qLHw== + dependencies: + character-entities-html4 "^1.0.0" + character-entities-legacy "^1.0.0" + is-alphanumerical "^1.0.0" + is-decimal "^1.0.2" + is-hexadecimal "^1.0.0" + stringify-object@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" @@ -10769,14 +10915,16 @@ stylelint-order@^4.0.0: postcss "^7.0.26" postcss-sorting "^5.0.1" -stylelint@^13.2.1: - version "13.2.1" - resolved "https://registry.npm.taobao.org/stylelint/download/stylelint-13.2.1.tgz#9101fcd70791856530049816ff53d980ecd561df" - integrity sha1-kQH81weRhWUwBJgW/1PZgOzVYd8= +stylelint@^13.3.1: + version "13.3.2" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.3.2.tgz#fbcb69a2452bc35de3eedd95b443449f92ab4107" + integrity sha512-kpO3/Gz2ZY40EWUwFYYkgpzhf8ZDUyKpcui5+pS0XKJBj/EMYmZpOJoL8IFAz2yApYeg91NVy5yAjE39hDzWvQ== dependencies: - autoprefixer "^9.7.4" + "@stylelint/postcss-css-in-js" "^0.37.1" + "@stylelint/postcss-markdown" "^0.36.1" + autoprefixer "^9.7.6" balanced-match "^1.0.0" - chalk "^3.0.0" + chalk "^4.0.0" cosmiconfig "^6.0.0" debug "^4.1.1" execall "^2.0.0" @@ -10794,19 +10942,17 @@ stylelint@^13.2.1: lodash "^4.17.15" log-symbols "^3.0.0" mathml-tag-names "^2.1.3" - meow "^6.0.1" + meow "^6.1.0" micromatch "^4.0.2" normalize-selector "^0.2.0" postcss "^7.0.27" postcss-html "^0.36.0" - postcss-jsx "^0.36.4" postcss-less "^3.1.4" - postcss-markdown "^0.36.0" postcss-media-query-parser "^0.2.3" postcss-reporter "^6.0.1" postcss-resolve-nested-selector "^0.1.1" - postcss-safe-parser "^4.0.1" - postcss-sass "^0.4.2" + postcss-safe-parser "^4.0.2" + postcss-sass "^0.4.4" postcss-scss "^2.0.0" postcss-selector-parser "^6.0.2" postcss-syntax "^0.36.2" @@ -11366,6 +11512,18 @@ unified@^7.0.0: vfile "^3.0.0" x-is-string "^0.1.0" +unified@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/unified/-/unified-9.0.0.tgz#12b099f97ee8b36792dbad13d278ee2f696eed1d" + integrity sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ== + dependencies: + bail "^1.0.0" + extend "^3.0.0" + is-buffer "^2.0.0" + is-plain-obj "^2.0.0" + trough "^1.0.0" + vfile "^4.0.0" + union-value@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" @@ -11409,11 +11567,23 @@ unist-util-find-all-after@^1.0.2: dependencies: unist-util-is "^3.0.0" +unist-util-find-all-after@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.1.tgz#95cc62f48812d879b4685a0512bf1b838da50e9a" + integrity sha512-0GICgc++sRJesLwEYDjFVJPJttBpVQaTNgc6Jw0Jhzvfs+jtKePEMu+uD+PqkRUrAvGQqwhpDwLGWo1PK8PDEw== + dependencies: + unist-util-is "^4.0.0" + unist-util-is@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd" integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A== +unist-util-is@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.2.tgz#c7d1341188aa9ce5b3cff538958de9895f14a5de" + integrity sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ== + unist-util-remove-position@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz#ec037348b6102c897703eee6d0294ca4755a2020" @@ -11421,6 +11591,13 @@ unist-util-remove-position@^1.0.0: dependencies: unist-util-visit "^1.1.0" +unist-util-remove-position@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" + integrity sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA== + dependencies: + unist-util-visit "^2.0.0" + unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz#3f37fcf351279dcbca7480ab5889bb8a832ee1c6" @@ -11440,6 +11617,14 @@ unist-util-visit-parents@^2.0.0: dependencies: unist-util-is "^3.0.0" +unist-util-visit-parents@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.0.2.tgz#d4076af3011739c71d2ce99d05de37d545f4351d" + integrity sha512-yJEfuZtzFpQmg1OSCyS9M5NJRrln/9FbYosH3iW0MG402QbdbaB8ZESwUv9RO6nRfLAKvWcMxCwdLWOov36x/g== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + unist-util-visit@^1.1.0: version "1.4.1" resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz#4724aaa8486e6ee6e26d7ff3c8685960d560b1e3" @@ -11447,6 +11632,15 @@ unist-util-visit@^1.1.0: dependencies: unist-util-visit-parents "^2.0.0" +unist-util-visit@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.2.tgz#3843782a517de3d2357b4c193b24af2d9366afb7" + integrity sha512-HoHNhGnKj6y+Sq+7ASo2zpVdfdRifhTgX2KTU3B/sO/TTlZchp7E3S4vjRzDJ7L60KmrCPsQkVK3lEF3cz36XQ== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + unist-util-visit-parents "^3.0.0" + universal-user-agent@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-4.0.1.tgz#fd8d6cb773a679a709e967ef8288a31fcc03e557" @@ -11595,10 +11789,10 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.2.tgz#7ff5c203467e91f5e0d85cfcbaaf7d2ebbca9be6" - integrity sha512-vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw== +uuid@7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" + integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== uuid@^3.0.1, uuid@^3.3.2: version "3.4.0" @@ -11646,6 +11840,11 @@ vfile-location@^2.0.0: resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.6.tgz#8a274f39411b8719ea5728802e10d9e0dff1519e" integrity sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA== +vfile-location@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.0.1.tgz#d78677c3546de0f7cd977544c367266764d31bb3" + integrity sha512-yYBO06eeN/Ki6Kh1QAkgzYpWT1d3Qln+ZCtSbJqFExPl1S3y2qqotJQXoh6qEvl/jDlgpUJolBn3PItVnnZRqQ== + vfile-message@*: version "2.0.3" resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.3.tgz#0dd4f6879fb240a8099b22bd3755536c92e59ba5" @@ -11661,6 +11860,14 @@ vfile-message@^1.0.0: dependencies: unist-util-stringify-position "^1.1.1" +vfile-message@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" + integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ== + dependencies: + "@types/unist" "^2.0.0" + unist-util-stringify-position "^2.0.0" + vfile@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/vfile/-/vfile-3.0.1.tgz#47331d2abe3282424f4a4bb6acd20a44c4121803" @@ -11671,6 +11878,17 @@ vfile@^3.0.0: unist-util-stringify-position "^1.0.0" vfile-message "^1.0.0" +vfile@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.1.0.tgz#d79248957f43225d57ff67a56effc67bef08946e" + integrity sha512-BaTPalregj++64xbGK6uIlsurN3BCRNM/P2Pg8HezlGzKd1O9PrwIac6bd9Pdx2uTb0QHoioZ+rXKolbVXEgJg== + dependencies: + "@types/unist" "^2.0.0" + is-buffer "^2.0.0" + replace-ext "1.0.0" + unist-util-stringify-position "^2.0.0" + vfile-message "^2.0.0" + vm-browserify@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" @@ -12137,10 +12355,10 @@ yargs-parser@10.x, yargs-parser@^10.0.0: dependencies: camelcase "^4.1.0" -yargs-parser@18.1.2, yargs-parser@^18.1.1: - version "18.1.2" - resolved "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-18.1.2.tgz?cache=0&sync_timestamp=1585243543699&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1" - integrity sha1-L0gr6iE2294IYWg6vqd1bTC1BPE= +yargs-parser@18.1.3: + version "18.1.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" + integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" @@ -12161,6 +12379,14 @@ yargs-parser@^16.1.0: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^18.1.1: + version "18.1.2" + resolved "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-18.1.2.tgz?cache=0&sync_timestamp=1585243543699&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1" + integrity sha1-L0gr6iE2294IYWg6vqd1bTC1BPE= + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs@12.0.5: version "12.0.5" resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" From 2364c4f526912433abf5ee2f36e2148beea7140b Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sun, 19 Apr 2020 14:59:28 +0800 Subject: [PATCH 004/151] style(Toast): increase border-radius to 8px --- src/style/var.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/var.less b/src/style/var.less index f8fa794f5..c9ef2784d 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -778,7 +778,7 @@ @toast-text-color: @white; @toast-loading-icon-color: @white; @toast-line-height: 20px; -@toast-border-radius: @border-radius-md; +@toast-border-radius: @border-radius-lg; @toast-background-color: fade(@text-color, 88%); @toast-icon-size: 40px; @toast-text-min-width: 96px; From 7db74490956ec9d4c742a885e436dc6915f1f9dc Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sun, 19 Apr 2020 15:37:50 +0800 Subject: [PATCH 005/151] style(DropdownMenu): add box-shadow style --- src/dropdown-menu/index.js | 29 +++- src/dropdown-menu/index.less | 21 ++- .../test/__snapshots__/demo.spec.js.snap | 40 +++--- .../test/__snapshots__/index.spec.js.snap | 124 +++++++++++------- src/style/var.less | 4 +- 5 files changed, 145 insertions(+), 73 deletions(-) diff --git a/src/dropdown-menu/index.js b/src/dropdown-menu/index.js index 087193685..383591887 100644 --- a/src/dropdown-menu/index.js +++ b/src/dropdown-menu/index.js @@ -1,6 +1,5 @@ // Utils -import { createNamespace } from '../utils'; -import { BORDER_TOP_BOTTOM } from '../utils/constant'; +import { createNamespace, isDef } from '../utils'; import { getScroller } from '../utils/dom/scroll'; // Mixins @@ -49,15 +48,27 @@ export default createComponent({ scroller() { return getScroller(this.$el); }, + + opened() { + return this.children.some((item) => item.showWrapper); + }, + + barStyle() { + if (this.opened && isDef(this.zIndex)) { + return { + zIndex: 1 + this.zIndex, + }; + } + }, }, methods: { updateOffset() { - if (!this.$refs.menu) { + if (!this.$refs.bar) { return; } - const rect = this.$refs.menu.getBoundingClientRect(); + const rect = this.$refs.bar.getBoundingClientRect(); if (this.direction === 'down') { this.offset = rect.bottom; @@ -113,8 +124,14 @@ export default createComponent({ )); return ( -
- {Titles} +
+
+ {Titles} +
{this.slots('default')}
); diff --git a/src/dropdown-menu/index.less b/src/dropdown-menu/index.less index ff747bc28..e293babc3 100644 --- a/src/dropdown-menu/index.less +++ b/src/dropdown-menu/index.less @@ -1,11 +1,20 @@ @import '../style/var'; .van-dropdown-menu { - display: flex; - height: @dropdown-menu-height; - background-color: @dropdown-menu-background-color; user-select: none; + &__bar { + position: relative; + display: flex; + height: @dropdown-menu-height; + background-color: @dropdown-menu-background-color; + box-shadow: 0 2px 12px fade(@gray-7, 8); + + &--opened { + z-index: @dropdown-item-z-index + 1; + } + } + &__item { display: flex; flex: 1; @@ -44,7 +53,7 @@ right: -4px; margin-top: -5px; border: 3px solid; - border-color: transparent transparent currentColor currentColor; + border-color: transparent transparent @gray-4 @gray-4; transform: rotate(-45deg); opacity: 0.8; content: ''; @@ -52,6 +61,10 @@ &--active { color: @dropdown-menu-title-active-text-color; + + &::after { + border-color: transparent transparent currentColor currentColor; + } } &--down { diff --git a/src/dropdown-menu/test/__snapshots__/demo.spec.js.snap b/src/dropdown-menu/test/__snapshots__/demo.spec.js.snap index 5afee72d1..2e154118c 100644 --- a/src/dropdown-menu/test/__snapshots__/demo.spec.js.snap +++ b/src/dropdown-menu/test/__snapshots__/demo.spec.js.snap @@ -3,9 +3,11 @@ exports[`renders demo correctly 1`] = `
-
-
全部商品
-
默认排序
+
+
+
全部商品
+
默认排序
+
-
-
全部商品
-
筛选
+
+
+
全部商品
+
筛选
+
-
-
全部商品
-
默认排序
+
+
+
全部商品
+
默认排序
+
-
-
全部商品
-
默认排序
+
+
+
全部商品
+
默认排序
+
-
-
全部商品
-
默认排序
+
+
+
全部商品
+
默认排序
+
+
@@ -208,9 +212,11 @@ exports[`renders demo correctly 1`] = `
-
+
+
diff --git a/src/form/test/__snapshots__/events.spec.js.snap b/src/form/test/__snapshots__/events.spec.js.snap index 9904e678f..a20948ddc 100644 --- a/src/form/test/__snapshots__/events.spec.js.snap +++ b/src/form/test/__snapshots__/events.spec.js.snap @@ -13,6 +13,8 @@ exports[`failed event 1`] = `
B failed
-
+
`; diff --git a/src/form/test/__snapshots__/methods.spec.js.snap b/src/form/test/__snapshots__/methods.spec.js.snap index 03deea7e9..6c019b6b1 100644 --- a/src/form/test/__snapshots__/methods.spec.js.snap +++ b/src/form/test/__snapshots__/methods.spec.js.snap @@ -12,6 +12,8 @@ exports[`resetValidation method - reset one field 1`] = `
B failed
-
+
`; diff --git a/src/form/test/__snapshots__/props.spec.js.snap b/src/form/test/__snapshots__/props.spec.js.snap index d33e3b524..b708bbb89 100644 --- a/src/form/test/__snapshots__/props.spec.js.snap +++ b/src/form/test/__snapshots__/props.spec.js.snap @@ -93,6 +93,8 @@ exports[`validate-first prop 1`] = `
-
+
`; diff --git a/src/goods-action/test/__snapshots__/demo.spec.js.snap b/src/goods-action/test/__snapshots__/demo.spec.js.snap index 4c36ac40d..6a7f9e539 100644 --- a/src/goods-action/test/__snapshots__/demo.spec.js.snap +++ b/src/goods-action/test/__snapshots__/demo.spec.js.snap @@ -13,7 +13,11 @@ exports[`renders demo correctly 1`] = `
购物车 -
+
@@ -32,7 +36,11 @@ exports[`renders demo correctly 1`] = `
12
店铺 -
+
@@ -51,7 +59,11 @@ exports[`renders demo correctly 1`] = `
已收藏 -
+
@@ -65,7 +77,11 @@ exports[`renders demo correctly 1`] = `
购物车 -
+ diff --git a/src/goods-action/test/__snapshots__/index.spec.js.snap b/src/goods-action/test/__snapshots__/index.spec.js.snap index c6108e99b..50696c6d1 100644 --- a/src/goods-action/test/__snapshots__/index.spec.js.snap +++ b/src/goods-action/test/__snapshots__/index.spec.js.snap @@ -1,6 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Button render default slot 1`] = ``; +exports[`Button render default slot 1`] = ` + +`; exports[`Icon render default slot 1`] = `
diff --git a/src/notify/test/__snapshots__/demo.spec.js.snap b/src/notify/test/__snapshots__/demo.spec.js.snap index 1ca33dc29..f55c7335b 100644 --- a/src/notify/test/__snapshots__/demo.spec.js.snap +++ b/src/notify/test/__snapshots__/demo.spec.js.snap @@ -2,10 +2,24 @@ exports[`renders demo correctly 1`] = `
-
+
-
+
-
+
`; diff --git a/src/overlay/test/__snapshots__/demo.spec.js.snap b/src/overlay/test/__snapshots__/demo.spec.js.snap index 11eab0ba7..2179861ea 100644 --- a/src/overlay/test/__snapshots__/demo.spec.js.snap +++ b/src/overlay/test/__snapshots__/demo.spec.js.snap @@ -2,10 +2,14 @@ exports[`renders demo correctly 1`] = `
-
+
-
+
diff --git a/src/sku/test/__snapshots__/demo.spec.js.snap b/src/sku/test/__snapshots__/demo.spec.js.snap index 3bbf590d9..7e7703f78 100644 --- a/src/sku/test/__snapshots__/demo.spec.js.snap +++ b/src/sku/test/__snapshots__/demo.spec.js.snap @@ -4,27 +4,35 @@ exports[`renders demo correctly 1`] = `
-
+
+
-
+
+
-
+
+
-
+
+ `; diff --git a/src/steps/test/__snapshots__/demo.spec.js.snap b/src/steps/test/__snapshots__/demo.spec.js.snap index cd11ee3e3..98a80d91e 100644 --- a/src/steps/test/__snapshots__/demo.spec.js.snap +++ b/src/steps/test/__snapshots__/demo.spec.js.snap @@ -27,7 +27,9 @@ exports[`renders demo correctly 1`] = `
- +
diff --git a/src/sticky/test/__snapshots__/demo.spec.js.snap b/src/sticky/test/__snapshots__/demo.spec.js.snap index 3fa91b535..07457da6f 100644 --- a/src/sticky/test/__snapshots__/demo.spec.js.snap +++ b/src/sticky/test/__snapshots__/demo.spec.js.snap @@ -4,24 +4,30 @@ exports[`renders demo correctly 1`] = `
-
+
+
-
+
+
-
+
+
diff --git a/src/submit-bar/test/__snapshots__/demo.spec.js.snap b/src/submit-bar/test/__snapshots__/demo.spec.js.snap index c026d9925..df6874505 100644 --- a/src/submit-bar/test/__snapshots__/demo.spec.js.snap +++ b/src/submit-bar/test/__snapshots__/demo.spec.js.snap @@ -5,7 +5,9 @@ exports[`renders demo correctly 1`] = `
-
合计：¥30.50
+
合计：¥30.50
@@ -14,7 +16,9 @@ exports[`renders demo correctly 1`] = `
你的收货地址不支持同城送, 我们已为你推荐快递
-
合计：¥30.50
+
合计：¥30.50
@@ -22,7 +26,9 @@ exports[`renders demo correctly 1`] = `
合计：¥30.50
@@ -39,7 +45,9 @@ exports[`renders demo correctly 1`] = `
全选 -
合计：¥30.50
+
合计：¥30.50
diff --git a/src/submit-bar/test/__snapshots__/index.spec.js.snap b/src/submit-bar/test/__snapshots__/index.spec.js.snap index 7c24b7229..5241284d9 100644 --- a/src/submit-bar/test/__snapshots__/index.spec.js.snap +++ b/src/submit-bar/test/__snapshots__/index.spec.js.snap @@ -3,21 +3,27 @@ exports[`decimal-length prop 1`] = `
-
合计：¥1.1
+
合计：¥1.1
`; exports[`disable safe-area-inset-bottom prop 1`] = `
-
+
`; exports[`disable submit 1`] = `
-
合计：¥0.01
+
合计：¥0.01
`; @@ -25,7 +31,9 @@ exports[`disable submit 1`] = ` exports[`suffix-label prop 1`] = `
-
Label¥1.11Suffix Label
+
Label¥1.11Suffix Label
`; @@ -33,18 +41,24 @@ exports[`suffix-label prop 1`] = ` exports[`text-align prop 1`] = `
-
合计：¥1.11
+
合计：¥1.11
`; exports[`top slot 1`] = ` -
top
+
top
`; exports[`without price 1`] = `
-
+
`; diff --git a/src/swipe-cell/test/__snapshots__/demo.spec.js.snap b/src/swipe-cell/test/__snapshots__/demo.spec.js.snap index 3763302b7..2e1757d61 100644 --- a/src/swipe-cell/test/__snapshots__/demo.spec.js.snap +++ b/src/swipe-cell/test/__snapshots__/demo.spec.js.snap @@ -6,12 +6,18 @@ exports[`renders demo correctly 1`] = `
-
+
单元格
内容
-
+
@@ -39,19 +45,25 @@ exports[`renders demo correctly 1`] = `
-
+
-
+
单元格
内容
-
+
diff --git a/src/toast/test/__snapshots__/demo.spec.js.snap b/src/toast/test/__snapshots__/demo.spec.js.snap index 36b7a85d1..f06b2697b 100644 --- a/src/toast/test/__snapshots__/demo.spec.js.snap +++ b/src/toast/test/__snapshots__/demo.spec.js.snap @@ -2,10 +2,28 @@ exports[`renders demo correctly 1`] = `
-
-
-
-
-
+
+
+
+
+
`; diff --git a/src/uploader/test/__snapshots__/demo.spec.js.snap b/src/uploader/test/__snapshots__/demo.spec.js.snap index 4470b6b31..34b43c532 100644 --- a/src/uploader/test/__snapshots__/demo.spec.js.snap +++ b/src/uploader/test/__snapshots__/demo.spec.js.snap @@ -95,10 +95,12 @@ exports[`renders demo correctly 1`] = `
-
+
+
From 6630816742d355f5b27d4886a5ad88d192352de4 Mon Sep 17 00:00:00 2001 From: Sakura-zfx <1367119371@qq.com> Date: Thu, 21 May 2020 17:34:07 +0800 Subject: [PATCH 121/151] fix(Calendar): Invalid color setting (#6331) --- src/calendar/components/Month.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calendar/components/Month.js b/src/calendar/components/Month.js index 300b7cb0a..2703fbec1 100644 --- a/src/calendar/components/Month.js +++ b/src/calendar/components/Month.js @@ -206,6 +206,7 @@ export default createComponent({ if ( type === 'start' || type === 'end' || + type === 'start-end' || type === 'multiple-selected' || type === 'multiple-middle' ) { From 96ef2557c24b1afbe335b6e3c4f0a8778645788f Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 21 May 2020 19:15:50 +0800 Subject: [PATCH 122/151] feat(Form): scrollToField can scroll to bottom (#6335) --- src/form/README.md | 12 ++++++------ src/form/README.zh-CN.md | 2 +- src/form/index.js | 4 ++-- types/form.d.ts | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/form/README.md b/src/form/README.md index 062f34e4e..1fe20070c 100644 --- a/src/form/README.md +++ b/src/form/README.md @@ -457,12 +457,12 @@ export default { Use [ref](https://vuejs.org/v2/api/#ref) to get Form instance and call instance methods -| Name | Description | Attribute | Return value | -| ---------------------- | ---------------- | --------------- | ------------ | -| submit | Submit form | - | - | -| validate | Validate form | _name?: string_ | _Promise_ | -| resetValidation | Reset validation | _name?: string_ | - | -| scrollToField `v2.5.2` | Scroll to field | _name: string_ | - | +| Name | Description | Attribute | Return value | +| --- | --- | --- | --- | +| submit | Submit form | - | - | +| validate | Validate form | _name?: string_ | _Promise_ | +| resetValidation | Reset validation | _name?: string_ | - | +| scrollToField `v2.8.2` | Scroll to field | _name: string, alignToTop: boolean_ | - | ### Slots diff --git a/src/form/README.zh-CN.md b/src/form/README.zh-CN.md index 00ad6e42f..e6ce3f0af 100644 --- a/src/form/README.zh-CN.md +++ b/src/form/README.zh-CN.md @@ -501,7 +501,7 @@ export default { | submit | 提交表单，与点击提交按钮的效果等价 | - | - | | validate | 验证表单，支持传入`name`来验证单个表单项 | _name?: string_ | _Promise_ | | resetValidation | 重置表单项的验证提示，支持传入`name`来重置单个表单项 | _name?: string_ | - | -| scrollToField `v2.5.2` | 滚动到对应表单项的位置 | _name: string_ | - | +| scrollToField `v2.8.2` | 滚动到对应表单项的位置，默认滚动到顶部，第二个参数传 false 可滚动至底部 | _name: string, alignToTop: boolean_ | - | ### Slots diff --git a/src/form/index.js b/src/form/index.js index ba5bf22be..c3254a53d 100644 --- a/src/form/index.js +++ b/src/form/index.js @@ -119,10 +119,10 @@ export default createComponent({ }, // @exposed-api - scrollToField(name) { + scrollToField(name, options) { this.fields.forEach((item) => { if (item.name === name) { - item.$el.scrollIntoView(); + item.$el.scrollIntoView(options); } }); }, diff --git a/types/form.d.ts b/types/form.d.ts index df0742623..3f11ee7fd 100644 --- a/types/form.d.ts +++ b/types/form.d.ts @@ -7,5 +7,5 @@ export class Form extends VanComponent { resetValidation(name?: string): void; - scrollToField(name: string): void; + scrollToField(name: string, options?: boolean | ScrollIntoViewOptions): void; } From 877ebd6054c61455bc1f53e403c431ab5551df36 Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 21 May 2020 19:21:49 +0800 Subject: [PATCH 123/151] feat(Form): add submit-on-enter prop (#6336) --- src/field/index.js | 4 ++-- src/form/README.md | 3 ++- src/form/README.zh-CN.md | 3 ++- src/form/index.js | 4 ++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/field/index.js b/src/field/index.js index 59808aa0d..6c4db0f03 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -356,8 +356,8 @@ export default createComponent({ const ENTER_CODE = 13; if (event.keyCode === ENTER_CODE) { - // should not submit form on etner - if (this.type !== 'textarea') { + const submitOnEnter = this.getProp('submitOnEnter'); + if (!submitOnEnter && this.type !== 'textarea') { preventDefault(event); } diff --git a/src/form/README.md b/src/form/README.md index 1fe20070c..e2e49b016 100644 --- a/src/form/README.md +++ b/src/form/README.md @@ -434,6 +434,7 @@ export default { | scroll-to-error `v2.5.2` | Whether to scroll to the error field when validation failed | _boolean_ | `false` | | show-error `v2.6.0` | Whether to highlight input when validation failed | _boolean_ | `true` | | show-error-message `v2.5.8` | Whether to show error message when validation failed | _boolean_ | `true` | +| submit-on-enter `v2.8.3` | Whether to submit form on enter | _boolean_ | `true` | ### Data Structure of Rule @@ -462,7 +463,7 @@ Use [ref](https://vuejs.org/v2/api/#ref) to get Form instance and call instance | submit | Submit form | - | - | | validate | Validate form | _name?: string_ | _Promise_ | | resetValidation | Reset validation | _name?: string_ | - | -| scrollToField `v2.8.2` | Scroll to field | _name: string, alignToTop: boolean_ | - | +| scrollToField `v2.8.3` | Scroll to field | _name: string, alignToTop: boolean_ | - | ### Slots diff --git a/src/form/README.zh-CN.md b/src/form/README.zh-CN.md index e6ce3f0af..83327109d 100644 --- a/src/form/README.zh-CN.md +++ b/src/form/README.zh-CN.md @@ -469,6 +469,7 @@ export default { | scroll-to-error `v2.5.2` | 是否在提交表单且校验不通过时滚动至错误的表单项 | _boolean_ | `false` | | show-error `v2.6.0` | 是否在校验不通过时标红输入框 | _boolean_ | `true` | | show-error-message `v2.5.8` | 是否在校验不通过时在输入框下方展示错误提示 | _boolean_ | `true` | +| submit-on-enter `v2.8.3` | 是否在按下回车键时提交表单 | _boolean_ | `true` | > 表单项的 API 参见：[Field 组件](#/zh-CN/field#api) @@ -501,7 +502,7 @@ export default { | submit | 提交表单，与点击提交按钮的效果等价 | - | - | | validate | 验证表单，支持传入`name`来验证单个表单项 | _name?: string_ | _Promise_ | | resetValidation | 重置表单项的验证提示，支持传入`name`来重置单个表单项 | _name?: string_ | - | -| scrollToField `v2.8.2` | 滚动到对应表单项的位置，默认滚动到顶部，第二个参数传 false 可滚动至底部 | _name: string, alignToTop: boolean_ | - | +| scrollToField `v2.8.3` | 滚动到对应表单项的位置，默认滚动到顶部，第二个参数传 false 可滚动至底部 | _name: string, alignToTop: boolean_ | - | ### Slots diff --git a/src/form/index.js b/src/form/index.js index c3254a53d..d36b5bd8e 100644 --- a/src/form/index.js +++ b/src/form/index.js @@ -12,6 +12,10 @@ export default createComponent({ scrollToError: Boolean, validateFirst: Boolean, errorMessageAlign: String, + submitOnEnter: { + type: Boolean, + default: true, + }, validateTrigger: { type: String, default: 'onBlur', From 8ee29c9cfb741132e3aee805be744eef91c8116b Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 21 May 2020 20:38:00 +0800 Subject: [PATCH 124/151] chore: release 2.8.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49f9b1450..6e591df91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vant", - "version": "2.8.2", + "version": "2.8.3", "description": "Mobile UI Components built on Vue", "main": "lib/index.js", "module": "es/index.js", From 75e4bace97e62addceb6dbdcffd3ae03df879a88 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 21 May 2020 20:50:08 +0800 Subject: [PATCH 125/151] docs(changelog): 2.8.3 --- docs/markdown/changelog.en-US.md | 17 +++++++++++++++++ docs/markdown/changelog.zh-CN.md | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md index 8bebc2d6a..465ed6a40 100644 --- a/docs/markdown/changelog.en-US.md +++ b/docs/markdown/changelog.en-US.md @@ -10,6 +10,23 @@ Vant follows [Semantic Versioning 2.0.0](https://semver.org/lang/zh-CN/). - Minor version：released every one to two months, including backwards compatible features. - Major version：including breaking changes and new features. +### [v2.8.3](https://github.com/youzan/vant/compare/v2.8.2...v2.8.3) + +`2020-05-21` + +**Feature** + +- Form: add submit-on-enter prop [#6336](https://github.com/youzan/vant/issues/6336) +- Form: scrollToField can scroll to bottom [#6335](https://github.com/youzan/vant/issues/6335) +- Field: adjust field placeholder color to gray-5 [#6304](https://github.com/youzan/vant/issues/6304) +- Field: minus can only be placed on the first char [#6303](https://github.com/youzan/vant/issues/6303) +- Picker: improve method type, support generic [#6315](https://github.com/youzan/vant/issues/6315) + +**Bug Fixes** + +- Button: text not align center in legacy safari [#6325](https://github.com/youzan/vant/issues/6325) +- Calendar: color prop not work when use allow-some-day [#6331](https://github.com/youzan/vant/issues/6331) + ### [v2.8.2](https://github.com/youzan/vant/compare/v2.8.1...v2.8.2) `2020-05-17` diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md index cc540e9ec..96c99f2ee 100644 --- a/docs/markdown/changelog.zh-CN.md +++ b/docs/markdown/changelog.zh-CN.md @@ -10,6 +10,23 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 - 次版本号：每隔一至二个月发布，包含新特性和较大的功能更新，向下兼容。 - 主版本号：发布时间不定，包含不兼容更新，预计下一个主版本会与 Vue 3.0 同期发布。 +### [v2.8.3](https://github.com/youzan/vant/compare/v2.8.2...v2.8.3) + +`2020-05-21` + +**Feature** + +- Form: 新增 submit-on-enter 属性，用于控制回车时是否提交表单 [#6336](https://github.com/youzan/vant/issues/6336) +- Form: 优化 scrollToField 方法，支持通过传参来控制滚动位置 [#6335](https://github.com/youzan/vant/issues/6335) +- Field: 调整 placeholder 的色值为 @gray-5 [#6304](https://github.com/youzan/vant/issues/6304) +- Field: 使用 digit 类型时，只能在第一位输入减号 [#6303](https://github.com/youzan/vant/issues/6303) +- Picker: 优化 methods 的类型定义，支持泛型 [#6315](https://github.com/youzan/vant/issues/6315) + +**Bug Fixes** + +- Button: 修复在低版本 iOS 下按钮文字不居中的问题 [#6325](https://github.com/youzan/vant/issues/6325) +- Calendar: 修复范围选择到同一天时 color 属性不生效的问题 [#6331](https://github.com/youzan/vant/issues/6331) + ### [v2.8.2](https://github.com/youzan/vant/compare/v2.8.1...v2.8.2) `2020-05-17` From 196219449963a2faf19a621cceaa1f70a04ef7f2 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 22 May 2020 17:18:15 +0800 Subject: [PATCH 126/151] chore: improve utils typing (#6341) --- src/utils/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/index.ts b/src/utils/index.ts index 9518cdd99..b17f4eabc 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -8,7 +8,7 @@ export const isServer: boolean = Vue.prototype.$isServer; // eslint-disable-next-line @typescript-eslint/no-empty-function export function noop() {} -export function isDef(val: any): boolean { +export function isDef(val: unknown): boolean { return val !== undefined && val !== null; } @@ -16,7 +16,7 @@ export function isFunction(val: unknown): val is Function { return typeof val === 'function'; } -export function isObject(val: any): val is Record { +export function isObject(val: unknown): val is Record { return val !== null && typeof val === 'object'; } From 0daf9e6bcf7c223f37a8d35107e6bedea13c1e20 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 23 May 2020 15:14:53 +0800 Subject: [PATCH 127/151] fix(GoodsAction): incorrect single button radius (#6347) --- src/goods-action-button/index.less | 6 +++-- src/goods-action/README.md | 24 +++++++------------ src/goods-action/README.zh-CN.md | 6 +---- src/goods-action/demo/index.vue | 12 +++++----- .../test/__snapshots__/demo.spec.js.snap | 9 ++++--- 5 files changed, 25 insertions(+), 32 deletions(-) diff --git a/src/goods-action-button/index.less b/src/goods-action-button/index.less index e3fcc5bf6..0bb7bbbbb 100644 --- a/src/goods-action-button/index.less +++ b/src/goods-action-button/index.less @@ -9,12 +9,14 @@ &--first { margin-left: 5px; - border-radius: @border-radius-max 0 0 @border-radius-max; + border-top-left-radius: @border-radius-max; + border-bottom-left-radius: @border-radius-max; } &--last { margin-right: 5px; - border-radius: 0 @border-radius-max @border-radius-max 0; + border-top-right-radius: @border-radius-max; + border-bottom-right-radius: @border-radius-max; } &--warning { diff --git a/src/goods-action/README.md b/src/goods-action/README.md index 40ebb9d00..fe3c623cf 100644 --- a/src/goods-action/README.md +++ b/src/goods-action/README.md @@ -19,16 +19,8 @@ Vue.use(GoodsActionIcon); - - + + ``` @@ -56,8 +48,8 @@ Use `badge` prop to show badge in icon - - + + ``` @@ -68,8 +60,8 @@ Use `badge` prop to show badge in icon - - + + ``` @@ -79,8 +71,8 @@ Use `badge` prop to show badge in icon - - + + ``` diff --git a/src/goods-action/README.zh-CN.md b/src/goods-action/README.zh-CN.md index 6ec54edcd..5740dc931 100644 --- a/src/goods-action/README.zh-CN.md +++ b/src/goods-action/README.zh-CN.md @@ -19,11 +19,7 @@ Vue.use(GoodsActionIcon); - + - 购物车 - From 54f3979fe8be8154c59cf5f8bb4e0d944ea9bfa9 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 23 May 2020 15:17:15 +0800 Subject: [PATCH 128/151] docs: mark panel as deprecated (#6348) --- src/panel/README.md | 4 ++++ src/panel/README.zh-CN.md | 4 ++++ src/switch-cell/README.zh-CN.md | 10 +++++++++- vant.config.js | 16 ++++++++-------- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/panel/README.md b/src/panel/README.md index 489cba62d..72cf7fad7 100644 --- a/src/panel/README.md +++ b/src/panel/README.md @@ -1,5 +1,9 @@ # Panel +### Deprecate Tip + +The Panel component will be deprecated in version 3.0. Please use the Cell and Button components instead. + ### Install ```js diff --git a/src/panel/README.zh-CN.md b/src/panel/README.zh-CN.md index 1d7e9c877..77d6d9ba8 100644 --- a/src/panel/README.zh-CN.md +++ b/src/panel/README.zh-CN.md @@ -1,5 +1,9 @@ # Panel 面板 +### 废弃提示 + +由于使用场景有限，Panel 组件将在 3.0 版本中废弃，请直接使用 Cell 和 Button 组件代替 + ### 引入 ```js diff --git a/src/switch-cell/README.zh-CN.md b/src/switch-cell/README.zh-CN.md index 31175dd98..d91c3cd58 100644 --- a/src/switch-cell/README.zh-CN.md +++ b/src/switch-cell/README.zh-CN.md @@ -2,7 +2,15 @@ ### 废弃提示 -SwitchCell 组件将在 3.0 版本中废弃，请直接使用 Cell 和 Switch 组件代替 +SwitchCell 组件将在 3.0 版本中废弃，请直接使用 Cell 和 Switch 组件代替，替换写法如下： + +```html + + + +``` ### 引入 diff --git a/vant.config.js b/vant.config.js index 8361d0abb..73d8f62d7 100644 --- a/vant.config.js +++ b/vant.config.js @@ -256,10 +256,6 @@ module.exports = { path: 'notice-bar', title: 'NoticeBar 通知栏', }, - { - path: 'panel', - title: 'Panel 面板', - }, { path: 'progress', title: 'Progress 进度条', @@ -367,6 +363,10 @@ module.exports = { { title: '废弃', items: [ + { + path: 'panel', + title: 'Panel 面板', + }, { path: 'switch-cell', title: 'SwitchCell 开关单元格', @@ -607,10 +607,6 @@ module.exports = { path: 'notice-bar', title: 'NoticeBar', }, - { - path: 'panel', - title: 'Panel', - }, { path: 'progress', title: 'Progress', @@ -718,6 +714,10 @@ module.exports = { { title: 'Deprecated', items: [ + { + path: 'panel', + title: 'Panel', + }, { path: 'switch-cell', title: 'SwitchCell', From 5d8ca5a531d192dfa6d0b86140405ecd3743b5a0 Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 24 May 2020 15:08:05 +0800 Subject: [PATCH 129/151] style(AddressList): add safe-area-inset-bottom (#6355) --- src/address-list/index.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/address-list/index.less b/src/address-list/index.less index d49805799..7a777636b 100644 --- a/src/address-list/index.less +++ b/src/address-list/index.less @@ -12,12 +12,15 @@ z-index: @address-list-add-button-z-index; box-sizing: border-box; width: 100%; - padding: 5px @padding-md; + padding: 0 @padding-md; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); background-color: @white; } &__add { height: 40px; + margin: 5px 0; line-height: 38px; } From 6a2a0cc5c62941ee34b337836b50a9e1b1170dbd Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 24 May 2020 15:28:51 +0800 Subject: [PATCH 130/151] feat(Area): use first city code when county list is empty (#6356) --- src/area/index.js | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/area/index.js b/src/area/index.js index 1463b2df6..9a4ac930c 100644 --- a/src/area/index.js +++ b/src/area/index.js @@ -197,17 +197,29 @@ export default createComponent({ this.$emit('confirm', values, index); }, + getDefaultCode() { + if (this.columnsPlaceholder.length) { + return PLACEHOLDER_CODE; + } + + const countyCodes = Object.keys(this.county); + if (countyCodes[0]) { + return countyCodes[0]; + } + + const cityCodes = Object.keys(this.city); + if (cityCodes[0]) { + return cityCodes[0]; + } + + return ''; + }, + setValues() { let { code } = this; if (!code) { - if (this.columnsPlaceholder.length) { - code = PLACEHOLDER_CODE; - } else if (Object.keys(this.county)[0]) { - code = Object.keys(this.county)[0]; - } else { - code = ''; - } + code = this.getDefaultCode(); } const { picker } = this.$refs; From c5c2e9690dc72838237ca82966c726594e721b7a Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 24 May 2020 16:24:20 +0800 Subject: [PATCH 131/151] refactor(Popup): create overlay for every popup (#6357) --- .../test/__snapshots__/index.spec.js.snap | 27 ------- src/dropdown-menu/test/index.spec.js | 6 +- src/mixins/popup/context.ts | 6 +- src/mixins/popup/index.js | 28 +++++-- src/mixins/popup/overlay.ts | 79 ++++++++----------- 5 files changed, 62 insertions(+), 84 deletions(-) diff --git a/src/dropdown-menu/test/__snapshots__/index.spec.js.snap b/src/dropdown-menu/test/__snapshots__/index.spec.js.snap index e194ab060..a32d0ba96 100644 --- a/src/dropdown-menu/test/__snapshots__/index.spec.js.snap +++ b/src/dropdown-menu/test/__snapshots__/index.spec.js.snap @@ -343,30 +343,3 @@ exports[`title slot 1`] = ` `; - -exports[`toggle method 1`] = ` -
-
-
-
-
-
-
-
-
-
-
-`; - -exports[`toggle method 2`] = ` -
-
-
-
-
-
- -
-
-
-`; diff --git a/src/dropdown-menu/test/index.spec.js b/src/dropdown-menu/test/index.spec.js index b956e5a3e..b92047b4b 100644 --- a/src/dropdown-menu/test/index.spec.js +++ b/src/dropdown-menu/test/index.spec.js @@ -224,12 +224,14 @@ test('toggle method', async (done) => { // show this.$refs.item.toggle(true, { immediate: true }); await later(); - expect(wrapper).toMatchSnapshot(); + + const content = wrapper.find('.van-dropdown-item__content'); + expect(content.element.style.display).toEqual(''); // hide this.$refs.item.toggle(false, { immediate: true }); await later(); - expect(wrapper).toMatchSnapshot(); + expect(content.element.style.display).toEqual('none'); done(); }, diff --git a/src/mixins/popup/context.ts b/src/mixins/popup/context.ts index 879954da4..6ab98f914 100644 --- a/src/mixins/popup/context.ts +++ b/src/mixins/popup/context.ts @@ -2,6 +2,7 @@ import { OverlayConfig } from './overlay'; export type StackItem = { vm: any; + overlay: any; config: OverlayConfig; }; @@ -9,8 +10,7 @@ export const context = { zIndex: 2000, lockCount: 0, stack: [] as StackItem[], - - get top(): StackItem { - return this.stack[this.stack.length - 1]; + find(vm: any): StackItem | undefined { + return this.stack.filter((item) => item.vm === vm)[0]; }, }; diff --git a/src/mixins/popup/index.js b/src/mixins/popup/index.js index cb9529cf0..2180ed6f8 100644 --- a/src/mixins/popup/index.js +++ b/src/mixins/popup/index.js @@ -1,6 +1,11 @@ // Context import { context } from './context'; -import { openOverlay, closeOverlay, updateOverlay } from './overlay'; +import { + openOverlay, + closeOverlay, + updateOverlay, + removeOverlay, +} from './overlay'; // Utils import { on, off, preventDefault } from '../../utils/dom/event'; @@ -94,7 +99,8 @@ export function PopupMixin(options = {}) { }, beforeDestroy() { - this.close(); + this.removeLock(); + removeOverlay(this); if (this.getContainer) { removeNode(this.$el); @@ -123,7 +129,10 @@ export function PopupMixin(options = {}) { this.opened = true; this.renderOverlay(); + this.addLock(); + }, + addLock() { if (this.lockScroll) { on(document, 'touchstart', this.touchStart); on(document, 'touchmove', this.onTouchMove); @@ -135,11 +144,7 @@ export function PopupMixin(options = {}) { } }, - close() { - if (!this.opened) { - return; - } - + removeLock() { if (this.lockScroll) { context.lockCount--; off(document, 'touchstart', this.touchStart); @@ -149,9 +154,16 @@ export function PopupMixin(options = {}) { document.body.classList.remove('van-overflow-hidden'); } } + }, + + close() { + if (!this.opened) { + return; + } - this.opened = false; closeOverlay(this); + this.opened = false; + this.removeLock(); this.$emit('input', false); }, diff --git a/src/mixins/popup/overlay.ts b/src/mixins/popup/overlay.ts index 84a9fb4af..9bf10c644 100644 --- a/src/mixins/popup/overlay.ts +++ b/src/mixins/popup/overlay.ts @@ -1,6 +1,7 @@ import Overlay from '../../overlay'; import { context } from './context'; import { mount } from '../../utils/functional'; +import { removeNode } from '../../utils/dom/node'; export type OverlayConfig = { zIndex?: number; @@ -13,71 +14,61 @@ const defaultConfig: OverlayConfig = { customStyle: {}, }; -let overlay: any; - -// close popup when click overlay && closeOnClickOverlay is true -function onClickOverlay(): void { - if (context.top) { - const { vm } = context.top; - vm.$emit('click-overlay'); - - if (vm.closeOnClickOverlay) { - if (vm.onClickOverlay) { - vm.onClickOverlay(); - } else { - vm.close(); - } - } - } -} - -function mountOverlay() { - overlay = mount(Overlay, { +function mountOverlay(vm: any) { + return mount(Overlay, { on: { - click: onClickOverlay, + // close popup when overlay clicked & closeOnClickOverlay is true + click() { + vm.$emit('click-overlay'); + + if (vm.closeOnClickOverlay) { + if (vm.onClickOverlay) { + vm.onClickOverlay(); + } else { + vm.close(); + } + } + }, }, }); } -export function updateOverlay(): void { - if (!overlay) { - mountOverlay(); - } - - if (context.top) { - const { vm, config } = context.top; +export function updateOverlay(vm: any): void { + const item = context.find(vm); + if (item) { const el = vm.$el; + const { config, overlay } = item; + if (el && el.parentNode) { el.parentNode.insertBefore(overlay.$el, el); - } else { - document.body.appendChild(overlay.$el); } Object.assign(overlay, defaultConfig, config, { show: true, }); - } else { - overlay.show = false; } } export function openOverlay(vm: any, config: OverlayConfig): void { - if (!context.stack.some((item) => item.vm === vm)) { - context.stack.push({ vm, config }); - updateOverlay(); + if (!context.find(vm)) { + const overlay = mountOverlay(vm); + context.stack.push({ vm, config, overlay }); } + + updateOverlay(vm); } export function closeOverlay(vm: any): void { - const { stack } = context; - - if (stack.length) { - if (context.top.vm === vm) { - stack.pop(); - updateOverlay(); - } else { - context.stack = stack.filter((item) => item.vm !== vm); - } + const item = context.find(vm); + if (item) { + item.overlay.show = false; + } +} + +export function removeOverlay(vm: any) { + const item = context.find(vm); + if (item) { + removeNode(item.overlay.$el); } } From 9db7eafe8f086f20d87ecfac4cd95986dbd436fd Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 24 May 2020 16:32:08 +0800 Subject: [PATCH 132/151] style(Collapse): increase content font-size to 14px (#6358) --- src/style/var.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/style/var.less b/src/style/var.less index c31b6e683..8040123a5 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -231,8 +231,8 @@ // Collapse @collapse-item-transition-duration: @animation-duration-base; -@collapse-item-content-padding: @padding-md; -@collapse-item-content-font-size: 13px; +@collapse-item-content-padding: @padding-sm @padding-md; +@collapse-item-content-font-size: 14px; @collapse-item-content-line-height: 1.5; @collapse-item-content-text-color: @gray-6; @collapse-item-content-background-color: @white; From 2c4f0efd6fc69e693c3e5e2d2880d27cc82a3897 Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 24 May 2020 16:39:54 +0800 Subject: [PATCH 133/151] style(Cell): lower CSS priority of the border (#6359) --- src/cell/index.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cell/index.less b/src/cell/index.less index 0c7163144..1949910e8 100644 --- a/src/cell/index.less +++ b/src/cell/index.less @@ -13,10 +13,11 @@ line-height: @cell-line-height; background-color: @cell-background-color; - &:not(:last-child)::after { + &::after { .hairline-bottom(@cell-border-color, @padding-md); } + &:last-child::after, &--borderless::after { display: none; } From dc45ab8d96ea175abd3c48eea8b35e57a226b6f0 Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 24 May 2020 16:41:23 +0800 Subject: [PATCH 134/151] fix(Cli): merge commit lint failed in some cases (#6360) --- packages/vant-cli/src/commands/commit-lint.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant-cli/src/commands/commit-lint.ts b/packages/vant-cli/src/commands/commit-lint.ts index 6937cc3f3..1c04bac34 100644 --- a/packages/vant-cli/src/commands/commit-lint.ts +++ b/packages/vant-cli/src/commands/commit-lint.ts @@ -2,7 +2,7 @@ import { readFileSync } from 'fs-extra'; import { consola } from '../common/logger'; const commitRE = /^(revert: )?(fix|feat|docs|perf|test|types|style|build|chore|refactor|breaking change)(\(.+\))?: .{1,50}/; -const mergeRE = /Merge branch /; +const mergeRE = /Merge /; export function commitLint() { const gitParams = process.env.HUSKY_GIT_PARAMS as string; From 43f9857688fb24a17a486bebdedc6211cda9ef25 Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 24 May 2020 18:05:45 +0800 Subject: [PATCH 135/151] style(Collapse): adjust border gag (#6361) --- src/collapse-item/index.js | 3 +-- src/collapse-item/index.less | 14 ++++++++++++-- src/collapse/test/__snapshots__/demo.spec.js.snap | 10 +++++----- src/collapse/test/__snapshots__/index.spec.js.snap | 6 +++--- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/collapse-item/index.js b/src/collapse-item/index.js index c1e722bb2..3bf08382d 100644 --- a/src/collapse-item/index.js +++ b/src/collapse-item/index.js @@ -1,6 +1,5 @@ // Utils import { createNamespace, isDef } from '../utils'; -import { BORDER_TOP } from '../utils/constant'; import { raf, doubleRaf } from '../utils/dom/raf'; // Mixins @@ -173,7 +172,7 @@ export default createComponent({ render() { return ( -
+
{this.genTitle()} {this.genContent()}
diff --git a/src/collapse-item/index.less b/src/collapse-item/index.less index cb929a5eb..b94951ebe 100644 --- a/src/collapse-item/index.less +++ b/src/collapse-item/index.less @@ -1,6 +1,15 @@ @import '../style/var'; +@import '../style/mixins/hairline'; .van-collapse-item { + position: relative; + + &--border { + &::after { + .hairline-top(@cell-border-color, @padding-md, @padding-md); + } + } + &__title { .van-cell__right-icon::before { transform: rotate(90deg); @@ -8,7 +17,8 @@ } &::after { - visibility: hidden; + right: @padding-md; + display: none; } &--expanded { @@ -17,7 +27,7 @@ } &::after { - visibility: visible; + display: block; } } diff --git a/src/collapse/test/__snapshots__/demo.spec.js.snap b/src/collapse/test/__snapshots__/demo.spec.js.snap index 83bdd1667..8075466e2 100644 --- a/src/collapse/test/__snapshots__/demo.spec.js.snap +++ b/src/collapse/test/__snapshots__/demo.spec.js.snap @@ -15,13 +15,13 @@ exports[`renders demo correctly 1`] = `
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
b
From 31acd1dde1a5ba425961ec990ec54a4180390b3d Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 25 May 2020 20:23:44 +0800 Subject: [PATCH 136/151] docs(Search): add clear icon faq (#6372) --- src/field/README.zh-CN.md | 2 +- src/search/README.zh-CN.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/field/README.zh-CN.md b/src/field/README.zh-CN.md index 14d63932c..c281ccd0b 100644 --- a/src/field/README.zh-CN.md +++ b/src/field/README.zh-CN.md @@ -306,4 +306,4 @@ export default { ### 在桌面端点击清除按钮无效？ -参见[在桌面端使用](#/zh-CN/quickstart#zai-zhuo-mian-duan-shi-yong)。 +清除按钮监听是的移动端 Touch 事件，参见[在桌面端使用](#/zh-CN/quickstart#zai-zhuo-mian-duan-shi-yong)。 diff --git a/src/search/README.zh-CN.md b/src/search/README.zh-CN.md index 429a582b4..db6d68101 100644 --- a/src/search/README.zh-CN.md +++ b/src/search/README.zh-CN.md @@ -150,3 +150,9 @@ export default { | label | 自定义左侧文本（搜索框内） | | left-icon | 自定义左侧图标（搜索框内） | | right-icon | 自定义右侧图标（搜索框内） | + +## 常见问题 + +### 在桌面端点击清除按钮无效？ + +清除按钮监听是的移动端 Touch 事件，参见[在桌面端使用](#/zh-CN/quickstart#zai-zhuo-mian-duan-shi-yong)。 From 52dbc7563cfa2e32adb2e61486f775d498456e23 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Tue, 26 May 2020 10:11:27 +0800 Subject: [PATCH 137/151] docs(ActionSheet): improve demo --- src/action-sheet/README.md | 53 ++++++++++++++++++------- src/action-sheet/README.zh-CN.md | 67 +++++++++++++++++++------------- src/action-sheet/demo/index.vue | 49 +++++++++++++++-------- 3 files changed, 114 insertions(+), 55 deletions(-) diff --git a/src/action-sheet/README.md b/src/action-sheet/README.md index b6c00b64d..a79ac6ccc 100644 --- a/src/action-sheet/README.md +++ b/src/action-sheet/README.md @@ -16,6 +16,7 @@ Vue.use(ActionSheet); Use `actions` prop to set options of action-sheet. ```html + ``` @@ -27,9 +28,9 @@ export default { return { show: false, actions: [ - { name: 'Option' }, - { name: 'Option' }, - { name: 'Option', subname: 'Description' }, + { name: 'Option 1' }, + { name: 'Option 2' }, + { name: 'Option 3' }, ], }; }, @@ -49,6 +50,7 @@ export default { v-model="show" :actions="actions" cancel-text="Cancel" + close-on-click-action @cancel="onCancel" /> ``` @@ -60,11 +62,15 @@ export default { data() { return { show: false, + actions: [ + { name: 'Option 1' }, + { name: 'Option 2' }, + { name: 'Option 3' }, + ], }; }, methods: { onCancel() { - this.show = false; Toast('cancel'); }, }, @@ -73,18 +79,13 @@ export default { ### Show Description -```html - -``` - -### Option Status - ```html ``` @@ -94,9 +95,35 @@ export default { return { show: false, actions: [ - { name: 'Option', color: '#07c160' }, - { loading: true }, + { name: 'Option 1' }, + { name: 'Option 2' }, + { name: 'Option 3', subname: 'Description' }, + ], + }; + }, +}; +``` + +### Option Status + +```html + +``` + +```js +export default { + data() { + return { + show: false, + actions: [ + { name: 'Colored Option', color: '#07c160' }, { name: 'Disabled Option', disabled: true }, + { name: 'Loading Option', loading: true }, ], }; }, diff --git a/src/action-sheet/README.zh-CN.md b/src/action-sheet/README.zh-CN.md index ce6f29471..0993e4e71 100644 --- a/src/action-sheet/README.zh-CN.md +++ b/src/action-sheet/README.zh-CN.md @@ -17,9 +17,10 @@ Vue.use(ActionSheet); ### 基础用法 -动作面板通过`actions`属性来定义选项，数组的每一项是一个对象，对象格式见文档下方表格。 +动作面板通过 `actions` 属性来定义选项，`actions` 属性是一个由对象构成的数组，数组中的每个对象配置一列，对象格式见文档下方表格。 ```html + ``` @@ -30,11 +31,7 @@ export default { data() { return { show: false, - actions: [ - { name: '选项' }, - { name: '选项' }, - { name: '选项', subname: '描述信息' }, - ], + actions: [{ name: '选项一' }, { name: '选项二' }, { name: '选项三' }], }; }, methods: { @@ -50,13 +47,14 @@ export default { ### 展示取消按钮 -设置`cancel-text`属性后，会在底部展示取消按钮，点击后关闭当前面板 +设置 `cancel-text` 属性后，会在底部展示取消按钮，点击后关闭当前面板并触发 `cancel` 事件。 ```html ``` @@ -68,12 +66,12 @@ export default { data() { return { show: false, + actions: [{ name: '选项一' }, { name: '选项二' }, { name: '选项三' }], }; }, methods: { onCancel() { - this.show = false; - Toast('cancel'); + Toast('取消'); }, }, }; @@ -81,26 +79,15 @@ export default { ### 展示描述信息 -设置`description`属性后，会在选项上方显示描述信息 - -```html - -``` - -### 选项状态 - -可以将选项设置为加载状态或禁用状态，或者通过`color`设置选项颜色 +通过 `description` 可以在菜单顶部显示描述信息，通过选项的 `subname` 属性可以在选项文字的右侧展示描述信息。 ```html ``` @@ -110,9 +97,37 @@ export default { return { show: false, actions: [ - { name: '选项', color: '#07c160' }, - { loading: true }, + { name: '选项一' }, + { name: '选项二' }, + { name: '选项三', subname: '描述信息' }, + ], + }; + }, +}; +``` + +### 选项状态 + +可以通过 `loading` 和 `disabled` 将选项设置为加载状态或禁用状态，或者通过`color`设置选项的颜色 + +```html + +``` + +```js +export default { + data() { + return { + show: false, + actions: [ + { name: '着色选项', color: '#07c160' }, { name: '禁用选项', disabled: true }, + { name: '加载选项', loading: true }, ], }; }, @@ -160,7 +175,7 @@ export default { ### Action 数据结构 -`actions`属性为一个对象数组，数组中的每个对象配置一列，对象可以包含以下值： +`actions` 属性是一个由对象构成的数组，数组中的每个对象配置一列，对象可以包含以下值： | 键名 | 说明 | 类型 | | --------- | ------------------------ | --------- | diff --git a/src/action-sheet/demo/index.vue b/src/action-sheet/demo/index.vue index 01979c46b..87064ecb3 100644 --- a/src/action-sheet/demo/index.vue +++ b/src/action-sheet/demo/index.vue @@ -28,13 +28,6 @@ @select="onSelect" /> - - + +
{{ t('content') }}
 @@ -62,22 +63,30 @@ import { GREEN } from '../../utils/constant'; export default { i18n: { 'zh-CN': { - subname: '副文本', + option1: '选项一', + option2: '选项二', + option3: '选项三', + subname: '描述信息', showCancel: '展示取消按钮', buttonText: '弹出菜单', customPanel: '自定义面板', description: '这是一段描述信息', optionStatus: '选项状态', + coloredOption: '着色选项', disabledOption: '禁用选项', showDescription: '展示描述信息', }, 'en-US': { - subname: 'Subname', + option1: 'Option 1', + option2: 'Option 2', + option3: 'Option 3', + subname: 'Description', showCancel: 'Show Cancel Button', buttonText: 'Show ActionSheet', customPanel: 'Custom Panel', description: 'Description', optionStatus: 'Option Status', + coloredOption: 'Colored Option', disabledOption: 'Disabled Option', showDescription: 'Show Description', }, @@ -98,17 +107,25 @@ export default { computed: { simpleActions() { return [ - { name: this.t('option') }, - { name: this.t('option') }, - { name: this.t('option'), subname: this.t('subname') }, + { name: this.t('option1') }, + { name: this.t('option2') }, + { name: this.t('option3') }, + ]; + }, + + actionsWithDescription() { + return [ + { name: this.t('option1') }, + { name: this.t('option2') }, + { name: this.t('option3'), subname: this.t('subname') }, ]; }, statusActions() { return [ - { name: this.t('option'), color: GREEN }, - { loading: true }, + { name: this.t('coloredOption'), color: GREEN }, { name: this.t('disabledOption'), disabled: true }, + { loading: true }, ]; }, }, @@ -120,7 +137,7 @@ export default { }, onCancel() { - this.$toast('cancel'); + this.$toast(this.t('cancel')); }, }, }; From e54c11d55244e65246df7eddd7751983dbc4d331 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Tue, 26 May 2020 10:13:08 +0800 Subject: [PATCH 138/151] style(ActionSheet): adjust subname color to gray-6 --- src/style/var.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/var.less b/src/style/var.less index 8040123a5..f8fb59ff4 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -75,7 +75,7 @@ @action-sheet-item-font-size: @font-size-lg; @action-sheet-item-text-color: @text-color; @action-sheet-item-disabled-text-color: @gray-5; -@action-sheet-subname-color: @gray-7; +@action-sheet-subname-color: @gray-6; @action-sheet-subname-font-size: @font-size-sm; @action-sheet-close-icon-size: 22px; @action-sheet-close-icon-color: @gray-5; From 8db218e9c0ca6905491a019cf983a0269f3aea8c Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Tue, 26 May 2020 10:14:01 +0800 Subject: [PATCH 139/151] style(ActionSheet): remove option border --- src/action-sheet/index.less | 6 ++++++ src/action-sheet/index.tsx | 3 +-- .../test/__snapshots__/index.spec.js.snap | 12 ++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/action-sheet/index.less b/src/action-sheet/index.less index c2ccebc5e..87aa9c78a 100644 --- a/src/action-sheet/index.less +++ b/src/action-sheet/index.less @@ -1,4 +1,5 @@ @import '../style/var'; +@import '../style/mixins/hairline'; .van-action-sheet { max-height: @action-sheet-max-height; @@ -60,11 +61,16 @@ } &__description { + position: relative; padding: @padding-md; color: @action-sheet-description-color; font-size: @action-sheet-description-font-size; line-height: @action-sheet-description-line-height; text-align: center; + + &::after { + .hairline-bottom(@cell-border-color, @padding-md, @padding-md); + } } &__close { diff --git a/src/action-sheet/index.tsx b/src/action-sheet/index.tsx index cc7089c11..2453662c8 100644 --- a/src/action-sheet/index.tsx +++ b/src/action-sheet/index.tsx @@ -1,7 +1,6 @@ // Utils import { createNamespace } from '../utils'; import { emit, inherit } from '../utils/functional'; -import { BORDER_TOP } from '../utils/constant'; // Mixins import { popupMixinProps } from '../mixins/popup'; @@ -110,7 +109,7 @@ function ActionSheet( return ( +
`; @@ -15,16 +15,16 @@ exports[`close-icon prop 1`] = `
`; -exports[`color option 1`] = `
`; +exports[`color option 1`] = `
`; exports[`description prop 1`] = `
-
This is a description
+
This is a description
`; exports[`disable lazy-render 1`] = ` - `; -exports[`round prop 1`] = `
`; +exports[`round prop 1`] = `
`; From 126f2124a206b298708652c176087cbd433d3dbc Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 26 May 2020 19:41:00 +0800 Subject: [PATCH 140/151] fix(Field): can not disable error in form (#6382) --- src/field/index.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/field/index.js b/src/field/index.js index 6c4db0f03..acc2d6d2c 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -37,7 +37,6 @@ export default createComponent({ ...cellProps, name: String, rules: Array, - error: Boolean, disabled: Boolean, readonly: Boolean, autosize: [Boolean, Object], @@ -58,6 +57,10 @@ export default createComponent({ type: String, default: 'text', }, + error: { + type: Boolean, + default: null, + }, colon: { type: Boolean, default: null, @@ -106,10 +109,12 @@ export default createComponent({ }, showError() { + if (this.error !== null) { + return this.error; + } if (this.vanForm && this.vanForm.showError && this.validateMessage) { return true; } - return this.error; }, listeners() { From 67a5a8d76cf5ab3582b91b48431fee9466e61597 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 26 May 2020 19:44:59 +0800 Subject: [PATCH 141/151] fix(Sidebar): should emit change when v-model changed (#6383) --- src/sidebar-item/index.js | 2 +- src/sidebar/index.js | 21 +++++++++++++++++++++ src/sidebar/test/index.spec.js | 14 ++++++++++---- src/tree-select/test/index.spec.js | 10 +++++++--- 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/src/sidebar-item/index.js b/src/sidebar-item/index.js index 863a1fb5b..41a64767b 100644 --- a/src/sidebar-item/index.js +++ b/src/sidebar-item/index.js @@ -31,7 +31,7 @@ export default createComponent({ this.$emit('click', this.index); this.parent.$emit('input', this.index); - this.parent.$emit('change', this.index); + this.parent.setIndex(this.index); route(this.$router, this); }, }, diff --git a/src/sidebar/index.js b/src/sidebar/index.js index dad186e5b..2485dac6e 100644 --- a/src/sidebar/index.js +++ b/src/sidebar/index.js @@ -17,6 +17,27 @@ export default createComponent({ }, }, + data() { + return { + index: +this.activeKey, + }; + }, + + watch: { + activeKey() { + this.setIndex(+this.activeKey); + }, + }, + + methods: { + setIndex(index) { + if (index !== this.index) { + this.index = index; + this.$emit('change', index); + } + }, + }, + render() { return
{this.slots()}
; }, diff --git a/src/sidebar/test/index.spec.js b/src/sidebar/test/index.spec.js index 508eba73f..a3e533410 100644 --- a/src/sidebar/test/index.spec.js +++ b/src/sidebar/test/index.spec.js @@ -7,6 +7,7 @@ test('click event & change event', () => { const wrapper = mount({ template: ` + Text Text `, @@ -16,16 +17,17 @@ test('click event & change event', () => { }, }); - wrapper.find('.van-sidebar-item').trigger('click'); - expect(onClick).toHaveBeenCalledWith(0); - expect(onChange).toHaveBeenCalledWith(0); + wrapper.findAll('.van-sidebar-item').at(1).trigger('click'); + expect(onClick).toHaveBeenCalledWith(1); + expect(onChange).toHaveBeenCalledWith(1); wrapper.vm.$destroy(); }); test('v-model', () => { + const onChange = jest.fn(); const wrapper = mount({ template: ` - + Text Text @@ -35,10 +37,14 @@ test('v-model', () => { active: 0, }; }, + methods: { + onChange, + }, }); wrapper.findAll('.van-sidebar-item').at(1).trigger('click'); expect(wrapper.vm.active).toEqual(1); + expect(onChange).toHaveBeenCalledWith(1); }); test('disabled prop', () => { diff --git a/src/tree-select/test/index.spec.js b/src/tree-select/test/index.spec.js index 39b66c092..8314203ab 100644 --- a/src/tree-select/test/index.spec.js +++ b/src/tree-select/test/index.spec.js @@ -20,6 +20,10 @@ const mockItems = [ text: 'group1', children: [mockItem], }, + { + text: 'group2', + children: [mockItem], + }, ]; test('click-nav event', () => { @@ -39,10 +43,10 @@ test('click-nav event', () => { }); const navItems = wrapper.findAll('.van-tree-select__nav-item'); - navItems.at(0).trigger('click'); + navItems.at(1).trigger('click'); - expect(onNavClick).toHaveBeenCalledWith(0); - expect(onClickNav).toHaveBeenCalledWith(0); + expect(onNavClick).toHaveBeenCalledWith(1); + expect(onClickNav).toHaveBeenCalledWith(1); }); test('click-item event', () => { From 26a7cc5d3cbb9ee393417a981b8e4997627b1e6a Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 27 May 2020 21:04:03 +0800 Subject: [PATCH 142/151] docs(cli): update wechat group qrcode --- packages/vant-cli/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant-cli/README.md b/packages/vant-cli/README.md index ecfa4c07d..31de84d08 100644 --- a/packages/vant-cli/README.md +++ b/packages/vant-cli/README.md @@ -73,7 +73,7 @@ yarn add @vant/cli --dev 扫码加入 Vant Cli 交流群，若群二维码过期，可以联系有赞前端小秘书加群 - + ## 关于桌面端组件 From f508d2e6c0a64e5b0ab07438d55dfc5cac25d360 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Wed, 27 May 2020 21:13:21 +0800 Subject: [PATCH 143/151] feat(cli): enable type checking --- packages/vant-cli/package.json | 1 + packages/vant-cli/src/config/webpack.base.ts | 42 ++++++++++++++++---- packages/vant-cli/yarn.lock | 27 ++++++++++++- types/sku.d.ts | 1 + 4 files changed, 63 insertions(+), 8 deletions(-) diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json index 789152aef..5e6c2b2f3 100644 --- a/packages/vant-cli/package.json +++ b/packages/vant-cli/package.json @@ -73,6 +73,7 @@ "css-loader": "^3.5.3", "eslint": "^6.8.0", "fast-glob": "^3.2.2", + "fork-ts-checker-webpack-plugin": "^4.1.6", "gh-pages": "^2.2.0", "hash-sum": "^2.0.0", "html-webpack-plugin": "4.3.0", diff --git a/packages/vant-cli/src/config/webpack.base.ts b/packages/vant-cli/src/config/webpack.base.ts index a15173df4..13343a6ad 100644 --- a/packages/vant-cli/src/config/webpack.base.ts +++ b/packages/vant-cli/src/config/webpack.base.ts @@ -1,7 +1,11 @@ import sass from 'sass'; import FriendlyErrorsPlugin from '@nuxt/friendly-errors-webpack-plugin'; import { VueLoaderPlugin } from 'vue-loader'; +import { join } from 'path'; +import { existsSync } from 'fs'; +import { consola } from '../common/logger'; import { + CWD, CACHE_DIR, STYLE_EXTS, SCRIPT_EXTS, @@ -28,6 +32,36 @@ const CSS_LOADERS = [ }, ]; +const plugins = [ + new VueLoaderPlugin(), + new FriendlyErrorsPlugin({ + clearConsole: false, + logLevel: 'WARNING', + }), +]; + +const tsconfigPath = join(CWD, 'tsconfig.json'); +console.log('tsconfigPath', existsSync(tsconfigPath)); +if (existsSync(tsconfigPath)) { + const ForkTsCheckerPlugin = require('fork-ts-checker-webpack-plugin'); + plugins.push( + new ForkTsCheckerPlugin({ + formatter: 'codeframe', + vue: { enabled: true }, + logger: { + // skip info message + info() {}, + warn(message: string) { + consola.warn(message); + }, + error(message: string) { + consola.error(message); + }, + }, + }) + ); +} + export const baseConfig = { mode: 'development', resolve: { @@ -83,11 +117,5 @@ export const baseConfig = { }, ], }, - plugins: [ - new VueLoaderPlugin(), - new FriendlyErrorsPlugin({ - clearConsole: false, - logLevel: 'WARNING', - }), - ], + plugins, }; diff --git a/packages/vant-cli/yarn.lock b/packages/vant-cli/yarn.lock index 5a5846945..fb6be038f 100644 --- a/packages/vant-cli/yarn.lock +++ b/packages/vant-cli/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": +"@babel/code-frame@^7.0.0", "@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== @@ -4946,6 +4946,19 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= +fork-ts-checker-webpack-plugin@^4.1.6: + version "4.1.6" + resolved "https://registry.npm.taobao.org/fork-ts-checker-webpack-plugin/download/fork-ts-checker-webpack-plugin-4.1.6.tgz#5055c703febcf37fa06405d400c122b905167fc5" + integrity sha1-UFXHA/6883+gZAXUAMEiuQUWf8U= + dependencies: + "@babel/code-frame" "^7.5.5" + chalk "^2.4.1" + micromatch "^3.1.10" + minimatch "^3.0.4" + semver "^5.6.0" + tapable "^1.0.0" + worker-rpc "^0.1.0" + form-data@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682" @@ -7582,6 +7595,11 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= +microevent.ts@~0.1.1: + version "0.1.1" + resolved "https://registry.npm.taobao.org/microevent.ts/download/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0" + integrity sha1-cLCbg/Q99RctAgWmMCW84Pc1f6A= + micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -11892,6 +11910,13 @@ worker-farm@^1.7.0: dependencies: errno "~0.1.7" +worker-rpc@^0.1.0: + version "0.1.1" + resolved "https://registry.npm.taobao.org/worker-rpc/download/worker-rpc-0.1.1.tgz#cb565bd6d7071a8f16660686051e969ad32f54d5" + integrity sha1-y1Zb1tcHGo8WZgaGBR6WmtMvVNU= + dependencies: + microevent.ts "~0.1.1" + wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" diff --git a/types/sku.d.ts b/types/sku.d.ts index 6e4d7c6ff..9d8215ac6 100644 --- a/types/sku.d.ts +++ b/types/sku.d.ts @@ -16,6 +16,7 @@ export type SkuTreeItemData = { k: string; v: SkuTreeItemValueData[]; k_s: string; + is_multiple: never; }; export type SkuTreeItemValueData = { From 5117170c216fcf130ab033bedab135fb2cc282f4 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Wed, 27 May 2020 21:14:49 +0800 Subject: [PATCH 144/151] chore: release @vant/cli@2.5.0 --- packages/vant-cli/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json index 5e6c2b2f3..17b788a3d 100644 --- a/packages/vant-cli/package.json +++ b/packages/vant-cli/package.json @@ -1,6 +1,6 @@ { "name": "@vant/cli", - "version": "2.4.2", + "version": "2.5.0", "description": "", "main": "lib/index.js", "typings": "lib/index.d.ts", From e587ea0b7abe2f54de1d61f568f60b23f88077ea Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Wed, 27 May 2020 21:17:40 +0800 Subject: [PATCH 145/151] docs(cli): changelog v2.5.0 --- package.json | 2 +- packages/vant-cli/changelog.md | 7 ++++ packages/vant-cli/src/config/webpack.base.ts | 1 - yarn.lock | 36 +++++++++++++++++--- 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 6e591df91..c59882875 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ }, "devDependencies": { "@ls-lint/ls-lint": "^1.8.0", - "@vant/cli": "^2.4.2", + "@vant/cli": "^2.5.0", "prettier": "^2.0.4", "vue": "^2.6.11", "vue-template-compiler": "^2.6.11" diff --git a/packages/vant-cli/changelog.md b/packages/vant-cli/changelog.md index a0636928f..cdf8c7de8 100644 --- a/packages/vant-cli/changelog.md +++ b/packages/vant-cli/changelog.md @@ -1,5 +1,12 @@ # 更新日志 +### v2.5.0 + +`2020-05-27` + +- 开启 fork-ts-checker-webpack-plugin，在编译时进行类型检查 +- 现在点击锚点时会立即滚动到对应位置 + ### v2.4.2 `2020-05-04` diff --git a/packages/vant-cli/src/config/webpack.base.ts b/packages/vant-cli/src/config/webpack.base.ts index 13343a6ad..461869b01 100644 --- a/packages/vant-cli/src/config/webpack.base.ts +++ b/packages/vant-cli/src/config/webpack.base.ts @@ -41,7 +41,6 @@ const plugins = [ ]; const tsconfigPath = join(CWD, 'tsconfig.json'); -console.log('tsconfigPath', existsSync(tsconfigPath)); if (existsSync(tsconfigPath)) { const ForkTsCheckerPlugin = require('fork-ts-checker-webpack-plugin'); plugins.push( diff --git a/yarn.lock b/yarn.lock index d32081db0..71fd6eedc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": +"@babel/code-frame@^7.0.0", "@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== @@ -1514,10 +1514,10 @@ semver "^6.3.0" tsutils "^3.17.1" -"@vant/cli@^2.4.2": - version "2.4.2" - resolved "https://registry.yarnpkg.com/@vant/cli/-/cli-2.4.2.tgz#9fb966289ea20ad27ba0f460f6585afe058ec34f" - integrity sha512-nposvhU7sp/U1Xno0Q9RtvG8oEVdp8c9UNQ4t5ZFjeoh97NTdJHMFJ9bDGygw38BNuTpcwJrUvWZUrF5uFcuBA== +"@vant/cli@^2.5.0": + version "2.5.0" + resolved "https://registry.npmjs.org/@vant/cli/-/cli-2.5.0.tgz#c1a36df9a7dd3dea4588f4dbddb96503c5fbe664" + integrity sha512-6RqS1/2zrq28hEl8w0GEnREriIM/yMZp4jGM9zFDLO37yrhiIPGPZhqMU7CNQNcv6A9kMGbqoTFXrc8Iipfwjw== dependencies: "@babel/core" "^7.9.6" "@babel/plugin-syntax-jsx" "^7.8.3" @@ -1551,6 +1551,7 @@ css-loader "^3.5.3" eslint "^6.8.0" fast-glob "^3.2.2" + fork-ts-checker-webpack-plugin "^4.1.6" gh-pages "^2.2.0" hash-sum "^2.0.0" html-webpack-plugin "4.3.0" @@ -4916,6 +4917,19 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= +fork-ts-checker-webpack-plugin@^4.1.6: + version "4.1.6" + resolved "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz#5055c703febcf37fa06405d400c122b905167fc5" + integrity sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw== + dependencies: + "@babel/code-frame" "^7.5.5" + chalk "^2.4.1" + micromatch "^3.1.10" + minimatch "^3.0.4" + semver "^5.6.0" + tapable "^1.0.0" + worker-rpc "^0.1.0" + form-data@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682" @@ -7552,6 +7566,11 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= +microevent.ts@~0.1.1: + version "0.1.1" + resolved "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0" + integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g== + micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -11885,6 +11904,13 @@ worker-farm@^1.7.0: dependencies: errno "~0.1.7" +worker-rpc@^0.1.0: + version "0.1.1" + resolved "https://registry.npmjs.org/worker-rpc/-/worker-rpc-0.1.1.tgz#cb565bd6d7071a8f16660686051e969ad32f54d5" + integrity sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg== + dependencies: + microevent.ts "~0.1.1" + wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" From d9d6f1f075aebc47618abf8666413ed22c68c76b Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Wed, 27 May 2020 21:18:10 +0800 Subject: [PATCH 146/151] chore: release @vant/cli@2.5.1 --- packages/vant-cli/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json index 17b788a3d..c8576f2d3 100644 --- a/packages/vant-cli/package.json +++ b/packages/vant-cli/package.json @@ -1,6 +1,6 @@ { "name": "@vant/cli", - "version": "2.5.0", + "version": "2.5.1", "description": "", "main": "lib/index.js", "typings": "lib/index.d.ts", From d8b6401cf0cc683eda1c998d829bb5974e5eb497 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Wed, 27 May 2020 21:20:08 +0800 Subject: [PATCH 147/151] docs(cli): changelog 2.5.1 --- package.json | 2 +- packages/vant-cli/changelog.md | 6 ++++++ yarn.lock | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c59882875..017ae906f 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ }, "devDependencies": { "@ls-lint/ls-lint": "^1.8.0", - "@vant/cli": "^2.5.0", + "@vant/cli": "^2.5.1", "prettier": "^2.0.4", "vue": "^2.6.11", "vue-template-compiler": "^2.6.11" diff --git a/packages/vant-cli/changelog.md b/packages/vant-cli/changelog.md index cdf8c7de8..392684a06 100644 --- a/packages/vant-cli/changelog.md +++ b/packages/vant-cli/changelog.md @@ -1,5 +1,11 @@ # 更新日志 +### v2.5.1 + +`2020-05-27` + +- 移除多余的 log + ### v2.5.0 `2020-05-27` diff --git a/yarn.lock b/yarn.lock index 71fd6eedc..f1e6628cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1514,10 +1514,10 @@ semver "^6.3.0" tsutils "^3.17.1" -"@vant/cli@^2.5.0": - version "2.5.0" - resolved "https://registry.npmjs.org/@vant/cli/-/cli-2.5.0.tgz#c1a36df9a7dd3dea4588f4dbddb96503c5fbe664" - integrity sha512-6RqS1/2zrq28hEl8w0GEnREriIM/yMZp4jGM9zFDLO37yrhiIPGPZhqMU7CNQNcv6A9kMGbqoTFXrc8Iipfwjw== +"@vant/cli@^2.5.1": + version "2.5.1" + resolved "https://registry.npmjs.org/@vant/cli/-/cli-2.5.1.tgz#055bfbdc68227ac761730eab2a31f52cd93641d9" + integrity sha512-U0n719aqoIGKG9x0fo8Onk5QTLfrJErjU3vhQOA5cVMN3z9rOOLU7SoB4oSLLr3lh0wfMxhsie9hh6mAO/4NlQ== dependencies: "@babel/core" "^7.9.6" "@babel/plugin-syntax-jsx" "^7.8.3" From 661fd07233099f7c92e37ae57f86d19d2a860d0d Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 28 May 2020 10:35:06 +0800 Subject: [PATCH 148/151] feat(DatetimePicker): add month-day type (#6395) --- src/datetime-picker/DatePicker.js | 48 ++++-- src/datetime-picker/README.md | 38 ++++- src/datetime-picker/README.zh-CN.md | 48 +++++- src/datetime-picker/demo/index.vue | 73 ++++++--- .../test/__snapshots__/demo.spec.js.snap | 150 ++++++++++++++++++ src/datetime-picker/test/date-picker.spec.js | 54 +++++++ 6 files changed, 365 insertions(+), 46 deletions(-) diff --git a/src/datetime-picker/DatePicker.js b/src/datetime-picker/DatePicker.js index 0999428d4..6baef67e7 100644 --- a/src/datetime-picker/DatePicker.js +++ b/src/datetime-picker/DatePicker.js @@ -1,4 +1,4 @@ -import { createNamespace } from '../utils'; +import { createNamespace, get } from '../utils'; import { isDate } from '../utils/validate/date'; import { padZero } from '../utils/format/string'; import { getTrueValue, getMonthEndDay } from './utils'; @@ -60,7 +60,7 @@ export default createComponent({ minMinute, } = this.getBoundary('min', this.innerValue); - const result = [ + let result = [ { type: 'year', range: [minYear, maxYear], @@ -83,8 +83,18 @@ export default createComponent({ }, ]; - if (this.type === 'date') result.splice(3, 2); - if (this.type === 'year-month') result.splice(2, 3); + if (this.type === 'date') { + result = result.slice(0, 3); + } + + if (this.type === 'year-month') { + result = result.slice(0, 2); + } + + if (this.type === 'month-day') { + result = result.slice(1, 3); + } + return result; }, }, @@ -139,35 +149,39 @@ export default createComponent({ }, updateInnerValue() { + const { type } = this; const indexes = this.getPicker().getIndexes(); - const getValue = (index) => { const { values } = this.originColumns[index]; return getTrueValue(values[indexes[index]]); }; - const year = getValue(0); - const month = getValue(1); - const maxDate = getMonthEndDay(year, month); + let year; + let month; + let day; - let date; - if (this.type === 'year-month') { - date = 1; + if (type === 'month-day') { + year = this.innerValue.getFullYear(); + month = getValue(0); + day = getValue(1); } else { - date = getValue(2); + year = getValue(0); + month = getValue(1); + day = type === 'year-month' ? 1 : getValue(2); } - date = date > maxDate ? maxDate : date; + const maxDay = getMonthEndDay(year, month); + day = day > maxDay ? maxDay : day; let hour = 0; let minute = 0; - if (this.type === 'datetime') { + if (type === 'datetime') { hour = getValue(3); minute = getValue(4); } - const value = new Date(year, month - 1, date, hour, minute); + const value = new Date(year, month - 1, day, hour, minute); this.innerValue = this.formatValue(value); }, @@ -203,6 +217,10 @@ export default createComponent({ values = values.slice(0, 2); } + if (this.type === 'month-day') { + values = values.slice(1, 3); + } + this.$nextTick(() => { this.getPicker().setValues(values); }); diff --git a/src/datetime-picker/README.md b/src/datetime-picker/README.md index bcd85a02a..93de87b90 100644 --- a/src/datetime-picker/README.md +++ b/src/datetime-picker/README.md @@ -74,6 +74,41 @@ export default { }; ``` +### Choose Month-Day + +```html + +``` + +```js +export default { + data() { + return { + minDate: new Date(2020, 0, 1), + maxDate: new Date(2025, 10, 1), + currentDate: new Date(), + }; + }, + methods: { + formatter(type, val) { + if (type === 'month') { + return `${val} Month`; + } else if (type === 'day') { + return `${val} Day`; + } + return val; + }, + }, +}; +``` + ### Choose Time ```html @@ -143,7 +178,6 @@ export default { if (type === 'minute') { return options.filter((option) => option % 5 === 0); } - return options; }, }, @@ -156,7 +190,7 @@ export default { | Attribute | Description | Type | Default | | --- | --- | --- | --- | -| type | Can be set to `date` `time`
`year-month` | _string_ | `datetime` | +| type | Can be set to `date` `time`
`year-month` `month-day` | _string_ | `datetime` | | title | Toolbar title | _string_ | `''` | | confirm-button-text | Text of confirm button | _string_ | `Confirm` | | cancel-button-text | Text of cancel button | _string_ | `Cancel` | diff --git a/src/datetime-picker/README.zh-CN.md b/src/datetime-picker/README.zh-CN.md index fffceddf1..e9db92cbe 100644 --- a/src/datetime-picker/README.zh-CN.md +++ b/src/datetime-picker/README.zh-CN.md @@ -17,6 +17,8 @@ Vue.use(DatetimePicker); ### 选择年月日 +DatetimePicker 通过 type 属性来定义需要选择的时间类型，type 为 `date` 表示选择年月日。通过 min-date 和 max-date 属性可以确定可选的时间范围。 + ```html +``` + +```js +export default { + data() { + return { + minDate: new Date(2020, 0, 1), + maxDate: new Date(2025, 10, 1), + currentDate: new Date(), + }; + }, + methods: { + formatter(type, val) { + if (type === 'month') { + return `${val}月`; + } else if (type === 'day') { + return `${val}日`; + } + return val; + }, + }, +}; +``` + ### 选择时间 +将 type 设置为 `time` 即可选择时间（小时和分钟） + ```html option % 5 === 0); } - return options; }, }, @@ -155,7 +197,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | | --- | --- | --- | --- | -| type | 类型，可选值为 `date`
`time` `year-month` | _string_ | `datetime` | +| type | 时间类型，可选值为 `date` `time`
`year-month` `month-day` | _string_ | `datetime` | | title | 顶部栏标题 | _string_ | `''` | | confirm-button-text | 确认按钮文字 | _string_ | `确认` | | cancel-button-text | 取消按钮文字 | _string_ | `取消` | diff --git a/src/datetime-picker/demo/index.vue b/src/datetime-picker/demo/index.vue index be0d5ddd5..9e8fbf613 100644 --- a/src/datetime-picker/demo/index.vue +++ b/src/datetime-picker/demo/index.vue @@ -1,41 +1,52 @@