Merge branch 'youzan:main' into main

suncohey · Apr 24, 2024 · cc836cb · cc836cb
2 parents 0793501 + 9dea0e9
commit cc836cb
Show file tree

Hide file tree

Showing 96 changed files with 5,082 additions and 3,251 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -1,11 +1,14 @@
 {
 	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
-	"extends": ["config:recommended"],
+	"extends": ["config:recommended", "schedule:weekly"],
+	"dependencyDashboard": false,
 	"packageRules": [
 		// Use chore as semantic commit type for commit messages
 		{
 			"matchPackagePatterns": ["*"],
-			"semanticCommitType": "chore"
+			"semanticCommitType": "chore",
+			// always bump package.json
+			"rangeStrategy": "bump"
 		},
 		{
 			"groupName": "rsbuild",
@@ -22,6 +25,12 @@
 			"packagePatterns": ["^@types/"],
 			"groupSlug": "types"
 		},
+		{
+			"groupName": "all patch dependencies",
+			"groupSlug": "all-patch",
+			"matchPackagePatterns": ["*"],
+			"matchUpdateTypes": ["patch"]
+		},
 		// manually update peer dependencies
 		{
 			"depTypeList": ["peerDependencies"],

diff --git a/.github/workflows/deploy-v4-site.yml b/.github/workflows/deploy-v4-site.yml
@@ -33,7 +33,7 @@ jobs:
         run: npm run build:site
 
       - name: Deploy for Gitee 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4.6.0
         with:
           branch: gh-pages
           folder: packages/vant/site-dist
@@ -57,9 +57,9 @@ jobs:
             vant-use/**/*
 
       - name: Deploy for GitHub 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4.6.0
         with:
-          branch: main
+          branch: gh-pages
           folder: packages/vant/site-dist
           token: ${{ secrets.VANT_UI_TOKEN }}
           repository-name: vant-ui/vant-ui.github.io

diff --git a/README.md b/README.md
@@ -126,7 +126,7 @@ Vant 3/4 supports modern browsers and Chrome >= 51、iOS >= 10.0 (same as Vue 3)
 | [vant-playground](https://github.com/LadyChatterleyLover/vant-playground) | Vant Playground |
 | [sfc-playground-vant](https://github.com/zhixiaoqiang/sfc-playground-vant) | Vant Playground |
 | [vue3-h5-template](https://github.com/yulimchen/vue3-h5-template) | Mobile project template based on Vant |
-| [vue3-vant-mobile](https://github.com/CharleeWa/vue3-vant-mobile) | Mobile project template based on Vant |
+| [vue3-vant-mobile](https://github.com/easy-temps/vue3-vant-mobile) | Mobile project template based on Vant |
 | [vscode-common-intellisense](https://github.com/Simon-He95/vscode-common-intellisense) | A VS Code extension that provides better intellisense to Vant developers |
 
 ## Links

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -134,7 +134,7 @@ Vant 3/4 支持现代浏览器以及 Chrome >= 51、iOS >= 10.0（与 Vue 3 一
 | [vant-playground](https://github.com/LadyChatterleyLover/vant-playground) | Vant Playground |
 | [sfc-playground-vant](https://github.com/zhixiaoqiang/sfc-playground-vant) | Vant Playground |
 | [vue3-h5-template](https://github.com/yulimchen/vue3-h5-template) | 基于 Vant 的移动端项目模板 |
-| [vue3-vant-mobile](https://github.com/CharleeWa/vue3-vant-mobile) | 基于 Vant 的移动端项目模板 |
+| [vue3-vant-mobile](https://github.com/easy-temps/vue3-vant-mobile) | 基于 Vant 的移动端项目模板 |
 | [vscode-common-intellisense](https://github.com/Simon-He95/vscode-common-intellisense) | VS Code 扩展，为 Vant 开发者提供更好的智能感知 |
 
 ## 链接

diff --git a/package.json b/package.json
@@ -17,15 +17,15 @@
     "*.{ts,tsx,js,vue}": "eslint --fix"
   },
   "engines": {
-    "pnpm": ">= 8.8.0"
+    "pnpm": ">= 9.0.0"
   },
-  "packageManager": "pnpm@8.14.1",
+  "packageManager": "pnpm@9.0.4",
   "devDependencies": {
     "@vant/cli": "workspace:*",
     "@vant/eslint-config": "workspace:*",
-    "eslint": "^8.46.0",
-    "husky": "^8.0.1",
+    "eslint": "^8.57.0",
+    "husky": "^8.0.3",
     "nano-staged": "^0.8.0",
-    "prettier": "^3.0.0"
+    "prettier": "^3.2.5"
   }
 }
diff --git a/packages/create-vant-cli-app/generators/vue3/package.json.tpl b/packages/create-vant-cli-app/generators/vue3/package.json.tpl
@@ -13,13 +13,9 @@
   "scripts": {
     "dev": "vant-cli dev",
     "lint": "vant-cli lint",
-    "test": "vant-cli test",
     "build": "vant-cli build",
     "build:site": "vant-cli build-site",
-    "release": "vant-cli release --tag next",
-    "release:site": "pnpm build:site && npx gh-pages -d site-dist",
-    "test:watch": "vant-cli test --watch",
-    "test:coverage": "open test/coverage/index.html"
+    "release:site": "pnpm build:site && npx gh-pages -d site-dist"
   },
   "author": "",
   "nano-staged": {
@@ -31,7 +27,7 @@
     "vue": "^3.3.4"
   },
   "devDependencies": {
-    "@vant/cli": "^6.0.0",
+    "@vant/cli": "^7.0.0",
     "vue": "^3.3.4",
     "sass": "^1.49.7"
   },

diff --git a/packages/create-vant-cli-app/package.json b/packages/create-vant-cli-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-vant-cli-app",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "description": "Create Vant CLI App",
   "main": "lib/index.js",
   "bin": {
@@ -31,15 +31,15 @@
   "author": "chenjiahan",
   "license": "MIT",
   "devDependencies": {
-    "@types/fs-extra": "^11.0.1",
-    "rimraf": "^5.0.0",
+    "@types/fs-extra": "^11.0.4",
+    "rimraf": "^5.0.5",
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "rslog": "^1.1.0",
-    "fast-glob": "^3.2.11",
-    "fs-extra": "^11.1.0",
-    "enquirer": "2.3.6",
+    "rslog": "^1.2.1",
+    "fast-glob": "^3.3.2",
+    "fs-extra": "^11.2.0",
+    "enquirer": "2.4.1",
     "picocolors": "^1.0.0"
   }
 }
diff --git a/packages/create-vant-cli-app/src/generator.ts b/packages/create-vant-cli-app/src/generator.ts
@@ -12,21 +12,21 @@ const PROMPTS = [
     message: 'Select Vue version',
     type: 'select',
     choices: [
-      {
-        name: 'vue2',
-        message: 'Vue 2',
-      },
       {
         name: 'vue3',
         message: 'Vue 3',
       },
+      {
+        name: 'vue2',
+        message: 'Vue 2',
+      },
     ],
   },
   {
     name: 'preprocessor',
     message: 'Select css preprocessor',
     type: 'select',
-    choices: ['Less', 'Sass'],
+    choices: ['Sass', 'Less'],
   },
 ];
 

diff --git a/packages/vant-area-data/package.json b/packages/vant-area-data/package.json
@@ -38,8 +38,8 @@
   "author": "chenjiahan",
   "license": "MIT",
   "devDependencies": {
-    "esbuild": "^0.19.10",
-    "rimraf": "^5.0.0",
+    "esbuild": "^0.20.2",
+    "rimraf": "^5.0.5",
     "typescript": "^5.0.4"
   }
 }
diff --git a/packages/vant-auto-import-resolver/README.md b/packages/vant-auto-import-resolver/README.md
@@ -14,16 +14,16 @@ English | [简体中文](./README.zh-CN.md)
 
 ```shell
 # via npm
-npm i @vant/auto-import-resolver unplugin-vue-components -D
+npm i @vant/auto-import-resolver unplugin-vue-components unplugin-auto-import -D
 
 # via yarn
-yarn add @vant/auto-import-resolver unplugin-vue-components -D
+yarn add @vant/auto-import-resolver unplugin-vue-components unplugin-auto-import -D
 
 # via pnpm
-pnpm add @vant/auto-import-resolver unplugin-vue-components -D
+pnpm add @vant/auto-import-resolver unplugin-vue-components unplugin-auto-import -D
 
 # via Bun
-bun add @vant/auto-import-resolver unplugin-vue-components -D
+bun add @vant/auto-import-resolver unplugin-vue-components unplugin-auto-import -D
 ```
 
 ## Usage
@@ -32,11 +32,15 @@ bun add @vant/auto-import-resolver unplugin-vue-components -D
 
 ```ts
 // vite.config.ts
+import AutoImport from 'unplugin-auto-import/vite';
 import Components from 'unplugin-vue-components/vite';
 import { VantResolver } from '@vant/auto-import-resolver';
 
 export default defineConfig({
   plugins: [
+    AutoImport({
+      resolvers: [VantResolver()],
+    }),
     Components({
       resolvers: [VantResolver()],
     }),
@@ -48,11 +52,15 @@ export default defineConfig({
 
 ```ts
 // rollup.config.js
+import AutoImport from 'unplugin-auto-import/rollup';
 import Components from 'unplugin-vue-components/rollup';
 import { VantResolver } from '@vant/auto-import-resolver';
 
 export default {
   plugins: [
+    AutoImport({
+      resolvers: [VantResolver()],
+    }),
     Components({
       resolvers: [VantResolver()],
     }),
@@ -64,11 +72,15 @@ export default {
 
 ```ts
 // webpack.config.js
+import AutoImport from 'unplugin-auto-import/webpack';
 import Components from 'unplugin-vue-components/webpack';
 import { VantResolver } from '@vant/auto-import-resolver';
 
 module.exports = {
   plugins: [
+    AutoImport({
+      resolvers: [VantResolver()],
+    }),
     Components({
       resolvers: [VantResolver()],
     }),
@@ -80,11 +92,15 @@ module.exports = {
 
 ```ts
 // rspack.config.js
+import AutoImport from 'unplugin-auto-import/rspack';
 import Components from 'unplugin-vue-components/rspack';
 import { VantResolver } from '@vant/auto-import-resolver';
 
 module.exports = {
   plugins: [
+    AutoImport({
+      resolvers: [VantResolver()],
+    }),
     Components({
       resolvers: [VantResolver()],
     }),
@@ -96,12 +112,16 @@ module.exports = {
 
 ```ts
 // vue.config.js
+import AutoImport from 'unplugin-auto-import/webpack';
 import Components from 'unplugin-vue-components/webpack';
 import { VantResolver } from '@vant/auto-import-resolver';
 
 module.exports = {
   configureWebpack: {
     plugins: [
+      AutoImport({
+        resolvers: [VantResolver()],
+      }),
       Components({
         resolvers: [VantResolver()],
       }),
@@ -115,11 +135,15 @@ module.exports = {
 ```ts
 // esbuild.config.js
 import { build } from 'esbuild';
+import AutoImport from 'unplugin-auto-import/esbuild';
 import Components from 'unplugin-vue-components/esbuild';
 import { VantResolver } from '@vant/auto-import-resolver';
 
 build({
   plugins: [
+    AutoImport({
+      resolvers: [VantResolver()],
+    }),
     Components({
       resolvers: [VantResolver()],
     }),