diff --git a/package.json b/package.json index cd09b25..17d1429 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "mitt": "^3.0.1", "nprogress": "^0.2.0", "page-stack-vue3": "^2.5.6", - "pinia": "^2.2.1", + "pinia": "^2.2.0", "pinia-plugin-persistedstate": "^3.2.1", "radash": "^12.1.0", "tdesign-icons-vue-next": "^0.2.4", @@ -31,9 +31,9 @@ "ts-enum-util": "^4.1.0", "utils4u": "^1.0.24", "vant": "^4.9.4", - "vue": "^3.4.36", + "vue": "^3.4.35", "vue-page-stack": "^3.2.0", - "vue-router": "^4.4.3" + "vue-router": "^4.4.2" }, "devDependencies": { "@iconify/utils": "^2.1.30", @@ -63,9 +63,14 @@ "unplugin-auto-import": "^0.18.2", "unplugin-vue-components": "^0.27.3", "unplugin-vue-router": "^0.10.2", - "vite": "^5.4.0", + "vite": "^5.3.5", "vite-plugin-vue-devtools": "^7.3.7", "vitest": "^2.0.5", "vue-tsc": "^2.0.29" + }, + "pnpm": { + "patchedDependencies": { + "vue-router@4.4.3": "patches/vue-router@4.4.3.patch" + } } } \ No newline at end of file diff --git a/patches/vue-router@4.4.2.patch b/patches/vue-router@4.4.3.patch similarity index 98% rename from patches/vue-router@4.4.2.patch rename to patches/vue-router@4.4.3.patch index 07d2190..cd6fc62 100644 --- a/patches/vue-router@4.4.2.patch +++ b/patches/vue-router@4.4.3.patch @@ -1,12 +1,12 @@ -diff --git a/dist/vue-router.d.ts b/dist/vue-router.d.ts -index a66b6e0c627a9221a5394066666da49597891d07..19aa9d5c2d42a7221017265225d08c4467f1a69b 100644 ---- a/dist/vue-router.d.ts -+++ b/dist/vue-router.d.ts -@@ -1751,7 +1751,7 @@ export { } +diff --git a/dist/vue-router.d.ts b/dist/vue-router.d.ts +index a66b6e0c627a9221a5394066666da49597891d07..19aa9d5c2d42a7221017265225d08c4467f1a69b 100644 +--- a/dist/vue-router.d.ts ++++ b/dist/vue-router.d.ts +@@ -1751,7 +1751,7 @@ export { } * NOTE: this used to be `@vue/runtime-core` but it should have been `vue` for a long time. Using both declaration at * the same time breaks so using only one everywhere is the preferred way. */ --declare module 'vue' { +-declare module 'vue' { +declare module '@vue/runtime-core' { export interface ComponentCustomOptions { /** diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 769c0d0..1b88323 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,11 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +patchedDependencies: + vue-router@4.4.3: + hash: srtmpgmwmi3z5x3wdppdguh7mi + path: patches/vue-router@4.4.3.patch + importers: .: @@ -34,9 +39,9 @@ importers: version: 0.2.0 page-stack-vue3: specifier: ^2.5.6 - version: 2.5.6(vue-router@4.4.3(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)) + version: 2.5.6(vue-router@4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)) pinia: - specifier: ^2.2.1 + specifier: ^2.2.0 version: 2.2.1(typescript@5.5.4)(vue@3.4.36(typescript@5.5.4)) pinia-plugin-persistedstate: specifier: ^3.2.1 @@ -60,14 +65,14 @@ importers: specifier: ^4.9.4 version: 4.9.4(vue@3.4.36(typescript@5.5.4)) vue: - specifier: ^3.4.36 + specifier: ^3.4.35 version: 3.4.36(typescript@5.5.4) vue-page-stack: specifier: ^3.2.0 - version: 3.2.0(vue-router@4.4.3(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)) + version: 3.2.0(vue-router@4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)) vue-router: - specifier: ^4.4.3 - version: 4.4.3(vue@3.4.36(typescript@5.5.4)) + specifier: ^4.4.2 + version: 4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)) devDependencies: '@iconify/utils': specifier: ^2.1.30 @@ -149,9 +154,9 @@ importers: version: 0.27.3(@babel/parser@7.25.3)(rollup@4.20.0)(vue@3.4.36(typescript@5.5.4)) unplugin-vue-router: specifier: ^0.10.2 - version: 0.10.2(rollup@4.20.0)(vue-router@4.4.3(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)) + version: 0.10.2(rollup@4.20.0)(vue-router@4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)) vite: - specifier: ^5.4.0 + specifier: ^5.3.5 version: 5.4.0(@types/node@22.1.0)(less@4.2.0) vite-plugin-vue-devtools: specifier: ^7.3.7 @@ -4200,10 +4205,10 @@ snapshots: destr@2.0.3: {} - detect-browser-navigation-in-vue-router@1.1.0(vue-router@4.4.3(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)): + detect-browser-navigation-in-vue-router@1.1.0(vue-router@4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)): dependencies: vue: 3.4.36(typescript@5.5.4) - vue-router: 4.4.3(vue@3.4.36(typescript@5.5.4)) + vue-router: 4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)) dir-glob@3.0.1: dependencies: @@ -4950,10 +4955,10 @@ snapshots: package-json-from-dist@1.0.0: {} - page-stack-vue3@2.5.6(vue-router@4.4.3(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)): + page-stack-vue3@2.5.6(vue-router@4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)): dependencies: vue: 3.4.36(typescript@5.5.4) - vue-router: 4.4.3(vue@3.4.36(typescript@5.5.4)) + vue-router: 4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)) parent-module@1.0.1: dependencies: @@ -5381,7 +5386,7 @@ snapshots: - rollup - supports-color - unplugin-vue-router@0.10.2(rollup@4.20.0)(vue-router@4.4.3(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)): + unplugin-vue-router@0.10.2(rollup@4.20.0)(vue-router@4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)): dependencies: '@babel/types': 7.25.2 '@rollup/pluginutils': 5.1.0(rollup@4.20.0) @@ -5397,7 +5402,7 @@ snapshots: unplugin: 1.12.1 yaml: 2.5.0 optionalDependencies: - vue-router: 4.4.3(vue@3.4.36(typescript@5.5.4)) + vue-router: 4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)) transitivePeerDependencies: - rollup - vue @@ -5571,14 +5576,14 @@ snapshots: transitivePeerDependencies: - supports-color - vue-page-stack@3.2.0(vue-router@4.4.3(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)): + vue-page-stack@3.2.0(vue-router@4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)): dependencies: '@vue/shared': 3.4.36 - detect-browser-navigation-in-vue-router: 1.1.0(vue-router@4.4.3(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)) + detect-browser-navigation-in-vue-router: 1.1.0(vue-router@4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)))(vue@3.4.36(typescript@5.5.4)) vue: 3.4.36(typescript@5.5.4) - vue-router: 4.4.3(vue@3.4.36(typescript@5.5.4)) + vue-router: 4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)) - vue-router@4.4.3(vue@3.4.36(typescript@5.5.4)): + vue-router@4.4.3(patch_hash=srtmpgmwmi3z5x3wdppdguh7mi)(vue@3.4.36(typescript@5.5.4)): dependencies: '@vue/devtools-api': 6.6.3 vue: 3.4.36(typescript@5.5.4)