Merge commit '259063b2721d3cc1e820fa1f01864f49539d04a0' into main

* commit '259063b2721d3cc1e820fa1f01864f49539d04a0': (30 commits) feat: Add documentation cell feat: remove screen adaptation prompt feat: Improve the prompt for screen adaptation in night mode feat: add screen adaptation prompt chore: release v3.4.0 feat: Support JSON5 (easy-temps#136) chore: Update all deps chore: release v3.3.1 chore: Apply lint chore: Update vite deps optimization config chore: Update to vite 6 chore: pin typescript - vuejs/language-tools#5018 chore: Update all deps perf: control the nested display of related files for vscode (easy-temps#135) chore: release v3.3.0 refactor: combine vant i18n setup (easy-temps#133) feat: Lazy loading the localization files chore: release v3.2.1 chore: Update editorconfig fix: Add `route.name` null check (easy-temps#132) ...
qiyue2015 · Dec 14, 2024 · 170af51 · 170af51
2 parents 85246b2 + 259063b
commit 170af51
Show file tree

Hide file tree

Showing 34 changed files with 3,320 additions and 3,276 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,38 +1,9 @@
+root=true
+
 [*]
 charset=utf-8
-end_of_line=lf
-insert_final_newline=false
-indent_style=space
-indent_size=2
-
-[{*.ng,*.sht,*.html,*.shtm,*.shtml,*.htm}]
-indent_style=space
-indent_size=2
-
-[{*.jhm,*.xslt,*.xul,*.rng,*.xsl,*.xsd,*.ant,*.tld,*.fxml,*.jrxml,*.xml,*.jnlp,*.wsdl}]
-indent_style=space
-indent_size=2
-
-[{.babelrc,.stylelintrc,jest.config,.eslintrc,.prettierrc,*.json,*.jsb3,*.jsb2,*.bowerrc}]
-indent_style=space
-indent_size=2
-
-[*.svg]
-indent_style=space
-indent_size=2
-
-[*.js.map]
-indent_style=space
-indent_size=2
-
-[*.less]
-indent_style=space
-indent_size=2
-
-[{*.vue,*.ts,*.tsx}]
-indent_style=space
-indent_size=2
-
-[{.analysis_options,*.yml,*.yaml}]
 indent_style=space
 indent_size=2
+end_of_line=lf
+insert_final_newline=true
+trim_trailing_whitespace=true
diff --git a/.env b/.env
@@ -1,3 +1,4 @@
 VITE_APP_PUBLIC_PATH=/
 VITE_APP_PREVIEW=true
-VITE_APP_API_BASE_URL=/api
+VITE_APP_API_BASE_URL=/api
+VITE_APP_OUT_DIR=dist
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -3,7 +3,10 @@
     "Vue.volar",
     "antfu.unocss",
     "antfu.goto-alias",
+    "antfu.iconify",
+    "antfu.file-nesting",
     "lokalise.i18n-ally",
-    "antfu.iconify"
+    "blueglassblock.better-json5",
+    "dbaeumer.vscode-eslint"
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -33,6 +33,7 @@
     "html",
     "markdown",
     "json",
+    "json5",
     "jsonc",
     "yaml",
     "toml",

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ An mobile web apps template based on the Vue 3 ecosystem.
 
 [文档](https://easy-temps.github.io/easy-docs/vue3-vant-mobile/) / [交流](https://github.com/easy-temps/vue3-vant-mobile/issues/56) / [反馈](https://github.com/easy-temps/vue3-vant-mobile/issues)
 
-<a href="https://vue3-vant-mobile.netlify.app">Live Demo</a>
+<a href="https://vue3-vant-mobile.netlify.app">🖥 Live Demo</a>
 
 [![Netlify Status](https://api.netlify.com/api/v1/badges/e6828bd2-2904-4c3e-a67c-b97d32aa1275/deploy-status)](https://app.netlify.com/sites/vue3-vant-mobile/deploys)
 
@@ -114,11 +114,14 @@ An mobile web apps template based on the Vue 3 ecosystem.
 - [pnpm](https://pnpm.js.org/) - fast, disk space efficient package manager
 - [Netlify](https://www.netlify.com/) - zero-config deployment
 - [VS Code Extensions](./.vscode/extensions.json)
-  - [Vite](https://marketplace.visualstudio.com/items?itemName=antfu.vite) - Fire up Vite server automatically
   - [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) - Vue 3 `<script setup>` IDE support
+  - [Unocss](https://marketplace.visualstudio.com/items?itemName=antfu.unocss) - UnoCSS for VS Code
+  - [Goto Alias](https://marketplace.visualstudio.com/items?itemName=antfu.goto-alias) - Go to Definition following alias redirections
   - [Iconify IntelliSense](https://marketplace.visualstudio.com/items?itemName=antfu.iconify) - Icon inline display and autocomplete
+  - [File Nesting](https://marketplace.visualstudio.com/items?itemName=antfu.file-nesting) - Config of File Nesting for VS Code
   - [i18n Ally](https://marketplace.visualstudio.com/items?itemName=lokalise.i18n-ally) - All in one i18n support
-  - [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+  - [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) - Eslint support
+  - [Better JSON5](https://marketplace.visualstudio.com/items?itemName=blueglassblock.better-json5) - JSON5 support
 
 ## Try it now
 

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -20,7 +20,7 @@ An mobile web apps template based on the Vue 3 ecosystem.
 
 [文档](https://easy-temps.github.io/easy-docs/vue3-vant-mobile/) / [交流](https://github.com/easy-temps/vue3-vant-mobile/issues/56) / [反馈](https://github.com/easy-temps/vue3-vant-mobile/issues)
 
-<a href="https://vue3-vant-mobile.netlify.app">在线 Demo</a>
+<a href="https://vue3-vant-mobile.netlify.app">🖥 在线 Demo</a>
 
 [![Netlify Status](https://api.netlify.com/api/v1/badges/e6828bd2-2904-4c3e-a67c-b97d32aa1275/deploy-status)](https://app.netlify.com/sites/vue3-vant-mobile/deploys)
 
@@ -114,11 +114,14 @@ An mobile web apps template based on the Vue 3 ecosystem.
 - [pnpm](https://pnpm.js.org/) - 快, 节省磁盘空间的包管理器
 - [Netlify](https://www.netlify.com/) - 零配置的部署
 - [VS Code Extensions](./.vscode/extensions.json)
-  - [Vite](https://marketplace.visualstudio.com/items?itemName=antfu.vite) - 自动启动 Vite 服务器
   - [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) - Vue 3 `<script setup>` IDE 支持
+  - [Unocss](https://marketplace.visualstudio.com/items?itemName=antfu.unocss) - Unocss 智能提示
+  - [Goto Alias](https://marketplace.visualstudio.com/items?itemName=antfu.goto-alias) - 跳转到定义
   - [Iconify IntelliSense](https://marketplace.visualstudio.com/items?itemName=antfu.iconify) - 图标内联显示和自动补全
+  - [File Nesting](https://marketplace.visualstudio.com/items?itemName=antfu.file-nesting) - 文件嵌套
   - [i18n Ally](https://marketplace.visualstudio.com/items?itemName=lokalise.i18n-ally) - 多合一的 I18n 支持
-  - [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+  - [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) - ESLint 支持
+  - [Better JSON5](https://marketplace.visualstudio.com/items?itemName=blueglassblock.better-json5) - JSON5 支持
 
 ## 现在可以试试
 

diff --git a/build/vite/index.ts b/build/vite/index.ts
@@ -1,5 +1,6 @@
 import { dirname, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
+import process from 'node:process'
 import { unheadVueComposablesImports } from '@unhead/vue'
 import legacy from '@vitejs/plugin-legacy'
 import vue from '@vitejs/plugin-vue'
@@ -15,8 +16,11 @@ import Sitemap from 'vite-plugin-sitemap'
 import VueDevTools from 'vite-plugin-vue-devtools'
 import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'
 import { createViteVConsole } from './vconsole'
+import { loadEnv } from 'vite'
+
+export function createVitePlugins(mode: string) {
+  const env = loadEnv(mode, process.cwd())
 
-export function createVitePlugins() {
   return [
     // https://github.com/posva/unplugin-vue-router
     VueRouter({
@@ -28,7 +32,9 @@ export function createVitePlugins() {
     vue(),
 
     // https://github.com/jbaubree/vite-plugin-sitemap
-    Sitemap(),
+    Sitemap({
+      outDir: env.VITE_APP_OUT_DIR || 'dist',
+    }),
 
     // https://github.com/pengzhanbo/vite-plugin-mock-dev-server
     mockDevServerPlugin(),

diff --git a/build/vite/optimize.ts b/build/vite/optimize.ts
@@ -3,6 +3,7 @@ const include = [
   'echarts',
   'lodash-es',
   'resize-detector',
+  'vant/es',
   'vant/es/cell-group/style/index',
   'vant/es/popup/style/index',
   'vant/es/picker/style/index',
@@ -17,6 +18,13 @@ const include = [
   'vant/es/form/style/index',
   'vant/es/field/style/index',
   'vant/es/notify/style/index',
+  'vant/es/config-provider/style/index',
+  'vant/es/nav-bar/style/index',
+  'vant/es/tabbar/style/index',
+  'vant/es/tabbar-item/style/index',
+  'unplugin-vue-router/runtime',
+  'unplugin-vue-router/data-loaders',
+  'unplugin-vue-router/data-loaders/basic',
 ]
 
 const exclude = [

diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "vue3-vant-mobile",
   "type": "module",
-  "version": "3.0.0",
-  "packageManager": "pnpm@9.10.0",
-  "description": "Vue + Vite H5 Starter Template",
+  "version": "3.4.0",
+  "packageManager": "pnpm@9.15.0",
+  "description": "An mobile web apps template based on the Vue 3 ecosystem",
   "license": "MIT",
   "scripts": {
     "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
@@ -14,81 +14,73 @@
     "lint:fix": "eslint . --fix",
     "test": "vitest",
     "release": "bumpp --commit --push --tag",
-    "prepare": "husky"
+    "prepare": "husky",
+    "typecheck": "vue-tsc --noEmit"
   },
   "dependencies": {
-    "@unhead/vue": "^1.11.6",
+    "@unhead/vue": "^1.11.13",
     "@vant/touch-emulator": "^1.4.0",
     "@vant/use": "^1.6.0",
-    "@vueuse/core": "^11.1.0",
-    "axios": "^1.7.7",
+    "@vueuse/core": "^12.0.0",
+    "axios": "^1.7.9",
     "echarts": "^5.5.1",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
-    "pinia": "^2.2.2",
-    "pinia-plugin-persistedstate": "^4.0.2",
+    "pinia": "^2.3.0",
+    "pinia-plugin-persistedstate": "^4.1.3",
     "resize-detector": "^0.3.0",
-    "vant": "^4.9.6",
+    "vant": "^4.9.10",
     "vconsole": "^3.15.1",
-    "vue": "^3.5.6",
-    "vue-i18n": "^10.0.1",
-    "vue-router": "^4.4.5"
+    "vue": "^3.5.13",
+    "vue-i18n": "^10.0.5",
+    "vue-router": "^4.5.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "3.6.2",
-    "@iconify-json/carbon": "^1.2.1",
-    "@intlify/unplugin-vue-i18n": "^5.0.0",
+    "@antfu/eslint-config": "3.11.2",
+    "@iconify-json/carbon": "^1.2.4",
+    "@intlify/unplugin-vue-i18n": "^6.0.1",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.5.5",
+    "@types/node": "^22.10.1",
     "@types/nprogress": "^0.2.3",
-    "@unocss/eslint-plugin": "0.62.4",
-    "@unocss/preset-rem-to-px": "0.62.4",
+    "@unocss/eslint-plugin": "0.65.1",
+    "@unocss/preset-rem-to-px": "0.65.1",
     "@vant/auto-import-resolver": "^1.2.1",
-    "@vitejs/plugin-legacy": "^5.4.2",
-    "@vitejs/plugin-vue": "^5.1.4",
+    "@vitejs/plugin-legacy": "^6.0.0",
+    "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.20",
-    "bumpp": "^9.5.2",
+    "bumpp": "^9.9.0",
     "consola": "^3.2.3",
     "cross-env": "^7.0.3",
-    "eslint": "^9.10.0",
-    "eslint-plugin-format": "^0.1.2",
-    "husky": "^9.1.6",
-    "less": "^4.2.0",
+    "eslint": "^9.16.0",
+    "eslint-plugin-format": "^0.1.3",
+    "husky": "^9.1.7",
+    "less": "^4.2.1",
     "mockjs": "^1.1.0",
-    "postcss-mobile-forever": "^4.1.6",
-    "rollup": "^4.22.0",
-    "terser": "^5.33.0",
-    "typescript": "^5.6.2",
-    "unocss": "0.62.4",
-    "unplugin-auto-import": "^0.18.3",
-    "unplugin-vue-components": "^0.27.4",
-    "unplugin-vue-router": "^0.10.8",
-    "vite": "^5.4.6",
-    "vite-plugin-mock-dev-server": "^1.7.2",
-    "vite-plugin-pwa": "^0.20.5",
+    "postcss-mobile-forever": "^4.3.1",
+    "rollup": "^4.28.1",
+    "terser": "^5.37.0",
+    "typescript": "~5.6.3",
+    "unocss": "0.65.1",
+    "unplugin-auto-import": "^0.18.6",
+    "unplugin-vue-components": "^0.27.5",
+    "unplugin-vue-router": "^0.10.9",
+    "vite": "^6.0.3",
+    "vite-plugin-mock-dev-server": "^1.8.2",
+    "vite-plugin-pwa": "^0.21.1",
     "vite-plugin-sitemap": "^0.7.1",
     "vite-plugin-vconsole": "^2.1.1",
-    "vite-plugin-vue-devtools": "^7.4.5",
-    "vitest": "^2.1.1",
-    "vue-tsc": "^2.1.6"
+    "vite-plugin-vue-devtools": "^7.6.7",
+    "vitest": "^2.1.8",
+    "vue-tsc": "^2.1.10"
   },
   "pnpm": {
-    "peerDependencyRules": {
-      "ignoreMissing": [
-        "postcss",
-        "esbuild"
-      ],
-      "allowedVersions": {
-        "rollup": "^4.x"
-      },
-      "allowAny": [
-        "eslint"
-      ]
-    },
     "allowedDeprecatedVersions": {
       "glob": "7.2.3",
       "inflight": "1.0.6",
       "sourcemap-codec": "1.4.8"
     }
+  },
+  "resolutions": {
+    "vite": "^6.0.3"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ @@
         "html",
         "markdown",
         "json",
+        "json5",
         "jsonc",
         "yaml",
         "toml",
@@ Expand Down @@