alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into next

Browse Source
This commit is contained in:
chenjiahan
2022-09-10 21:51:26 +08:00
parent e2ea3be819 0e55b72200
commit 66df033ec8
17 changed files with 74 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pnpm-lock.yaml
Generated
+29 -35
View File
@@ -1,4 +1,4 @@
lockfileVersion: 5.3
lockfileVersion: 5.4
importers:
@@ -45,6 +45,7 @@ importers:
packages/vant:
specifiers:
'@types/jest': ^27.0.0
'@types/node': ^16.11.56
'@vant/area-data': workspace:*
'@vant/cli': workspace:*
@@ -62,6 +63,7 @@ importers:
'@vant/popperjs': link:../vant-popperjs
'@vant/use': link:../vant-use
devDependencies:
'@types/jest': 27.5.2
'@types/node': 16.11.56
'@vant/area-data': link:../vant-area-data
'@vant/cli': link:../vant-cli
@@ -136,7 +138,7 @@ importers:
'@babel/core': 7.18.13
'@babel/preset-typescript': 7.18.6_@babel+core@7.18.13
'@docsearch/css': 3.2.1
'@docsearch/js': 3.2.1_react-dom@18.2.0+react@18.2.0
'@docsearch/js': 3.2.1_biqbaboplfbrettd7655fr4n2y
'@types/jest': 27.5.2
'@vant/eslint-config': link:../vant-eslint-config
'@vant/touch-emulator': link:../vant-touch-emulator
@@ -160,7 +162,7 @@ importers:
jest-serializer-html: 7.1.0
less: 4.1.3
markdown-it: 12.3.2
markdown-it-anchor: 8.6.4_d643ca6eb40ae68ab966a77bead78073
markdown-it-anchor: 8.6.4_2zb4u3vubltivolgu556vv4aom
nano-staged: 0.8.0
nanospinner: 1.1.0
picocolors: 1.0.0
@@ -211,11 +213,11 @@ importers:
eslint-plugin-vue: ^9.4.0
typescript: ^4.8.2
dependencies:
'@typescript-eslint/eslint-plugin': 5.36.1_586c56b3bc76dec8ef0f241fb0cda488
'@typescript-eslint/parser': 5.36.1_eslint@8.23.0+typescript@4.8.2
eslint-config-airbnb-base: 15.0.0_281cc4e22b3419695ab0c330ccaae282
'@typescript-eslint/eslint-plugin': 5.36.1_lbwfnm54o3pmr3ypeqp3btnera
'@typescript-eslint/parser': 5.36.1_yqf6kl63nyoq5megxukfnom5rm
eslint-config-airbnb-base: 15.0.0_faomjyrlgqmwswvqymymzkxcqi
eslint-config-prettier: 8.5.0_eslint@8.23.0
eslint-plugin-import: 2.26.0_b62f4c66ab291fb5cb0e4045c2ba4587
eslint-plugin-import: 2.26.0_wyxuyzvlfep3lsyoibc4fosfq4
eslint-plugin-vue: 9.4.0_eslint@8.23.0
devDependencies:
enhanced-resolve: 5.10.0
@@ -914,10 +916,10 @@ packages:
resolution: {integrity: sha512-gaP6TxxwQC+K8D6TRx5WULUWKrcbzECOPA2KCVMuI+6C7dNiGUk5yXXzVhc5sld79XKYLnO9DRTI4mjXDYkh+g==}
dev: false
/@docsearch/js/3.2.1_react-dom@18.2.0+react@18.2.0:
/@docsearch/js/3.2.1_biqbaboplfbrettd7655fr4n2y:
resolution: {integrity: sha512-H1PekEtSeS0msetR2YGGey2w7jQ2wAKfGODJvQTygSwMgUZ+2DHpzUgeDyEBIXRIfaBcoQneqrzsljM62pm6Xg==}
dependencies:
'@docsearch/react': 3.2.1_react-dom@18.2.0+react@18.2.0
'@docsearch/react': 3.2.1_biqbaboplfbrettd7655fr4n2y
preact: 10.8.2
transitivePeerDependencies:
- '@algolia/client-search'
@@ -926,7 +928,7 @@ packages:
- react-dom
dev: false
/@docsearch/react/3.2.1_react-dom@18.2.0+react@18.2.0:
/@docsearch/react/3.2.1_biqbaboplfbrettd7655fr4n2y:
resolution: {integrity: sha512-EzTQ/y82s14IQC5XVestiK/kFFMe2aagoYFuTAIfIb/e+4FU7kSMKonRtLwsCiLQHmjvNQq+HO+33giJ5YVtaQ==}
peerDependencies:
'@types/react': '>= 16.8.0 < 19.0.0'
@@ -1502,7 +1504,6 @@ packages:
dependencies:
jest-matcher-utils: 27.5.1
pretty-format: 27.5.1
dev: false
/@types/json-buffer/3.0.0:
resolution: {integrity: sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==}
@@ -1581,7 +1582,7 @@ packages:
dependencies:
'@types/yargs-parser': 21.0.0
/@typescript-eslint/eslint-plugin/5.36.1_586c56b3bc76dec8ef0f241fb0cda488:
/@typescript-eslint/eslint-plugin/5.36.1_lbwfnm54o3pmr3ypeqp3btnera:
resolution: {integrity: sha512-iC40UK8q1tMepSDwiLbTbMXKDxzNy+4TfPWgIL661Ym0sD42vRcQU93IsZIrmi+x292DBr60UI/gSwfdVYexCA==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -1592,10 +1593,10 @@ packages:
typescript:
optional: true
dependencies:
'@typescript-eslint/parser': 5.36.1_eslint@8.23.0+typescript@4.8.2
'@typescript-eslint/parser': 5.36.1_yqf6kl63nyoq5megxukfnom5rm
'@typescript-eslint/scope-manager': 5.36.1
'@typescript-eslint/type-utils': 5.36.1_eslint@8.23.0+typescript@4.8.2
'@typescript-eslint/utils': 5.36.1_eslint@8.23.0+typescript@4.8.2
'@typescript-eslint/type-utils': 5.36.1_yqf6kl63nyoq5megxukfnom5rm
'@typescript-eslint/utils': 5.36.1_yqf6kl63nyoq5megxukfnom5rm
debug: 4.3.4
eslint: 8.23.0
functional-red-black-tree: 1.0.1
@@ -1608,7 +1609,7 @@ packages:
- supports-color
dev: false
/@typescript-eslint/parser/5.36.1_eslint@8.23.0+typescript@4.8.2:
/@typescript-eslint/parser/5.36.1_yqf6kl63nyoq5megxukfnom5rm:
resolution: {integrity: sha512-/IsgNGOkBi7CuDfUbwt1eOqUXF9WGVBW9dwEe1pi+L32XrTsZIgmDFIi2RxjzsvB/8i+MIf5JIoTEH8LOZ368A==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -1636,7 +1637,7 @@ packages:
'@typescript-eslint/visitor-keys': 5.36.1
dev: false
/@typescript-eslint/type-utils/5.36.1_eslint@8.23.0+typescript@4.8.2:
/@typescript-eslint/type-utils/5.36.1_yqf6kl63nyoq5megxukfnom5rm:
resolution: {integrity: sha512-xfZhfmoQT6m3lmlqDvDzv9TiCYdw22cdj06xY0obSznBsT///GK5IEZQdGliXpAOaRL34o8phEvXzEo/VJx13Q==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -1647,7 +1648,7 @@ packages:
optional: true
dependencies:
'@typescript-eslint/typescript-estree': 5.36.1_typescript@4.8.2
'@typescript-eslint/utils': 5.36.1_eslint@8.23.0+typescript@4.8.2
'@typescript-eslint/utils': 5.36.1_yqf6kl63nyoq5megxukfnom5rm
debug: 4.3.4
eslint: 8.23.0
tsutils: 3.21.0_typescript@4.8.2
@@ -1682,7 +1683,7 @@ packages:
- supports-color
dev: false
/@typescript-eslint/utils/5.36.1_eslint@8.23.0+typescript@4.8.2:
/@typescript-eslint/utils/5.36.1_yqf6kl63nyoq5megxukfnom5rm:
resolution: {integrity: sha512-lNj4FtTiXm5c+u0pUehozaUWhh7UYKnwryku0nxJlYUEWetyG92uw2pr+2Iy4M/u0ONMKzfrx7AsGBTCzORmIg==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -1967,7 +1968,6 @@ packages:
/ansi-styles/5.2.0:
resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
engines: {node: '>=10'}
dev: false
/ansi-styles/6.1.0:
resolution: {integrity: sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==}
@@ -2615,8 +2615,8 @@ packages:
engines: {node: '>=10'}
hasBin: true
dependencies:
is-text-path: 1.0.1
JSONStream: 1.3.5
is-text-path: 1.0.1
lodash: 4.17.21
meow: 8.1.2
split2: 3.2.2
@@ -2836,7 +2836,6 @@ packages:
/diff-sequences/27.5.1:
resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==}
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
dev: false
/diffable-html/4.1.0:
resolution: {integrity: sha512-++kyNek+YBLH8cLXS+iTj/Hiy2s5qkRJEJ8kgu/WHbFrVY2vz9xPFUT+fii2zGF0m1CaojDlQJjkfrCt7YWM1g==}
@@ -3288,7 +3287,7 @@ packages:
source-map: 0.6.1
dev: false
/eslint-config-airbnb-base/15.0.0_281cc4e22b3419695ab0c330ccaae282:
/eslint-config-airbnb-base/15.0.0_faomjyrlgqmwswvqymymzkxcqi:
resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}
engines: {node: ^10.12.0 || >=12.0.0}
peerDependencies:
@@ -3297,7 +3296,7 @@ packages:
dependencies:
confusing-browser-globals: 1.0.11
eslint: 8.23.0
eslint-plugin-import: 2.26.0_b62f4c66ab291fb5cb0e4045c2ba4587
eslint-plugin-import: 2.26.0_wyxuyzvlfep3lsyoibc4fosfq4
object.assign: 4.1.2
object.entries: 1.1.5
semver: 6.3.0
@@ -3321,7 +3320,7 @@ packages:
- supports-color
dev: false
/eslint-module-utils/2.7.3_f6f598d58d3bd4640126d6600a4285f5:
/eslint-module-utils/2.7.3_632zrvmnhpkgiajg2zqauquf6u:
resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==}
engines: {node: '>=4'}
peerDependencies:
@@ -3339,7 +3338,7 @@ packages:
eslint-import-resolver-webpack:
optional: true
dependencies:
'@typescript-eslint/parser': 5.36.1_eslint@8.23.0+typescript@4.8.2
'@typescript-eslint/parser': 5.36.1_yqf6kl63nyoq5megxukfnom5rm
debug: 3.2.7
eslint-import-resolver-node: 0.3.6
find-up: 2.1.0
@@ -3347,7 +3346,7 @@ packages:
- supports-color
dev: false
/eslint-plugin-import/2.26.0_b62f4c66ab291fb5cb0e4045c2ba4587:
/eslint-plugin-import/2.26.0_wyxuyzvlfep3lsyoibc4fosfq4:
resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}
engines: {node: '>=4'}
peerDependencies:
@@ -3357,14 +3356,14 @@ packages:
'@typescript-eslint/parser':
optional: true
dependencies:
'@typescript-eslint/parser': 5.36.1_eslint@8.23.0+typescript@4.8.2
'@typescript-eslint/parser': 5.36.1_yqf6kl63nyoq5megxukfnom5rm
array-includes: 3.1.5
array.prototype.flat: 1.3.0
debug: 2.6.9
doctrine: 2.1.0
eslint: 8.23.0
eslint-import-resolver-node: 0.3.6
eslint-module-utils: 2.7.3_f6f598d58d3bd4640126d6600a4285f5
eslint-module-utils: 2.7.3_632zrvmnhpkgiajg2zqauquf6u
has: 1.0.3
is-core-module: 2.9.0
is-glob: 4.0.3
@@ -4675,7 +4674,6 @@ packages:
diff-sequences: 27.5.1
jest-get-type: 27.5.1
pretty-format: 27.5.1
dev: false
/jest-docblock/27.5.1:
resolution: {integrity: sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==}
@@ -4728,7 +4726,6 @@ packages:
/jest-get-type/27.5.1:
resolution: {integrity: sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==}
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
dev: false
/jest-haste-map/27.5.1:
resolution: {integrity: sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==}
@@ -4791,7 +4788,6 @@ packages:
jest-diff: 27.5.1
jest-get-type: 27.5.1
pretty-format: 27.5.1
dev: false
/jest-message-util/27.5.1:
resolution: {integrity: sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==}
@@ -5353,7 +5349,7 @@ packages:
engines: {node: '>=8'}
dev: false
/markdown-it-anchor/8.6.4_d643ca6eb40ae68ab966a77bead78073:
/markdown-it-anchor/8.6.4_2zb4u3vubltivolgu556vv4aom:
resolution: {integrity: sha512-Ul4YVYZNxMJYALpKtu+ZRdrryYt/GlQ5CK+4l1bp/gWXOG2QWElt6AqF3Mih/wfUKdZbNAZVXGR73/n6U/8img==}
peerDependencies:
'@types/markdown-it': '*'
@@ -6034,7 +6030,6 @@ packages:
ansi-regex: 5.0.1
ansi-styles: 5.2.0
react-is: 17.0.2
dev: false
/process-nextick-args/2.0.1:
resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
@@ -6157,7 +6152,6 @@ packages:
/react-is/17.0.2:
resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
dev: false
/react/18.2.0:
resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}