From 90deb2439f0039c985c24f33f57e1c7b938145ed Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 22 May 2022 20:49:09 +0800 Subject: [PATCH 01/23] feat: using mjs entry for sub packages (#10626) --- packages/vant-area-data/package.json | 2 +- packages/vant-popperjs/package.json | 2 +- packages/vant-use/build.js | 3 ++- packages/vant-use/package.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/vant-area-data/package.json b/packages/vant-area-data/package.json index 83d0c64a6..0d762868e 100644 --- a/packages/vant-area-data/package.json +++ b/packages/vant-area-data/package.json @@ -3,7 +3,7 @@ "version": "1.2.4", "description": "Vant 省市区数据", "main": "dist/index.cjs.js", - "module": "dist/index.esm.js", + "module": "dist/index.esm.mjs", "types": "dist/index.d.ts", "files": [ "dist" diff --git a/packages/vant-popperjs/package.json b/packages/vant-popperjs/package.json index 7f9a1eac6..8d1125e3d 100644 --- a/packages/vant-popperjs/package.json +++ b/packages/vant-popperjs/package.json @@ -3,7 +3,7 @@ "version": "1.1.0", "description": "Pre-compiled popperjs core", "main": "dist/index.cjs.js", - "module": "dist/index.esm.js", + "module": "dist/index.esm.mjs", "types": "dist/index.d.ts", "sideEffects": false, "files": [ diff --git a/packages/vant-use/build.js b/packages/vant-use/build.js index a763c8758..2afe17ad7 100644 --- a/packages/vant-use/build.js +++ b/packages/vant-use/build.js @@ -1,7 +1,8 @@ const { build } = require('esbuild'); function bundleBundle(format) { - const outfile = `dist/index.${format}.js`; + const ext = format === 'esm' ? '.mjs' : '.js'; + const outfile = `dist/index.${format}${ext}`; const finish = () => console.log('Build finished:', outfile); const onRebuild = (error) => (error ? console.log(error) : finish()); diff --git a/packages/vant-use/package.json b/packages/vant-use/package.json index c0398891e..747dc56be 100644 --- a/packages/vant-use/package.json +++ b/packages/vant-use/package.json @@ -3,7 +3,7 @@ "version": "1.3.6", "description": "Vant Composition API", "main": "dist/index.cjs.js", - "module": "dist/index.esm.js", + "module": "dist/index.esm.mjs", "typings": "dist/index.d.ts", "sideEffects": false, "files": [ From 4bb4a6622f238d3938256d95fd4959bf938bded2 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sun, 22 May 2022 20:50:23 +0800 Subject: [PATCH 02/23] release: @vant/use 1.4.0 --- packages/vant-use/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant-use/package.json b/packages/vant-use/package.json index 747dc56be..c337484c3 100644 --- a/packages/vant-use/package.json +++ b/packages/vant-use/package.json @@ -1,6 +1,6 @@ { "name": "@vant/use", - "version": "1.3.6", + "version": "1.4.0", "description": "Vant Composition API", "main": "dist/index.cjs.js", "module": "dist/index.esm.mjs", From dada6a42fccd97d7908ab69d9a1aef5bbca1254b Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sun, 22 May 2022 20:51:34 +0800 Subject: [PATCH 03/23] release: @vant/popperjs 1.2.0 --- packages/vant-popperjs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant-popperjs/package.json b/packages/vant-popperjs/package.json index 8d1125e3d..b2f0b4ad8 100644 --- a/packages/vant-popperjs/package.json +++ b/packages/vant-popperjs/package.json @@ -1,6 +1,6 @@ { "name": "@vant/popperjs", - "version": "1.1.0", + "version": "1.2.0", "description": "Pre-compiled popperjs core", "main": "dist/index.cjs.js", "module": "dist/index.esm.mjs", From 1d0bbb39d155e62b77be12cd56ac32af075aaeb9 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sun, 22 May 2022 20:52:41 +0800 Subject: [PATCH 04/23] release: @vant/area-data 1.3.0 --- packages/vant-area-data/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant-area-data/package.json b/packages/vant-area-data/package.json index 0d762868e..c5273902f 100644 --- a/packages/vant-area-data/package.json +++ b/packages/vant-area-data/package.json @@ -1,6 +1,6 @@ { "name": "@vant/area-data", - "version": "1.2.4", + "version": "1.3.0", "description": "Vant 省市区数据", "main": "dist/index.cjs.js", "module": "dist/index.esm.mjs", From d4e49b59ff0f9501e1896a7c09aa871cedfa87ae Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sun, 22 May 2022 20:56:16 +0800 Subject: [PATCH 05/23] docs(@vant/use): changelog 1.4.0 --- packages/vant-use/changelog.md | 4 ++++ packages/vant/package.json | 6 +++--- pnpm-lock.yaml | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/vant-use/changelog.md b/packages/vant-use/changelog.md index 50d60899d..bba836e93 100644 --- a/packages/vant-use/changelog.md +++ b/packages/vant-use/changelog.md @@ -1,5 +1,9 @@ # Changelog +## v1.4.0 + +- Using `.mjs` extension, `dist/index.esm.js` -> `dist/index.esm.mjs` + ## v1.3.6 - Fix missing VisibilityState type diff --git a/packages/vant/package.json b/packages/vant/package.json index 97037494b..0e5a5866b 100644 --- a/packages/vant/package.json +++ b/packages/vant/package.json @@ -62,14 +62,14 @@ ], "dependencies": { "@vant/icons": "^1.8.0", - "@vant/popperjs": "^1.1.0", - "@vant/use": "^1.3.6" + "@vant/popperjs": "^1.2.0", + "@vant/use": "^1.4.0" }, "peerDependencies": { "vue": "^3.0.0" }, "devDependencies": { - "@vant/area-data": "^1.1.3", + "@vant/area-data": "workspace:*", "@vant/cli": "workspace:*", "@vant/eslint-config": "workspace:*", "@vue/runtime-core": "^3.2.27", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c0e5207a5..1eb30ba28 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -49,12 +49,12 @@ importers: packages/vant: specifiers: - '@vant/area-data': ^1.1.3 + '@vant/area-data': workspace:* '@vant/cli': workspace:* '@vant/eslint-config': workspace:* '@vant/icons': ^1.8.0 - '@vant/popperjs': ^1.1.0 - '@vant/use': ^1.3.6 + '@vant/popperjs': ^1.2.0 + '@vant/use': ^1.4.0 '@vue/runtime-core': ^3.2.27 '@vue/test-utils': ^2.0.0-rc.16 typescript: ~4.5.2 From 1f4155c46432b034fcae27defede5b48c4568db6 Mon Sep 17 00:00:00 2001 From: richard1015 <51844712@qq.com> Date: Fri, 27 May 2022 19:15:23 +0800 Subject: [PATCH 06/23] docs(cell): center parameter default value edit (#10635) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cell英文文档 center 参数 默认值错误修改parameter default value --- packages/vant/src/cell/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant/src/cell/README.md b/packages/vant/src/cell/README.md index 6a15a7364..ac15517d0 100644 --- a/packages/vant/src/cell/README.md +++ b/packages/vant/src/cell/README.md @@ -155,7 +155,7 @@ app.use(CellGroup); | icon | Left Icon | _string_ | - | | icon-prefix | Icon className prefix | _string_ | `van-icon` | | border | Whether to show inner border | _boolean_ | `true` | -| center | Whether to center content vertically | _boolean_ | `true` | +| center | Whether to center content vertically | _boolean_ | `false` | | url | Link URL | _string_ | - | | to | Target route of the link, same as to of vue-router | _string \| object_ | - | | replace | If true, the navigation will not leave a history record | _boolean_ | `false` | From 3fe6a04e7ce30ffe0562f55988c075d15670c611 Mon Sep 17 00:00:00 2001 From: Morteza Sabihi <35567646+mortezasabihi@users.noreply.github.com> Date: Sat, 28 May 2022 04:28:35 +0430 Subject: [PATCH 07/23] feat(Locale): Add Farsi translations (#10637) --- packages/vant/src/locale/README.md | 1 + packages/vant/src/locale/lang/fa-IR.ts | 63 ++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 packages/vant/src/locale/lang/fa-IR.ts diff --git a/packages/vant/src/locale/README.md b/packages/vant/src/locale/README.md index 6cd452836..9e4d2f49d 100644 --- a/packages/vant/src/locale/README.md +++ b/packages/vant/src/locale/README.md @@ -49,6 +49,7 @@ Current supported languages: | Greek | el-GR | `v3.5.0` | | English | en-US | - | | Spanish (Spain) | es-ES | - | +| Farsi | fa-IR | `v3.4.9` | | French | fr-FR | - | | Hebrew | he-IL | `v3.5.0` | | Hindi | hi-IN | `v3.4.3` | diff --git a/packages/vant/src/locale/lang/fa-IR.ts b/packages/vant/src/locale/lang/fa-IR.ts new file mode 100644 index 000000000..7c9d5dd40 --- /dev/null +++ b/packages/vant/src/locale/lang/fa-IR.ts @@ -0,0 +1,63 @@ +export default { + name: 'نام', + tel: 'تلفن', + save: 'ذخیره', + confirm: 'تایید', + cancel: 'انصراف', + delete: 'حذف', + loading: 'در حال بارگزاری ...', + noCoupon: 'بدون کوپن', + nameEmpty: 'لطفا نام را وارد کنید', + addContact: 'افزودن مخاطب', + telInvalid: 'شماره تلفن ناقص', + vanCalendar: { + end: 'پایان', + start: 'شروع', + title: 'تقویم', + weekdays: ['شنبه', 'یکشنبه', 'دوشنبه', 'سه‌شنبه', 'چهارشنبه', 'پنج‌شنبه', 'جمعه'], + monthTitle: (year: number, month: number) => `${year}/${month}`, + rangePrompt: (maxRange: number) => `بیشتر از ${maxRange} روز انتخاب کنید`, + }, + vanCascader: { + select: 'انتخاب', + }, + vanPagination: { + prev: 'قبلی', + next: 'بعدی', + }, + vanPullRefresh: { + pulling: 'بکشید تا تازه شود ...', + loosing: 'رها کنید تا تازه شود ...', + }, + vanSubmitBar: { + label: 'مجموع:', + }, + vanCoupon: { + unlimited: 'نامحدود', + discount: (discount: number) => `${discount * 10}% تخفیف`, + condition: (condition: number) => `حداقل ${condition}`, + }, + vanCouponCell: { + title: 'کوپن', + count: (count: number) => `شما ${count} کوپن دارید`, + }, + vanCouponList: { + exchange: 'تبادل', + close: 'بستن', + enable: 'موجود', + disabled: 'ناموجود', + placeholder: 'کد کوپن', + }, + vanAddressEdit: { + area: 'محدوده', + postal: 'کد پستی', + areaEmpty: 'لطفا یک منطقه برای دریافت انتخاب کنید', + addressEmpty: 'آدرس نمی‌تواند خالی باشد', + postalEmpty: 'کد پستی نامعتبر است', + addressDetail: 'آدرس', + defaultAddress: 'تنظیم به عنوان آدرس پیش فرض', + }, + vanAddressList: { + add: 'افزودن آدرس جدید', + }, +}; From a2df2b1b3bfb523913aa34aca133e002c4051adf Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 28 May 2022 08:08:19 +0800 Subject: [PATCH 08/23] docs: add Farsi to Chinese document (#10638) --- packages/vant/src/locale/README.md | 2 +- packages/vant/src/locale/README.zh-CN.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vant/src/locale/README.md b/packages/vant/src/locale/README.md index 9e4d2f49d..c969fb672 100644 --- a/packages/vant/src/locale/README.md +++ b/packages/vant/src/locale/README.md @@ -49,7 +49,7 @@ Current supported languages: | Greek | el-GR | `v3.5.0` | | English | en-US | - | | Spanish (Spain) | es-ES | - | -| Farsi | fa-IR | `v3.4.9` | +| Farsi | fa-IR | `v3.5.0` | | French | fr-FR | - | | Hebrew | he-IL | `v3.5.0` | | Hindi | hi-IN | `v3.4.3` | diff --git a/packages/vant/src/locale/README.zh-CN.md b/packages/vant/src/locale/README.zh-CN.md index 579a232e0..2a866aa32 100644 --- a/packages/vant/src/locale/README.zh-CN.md +++ b/packages/vant/src/locale/README.zh-CN.md @@ -50,6 +50,7 @@ Locale.add(messages); | 希腊语 | el-GR | `v3.5.0` | | 英语 | en-US | - | | 西班牙语 | es-ES | - | +| 波斯语 | fa-IR | `v3.5.0` | | 法语 | fr-FR | - | | 希伯来语 | he-IL | `v3.5.0` | | 印地语 | hi-IN | `v3.4.3` | From a4472f878855a0cc3ef4fd43b4c9c4435972528e Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 28 May 2022 08:26:26 +0800 Subject: [PATCH 09/23] chore: compatible with pnpm v7 (#10639) * chore: compatible with pnpm v7 * chore: fix missing @types/node --- .github/workflows/deploy-v3-site.yml | 4 +- .github/workflows/test.yml | 12 +--- package.json | 14 ++-- packages/vant-cli/package.json | 1 + packages/vant-cli/src/module.d.ts | 1 + packages/vant/package.json | 1 + pnpm-lock.yaml | 97 ++++++++++++---------------- 7 files changed, 56 insertions(+), 74 deletions(-) diff --git a/.github/workflows/deploy-v3-site.yml b/.github/workflows/deploy-v3-site.yml index e2e7950eb..27eed332e 100644 --- a/.github/workflows/deploy-v3-site.yml +++ b/.github/workflows/deploy-v3-site.yml @@ -16,9 +16,7 @@ jobs: ref: 'dev' - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 - with: - version: 6.20.3 + run: npm i pnpm@7 -g - uses: actions/setup-node@v2 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f6bd54ab3..ca53f88fb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,9 +9,7 @@ jobs: - uses: actions/checkout@v2 - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 - with: - version: 6.20.3 + run: npm i pnpm@7 -g - uses: actions/setup-node@v2 with: @@ -30,9 +28,7 @@ jobs: - uses: actions/checkout@v2 - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 - with: - version: 6.20.3 + run: npm i pnpm@7 -g - uses: actions/setup-node@v2 with: @@ -56,9 +52,7 @@ jobs: - uses: actions/checkout@v2 - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 - with: - version: 6.20.3 + run: npm i pnpm@7 -g - uses: actions/setup-node@v2 with: diff --git a/package.json b/package.json index 55f257472..432d40bed 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,12 @@ "private": true, "scripts": { "prepare": "husky install", - "dev": "pnpm dev --dir ./packages/vant", - "lint": "pnpm lint --dir ./packages/vant", - "test": "pnpm test --dir ./packages/vant", - "test:watch": "pnpm test:watch --dir ./packages/vant", - "build": "pnpm build --dir ./packages/vant", - "build:site": "pnpm build:site --dir ./packages/vant" + "dev": "pnpm --dir ./packages/vant dev", + "lint": "pnpm --dir ./packages/vant lint", + "test": "pnpm --dir ./packages/vant test", + "test:watch": "pnpm --dir ./packages/vant test:watch", + "build": "pnpm --dir ./packages/vant build", + "build:site": "pnpm --dir ./packages/vant build:site" }, "lint-staged": { "*.md": "prettier --write", @@ -15,7 +15,7 @@ "*.{ts,tsx,js,vue}": "eslint --fix", "*.{vue,css,less}": "stylelint --fix" }, - "packageManager": "pnpm", + "packageManager": "pnpm@7.1.6", "devDependencies": { "@vant/cli": "workspace:*", "@vant/eslint-config": "workspace:*", diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json index c92702d33..b501a8bf2 100644 --- a/packages/vant-cli/package.json +++ b/packages/vant-cli/package.json @@ -42,6 +42,7 @@ "@types/fs-extra": "^9.0.13", "@types/less": "^3.0.3", "@types/markdown-it": "^12.2.3", + "@jest/types": "^27", "vue": "^3.2.27" }, "dependencies": { diff --git a/packages/vant-cli/src/module.d.ts b/packages/vant-cli/src/module.d.ts index d2726548a..9919346f4 100644 --- a/packages/vant-cli/src/module.d.ts +++ b/packages/vant-cli/src/module.d.ts @@ -1,6 +1,7 @@ // some modules with missing type definitions declare module 'execa'; declare module 'hash-sum'; +declare module '@babel/core'; declare module 'release-it'; declare module 'conventional-changelog'; declare module '@vant/markdown-vetur'; diff --git a/packages/vant/package.json b/packages/vant/package.json index 0e5a5866b..ca612ebd2 100644 --- a/packages/vant/package.json +++ b/packages/vant/package.json @@ -69,6 +69,7 @@ "vue": "^3.0.0" }, "devDependencies": { + "@types/node": "^16", "@vant/area-data": "workspace:*", "@vant/cli": "workspace:*", "@vant/eslint-config": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1eb30ba28..1fcfb3dea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: 5.3 +lockfileVersion: 5.4 importers: @@ -49,6 +49,7 @@ importers: packages/vant: specifiers: + '@types/node': ^16 '@vant/area-data': workspace:* '@vant/cli': workspace:* '@vant/eslint-config': workspace:* @@ -65,6 +66,7 @@ importers: '@vant/popperjs': link:../vant-popperjs '@vant/use': link:../vant-use devDependencies: + '@types/node': 16.11.36 '@vant/area-data': link:../vant-area-data '@vant/cli': link:../vant-cli '@vant/eslint-config': link:../vant-eslint-config @@ -90,6 +92,7 @@ importers: '@babel/preset-typescript': ^7.16.0 '@docsearch/css': ^3.0.0 '@docsearch/js': ^3.0.0 + '@jest/types': ^27 '@types/fs-extra': ^9.0.13 '@types/jest': ^27.0.3 '@types/less': ^3.0.3 @@ -168,7 +171,7 @@ importers: less: 4.1.2 lint-staged: 12.4.1 markdown-it: 12.3.2 - markdown-it-anchor: 8.6.4_d643ca6eb40ae68ab966a77bead78073 + markdown-it-anchor: 8.6.4_2zb4u3vubltivolgu556vv4aom ora: 6.1.0 postcss: 8.4.14 postcss-load-config: 3.1.4_postcss@8.4.14 @@ -182,6 +185,7 @@ importers: vite-plugin-md: 0.11.9_vite@2.9.9 vue-router: 4.0.15_vue@3.2.35 devDependencies: + '@jest/types': 27.5.1 '@types/fs-extra': 9.0.13 '@types/less': 3.0.3 '@types/markdown-it': 12.2.3 @@ -199,11 +203,11 @@ importers: eslint-plugin-vue: ^8.4.0 typescript: ~4.5.5 dependencies: - '@typescript-eslint/eslint-plugin': 5.25.0_19b6938f2bc33141392b02d6696d1ab6 - '@typescript-eslint/parser': 5.25.0_eslint@8.16.0+typescript@4.5.5 - eslint-config-airbnb-base: 15.0.0_0ce4f552c18297c00de8a172104cf37a + '@typescript-eslint/eslint-plugin': 5.25.0_dg3jhdzlymyucojlallgs3i2wy + '@typescript-eslint/parser': 5.25.0_els4elilzrtenp42wxa4dytc34 + eslint-config-airbnb-base: 15.0.0_btspkuwbqkl4adpiufzbathtpi eslint-config-prettier: 8.5.0_eslint@8.16.0 - eslint-plugin-import: 2.26.0_2bebc5fd3a439999da4a6fc2046abe07 + eslint-plugin-import: 2.26.0_fpv4l7j2iomztwskn7bai2v6a4 eslint-plugin-vue: 8.7.1_eslint@8.16.0 devDependencies: enhanced-resolve: 5.9.3 @@ -1035,7 +1039,6 @@ packages: '@types/node': 17.0.35 '@types/yargs': 16.0.4 chalk: 4.1.2 - dev: false /@jridgewell/gen-mapping/0.1.1: resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==} @@ -1210,7 +1213,7 @@ packages: '@sinonjs/commons': 1.8.3 dev: false - /@stylelint/postcss-css-in-js/0.37.3_4f7b71a942b8b7a555b8adf78f88122b: + /@stylelint/postcss-css-in-js/0.37.3_j55xdkkcxc32kvnyvx3y7casfm: resolution: {integrity: sha512-scLk3cSH1H9KggSniseb2KNAU5D9FWc3H7BxCSAIdtU9OWIyw0zkEZ9qEKHryRM+SExYXRKNb7tOOVNAsQ3iwg==} peerDependencies: postcss: '>=7.0.0' @@ -1218,11 +1221,11 @@ packages: dependencies: '@babel/core': 7.18.0 postcss: 7.0.39 - postcss-syntax: 0.36.2_5111c4e3f61982716b7e3f1c84e1f773 + postcss-syntax: 0.36.2_kei4jy7wdgbhc236h4oijypxom transitivePeerDependencies: - supports-color - /@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: @@ -1230,7 +1233,7 @@ packages: postcss-syntax: '>=0.36.2' dependencies: postcss: 7.0.39 - postcss-syntax: 0.36.2_5111c4e3f61982716b7e3f1c84e1f773 + postcss-syntax: 0.36.2_kei4jy7wdgbhc236h4oijypxom remark: 13.0.0 unist-util-find-all-after: 3.0.2 transitivePeerDependencies: @@ -1296,19 +1299,16 @@ packages: /@types/istanbul-lib-coverage/2.0.4: resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==} - dev: false /@types/istanbul-lib-report/3.0.0: resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==} dependencies: '@types/istanbul-lib-coverage': 2.0.4 - dev: false /@types/istanbul-reports/3.0.1: resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==} dependencies: '@types/istanbul-lib-report': 3.0.0 - dev: false /@types/jest/27.5.1: resolution: {integrity: sha512-fUy7YRpT+rHXto1YlL+J9rs0uLGyiqVt3ZOTQR+4ROc47yNl8WLdVLgUloBRhOxP1PZvguHl44T3H0wAWxahYQ==} @@ -1354,6 +1354,10 @@ packages: /@types/minimist/1.2.2: resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==} + /@types/node/16.11.36: + resolution: {integrity: sha512-FR5QJe+TaoZ2GsMHkjuwoNabr+UrJNRr2HNOo+r/7vhcuntM6Ee/pRPOnRhhL2XE9OOvX9VLEq+BcXl3VjNoWA==} + dev: true + /@types/node/17.0.35: resolution: {integrity: sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==} @@ -1387,15 +1391,13 @@ packages: /@types/yargs-parser/21.0.0: resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} - dev: false /@types/yargs/16.0.4: resolution: {integrity: sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==} dependencies: '@types/yargs-parser': 21.0.0 - dev: false - /@typescript-eslint/eslint-plugin/5.25.0_19b6938f2bc33141392b02d6696d1ab6: + /@typescript-eslint/eslint-plugin/5.25.0_dg3jhdzlymyucojlallgs3i2wy: resolution: {integrity: sha512-icYrFnUzvm+LhW0QeJNKkezBu6tJs9p/53dpPLFH8zoM9w1tfaKzVurkPotEpAqQ8Vf8uaFyL5jHd0Vs6Z0ZQg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1406,10 +1408,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.25.0_eslint@8.16.0+typescript@4.5.5 + '@typescript-eslint/parser': 5.25.0_els4elilzrtenp42wxa4dytc34 '@typescript-eslint/scope-manager': 5.25.0 - '@typescript-eslint/type-utils': 5.25.0_eslint@8.16.0+typescript@4.5.5 - '@typescript-eslint/utils': 5.25.0_eslint@8.16.0+typescript@4.5.5 + '@typescript-eslint/type-utils': 5.25.0_els4elilzrtenp42wxa4dytc34 + '@typescript-eslint/utils': 5.25.0_els4elilzrtenp42wxa4dytc34 debug: 4.3.4 eslint: 8.16.0 functional-red-black-tree: 1.0.1 @@ -1422,7 +1424,7 @@ packages: - supports-color dev: false - /@typescript-eslint/parser/5.25.0_eslint@8.16.0+typescript@4.5.5: + /@typescript-eslint/parser/5.25.0_els4elilzrtenp42wxa4dytc34: resolution: {integrity: sha512-r3hwrOWYbNKP1nTcIw/aZoH+8bBnh/Lh1iDHoFpyG4DnCpvEdctrSl6LOo19fZbzypjQMHdajolxs6VpYoChgA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1450,7 +1452,7 @@ packages: '@typescript-eslint/visitor-keys': 5.25.0 dev: false - /@typescript-eslint/type-utils/5.25.0_eslint@8.16.0+typescript@4.5.5: + /@typescript-eslint/type-utils/5.25.0_els4elilzrtenp42wxa4dytc34: resolution: {integrity: sha512-B6nb3GK3Gv1Rsb2pqalebe/RyQoyG/WDy9yhj8EE0Ikds4Xa8RR28nHz+wlt4tMZk5bnAr0f3oC8TuDAd5CPrw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1460,7 +1462,7 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/utils': 5.25.0_eslint@8.16.0+typescript@4.5.5 + '@typescript-eslint/utils': 5.25.0_els4elilzrtenp42wxa4dytc34 debug: 4.3.4 eslint: 8.16.0 tsutils: 3.21.0_typescript@4.5.5 @@ -1495,7 +1497,7 @@ packages: - supports-color dev: false - /@typescript-eslint/utils/5.25.0_eslint@8.16.0+typescript@4.5.5: + /@typescript-eslint/utils/5.25.0_els4elilzrtenp42wxa4dytc34: resolution: {integrity: sha512-qNC9bhnz/n9Kba3yI6HQgQdBLuxDoMgdjzdhSInZh6NaDnFpTUlwNGxplUFWfY260Ya0TRPvkg9dd57qxrJI9g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1574,14 +1576,12 @@ packages: '@vue/shared': 3.2.35 estree-walker: 2.0.2 source-map: 0.6.1 - dev: true /@vue/compiler-dom/3.2.35: resolution: {integrity: sha512-I4bXB9MkRSTJ3gVXRQ4iaYJgABZGew+K/CCBoAh9fdLaeY7A7uUlS5nWGOlICSVfOH0/xk4QlcXeGZYCJkEleA==} dependencies: '@vue/compiler-core': 3.2.35 '@vue/shared': 3.2.35 - dev: true /@vue/compiler-sfc/3.2.35: resolution: {integrity: sha512-2wKQtnuHfwBFc7uV2Cmtms3Cc7u/u6kKJI3F+i0A+9xnuahK39cCMNJKHzI9x93Xai+uft64fDc5JSh8zDQBQA==} @@ -1596,14 +1596,12 @@ packages: magic-string: 0.25.9 postcss: 8.4.14 source-map: 0.6.1 - dev: true /@vue/compiler-ssr/3.2.35: resolution: {integrity: sha512-dJyqB8fZbvVQEnWl5VGxkWHTqx0ERnZXXqInFzyOX8FpTEidmQbUSmDrXidea7bZTdeg6ly94kZFGPYXT29mgQ==} dependencies: '@vue/compiler-dom': 3.2.35 '@vue/shared': 3.2.35 - dev: true /@vue/devtools-api/6.1.4: resolution: {integrity: sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ==} @@ -1616,20 +1614,17 @@ packages: '@vue/shared': 3.2.35 estree-walker: 2.0.2 magic-string: 0.25.9 - dev: true /@vue/reactivity/3.2.35: resolution: {integrity: sha512-6j9N9R1SwHVcJas4YqAzwdRS/cgmj3Z9aUert5Mv1jk5B9H9ivN/zot/fgMUbseWXigkkmX60OsfRbz49o8kCw==} dependencies: '@vue/shared': 3.2.35 - dev: true /@vue/runtime-core/3.2.35: resolution: {integrity: sha512-P8AeGPRGyIiYdOdvLc/7KR8VSdbUGG8Jxdx6Xlj5okEjyV9IYxeHRIQIoye85K0lZXBH4zuh1syD1mX+oZ0KqQ==} dependencies: '@vue/reactivity': 3.2.35 '@vue/shared': 3.2.35 - dev: true /@vue/runtime-dom/3.2.35: resolution: {integrity: sha512-M5xrVJ/b0KqssjPQMdpwLp3KwzG1Tn2w/IrOptVqGY5c9fEBluIbm18AeO4Fr3YxfeyaPWm1rY8POrEso0UE3w==} @@ -1637,7 +1632,6 @@ packages: '@vue/runtime-core': 3.2.35 '@vue/shared': 3.2.35 csstype: 2.6.20 - dev: true /@vue/server-renderer/3.2.35_vue@3.2.35: resolution: {integrity: sha512-ZMF8V+bZ0EIjSB7yzPEmDlxRDOIXj04iqG4Rw/H5rIuBCf0b7rNTleiOldlX5haG++zUq6uiL2AVp/A9uyz+cw==} @@ -1647,11 +1641,9 @@ packages: '@vue/compiler-ssr': 3.2.35 '@vue/shared': 3.2.35 vue: 3.2.35 - dev: true /@vue/shared/3.2.35: resolution: {integrity: sha512-/sxDqMcy0MsfQ3LQixKYDxIinDYNy1dXTsF2Am0pv0toImWabymFQ8cFmPJnPt+gh5ElKwwn7KzQcDbLHar60A==} - dev: true /@vue/test-utils/2.0.0_vue@3.2.35: resolution: {integrity: sha512-zL5kygNq7hONrO1CzaUGprEAklAX+pH8J1MPMCU3Rd2xtSYkZ+PmKU3oEDRg8VAGdL5lNJHzDgrud5amFPtirw==} @@ -2561,7 +2553,6 @@ packages: /csstype/2.6.20: resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==} - dev: true /dargs/7.0.0: resolution: {integrity: sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==} @@ -3152,7 +3143,7 @@ packages: source-map: 0.6.1 dev: false - /eslint-config-airbnb-base/15.0.0_0ce4f552c18297c00de8a172104cf37a: + /eslint-config-airbnb-base/15.0.0_btspkuwbqkl4adpiufzbathtpi: resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -3161,7 +3152,7 @@ packages: dependencies: confusing-browser-globals: 1.0.11 eslint: 8.16.0 - eslint-plugin-import: 2.26.0_2bebc5fd3a439999da4a6fc2046abe07 + eslint-plugin-import: 2.26.0_fpv4l7j2iomztwskn7bai2v6a4 object.assign: 4.1.2 object.entries: 1.1.5 semver: 6.3.0 @@ -3185,7 +3176,7 @@ packages: - supports-color dev: false - /eslint-module-utils/2.7.3_609300abf1d36304a28540d68c558c7d: + /eslint-module-utils/2.7.3_mcjqbk7r2nrqjiufidliyvmmpu: resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==} engines: {node: '>=4'} peerDependencies: @@ -3203,7 +3194,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.25.0_eslint@8.16.0+typescript@4.5.5 + '@typescript-eslint/parser': 5.25.0_els4elilzrtenp42wxa4dytc34 debug: 3.2.7 eslint-import-resolver-node: 0.3.6 find-up: 2.1.0 @@ -3211,7 +3202,7 @@ packages: - supports-color dev: false - /eslint-plugin-import/2.26.0_2bebc5fd3a439999da4a6fc2046abe07: + /eslint-plugin-import/2.26.0_fpv4l7j2iomztwskn7bai2v6a4: resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==} engines: {node: '>=4'} peerDependencies: @@ -3221,14 +3212,14 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.25.0_eslint@8.16.0+typescript@4.5.5 + '@typescript-eslint/parser': 5.25.0_els4elilzrtenp42wxa4dytc34 array-includes: 3.1.5 array.prototype.flat: 1.3.0 debug: 2.6.9 doctrine: 2.1.0 eslint: 8.16.0 eslint-import-resolver-node: 0.3.6 - eslint-module-utils: 2.7.3_609300abf1d36304a28540d68c558c7d + eslint-module-utils: 2.7.3_mcjqbk7r2nrqjiufidliyvmmpu has: 1.0.3 is-core-module: 2.9.0 is-glob: 4.0.3 @@ -5316,7 +5307,6 @@ packages: resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==} dependencies: sourcemap-codec: 1.4.8 - dev: true /make-dir/2.1.0: resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==} @@ -5348,7 +5338,7 @@ packages: resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==} engines: {node: '>=8'} - /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': '*' @@ -6005,7 +5995,7 @@ packages: find-up: 4.1.0 dev: false - /postcss-html/0.36.0_4f7b71a942b8b7a555b8adf78f88122b: + /postcss-html/0.36.0_j55xdkkcxc32kvnyvx3y7casfm: resolution: {integrity: sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==} peerDependencies: postcss: '>=5.0.0' @@ -6013,7 +6003,7 @@ packages: dependencies: htmlparser2: 3.10.1 postcss: 7.0.39 - postcss-syntax: 0.36.2_5111c4e3f61982716b7e3f1c84e1f773 + postcss-syntax: 0.36.2_kei4jy7wdgbhc236h4oijypxom /postcss-less/3.1.4: resolution: {integrity: sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==} @@ -6069,7 +6059,7 @@ packages: cssesc: 3.0.0 util-deprecate: 1.0.2 - /postcss-syntax/0.36.2_5111c4e3f61982716b7e3f1c84e1f773: + /postcss-syntax/0.36.2_kei4jy7wdgbhc236h4oijypxom: resolution: {integrity: sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==} peerDependencies: postcss: '>=5.0.0' @@ -6091,7 +6081,7 @@ packages: optional: true dependencies: postcss: 7.0.39 - postcss-html: 0.36.0_4f7b71a942b8b7a555b8adf78f88122b + postcss-html: 0.36.0_j55xdkkcxc32kvnyvx3y7casfm postcss-less: 3.1.4 postcss-scss: 2.1.1 @@ -6696,7 +6686,6 @@ packages: /sourcemap-codec/1.4.8: resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==} - dev: true /spdx-correct/3.1.1: resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==} @@ -6898,8 +6887,8 @@ packages: engines: {node: '>=10.13.0'} hasBin: true dependencies: - '@stylelint/postcss-css-in-js': 0.37.3_4f7b71a942b8b7a555b8adf78f88122b - '@stylelint/postcss-markdown': 0.36.2_4f7b71a942b8b7a555b8adf78f88122b + '@stylelint/postcss-css-in-js': 0.37.3_j55xdkkcxc32kvnyvx3y7casfm + '@stylelint/postcss-markdown': 0.36.2_j55xdkkcxc32kvnyvx3y7casfm autoprefixer: 9.8.8 balanced-match: 2.0.0 chalk: 4.1.2 @@ -6925,7 +6914,7 @@ packages: micromatch: 4.0.5 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 @@ -6933,7 +6922,7 @@ packages: postcss-sass: 0.4.4 postcss-scss: 2.1.1 postcss-selector-parser: 6.0.10 - postcss-syntax: 0.36.2_5111c4e3f61982716b7e3f1c84e1f773 + postcss-syntax: 0.36.2_kei4jy7wdgbhc236h4oijypxom postcss-value-parser: 4.2.0 resolve-from: 5.0.0 slash: 3.0.0 @@ -7220,7 +7209,6 @@ packages: resolution: {integrity: sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==} engines: {node: '>=4.2.0'} hasBin: true - dev: true /typescript/4.6.4: resolution: {integrity: sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==} @@ -7459,7 +7447,6 @@ packages: '@vue/runtime-dom': 3.2.35 '@vue/server-renderer': 3.2.35_vue@3.2.35 '@vue/shared': 3.2.35 - dev: true /w3c-hr-time/1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} From ba448b8617e77022df2c26379753e23c4a4f3b70 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 28 May 2022 08:29:24 +0800 Subject: [PATCH 10/23] chore: fix test CI runs twice on pull request (#10640) --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ca53f88fb..1082a8153 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ name: CI -on: [push, pull_request] +on: [push] jobs: lint: From 607e6e2be4228e5c8aecbe5d9335a447c2e726ac Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 22 May 2022 20:10:14 +0800 Subject: [PATCH 11/23] feat: using mjs extension for esmodule (#10625) --- packages/vant/package.json | 18 +----------------- packages/vant/vant.config.mjs | 3 +++ 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/packages/vant/package.json b/packages/vant/package.json index ca612ebd2..1358b9c6f 100644 --- a/packages/vant/package.json +++ b/packages/vant/package.json @@ -3,27 +3,11 @@ "version": "3.4.9", "description": "Mobile UI Components built on Vue", "main": "lib/vant.cjs.js", - "module": "es/index.js", + "module": "es/index.mjs", "style": "lib/index.css", "typings": "lib/index.d.ts", "unpkg": "lib/vant.min.js", "jsdelivr": "lib/vant.min.js", - "exports": { - ".": { - "node": { - "import": "./lib/ssr.mjs", - "require": "./lib/ssr.js" - }, - "import": "./es/index.js", - "require": "./lib/vant.cjs.js", - "types": "./lib/index.d.ts" - }, - "./es": "./es/index.js", - "./lib": "./lib/vant.cjs.js", - "./es/": "./es/", - "./lib/": "./lib/", - "./package.json": "./package.json" - }, "files": [ "es", "lib", diff --git a/packages/vant/vant.config.mjs b/packages/vant/vant.config.mjs index 86e34d454..7e4ec2e88 100644 --- a/packages/vant/vant.config.mjs +++ b/packages/vant/vant.config.mjs @@ -5,6 +5,9 @@ export default { namedExport: true, skipInstall: ['lazyload'], packageManager: 'pnpm', + extensions: { + esm: '.mjs' + }, site: { publicPath: (typeof window === 'undefined' && process.env.PUBLIC_PATH) || '/vant/', From ffed2035c8aacb0468ec056257026be29814f0ea Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 28 May 2022 09:10:40 +0800 Subject: [PATCH 12/23] docs: update vant demo url (#10641) --- README.md | 2 +- README.zh-CN.md | 2 +- packages/vant/docs/markdown/home.en-US.md | 2 +- packages/vant/docs/markdown/home.zh-CN.md | 3 +-- packages/vant/docs/markdown/quickstart.zh-CN.md | 2 +- packages/vant/docs/markdown/theme.zh-CN.md | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index bdc154c71..6f29f570a 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ Vant 3/4 supports modern browsers and Chrome >= 51、iOS >= 10.0 (same as Vue 3) | Project | Description | | --- | --- | | [vant-weapp](https://github.com/youzan/vant-weapp) | WeChat MiniProgram UI | -| [vant-demo](https://github.com/youzan/vant-demo) | Collection of Vant demos | +| [vant-demo](https://github.com/vant-ui/vant-demo) | Collection of Vant demos | | [vant-cli](https://github.com/youzan/vant/tree/dev/packages/vant-cli) | Scaffold for UI library | | [vant-icons](https://github.com/youzan/vant/tree/dev/packages/vant-icons) | Vant icons | | [vant-touch-emulator](https://github.com/youzan/vant/tree/dev/packages/vant-touch-emulator) | Using vant in desktop browsers | diff --git a/README.zh-CN.md b/README.zh-CN.md index cfadb3ea2..2b20fb986 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -93,7 +93,7 @@ Vant 3/4 支持现代浏览器以及 Chrome >= 51、iOS >= 10.0(与 Vue 3 一 | 项目 | 描述 | | --- | --- | | [vant-weapp](https://github.com/youzan/vant-weapp) | Vant 微信小程序版 | -| [vant-demo](https://github.com/youzan/vant-demo) | Vant 官方示例合集 | +| [vant-demo](https://github.com/vant-ui/vant-demo) | Vant 官方示例合集 | | [vant-cli](https://github.com/youzan/vant/tree/dev/packages/vant-cli) | 开箱即用的组件库搭建工具 | | [vant-icons](https://github.com/youzan/vant/tree/dev/packages/vant-icons) | Vant 图标库 | | [vant-touch-emulator](https://github.com/youzan/vant/tree/dev/packages/vant-touch-emulator) | 在桌面端使用 Vant 的辅助库 | diff --git a/packages/vant/docs/markdown/home.en-US.md b/packages/vant/docs/markdown/home.en-US.md index 630646bac..56526d5a4 100644 --- a/packages/vant/docs/markdown/home.en-US.md +++ b/packages/vant/docs/markdown/home.en-US.md @@ -39,7 +39,7 @@ Vant 3/4 supports modern browsers and Chrome >= 51、iOS >= 10.0 (same as Vue 3) | Project | Description | | --- | --- | | [vant-weapp](https://github.com/youzan/vant-weapp) | WeChat MiniProgram UI | -| [vant-demo](https://github.com/youzan/vant-demo) | Collection of Vant demos | +| [vant-demo](https://github.com/vant-ui/vant-demo) | Collection of Vant demos | | [vant-cli](https://github.com/youzan/vant/tree/dev/packages/vant-cli) | Scaffold for UI library | | [vant-icons](https://github.com/youzan/vant/tree/dev/packages/vant-icons) | Vant icons | | [vant-touch-emulator](https://github.com/youzan/vant/tree/dev/packages/vant-touch-emulator) | Using vant in desktop browsers | diff --git a/packages/vant/docs/markdown/home.zh-CN.md b/packages/vant/docs/markdown/home.zh-CN.md index 344988730..a8aa8a3a8 100644 --- a/packages/vant/docs/markdown/home.zh-CN.md +++ b/packages/vant/docs/markdown/home.zh-CN.md @@ -51,7 +51,7 @@ Vant 3/4 支持现代浏览器以及 Chrome >= 51、iOS >= 10.0(与 Vue 3 一 | 项目 | 描述 | | --- | --- | | [vant-weapp](https://github.com/youzan/vant-weapp) | Vant 微信小程序版 | -| [vant-demo](https://github.com/youzan/vant-demo) | Vant 官方示例合集 | +| [vant-demo](https://github.com/vant-ui/vant-demo) | Vant 官方示例合集 | | [vant-cli](https://github.com/youzan/vant/tree/dev/packages/vant-cli) | 开箱即用的组件库搭建工具 | | [vant-icons](https://github.com/youzan/vant/tree/dev/packages/vant-icons) | Vant 图标库 | | [vant-touch-emulator](https://github.com/youzan/vant/tree/dev/packages/vant-touch-emulator) | 在桌面端使用 Vant 的辅助库 | @@ -70,7 +70,6 @@ Vant 3/4 支持现代浏览器以及 Chrome >= 51、iOS >= 10.0(与 Vue 3 一 | [@antmjs/vantui](https://github.com/antmjs/vantui) | 基于 Vant Weapp 开发的多端组件库,同时支持 Taro 和 React | | [sfc-playground-vant](https://github.com/zhixiaoqiang/sfc-playground-vant) | Vant Playground. 当前仅支持 Vant 3.0 以上 | - ### 其他链接 - [意见反馈](https://github.com/youzan/vant/issues) diff --git a/packages/vant/docs/markdown/quickstart.zh-CN.md b/packages/vant/docs/markdown/quickstart.zh-CN.md index eb839bdea..722591120 100644 --- a/packages/vant/docs/markdown/quickstart.zh-CN.md +++ b/packages/vant/docs/markdown/quickstart.zh-CN.md @@ -80,7 +80,7 @@ pnpm add vant ### 示例工程 -我们提供了丰富的[示例工程](https://github.com/youzan/vant-demo),通过示例工程你可以了解如下内容: +我们提供了丰富的[示例工程](https://github.com/vant-ui/vant-demo),通过示例工程你可以了解如下内容: - 基于 Vite 和 Vant 搭建应用 - 基于 Nuxt 和 Vant 搭建应用 diff --git a/packages/vant/docs/markdown/theme.zh-CN.md b/packages/vant/docs/markdown/theme.zh-CN.md index 44ea1c73c..c5763966f 100644 --- a/packages/vant/docs/markdown/theme.zh-CN.md +++ b/packages/vant/docs/markdown/theme.zh-CN.md @@ -10,7 +10,7 @@ Vant 提供了一套默认主题,CSS 命名采用 BEM 的风格,方便使用 ### 示例工程 -我们提供了一个基于 Vue CLI 3 的示例工程,仓库地址为 [Vant Demo](https://github.com/youzan/vant-demo),其中包含了定制主题的基本配置,可以作为参考。 +我们提供了一个基于 Vue CLI 3 的示例工程,仓库地址为 [Vant Demo](https://github.com/vant-ui/vant-demo),其中包含了定制主题的基本配置,可以作为参考。 ### 样式变量 From 95bee736243693a76192fcb0994242dcdd30a54a Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 28 May 2022 09:26:28 +0800 Subject: [PATCH 13/23] docs: fix jsdelivr domain (#10642) --- README.md | 4 +-- README.zh-CN.md | 4 +-- .../generators/vue2/vant.config.js | 2 +- .../generators/vue3/vant.config.mjs | 2 +- packages/vant-cli/docs/config.md | 2 +- packages/vant-cli/docs/config.zh-CN.md | 2 +- packages/vant-icons/contribution.zh-CN.md | 4 +-- packages/vant-touch-emulator/README.md | 2 +- .../docs/markdown/advanced-usage.zh-CN.md | 7 ++-- .../vant/docs/markdown/changelog.en-US.md | 2 +- .../vant/docs/markdown/changelog.zh-CN.md | 4 +-- packages/vant/docs/markdown/design.en-US.md | 10 +++--- packages/vant/docs/markdown/design.zh-CN.md | 10 +++--- packages/vant/docs/markdown/home.en-US.md | 2 +- packages/vant/docs/markdown/home.zh-CN.md | 2 +- .../vant/docs/markdown/quickstart.en-US.md | 8 ++--- .../vant/docs/markdown/quickstart.zh-CN.md | 6 ++-- packages/vant/docs/site/index.ts | 2 +- packages/vant/src/button/README.md | 2 +- packages/vant/src/button/README.zh-CN.md | 2 +- .../test/__snapshots__/demo.spec.ts.snap | 2 +- packages/vant/src/card/README.md | 6 ++-- packages/vant/src/card/README.zh-CN.md | 6 ++-- .../card/test/__snapshots__/demo.spec.ts.snap | 6 ++-- packages/vant/src/checkbox/README.md | 5 +-- packages/vant/src/checkbox/README.zh-CN.md | 5 +-- .../test/__snapshots__/demo.spec.ts.snap | 2 +- .../test/__snapshots__/index.spec.ts.snap | 2 +- packages/vant/src/dialog/README.md | 2 +- packages/vant/src/dialog/README.zh-CN.md | 2 +- .../test/__snapshots__/demo.spec.ts.snap | 2 +- packages/vant/src/empty/README.md | 2 +- packages/vant/src/empty/README.zh-CN.md | 2 +- .../test/__snapshots__/demo.spec.ts.snap | 2 +- packages/vant/src/form/README.md | 2 +- packages/vant/src/form/README.zh-CN.md | 2 +- .../form/test/__snapshots__/demo.spec.ts.snap | 2 +- packages/vant/src/grid/README.md | 12 +++++-- packages/vant/src/grid/README.zh-CN.md | 12 +++++-- .../grid/test/__snapshots__/demo.spec.ts.snap | 6 ++-- packages/vant/src/icon/README.md | 2 +- packages/vant/src/icon/README.zh-CN.md | 2 +- .../icon/test/__snapshots__/demo.spec.ts.snap | 2 +- .../test/__snapshots__/index.spec.ts.snap | 2 +- packages/vant/src/image-preview/README.md | 24 ++++++------- .../vant/src/image-preview/README.zh-CN.md | 26 +++++++------- .../test/__snapshots__/index.spec.ts.snap | 4 +-- packages/vant/src/image/README.md | 10 +++--- packages/vant/src/image/README.zh-CN.md | 14 ++++---- .../test/__snapshots__/demo.spec.ts.snap | 34 +++++++++---------- packages/vant/src/lazyload/README.md | 4 +-- packages/vant/src/lazyload/README.zh-CN.md | 4 +-- packages/vant/src/pull-refresh/README.md | 6 ++-- .../vant/src/pull-refresh/README.zh-CN.md | 6 ++-- packages/vant/src/radio/README.md | 5 +-- packages/vant/src/radio/README.zh-CN.md | 5 +-- .../test/__snapshots__/demo.spec.ts.snap | 4 +-- packages/vant/src/share-sheet/README.md | 6 ++-- packages/vant/src/share-sheet/README.zh-CN.md | 6 ++-- packages/vant/src/swipe-cell/README.md | 2 +- packages/vant/src/swipe-cell/README.zh-CN.md | 2 +- .../test/__snapshots__/demo.spec.ts.snap | 2 +- packages/vant/src/swipe/README.md | 4 +-- packages/vant/src/swipe/README.zh-CN.md | 4 +-- .../test/__snapshots__/demo.spec.ts.snap | 6 ++-- packages/vant/src/tabbar/README.md | 5 +-- packages/vant/src/tabbar/README.zh-CN.md | 5 +-- .../test/__snapshots__/demo.spec.ts.snap | 2 +- packages/vant/src/toast/README.md | 2 +- packages/vant/src/toast/README.zh-CN.md | 2 +- packages/vant/src/tree-select/README.md | 4 +-- packages/vant/src/tree-select/README.zh-CN.md | 4 +-- .../test/__snapshots__/demo.spec.ts.snap | 2 +- packages/vant/src/uploader/README.md | 10 +++--- packages/vant/src/uploader/README.zh-CN.md | 10 +++--- .../test/__snapshots__/demo.spec.ts.snap | 20 +++++------ .../test/__snapshots__/index.spec.ts.snap | 8 ++--- packages/vant/vant.config.mjs | 10 +++--- 78 files changed, 225 insertions(+), 206 deletions(-) diff --git a/README.md b/README.md index 6f29f570a..d4810fb7e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- logo + logo

Vant

@@ -114,7 +114,7 @@ Vant 3/4 supports modern browsers and Chrome >= 51、iOS >= 10.0 (same as Vue 3) You can scan the following QR code to access the demo: - + ## Core Team diff --git a/README.zh-CN.md b/README.zh-CN.md index 2b20fb986..e0ff482af 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,5 +1,5 @@

- logo + logo

Vant

@@ -122,7 +122,7 @@ Vant 3/4 支持现代浏览器以及 Chrome >= 51、iOS >= 10.0(与 Vue 3 一 可以手机扫码以下二维码访问手机端 demo: - + ## 核心团队 diff --git a/packages/create-vant-cli-app/generators/vue2/vant.config.js b/packages/create-vant-cli-app/generators/vue2/vant.config.js index a7fe8bb3c..1732cbb4f 100644 --- a/packages/create-vant-cli-app/generators/vue2/vant.config.js +++ b/packages/create-vant-cli-app/generators/vue2/vant.config.js @@ -10,7 +10,7 @@ module.exports = { }, site: { title: '<%= name %>', - logo: 'https://cdn.jsdelivr.net/npm/@vant/assets/logo.png', + logo: 'https://fastly.jsdelivr.net/npm/@vant/assets/logo.png', nav: [ { title: '开发指南', diff --git a/packages/create-vant-cli-app/generators/vue3/vant.config.mjs b/packages/create-vant-cli-app/generators/vue3/vant.config.mjs index 6e71e8679..baa16cbf2 100644 --- a/packages/create-vant-cli-app/generators/vue3/vant.config.mjs +++ b/packages/create-vant-cli-app/generators/vue3/vant.config.mjs @@ -10,7 +10,7 @@ export default { }, site: { title: '<%= name %>', - logo: 'https://cdn.jsdelivr.net/npm/@vant/assets/logo.png', + logo: 'https://fastly.jsdelivr.net/npm/@vant/assets/logo.png', nav: [ { title: '开发指南', diff --git a/packages/vant-cli/docs/config.md b/packages/vant-cli/docs/config.md index 9bd0541a7..84604f7dc 100644 --- a/packages/vant-cli/docs/config.md +++ b/packages/vant-cli/docs/config.md @@ -44,7 +44,7 @@ export default { // title title: 'Demo UI', // logo - logo: 'https://cdn.jsdelivr.net/npm/@vant/assets/logo.png', + logo: 'https://fastly.jsdelivr.net/npm/@vant/assets/logo.png', // description description: '示例组件库', // left nav diff --git a/packages/vant-cli/docs/config.zh-CN.md b/packages/vant-cli/docs/config.zh-CN.md index 81b022e26..24ece4b09 100644 --- a/packages/vant-cli/docs/config.zh-CN.md +++ b/packages/vant-cli/docs/config.zh-CN.md @@ -44,7 +44,7 @@ export default { // 标题 title: 'Demo UI', // 图标 - logo: 'https://cdn.jsdelivr.net/npm/@vant/assets/logo.png', + logo: 'https://fastly.jsdelivr.net/npm/@vant/assets/logo.png', // 描述 description: '示例组件库', // 左侧导航 diff --git a/packages/vant-icons/contribution.zh-CN.md b/packages/vant-icons/contribution.zh-CN.md index 87ad140f0..a2046028b 100644 --- a/packages/vant-icons/contribution.zh-CN.md +++ b/packages/vant-icons/contribution.zh-CN.md @@ -25,7 +25,7 @@ Vant 图标库托管在 [iconfont.cn](https://iconfont.cn) 上,同时仓库中 从 Sketch 中导出图标对应的 SVG 文件,并上传到 [iconfont 项目](https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=2553510)中。 - + > 此步骤需要图标库管理员权限,请联系 Vant 维护者进行添加。 @@ -43,7 +43,7 @@ Vant 图标库托管在 [iconfont.cn](https://iconfont.cn) 上,同时仓库中 字体文件的 base64 URL 通过 [transfonter](https://transfonter.org/) 生成,步骤如下图所示: - + ### 4. 发布图标库 diff --git a/packages/vant-touch-emulator/README.md b/packages/vant-touch-emulator/README.md index fe53349d3..07286525e 100644 --- a/packages/vant-touch-emulator/README.md +++ b/packages/vant-touch-emulator/README.md @@ -26,7 +26,7 @@ import '@vant/touch-emulator'; ## CDN 引入 ```html - + ``` ## 禁用 touch 模拟 diff --git a/packages/vant/docs/markdown/advanced-usage.zh-CN.md b/packages/vant/docs/markdown/advanced-usage.zh-CN.md index 50ce21981..780eab1c9 100644 --- a/packages/vant/docs/markdown/advanced-usage.zh-CN.md +++ b/packages/vant/docs/markdown/advanced-usage.zh-CN.md @@ -92,9 +92,10 @@ export default { data() { return { checked: true, - activeIcon: 'https://cdn.jsdelivr.net/npm/@vant/assets/user-active.png', + activeIcon: + 'https://fastly.jsdelivr.net/npm/@vant/assets/user-active.png', inactiveIcon: - 'https://cdn.jsdelivr.net/npm/@vant/assets/user-inactive.png', + 'https://fastly.jsdelivr.net/npm/@vant/assets/user-inactive.png', }; }, }; @@ -224,4 +225,4 @@ iPhone X 等机型底部存在底部指示条,指示条的操作区域与页 ``` - + diff --git a/packages/vant/docs/markdown/changelog.en-US.md b/packages/vant/docs/markdown/changelog.en-US.md index 9a080386a..fdd8e104d 100644 --- a/packages/vant/docs/markdown/changelog.en-US.md +++ b/packages/vant/docs/markdown/changelog.en-US.md @@ -1034,7 +1034,7 @@ Reference: [Vant 3.0 正式发布:全面拥抱 Vue 3](https://github.com/youza - add Cascader component [#7771](https://github.com/youzan/vant/pull/7771) - + **Feature** diff --git a/packages/vant/docs/markdown/changelog.zh-CN.md b/packages/vant/docs/markdown/changelog.zh-CN.md index 97decb89d..cc3328abe 100644 --- a/packages/vant/docs/markdown/changelog.zh-CN.md +++ b/packages/vant/docs/markdown/changelog.zh-CN.md @@ -1036,7 +1036,7 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 - 新增 Cascader 级联选择组件 [#7771](https://github.com/youzan/vant/pull/7771) - + **Feature** @@ -1124,7 +1124,7 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 - 新增 [Popover 气泡弹出框](#/zh-CN/popover)组件 [#7579](https://github.com/youzan/vant/issues/7579) -![](https://cdn.jsdelivr.net/npm/@vant/assets/component-preview-1122.png) +![](https://fastly.jsdelivr.net/npm/@vant/assets/component-preview-1122.png) **Feature** diff --git a/packages/vant/docs/markdown/design.en-US.md b/packages/vant/docs/markdown/design.en-US.md index bd757fd2f..c4abbdaac 100644 --- a/packages/vant/docs/markdown/design.en-US.md +++ b/packages/vant/docs/markdown/design.en-US.md @@ -12,15 +12,15 @@ Contains color specifications, font specifications, and component design specifi #### Colors - + #### Fonts - + #### Components - + Download @@ -28,13 +28,13 @@ Contains color specifications, font specifications, and component design specifi Contains icon library resources. - + Download ### Axure - + Download diff --git a/packages/vant/docs/markdown/design.zh-CN.md b/packages/vant/docs/markdown/design.zh-CN.md index 651ff4c4b..2582c515a 100644 --- a/packages/vant/docs/markdown/design.zh-CN.md +++ b/packages/vant/docs/markdown/design.zh-CN.md @@ -12,15 +12,15 @@ #### 色彩规范 - + #### 字体规范 - + #### 组件规范 - + 下载 @@ -28,7 +28,7 @@ 包含 Sketch 格式的图标库资源。 - + 下载 @@ -40,7 +40,7 @@ Vant 的所有图标都托管在 **iconfont.cn** 上,点此查看:[Vant 图 Axure 元件库,由社区的 [@axure-tczy](https://github.com/axure-tczy) 同学贡献。 - + 下载 diff --git a/packages/vant/docs/markdown/home.en-US.md b/packages/vant/docs/markdown/home.en-US.md index 56526d5a4..811989c14 100644 --- a/packages/vant/docs/markdown/home.en-US.md +++ b/packages/vant/docs/markdown/home.en-US.md @@ -1,6 +1,6 @@
- +

Vant

Mobile UI Components built on Vue

diff --git a/packages/vant/docs/markdown/home.zh-CN.md b/packages/vant/docs/markdown/home.zh-CN.md index a8aa8a3a8..53ee6e7f3 100644 --- a/packages/vant/docs/markdown/home.zh-CN.md +++ b/packages/vant/docs/markdown/home.zh-CN.md @@ -1,6 +1,6 @@
- +

Vant

轻量、可靠的移动端 Vue 组件库

diff --git a/packages/vant/docs/markdown/quickstart.en-US.md b/packages/vant/docs/markdown/quickstart.en-US.md index 088ca21a3..efc877e92 100644 --- a/packages/vant/docs/markdown/quickstart.en-US.md +++ b/packages/vant/docs/markdown/quickstart.en-US.md @@ -32,12 +32,12 @@ The easiest way to use Vant is to include a CDN link in the html file, after whi - - + + - + +