From 1baa83bdcbe356ebc1b94a9760469b11bbc2bba4 Mon Sep 17 00:00:00 2001
From: wegi8 <18272190626@163.com>
Date: Tue, 17 May 2022 18:41:34 +0800
Subject: [PATCH 1/5] chore: add the `@types/glob` into `devDependencies`
---
packages/varlet-cli/package.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/varlet-cli/package.json b/packages/varlet-cli/package.json
index a49f772ba30..6affd503338 100644
--- a/packages/varlet-cli/package.json
+++ b/packages/varlet-cli/package.json
@@ -72,6 +72,7 @@
"devDependencies": {
"@types/babel__core": "^7.1.12",
"@types/fs-extra": "^9.0.2",
+ "@types/glob": "^7.1.3",
"@types/hash-sum": "^1.0.0",
"@types/jest": "^26.0.15",
"@types/lodash": "^4.14.174",
From 90ab2b481232aab7a7d9ed2cdcfcd74d2fcfc22b Mon Sep 17 00:00:00 2001
From: wegi8 <18272190626@163.com>
Date: Tue, 17 May 2022 18:46:30 +0800
Subject: [PATCH 2/5] Update pnpm-lock.yaml
---
pnpm-lock.yaml | 281 ++++++++++++++++++++++++++++++-------------------
1 file changed, 173 insertions(+), 108 deletions(-)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c4a963c9b91..ca09ffa6599 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: 5.3
+lockfileVersion: 5.4
importers:
@@ -38,6 +38,7 @@ importers:
'@babel/preset-typescript': ^7.14.5
'@types/babel__core': ^7.1.12
'@types/fs-extra': ^9.0.2
+ '@types/glob': ^7.1.3
'@types/hash-sum': ^1.0.0
'@types/jest': ^26.0.15
'@types/lodash': ^4.14.174
@@ -104,15 +105,16 @@ importers:
ora: 5.4.1
semver: 7.3.5
slash: 3.0.0
- ts-jest: 26.5.6_jest@26.6.3+typescript@4.5.4
+ ts-jest: 26.5.6_hoj6rh37du6uxub6buv3fchqgy
typescript: 4.5.4
vite: 2.9.5_less@3.13.1
vite-plugin-html: 2.1.2_vite@2.9.5
vue: 3.2.25
- vue-jest: 5.0.0-alpha.10_50877e7063dde22867df882d01feacc5
+ vue-jest: 5.0.0-alpha.10_kcdx44dd3xrcqz67rawqd7vmyu
devDependencies:
'@types/babel__core': 7.1.17
'@types/fs-extra': 9.0.13
+ '@types/glob': 7.2.0
'@types/hash-sum': 1.0.0
'@types/jest': 26.0.24
'@types/lodash': 4.14.178
@@ -128,12 +130,12 @@ importers:
eslint-plugin-import: ^2.22.1
eslint-plugin-vue: ^7.1.0
dependencies:
- '@typescript-eslint/eslint-plugin': 4.33.0_3289a875d95a672b97ebf589745c66ef
- '@typescript-eslint/parser': 4.33.0_eslint@7.32.0+typescript@4.5.4
- eslint-config-airbnb-base: 14.2.1_a820dc868cc8cd66d8297be6779b9035
- eslint-config-prettier: 6.15.0_eslint@7.32.0
- eslint-plugin-import: 2.25.3_eslint@7.32.0
- eslint-plugin-vue: 7.20.0_eslint@7.32.0
+ '@typescript-eslint/eslint-plugin': 4.33.0_sz4i7qznf44sliit4yqchbvfk4
+ '@typescript-eslint/parser': 4.33.0
+ eslint-config-airbnb-base: 14.2.1_p67asgcrztirht27gt2zvikev4
+ eslint-config-prettier: 6.15.0
+ eslint-plugin-import: 2.25.3_sz4i7qznf44sliit4yqchbvfk4
+ eslint-plugin-vue: 7.20.0
packages/varlet-icons:
specifiers:
@@ -158,8 +160,8 @@ importers:
stylelint-config-prettier: ^8.0.2
stylelint-config-standard: ^20.0.0
dependencies:
- stylelint-config-prettier: 8.0.2_stylelint@13.13.1
- stylelint-config-standard: 20.0.0_stylelint@13.13.1
+ stylelint-config-prettier: 8.0.2
+ stylelint-config-standard: 20.0.0
packages/varlet-touch-emulator:
specifiers: {}
@@ -242,7 +244,7 @@ importers:
'@types/node': 14.18.3
'@types/vscode': 1.63.1
glob: 7.2.0
- ts-loader: 8.3.0_typescript@4.5.4+webpack@5.65.0
+ ts-loader: 8.3.0_vpu6w3irz2xtriped7fy5c7mha
typescript: 4.5.4
vsce: 2.7.0
webpack: 5.65.0_webpack-cli@4.9.1
@@ -676,7 +678,6 @@ packages:
/@babel/helper-validator-identifier/7.16.7:
resolution: {integrity: sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==}
engines: {node: '>=6.9.0'}
- dev: false
/@babel/helper-validator-option/7.14.5:
resolution: {integrity: sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==}
@@ -741,11 +742,15 @@ packages:
resolution: {integrity: sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==}
engines: {node: '>=6.0.0'}
hasBin: true
+ dependencies:
+ '@babel/types': 7.17.0
/@babel/parser/7.17.0:
resolution: {integrity: sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==}
engines: {node: '>=6.0.0'}
hasBin: true
+ dependencies:
+ '@babel/types': 7.17.0
dev: false
/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.16.2_@babel+core@7.16.5:
@@ -1720,7 +1725,6 @@ packages:
dependencies:
'@babel/helper-validator-identifier': 7.16.7
to-fast-properties: 2.0.0
- dev: false
/@bcoe/v8-coverage/0.2.3:
resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
@@ -2046,7 +2050,7 @@ packages:
'@sinonjs/commons': 1.8.3
dev: false
- /@stylelint/postcss-css-in-js/0.37.2_4f7b71a942b8b7a555b8adf78f88122b:
+ /@stylelint/postcss-css-in-js/0.37.2_j55xdkkcxc32kvnyvx3y7casfm:
resolution: {integrity: sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==}
peerDependencies:
postcss: '>=7.0.0'
@@ -2054,12 +2058,12 @@ packages:
dependencies:
'@babel/core': 7.16.5
postcss: 7.0.39
- postcss-syntax: 0.36.2_postcss@7.0.39
+ postcss-syntax: 0.36.2_kei4jy7wdgbhc236h4oijypxom
transitivePeerDependencies:
- supports-color
dev: true
- /@stylelint/postcss-markdown/0.36.2_4f7b71a942b8b7a555b8adf78f88122b:
+ /@stylelint/postcss-markdown/0.36.2_j55xdkkcxc32kvnyvx3y7casfm:
resolution: {integrity: sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==}
deprecated: 'Use the original unforked package instead: postcss-markdown'
peerDependencies:
@@ -2067,7 +2071,7 @@ packages:
postcss-syntax: '>=0.36.2'
dependencies:
postcss: 7.0.39
- postcss-syntax: 0.36.2_postcss@7.0.39
+ postcss-syntax: 0.36.2_kei4jy7wdgbhc236h4oijypxom
remark: 13.0.0
unist-util-find-all-after: 3.0.2
transitivePeerDependencies:
@@ -2246,7 +2250,7 @@ packages:
dependencies:
'@types/yargs-parser': 20.2.1
- /@typescript-eslint/eslint-plugin/4.33.0_3289a875d95a672b97ebf589745c66ef:
+ /@typescript-eslint/eslint-plugin/4.33.0_sz4i7qznf44sliit4yqchbvfk4:
resolution: {integrity: sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==}
engines: {node: ^10.12.0 || >=12.0.0}
peerDependencies:
@@ -2257,22 +2261,20 @@ packages:
typescript:
optional: true
dependencies:
- '@typescript-eslint/experimental-utils': 4.33.0_eslint@7.32.0+typescript@4.5.4
- '@typescript-eslint/parser': 4.33.0_eslint@7.32.0+typescript@4.5.4
+ '@typescript-eslint/experimental-utils': 4.33.0
+ '@typescript-eslint/parser': 4.33.0
'@typescript-eslint/scope-manager': 4.33.0
debug: 4.3.3
- eslint: 7.32.0
functional-red-black-tree: 1.0.1
ignore: 5.2.0
regexpp: 3.2.0
semver: 7.3.5
- tsutils: 3.21.0_typescript@4.5.4
- typescript: 4.5.4
+ tsutils: 3.21.0
transitivePeerDependencies:
- supports-color
dev: false
- /@typescript-eslint/experimental-utils/4.33.0_eslint@7.32.0+typescript@4.5.4:
+ /@typescript-eslint/experimental-utils/4.33.0:
resolution: {integrity: sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==}
engines: {node: ^10.12.0 || >=12.0.0}
peerDependencies:
@@ -2281,16 +2283,15 @@ packages:
'@types/json-schema': 7.0.9
'@typescript-eslint/scope-manager': 4.33.0
'@typescript-eslint/types': 4.33.0
- '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.5.4
- eslint: 7.32.0
+ '@typescript-eslint/typescript-estree': 4.33.0
eslint-scope: 5.1.1
- eslint-utils: 3.0.0_eslint@7.32.0
+ eslint-utils: 3.0.0
transitivePeerDependencies:
- supports-color
- typescript
dev: false
- /@typescript-eslint/parser/4.33.0_eslint@7.32.0+typescript@4.5.4:
+ /@typescript-eslint/parser/4.33.0:
resolution: {integrity: sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==}
engines: {node: ^10.12.0 || >=12.0.0}
peerDependencies:
@@ -2302,10 +2303,8 @@ packages:
dependencies:
'@typescript-eslint/scope-manager': 4.33.0
'@typescript-eslint/types': 4.33.0
- '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.5.4
+ '@typescript-eslint/typescript-estree': 4.33.0
debug: 4.3.3
- eslint: 7.32.0
- typescript: 4.5.4
transitivePeerDependencies:
- supports-color
dev: false
@@ -2323,7 +2322,7 @@ packages:
engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
dev: false
- /@typescript-eslint/typescript-estree/4.33.0_typescript@4.5.4:
+ /@typescript-eslint/typescript-estree/4.33.0:
resolution: {integrity: sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==}
engines: {node: ^10.12.0 || >=12.0.0}
peerDependencies:
@@ -2338,8 +2337,7 @@ packages:
globby: 11.0.4
is-glob: 4.0.3
semver: 7.3.5
- tsutils: 3.21.0_typescript@4.5.4
- typescript: 4.5.4
+ tsutils: 3.21.0
transitivePeerDependencies:
- supports-color
dev: false
@@ -2708,7 +2706,7 @@ packages:
'@xtuc/long': 4.2.2
dev: true
- /@webpack-cli/configtest/1.1.0_webpack-cli@4.9.1+webpack@5.65.0:
+ /@webpack-cli/configtest/1.1.0_5mkmpm5yhygs4kjlquk5gjvbjm:
resolution: {integrity: sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==}
peerDependencies:
webpack: 4.x.x || 5.x.x
@@ -2892,6 +2890,8 @@ packages:
dependencies:
micromatch: 3.1.10
normalize-path: 2.1.1
+ transitivePeerDependencies:
+ - supports-color
/anymatch/3.1.2:
resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==}
@@ -3270,6 +3270,8 @@ packages:
snapdragon-node: 2.1.1
split-string: 3.1.0
to-regex: 3.0.2
+ transitivePeerDependencies:
+ - supports-color
/braces/3.0.2:
resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
@@ -3489,6 +3491,8 @@ packages:
upath: 1.2.0
optionalDependencies:
fsevents: 1.2.13
+ transitivePeerDependencies:
+ - supports-color
dev: true
/chokidar/3.5.2:
@@ -3717,6 +3721,8 @@ packages:
finalhandler: 1.1.2
parseurl: 1.3.3
utils-merge: 1.0.1
+ transitivePeerDependencies:
+ - supports-color
dev: true
/console-control-strings/1.1.0:
@@ -4025,11 +4031,21 @@ packages:
/debug/2.6.9:
resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
+ peerDependencies:
+ supports-color: '*'
+ peerDependenciesMeta:
+ supports-color:
+ optional: true
dependencies:
ms: 2.0.0
/debug/3.2.7:
resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+ peerDependencies:
+ supports-color: '*'
+ peerDependenciesMeta:
+ supports-color:
+ optional: true
dependencies:
ms: 2.1.3
dev: false
@@ -4811,7 +4827,7 @@ packages:
source-map: 0.6.1
dev: false
- /eslint-config-airbnb-base/14.2.1_a820dc868cc8cd66d8297be6779b9035:
+ /eslint-config-airbnb-base/14.2.1_p67asgcrztirht27gt2zvikev4:
resolution: {integrity: sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==}
engines: {node: '>= 6'}
peerDependencies:
@@ -4819,19 +4835,17 @@ packages:
eslint-plugin-import: ^2.22.1
dependencies:
confusing-browser-globals: 1.0.11
- eslint: 7.32.0
- eslint-plugin-import: 2.25.3_eslint@7.32.0
+ eslint-plugin-import: 2.25.3_sz4i7qznf44sliit4yqchbvfk4
object.assign: 4.1.2
object.entries: 1.1.5
dev: false
- /eslint-config-prettier/6.15.0_eslint@7.32.0:
+ /eslint-config-prettier/6.15.0:
resolution: {integrity: sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==}
hasBin: true
peerDependencies:
eslint: '>=3.14.1'
dependencies:
- eslint: 7.32.0
get-stdin: 6.0.0
dev: false
@@ -4840,30 +4854,54 @@ packages:
dependencies:
debug: 3.2.7
resolve: 1.20.0
+ transitivePeerDependencies:
+ - supports-color
dev: false
- /eslint-module-utils/2.7.1:
+ /eslint-module-utils/2.7.1_lkzaig2qiyp6elizstfbgvzhie:
resolution: {integrity: sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==}
engines: {node: '>=4'}
+ peerDependencies:
+ '@typescript-eslint/parser': '*'
+ eslint-import-resolver-node: '*'
+ eslint-import-resolver-typescript: '*'
+ eslint-import-resolver-webpack: '*'
+ peerDependenciesMeta:
+ '@typescript-eslint/parser':
+ optional: true
+ eslint-import-resolver-node:
+ optional: true
+ eslint-import-resolver-typescript:
+ optional: true
+ eslint-import-resolver-webpack:
+ optional: true
dependencies:
+ '@typescript-eslint/parser': 4.33.0
debug: 3.2.7
+ eslint-import-resolver-node: 0.3.6
find-up: 2.1.0
pkg-dir: 2.0.0
+ transitivePeerDependencies:
+ - supports-color
dev: false
- /eslint-plugin-import/2.25.3_eslint@7.32.0:
+ /eslint-plugin-import/2.25.3_sz4i7qznf44sliit4yqchbvfk4:
resolution: {integrity: sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==}
engines: {node: '>=4'}
peerDependencies:
+ '@typescript-eslint/parser': '*'
eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+ peerDependenciesMeta:
+ '@typescript-eslint/parser':
+ optional: true
dependencies:
+ '@typescript-eslint/parser': 4.33.0
array-includes: 3.1.4
array.prototype.flat: 1.2.5
debug: 2.6.9
doctrine: 2.1.0
- eslint: 7.32.0
eslint-import-resolver-node: 0.3.6
- eslint-module-utils: 2.7.1
+ eslint-module-utils: 2.7.1_lkzaig2qiyp6elizstfbgvzhie
has: 1.0.3
is-core-module: 2.8.0
is-glob: 4.0.3
@@ -4871,19 +4909,22 @@ packages:
object.values: 1.1.5
resolve: 1.20.0
tsconfig-paths: 3.12.0
+ transitivePeerDependencies:
+ - eslint-import-resolver-typescript
+ - eslint-import-resolver-webpack
+ - supports-color
dev: false
- /eslint-plugin-vue/7.20.0_eslint@7.32.0:
+ /eslint-plugin-vue/7.20.0:
resolution: {integrity: sha512-oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==}
engines: {node: '>=8.10'}
peerDependencies:
eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
dependencies:
- eslint: 7.32.0
eslint-utils: 2.1.0
natural-compare: 1.4.0
semver: 6.3.0
- vue-eslint-parser: 7.11.0_eslint@7.32.0
+ vue-eslint-parser: 7.11.0
transitivePeerDependencies:
- supports-color
dev: false
@@ -4901,13 +4942,12 @@ packages:
dependencies:
eslint-visitor-keys: 1.3.0
- /eslint-utils/3.0.0_eslint@7.32.0:
+ /eslint-utils/3.0.0:
resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
peerDependencies:
eslint: '>=5'
dependencies:
- eslint: 7.32.0
eslint-visitor-keys: 2.1.0
dev: false
@@ -5019,7 +5059,7 @@ packages:
engines: {node: '>=0.10.0'}
/etag/1.8.1:
- resolution: {integrity: sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=}
+ resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
engines: {node: '>= 0.6'}
dev: true
@@ -5108,6 +5148,8 @@ packages:
regex-not: 1.0.2
snapdragon: 0.8.2
to-regex: 3.0.2
+ transitivePeerDependencies:
+ - supports-color
/expand-template/2.0.3:
resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
@@ -5164,6 +5206,8 @@ packages:
regex-not: 1.0.2
snapdragon: 0.8.2
to-regex: 3.0.2
+ transitivePeerDependencies:
+ - supports-color
/extract-from-css/0.4.4:
resolution: {integrity: sha1-HqffLnx8brmSL6COitrqSG9vj5I=}
@@ -5186,6 +5230,8 @@ packages:
is-glob: 4.0.3
merge2: 1.4.1
micromatch: 3.1.10
+ transitivePeerDependencies:
+ - supports-color
dev: false
/fast-glob/3.2.7:
@@ -5287,6 +5333,8 @@ packages:
parseurl: 1.3.3
statuses: 1.5.0
unpipe: 1.0.0
+ transitivePeerDependencies:
+ - supports-color
dev: true
/find-up/2.1.0:
@@ -5335,7 +5383,7 @@ packages:
map-cache: 0.2.2
/fresh/0.5.2:
- resolution: {integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=}
+ resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
engines: {node: '>= 0.6'}
dev: true
@@ -5614,6 +5662,8 @@ packages:
ignore: 4.0.6
pify: 4.0.1
slash: 2.0.0
+ transitivePeerDependencies:
+ - supports-color
dev: false
/globjoin/0.1.4:
@@ -5764,8 +5814,6 @@ packages:
param-case: 3.0.4
relateurl: 0.2.7
terser: 5.10.0
- transitivePeerDependencies:
- - acorn
dev: false
/html-tags/3.1.0:
@@ -5875,7 +5923,7 @@ packages:
engines: {node: '>= 4'}
/image-size/0.5.5:
- resolution: {integrity: sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=}
+ resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==}
engines: {node: '>=0.10.0'}
hasBin: true
requiresBuild: true
@@ -6289,7 +6337,7 @@ packages:
engines: {node: '>=0.10.0'}
/is-wsl/1.1.0:
- resolution: {integrity: sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=}
+ resolution: {integrity: sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==}
engines: {node: '>=4'}
dev: true
@@ -6538,6 +6586,8 @@ packages:
walker: 1.0.8
optionalDependencies:
fsevents: 2.3.2
+ transitivePeerDependencies:
+ - supports-color
dev: false
/jest-jasmine2/26.6.3:
@@ -6635,6 +6685,8 @@ packages:
'@jest/types': 26.6.2
jest-regex-util: 26.0.0
jest-snapshot: 26.6.2
+ transitivePeerDependencies:
+ - supports-color
dev: false
/jest-resolve/26.6.2:
@@ -6751,6 +6803,8 @@ packages:
natural-compare: 1.4.0
pretty-format: 26.6.2
semver: 7.3.5
+ transitivePeerDependencies:
+ - supports-color
dev: false
/jest-util/26.6.2:
@@ -7099,6 +7153,8 @@ packages:
proxy-middleware: 0.15.0
send: 0.18.0
serve-index: 1.9.1
+ transitivePeerDependencies:
+ - supports-color
dev: true
/load-json-file/4.0.0:
@@ -7412,6 +7468,8 @@ packages:
regex-not: 1.0.2
snapdragon: 0.8.2
to-regex: 3.0.2
+ transitivePeerDependencies:
+ - supports-color
/micromatch/4.0.4:
resolution: {integrity: sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==}
@@ -7503,6 +7561,8 @@ packages:
depd: 2.0.0
on-finished: 2.3.0
on-headers: 1.0.2
+ transitivePeerDependencies:
+ - supports-color
dev: true
/ms/2.0.0:
@@ -7553,6 +7613,8 @@ packages:
regex-not: 1.0.2
snapdragon: 0.8.2
to-regex: 3.0.2
+ transitivePeerDependencies:
+ - supports-color
/napi-build-utils/1.0.2:
resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
@@ -8088,7 +8150,7 @@ packages:
resolution: {integrity: sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=}
engines: {node: '>=0.10.0'}
- /postcss-html/0.36.0_4f7b71a942b8b7a555b8adf78f88122b:
+ /postcss-html/0.36.0_j55xdkkcxc32kvnyvx3y7casfm:
resolution: {integrity: sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==}
peerDependencies:
postcss: '>=5.0.0'
@@ -8096,7 +8158,7 @@ packages:
dependencies:
htmlparser2: 3.10.1
postcss: 7.0.39
- postcss-syntax: 0.36.2_postcss@7.0.39
+ postcss-syntax: 0.36.2_kei4jy7wdgbhc236h4oijypxom
dev: true
/postcss-less/3.1.4:
@@ -8150,12 +8212,31 @@ packages:
util-deprecate: 1.0.2
dev: true
- /postcss-syntax/0.36.2_postcss@7.0.39:
+ /postcss-syntax/0.36.2_kei4jy7wdgbhc236h4oijypxom:
resolution: {integrity: sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==}
peerDependencies:
postcss: '>=5.0.0'
+ postcss-html: '*'
+ postcss-jsx: '*'
+ postcss-less: '*'
+ postcss-markdown: '*'
+ postcss-scss: '*'
+ peerDependenciesMeta:
+ postcss-html:
+ optional: true
+ postcss-jsx:
+ optional: true
+ postcss-less:
+ optional: true
+ postcss-markdown:
+ optional: true
+ postcss-scss:
+ optional: true
dependencies:
postcss: 7.0.39
+ postcss-html: 0.36.0_j55xdkkcxc32kvnyvx3y7casfm
+ postcss-less: 3.1.4
+ postcss-scss: 2.1.1
dev: true
/postcss-value-parser/4.2.0:
@@ -8257,7 +8338,7 @@ packages:
dev: false
/proxy-middleware/0.15.0:
- resolution: {integrity: sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=}
+ resolution: {integrity: sha512-EGCG8SeoIRVMhsqHQUdDigB2i7qU7fCsWASwn54+nPutYO8n4q6EiwMzyfWlC+dzRFExP+kvcnDFdBDHoZBU7Q==}
engines: {node: '>=0.8.0'}
dev: true
@@ -8402,6 +8483,8 @@ packages:
graceful-fs: 4.2.8
micromatch: 3.1.10
readable-stream: 2.3.7
+ transitivePeerDependencies:
+ - supports-color
dev: true
/readdirp/3.6.0:
@@ -8663,6 +8746,8 @@ packages:
micromatch: 3.1.10
minimist: 1.2.5
walker: 1.0.8
+ transitivePeerDependencies:
+ - supports-color
dev: false
/sax/1.2.4:
@@ -8729,6 +8814,8 @@ packages:
on-finished: 2.4.1
range-parser: 1.2.1
statuses: 2.0.1
+ transitivePeerDependencies:
+ - supports-color
dev: true
/serialize-javascript/6.0.0:
@@ -8748,6 +8835,8 @@ packages:
http-errors: 1.6.3
mime-types: 2.1.34
parseurl: 1.3.3
+ transitivePeerDependencies:
+ - supports-color
dev: true
/set-blocking/2.0.0:
@@ -8894,6 +8983,8 @@ packages:
source-map: 0.5.7
source-map-resolve: 0.5.3
use: 3.1.1
+ transitivePeerDependencies:
+ - supports-color
/source-map-js/1.0.1:
resolution: {integrity: sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==}
@@ -9152,31 +9243,26 @@ packages:
resolution: {integrity: sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=}
dev: true
- /stylelint-config-prettier/8.0.2_stylelint@13.13.1:
+ /stylelint-config-prettier/8.0.2:
resolution: {integrity: sha512-TN1l93iVTXpF9NJstlvP7nOu9zY2k+mN0NSFQ/VEGz15ZIP9ohdDZTtCWHs5LjctAhSAzaILULGbgiM0ItId3A==}
engines: {node: '>= 10', npm: '>= 5'}
hasBin: true
peerDependencies:
stylelint: '>=11.0.0'
- dependencies:
- stylelint: 13.13.1
dev: false
- /stylelint-config-recommended/3.0.0_stylelint@13.13.1:
+ /stylelint-config-recommended/3.0.0:
resolution: {integrity: sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==}
peerDependencies:
stylelint: '>=10.1.0'
- dependencies:
- stylelint: 13.13.1
dev: false
- /stylelint-config-standard/20.0.0_stylelint@13.13.1:
+ /stylelint-config-standard/20.0.0:
resolution: {integrity: sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA==}
peerDependencies:
stylelint: '>=10.1.0'
dependencies:
- stylelint: 13.13.1
- stylelint-config-recommended: 3.0.0_stylelint@13.13.1
+ stylelint-config-recommended: 3.0.0
dev: false
/stylelint/13.13.1:
@@ -9184,8 +9270,8 @@ packages:
engines: {node: '>=10.13.0'}
hasBin: true
dependencies:
- '@stylelint/postcss-css-in-js': 0.37.2_4f7b71a942b8b7a555b8adf78f88122b
- '@stylelint/postcss-markdown': 0.36.2_4f7b71a942b8b7a555b8adf78f88122b
+ '@stylelint/postcss-css-in-js': 0.37.2_j55xdkkcxc32kvnyvx3y7casfm
+ '@stylelint/postcss-markdown': 0.36.2_j55xdkkcxc32kvnyvx3y7casfm
autoprefixer: 9.8.8
balanced-match: 2.0.0
chalk: 4.1.2
@@ -9211,7 +9297,7 @@ packages:
micromatch: 4.0.4
normalize-selector: 0.2.0
postcss: 7.0.39
- postcss-html: 0.36.0_4f7b71a942b8b7a555b8adf78f88122b
+ postcss-html: 0.36.0_j55xdkkcxc32kvnyvx3y7casfm
postcss-less: 3.1.4
postcss-media-query-parser: 0.2.3
postcss-resolve-nested-selector: 0.1.1
@@ -9219,7 +9305,7 @@ packages:
postcss-sass: 0.4.4
postcss-scss: 2.1.1
postcss-selector-parser: 6.0.8
- postcss-syntax: 0.36.2_postcss@7.0.39
+ postcss-syntax: 0.36.2_kei4jy7wdgbhc236h4oijypxom
postcss-value-parser: 4.2.0
resolve-from: 5.0.0
slash: 3.0.0
@@ -9233,6 +9319,8 @@ packages:
v8-compile-cache: 2.3.0
write-file-atomic: 3.0.3
transitivePeerDependencies:
+ - postcss-jsx
+ - postcss-markdown
- supports-color
dev: true
@@ -9368,7 +9456,7 @@ packages:
supports-hyperlinks: 2.2.0
dev: false
- /terser-webpack-plugin/5.3.0_acorn@8.7.0+webpack@5.65.0:
+ /terser-webpack-plugin/5.3.0_webpack@5.65.0:
resolution: {integrity: sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==}
engines: {node: '>= 10.13.0'}
peerDependencies:
@@ -9388,33 +9476,14 @@ packages:
schema-utils: 3.1.1
serialize-javascript: 6.0.0
source-map: 0.6.1
- terser: 5.10.0_acorn@8.7.0
+ terser: 5.10.0
webpack: 5.65.0_webpack-cli@4.9.1
- transitivePeerDependencies:
- - acorn
dev: true
/terser/5.10.0:
resolution: {integrity: sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==}
engines: {node: '>=10'}
hasBin: true
- peerDependencies:
- acorn: ^8.5.0
- peerDependenciesMeta:
- acorn:
- optional: true
- dependencies:
- commander: 2.20.3
- source-map: 0.7.3
- source-map-support: 0.5.21
- dev: false
-
- /terser/5.10.0_acorn@8.7.0:
- resolution: {integrity: sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==}
- engines: {node: '>=10'}
- hasBin: true
- peerDependencies:
- acorn: ^8.5.0
peerDependenciesMeta:
acorn:
optional: true
@@ -9423,7 +9492,6 @@ packages:
commander: 2.20.3
source-map: 0.7.3
source-map-support: 0.5.21
- dev: true
/test-exclude/6.0.0:
resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
@@ -9551,7 +9619,7 @@ packages:
resolution: {integrity: sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==}
dev: true
- /ts-jest/26.5.6_jest@26.6.3+typescript@4.5.4:
+ /ts-jest/26.5.6_hoj6rh37du6uxub6buv3fchqgy:
resolution: {integrity: sha512-rua+rCP8DxpA8b4DQD/6X2HQS8Zy/xzViVYfEs2OQu68tkCuKLV0Md8pmX55+W24uRIyAsf/BajRfxOs+R2MKA==}
engines: {node: '>= 10'}
hasBin: true
@@ -9573,7 +9641,7 @@ packages:
yargs-parser: 20.2.9
dev: false
- /ts-loader/8.3.0_typescript@4.5.4+webpack@5.65.0:
+ /ts-loader/8.3.0_vpu6w3irz2xtriped7fy5c7mha:
resolution: {integrity: sha512-MgGly4I6cStsJy27ViE32UoqxPTN9Xly4anxxVyaIWR+9BGxboV4EyJBGfR3RePV7Ksjj3rHmPZJeIt+7o4Vag==}
engines: {node: '>=10.0.0'}
peerDependencies:
@@ -9614,14 +9682,13 @@ packages:
/tslib/2.3.1:
resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==}
- /tsutils/3.21.0_typescript@4.5.4:
+ /tsutils/3.21.0:
resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
engines: {node: '>= 6'}
peerDependencies:
typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
dependencies:
tslib: 1.14.1
- typescript: 4.5.4
dev: false
/ttf2eot/2.0.0:
@@ -9895,7 +9962,7 @@ packages:
dev: false
/vary/1.1.2:
- resolution: {integrity: sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=}
+ resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
engines: {node: '>= 0.8'}
dev: true
@@ -9927,8 +9994,6 @@ packages:
fs-extra: 10.0.0
html-minifier-terser: 6.1.0
vite: 2.9.5_less@3.13.1
- transitivePeerDependencies:
- - acorn
dev: false
/vite/2.7.13:
@@ -10007,14 +10072,13 @@ packages:
yazl: 2.5.1
dev: true
- /vue-eslint-parser/7.11.0_eslint@7.32.0:
+ /vue-eslint-parser/7.11.0:
resolution: {integrity: sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==}
engines: {node: '>=8.10'}
peerDependencies:
eslint: '>=5.0.0'
dependencies:
debug: 4.3.3
- eslint: 7.32.0
eslint-scope: 5.1.1
eslint-visitor-keys: 1.3.0
espree: 6.2.1
@@ -10025,7 +10089,7 @@ packages:
- supports-color
dev: false
- /vue-jest/5.0.0-alpha.10_50877e7063dde22867df882d01feacc5:
+ /vue-jest/5.0.0-alpha.10_kcdx44dd3xrcqz67rawqd7vmyu:
resolution: {integrity: sha512-iN62cTi4AL0UsgxEyVeJtHG6qXEv+8Ci2wX1vP3b/dAZvyBRmqy5aJHQrP6VCEuio+HgHQ1LAZ+ccM2pouBmlg==}
peerDependencies:
'@babel/core': 7.x
@@ -10048,7 +10112,7 @@ packages:
extract-from-css: 0.4.4
jest: 26.6.3
source-map: 0.5.6
- ts-jest: 26.5.6_jest@26.6.3+typescript@4.5.4
+ ts-jest: 26.5.6_hoj6rh37du6uxub6buv3fchqgy
tsconfig: 7.0.0
typescript: 4.5.4
vue: 3.2.25
@@ -10144,6 +10208,7 @@ packages:
xml2js: 0.4.23
transitivePeerDependencies:
- chokidar
+ - supports-color
dev: false
/webidl-conversions/5.0.0:
@@ -10177,7 +10242,7 @@ packages:
optional: true
dependencies:
'@discoveryjs/json-ext': 0.5.6
- '@webpack-cli/configtest': 1.1.0_webpack-cli@4.9.1+webpack@5.65.0
+ '@webpack-cli/configtest': 1.1.0_5mkmpm5yhygs4kjlquk5gjvbjm
'@webpack-cli/info': 1.4.0_webpack-cli@4.9.1
'@webpack-cli/serve': 1.6.0_webpack-cli@4.9.1
colorette: 2.0.16
@@ -10235,7 +10300,7 @@ packages:
neo-async: 2.6.2
schema-utils: 3.1.1
tapable: 2.2.1
- terser-webpack-plugin: 5.3.0_acorn@8.7.0+webpack@5.65.0
+ terser-webpack-plugin: 5.3.0_webpack@5.65.0
watchpack: 2.3.1
webpack-cli: 4.9.1_webpack@5.65.0
webpack-sources: 3.2.2
From 853f88c0fb6958c017ea2d31ddbbfa9f26768433 Mon Sep 17 00:00:00 2001
From: wegi8 <18272190626@163.com>
Date: Wed, 18 May 2022 20:15:12 +0800
Subject: [PATCH 3/5] feat: varlet/cli site version config
---
.../generators/base/varlet.config.js | 2 +
.../site/pc/components/AppHeader.vue | 84 +++++++++++++++----
packages/varlet-cli/varlet.default.config.js | 1 +
packages/varlet-ui/docs/cli.en-US.md | 1 +
packages/varlet-ui/docs/cli.zh-CN.md | 1 +
packages/varlet-ui/varlet.config.js | 9 ++
6 files changed, 84 insertions(+), 14 deletions(-)
diff --git a/packages/varlet-cli/generators/base/varlet.config.js b/packages/varlet-cli/generators/base/varlet.config.js
index 202acc0adbc..90bed299e4b 100644
--- a/packages/varlet-cli/generators/base/varlet.config.js
+++ b/packages/varlet-cli/generators/base/varlet.config.js
@@ -61,6 +61,8 @@ module.exports = {
'zh-CN': '一个组件库',
},
header: {
+ darkMode: null,
+ versions: null,
i18n: null,
playground: null,
github: 'https://github.com/varletjs/varlet',
diff --git a/packages/varlet-cli/site/pc/components/AppHeader.vue b/packages/varlet-cli/site/pc/components/AppHeader.vue
index 59f6888f755..31a77d51644 100644
--- a/packages/varlet-cli/site/pc/components/AppHeader.vue
+++ b/packages/varlet-cli/site/pc/components/AppHeader.vue
@@ -1,8 +1,33 @@
@@ -66,22 +92,26 @@ export default defineComponent({
props: {
language: {
type: String,
- },
+ }
},
setup() {
const title: Ref = ref(get(config, 'title'))
const logo: Ref = ref(get(config, 'logo'))
const themesKey = get(config, 'themesKey')
const languages: Ref> = ref(get(config, 'pc.header.i18n'))
+ const nowVersion: Ref = ref(get(config, 'pc.header.versions.default'))
+ const versions: Ref> = ref(get(config, 'pc.header.versions.item'))
const playground: Ref = ref(get(config, 'pc.header.playground'))
const github: Ref = ref(get(config, 'pc.header.github'))
const redirect = get(config, 'pc.redirect')
const darkMode: Ref = ref(get(config, 'pc.header.darkMode'))
const currentThemes = ref(getBrowserThemes(themesKey))
- const isOpenMenu: Ref = ref(false)
+ const isOpenLanguageMenu: Ref = ref(false)
+ const isOpenVersionsMenu: Ref = ref(false)
const router = useRouter()
const nonEmptyLanguages: ComputedRef> = computed(() => removeEmpty(languages.value))
+ const nonEmptyVersions: ComputedRef> = computed(() => removeEmpty(versions.value))
const backRoot = () => {
const { language: lang } = getPCLocationInfo()
@@ -91,7 +121,7 @@ export default defineComponent({
const handleLanguageChange = (language: string) => {
const { menuName } = getPCLocationInfo()
router.replace(`/${language}/${menuName}`)
- isOpenMenu.value = false
+ isOpenLanguageMenu.value = false
}
const setCurrentThemes = (themes: 'themes' | 'darkThemes') => {
@@ -108,6 +138,10 @@ export default defineComponent({
;(document.getElementById('mobile') as HTMLIFrameElement).contentWindow!.postMessage(getThemesMessage(), '*')
}
+ const open = (value:string) => {
+ window.location.href = value;
+ }
+
watchThemes((themes, from) => {
from === 'mobile' && setCurrentThemes(themes)
})
@@ -118,13 +152,18 @@ export default defineComponent({
return {
logo,
title,
+ nowVersion,
languages,
+ versions,
nonEmptyLanguages,
+ nonEmptyVersions,
playground,
github,
- isOpenMenu,
+ isOpenLanguageMenu,
+ isOpenVersionsMenu,
darkMode,
currentThemes,
+ open,
backRoot,
handleLanguageChange,
toggleTheme,
@@ -198,6 +237,7 @@ export default defineComponent({
&__title {
font-size: 22px;
+ margin-right: 12px;
}
&__tail {
@@ -226,6 +266,22 @@ export default defineComponent({
}
}
+ &__versions {
+ border-radius: 3px;
+ height: 40px;
+ display: flex;
+ align-items: center;
+ padding-right: 10px;
+ padding-left: 18px;
+ position: relative;
+ cursor: pointer;
+ transition: background-color 0.25s;
+
+ &:hover {
+ background: var(--site-config-color-nav-button-hover-background);
+ }
+ }
+
&__link {
border-radius: 50%;
width: 42px;
@@ -264,7 +320,7 @@ export default defineComponent({
}
}
- &__language-list {
+ &__animation-list {
background: var(--site-config-color-bar);
cursor: pointer;
color: var(--site-config-color-text);
diff --git a/packages/varlet-cli/varlet.default.config.js b/packages/varlet-cli/varlet.default.config.js
index 2da25ac4339..4d894816141 100644
--- a/packages/varlet-cli/varlet.default.config.js
+++ b/packages/varlet-cli/varlet.default.config.js
@@ -29,6 +29,7 @@ module.exports = {
'zh-CN': '中文',
'en-US': 'English',
},
+ versions: null,
github: 'https://github.com/varletjs/varlet',
playground: 'https://varlet-ui-playground.vercel.app',
darkMode: true,
diff --git a/packages/varlet-ui/docs/cli.en-US.md b/packages/varlet-ui/docs/cli.en-US.md
index 2f10e05f801..7f4902073ff 100644
--- a/packages/varlet-ui/docs/cli.en-US.md
+++ b/packages/varlet-ui/docs/cli.en-US.md
@@ -162,6 +162,7 @@ module.exports = {
},
header: {
darkMode: null,
+ versions: null,
i18n: null,
github: 'https://github.com/varletjs/varlet',
},
diff --git a/packages/varlet-ui/docs/cli.zh-CN.md b/packages/varlet-ui/docs/cli.zh-CN.md
index b3f4e5c23a4..bd50932f13c 100644
--- a/packages/varlet-ui/docs/cli.zh-CN.md
+++ b/packages/varlet-ui/docs/cli.zh-CN.md
@@ -158,6 +158,7 @@ module.exports = {
},
header: {
darkMode: null,
+ versions: null,
i18n: null,
github: 'https://github.com/varletjs/varlet',
},
diff --git a/packages/varlet-ui/varlet.config.js b/packages/varlet-ui/varlet.config.js
index 46a72527ee5..a1878295c31 100644
--- a/packages/varlet-ui/varlet.config.js
+++ b/packages/varlet-ui/varlet.config.js
@@ -4,6 +4,15 @@ module.exports = {
baidu: 'https://hm.baidu.com/hm.js?5c628ce58967c90ff4dd9c8803d930fa',
},
pc: {
+ header: {
+ versions: {
+ default: "VUE3",
+ item: {
+ 'VUE3': 'https://varlet-varletjs.vercel.app/',
+ 'VUE2': 'https://varlet-vue2.vercel.app/'
+ }
+ }
+ },
menu: [
{
text: {
From fd4bfb7335392bb344aeaf68e3e54c77ec142acf Mon Sep 17 00:00:00 2001
From: wegi8 <18272190626@163.com>
Date: Thu, 19 May 2022 13:49:26 +0800
Subject: [PATCH 4/5] chore: code review
---
packages/varlet-cli/site/pc/components/AppHeader.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/packages/varlet-cli/site/pc/components/AppHeader.vue b/packages/varlet-cli/site/pc/components/AppHeader.vue
index 31a77d51644..015faff1c67 100644
--- a/packages/varlet-cli/site/pc/components/AppHeader.vue
+++ b/packages/varlet-cli/site/pc/components/AppHeader.vue
@@ -138,8 +138,10 @@ export default defineComponent({
;(document.getElementById('mobile') as HTMLIFrameElement).contentWindow!.postMessage(getThemesMessage(), '*')
}
- const open = (value:string) => {
- window.location.href = value;
+ const open = (value: string) => {
+ if (value !== nowVersion.value) {
+ window.location.href = value
+ }
}
watchThemes((themes, from) => {
From 060331577bcf298c27e9ef14d0ca60325da895c0 Mon Sep 17 00:00:00 2001
From: wegi8 <18272190626@163.com>
Date: Thu, 19 May 2022 15:25:30 +0800
Subject: [PATCH 5/5] chore: offset fixed
---
packages/varlet-cli/site/pc/components/AppHeader.vue | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/packages/varlet-cli/site/pc/components/AppHeader.vue b/packages/varlet-cli/site/pc/components/AppHeader.vue
index 015faff1c67..d5f06a77945 100644
--- a/packages/varlet-cli/site/pc/components/AppHeader.vue
+++ b/packages/varlet-cli/site/pc/components/AppHeader.vue
@@ -13,7 +13,7 @@