From 28d5bb37b9e701e96149b6135e049e1c55920a23 Mon Sep 17 00:00:00 2001 From: userquin Date: Fri, 19 Sep 2025 16:00:11 +0200 Subject: [PATCH 1/4] fix(auto-resolver): add `auto-resolver` subpackage export with types only --- packages/router/auto-resolver.d.mts | 12 ++++++++++++ packages/router/package.json | 4 ++++ 2 files changed, 16 insertions(+) create mode 100644 packages/router/auto-resolver.d.mts diff --git a/packages/router/auto-resolver.d.mts b/packages/router/auto-resolver.d.mts new file mode 100644 index 000000000..87a8f1a57 --- /dev/null +++ b/packages/router/auto-resolver.d.mts @@ -0,0 +1,12 @@ +declare module 'vue-router/auto-resolver' { + import type { + EXPERIMENTAL_Router, + EXPERIMENTAL_RouterOptions, + } from 'vue-router/experimental' + + export function handleHotUpdate(router: EXPERIMENTAL_Router): void + + const resolver: EXPERIMENTAL_RouterOptions['resolver'] + + export { resolver } +} diff --git a/packages/router/package.json b/packages/router/package.json index 647962757..3b332348d 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -28,6 +28,9 @@ "./vetur/*": "./vetur/*", "./package.json": "./package.json", "./experimental": "./dist/experimental/index.mjs", + "./auto-resolver": { + "types": "./auto-resolver.d.mts" + }, "./auto-routes": { "types": "./vue-router-auto-routes.d.ts", "node": { @@ -79,6 +82,7 @@ }, "homepage": "https://router.vuejs.org", "files": [ + "auto-resolver.d.mts", "index.js", "vue-router.node.mjs", "vue-router-auto.d.ts", From e9dc56c019b1fb685b4eba9098b6084c47f4b747 Mon Sep 17 00:00:00 2001 From: Eduardo San Martin Morote Date: Thu, 25 Sep 2025 17:31:18 +0200 Subject: [PATCH 2/4] refactor: rename file and remove module declaration --- packages/router/auto-resolver.d.mts | 12 ------------ packages/router/vue-router-auto-resolver.d.mts | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) delete mode 100644 packages/router/auto-resolver.d.mts create mode 100644 packages/router/vue-router-auto-resolver.d.mts diff --git a/packages/router/auto-resolver.d.mts b/packages/router/auto-resolver.d.mts deleted file mode 100644 index 87a8f1a57..000000000 --- a/packages/router/auto-resolver.d.mts +++ /dev/null @@ -1,12 +0,0 @@ -declare module 'vue-router/auto-resolver' { - import type { - EXPERIMENTAL_Router, - EXPERIMENTAL_RouterOptions, - } from 'vue-router/experimental' - - export function handleHotUpdate(router: EXPERIMENTAL_Router): void - - const resolver: EXPERIMENTAL_RouterOptions['resolver'] - - export { resolver } -} diff --git a/packages/router/vue-router-auto-resolver.d.mts b/packages/router/vue-router-auto-resolver.d.mts new file mode 100644 index 000000000..69cf61cdb --- /dev/null +++ b/packages/router/vue-router-auto-resolver.d.mts @@ -0,0 +1,16 @@ +import type { + EXPERIMENTAL_Router, + EXPERIMENTAL_RouterOptions, +} from 'vue-router/experimental' + +/** + * Handles HMR. + * Generated by unplugin-vue-router + */ +export declare function handleHotUpdate(router: EXPERIMENTAL_Router): void + +/** + * Custom resolver automatically generated at build time + * Generated by unplugin-vue-router + */ +export declare const resolver: EXPERIMENTAL_RouterOptions['resolver'] From 4f1a37a16f1543043855dd97c32377dae994065b Mon Sep 17 00:00:00 2001 From: Eduardo San Martin Morote Date: Thu, 25 Sep 2025 17:46:51 +0200 Subject: [PATCH 3/4] chore: oops --- packages/router/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/router/package.json b/packages/router/package.json index 3b332348d..7850e571c 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -29,7 +29,7 @@ "./package.json": "./package.json", "./experimental": "./dist/experimental/index.mjs", "./auto-resolver": { - "types": "./auto-resolver.d.mts" + "types": "./vue-router-auto-resolver.d.mts" }, "./auto-routes": { "types": "./vue-router-auto-routes.d.ts", @@ -82,7 +82,7 @@ }, "homepage": "https://router.vuejs.org", "files": [ - "auto-resolver.d.mts", + "vue-router-auto-resolver.d.mts", "index.js", "vue-router.node.mjs", "vue-router-auto.d.ts", From 45b68428185d17395199eee02451e9573dec1c26 Mon Sep 17 00:00:00 2001 From: Eduardo San Martin Morote Date: Thu, 25 Sep 2025 17:55:03 +0200 Subject: [PATCH 4/4] chore: turns out the declare module is needed for the moment to let ts merge --- .../router/vue-router-auto-resolver.d.mts | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/router/vue-router-auto-resolver.d.mts b/packages/router/vue-router-auto-resolver.d.mts index 69cf61cdb..a7b312ce4 100644 --- a/packages/router/vue-router-auto-resolver.d.mts +++ b/packages/router/vue-router-auto-resolver.d.mts @@ -1,16 +1,18 @@ -import type { - EXPERIMENTAL_Router, - EXPERIMENTAL_RouterOptions, -} from 'vue-router/experimental' +declare module 'vue-router/auto-resolver' { + import type { + EXPERIMENTAL_Router, + EXPERIMENTAL_RouterOptions, + } from 'vue-router/experimental' -/** - * Handles HMR. - * Generated by unplugin-vue-router - */ -export declare function handleHotUpdate(router: EXPERIMENTAL_Router): void + /** + * Handles HMR. + * Generated by unplugin-vue-router + */ + export function handleHotUpdate(router: EXPERIMENTAL_Router): void -/** - * Custom resolver automatically generated at build time - * Generated by unplugin-vue-router - */ -export declare const resolver: EXPERIMENTAL_RouterOptions['resolver'] + /** + * Custom resolver automatically generated at build time + * Generated by unplugin-vue-router + */ + export const resolver: EXPERIMENTAL_RouterOptions['resolver'] +}