fix: missing routes in typed-router.d.ts + ignore it from Prettier (#7746)

This commit is contained in:
Thierry Goettelmann
2024-06-14 10:10:33 +02:00
committed by GitHub
parent 32448cfa1b
commit 306a58e412
2 changed files with 21 additions and 20 deletions

View File

@@ -1,3 +1,6 @@
# Ignore Handlebars files because partials are not currently supported # Ignore Handlebars files because partials are not currently supported
# https://github.com/prettier/prettier/issues/11834 # https://github.com/prettier/prettier/issues/11834
**/*.hbs **/*.hbs
# Generated files
/@xen-orchestra/web/typed-router.d.ts

View File

@@ -39,12 +39,13 @@ import type {
declare module 'vue-router/auto/routes' { declare module 'vue-router/auto/routes' {
export interface RouteNamedMap { export interface RouteNamedMap {
'/': RouteRecordInfo<'/', '/', Record<never, never>, Record<never, never>> '/': RouteRecordInfo<'/', '/', Record<never, never>, Record<never, never>>,
'/dev/': RouteRecordInfo<'/dev/', '/dev', Record<never, never>, Record<never, never>> '/dev/': RouteRecordInfo<'/dev/', '/dev', Record<never, never>, Record<never, never>>,
'/dev/token': RouteRecordInfo<'/dev/token', '/dev/token', Record<never, never>, Record<never, never>> '/dev/token': RouteRecordInfo<'/dev/token', '/dev/token', Record<never, never>, Record<never, never>>,
'/host/[id]': RouteRecordInfo<'/host/[id]', '/host/:id', { id: ParamValue<true> }, { id: ParamValue<false> }> '/host/[id]': RouteRecordInfo<'/host/[id]', '/host/:id', { id: ParamValue<true> }, { id: ParamValue<false> }>,
'/pool/[id]': RouteRecordInfo<'/pool/[id]', '/pool/:id', { id: ParamValue<true> }, { id: ParamValue<false> }> '/pool/[id]': RouteRecordInfo<'/pool/[id]', '/pool/:id', { id: ParamValue<true> }, { id: ParamValue<false> }>,
'/vm/[id]': RouteRecordInfo<'/vm/[id]', '/vm/:id', { id: ParamValue<true> }, { id: ParamValue<false> }> '/vm/[id]/': RouteRecordInfo<'/vm/[id]/', '/vm/:id', { id: ParamValue<true> }, { id: ParamValue<false> }>,
'/vm/[id]/console': RouteRecordInfo<'/vm/[id]/console', '/vm/:id/console', { id: ParamValue<true> }, { id: ParamValue<false> }>,
} }
} }
@@ -57,28 +58,24 @@ declare module 'vue-router/auto' {
* Type safe version of `RouteLocationNormalized` (the type of `to` and `from` in navigation guards). * Type safe version of `RouteLocationNormalized` (the type of `to` and `from` in navigation guards).
* Allows passing the name of the route to be passed as a generic. * Allows passing the name of the route to be passed as a generic.
*/ */
export type RouteLocationNormalized<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = export type RouteLocationNormalized<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = RouteLocationNormalizedTypedList<RouteNamedMap>[Name]
RouteLocationNormalizedTypedList<RouteNamedMap>[Name]
/** /**
* Type safe version of `RouteLocationNormalizedLoaded` (the return type of `useRoute()`). * Type safe version of `RouteLocationNormalizedLoaded` (the return type of `useRoute()`).
* Allows passing the name of the route to be passed as a generic. * Allows passing the name of the route to be passed as a generic.
*/ */
export type RouteLocationNormalizedLoaded<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = export type RouteLocationNormalizedLoaded<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = RouteLocationNormalizedLoadedTypedList<RouteNamedMap>[Name]
RouteLocationNormalizedLoadedTypedList<RouteNamedMap>[Name]
/** /**
* Type safe version of `RouteLocationResolved` (the returned route of `router.resolve()`). * Type safe version of `RouteLocationResolved` (the returned route of `router.resolve()`).
* Allows passing the name of the route to be passed as a generic. * Allows passing the name of the route to be passed as a generic.
*/ */
export type RouteLocationResolved<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = export type RouteLocationResolved<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = RouteLocationResolvedTypedList<RouteNamedMap>[Name]
RouteLocationResolvedTypedList<RouteNamedMap>[Name]
/** /**
* Type safe version of `RouteLocation` . Allows passing the name of the route to be passed as a generic. * Type safe version of `RouteLocation` . Allows passing the name of the route to be passed as a generic.
*/ */
export type RouteLocation<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = export type RouteLocation<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = RouteLocationTypedList<RouteNamedMap>[Name]
RouteLocationTypedList<RouteNamedMap>[Name]
/** /**
* Type safe version of `RouteLocationRaw` . Allows passing the name of the route to be passed as a generic. * Type safe version of `RouteLocationRaw` . Allows passing the name of the route to be passed as a generic.
@@ -98,9 +95,7 @@ declare module 'vue-router/auto' {
export type RouteParamsRaw<Name extends keyof RouteNamedMap> = RouteNamedMap[Name]['paramsRaw'] export type RouteParamsRaw<Name extends keyof RouteNamedMap> = RouteNamedMap[Name]['paramsRaw']
export function useRouter(): RouterTyped export function useRouter(): RouterTyped
export function useRoute<Name extends keyof RouteNamedMap = keyof RouteNamedMap>( export function useRoute<Name extends keyof RouteNamedMap = keyof RouteNamedMap>(name?: Name): RouteLocationNormalizedLoadedTypedList<RouteNamedMap>[Name]
name?: Name
): RouteLocationNormalizedLoadedTypedList<RouteNamedMap>[Name]
export const useLink: UseLinkFnTyped<RouteNamedMap> export const useLink: UseLinkFnTyped<RouteNamedMap>
@@ -119,11 +114,14 @@ declare module 'vue-router/auto' {
>( >(
name: Name, name: Name,
loader: (route: RouteLocationNormalizedLoaded<Name>) => P, loader: (route: RouteLocationNormalizedLoaded<Name>) => P,
options?: _DefineLoaderOptions<isLazy> options?: _DefineLoaderOptions<isLazy>,
): _DataLoader<Awaited<P>, isLazy> ): _DataLoader<Awaited<P>, isLazy>
export function defineLoader<P extends Promise<any>, isLazy extends boolean = false>( export function defineLoader<
P extends Promise<any>,
isLazy extends boolean = false,
>(
loader: (route: RouteLocationNormalizedLoaded) => P, loader: (route: RouteLocationNormalizedLoaded) => P,
options?: _DefineLoaderOptions<isLazy> options?: _DefineLoaderOptions<isLazy>,
): _DataLoader<Awaited<P>, isLazy> ): _DataLoader<Awaited<P>, isLazy>
export { export {