From: skirtle <65301168+skirtles-code@users.noreply.github.com> Date: Thu, 27 Feb 2025 09:02:44 +0000 (+0000) Subject: chore: upgrade to Prettier 3 (#2467) X-Git-Tag: v4.5.1~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3753ede2e6bf2cdf8955bb6b22deb7af8de45d94;p=thirdparty%2Fvuejs%2Frouter.git chore: upgrade to Prettier 3 (#2467) --- diff --git a/package.json b/package.json index 1abe26ea..94e3d963 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "lint-staged": "^15.2.10", "minimist": "^1.2.8", "p-series": "^3.0.0", - "prettier": "^2.8.8", + "prettier": "^3.5.2", "semver": "^7.6.3", "simple-git-hooks": "^2.11.1", "typedoc": "^0.26.11", diff --git a/packages/playground/index.html b/packages/playground/index.html index 665a0ec9..8e6aeb4a 100644 --- a/packages/playground/index.html +++ b/packages/playground/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/router/__tests__/RouterLink.spec.ts b/packages/router/__tests__/RouterLink.spec.ts index ccca9fdb..9a0a5145 100644 --- a/packages/router/__tests__/RouterLink.spec.ts +++ b/packages/router/__tests__/RouterLink.spec.ts @@ -47,7 +47,7 @@ function createLocations< normalized: RouteLocationResolved toResolve?: MatcherLocationRaw & Required } - > + >, >(locs: T) { return locs } diff --git a/packages/router/__tests__/guards/guardsContext.spec.ts b/packages/router/__tests__/guards/guardsContext.spec.ts index 9eb59b80..dd8de481 100644 --- a/packages/router/__tests__/guards/guardsContext.spec.ts +++ b/packages/router/__tests__/guards/guardsContext.spec.ts @@ -12,12 +12,15 @@ const component = { describe('beforeRouteLeave', () => { it('invokes with the component context', async () => { expect.assertions(2) - const spy = vi - .fn() - .mockImplementationOnce(function (this: any, to, from, next) { - expect(typeof this.counter).toBe('number') - next() - }) + const spy = vi.fn().mockImplementationOnce(function ( + this: any, + to, + from, + next + ) { + expect(typeof this.counter).toBe('number') + next() + }) const WithLeave = defineComponent({ template: `text`, // we use data to check if the context is the right one because saving `this` in a variable logs a few warnings @@ -54,23 +57,29 @@ describe('beforeRouteLeave', () => { template: `text`, // we use data to check if the context is the right one because saving `this` in a variable logs a few warnings data: () => ({ counter: 0 }), - beforeRouteLeave: vi - .fn() - .mockImplementationOnce(function (this: any, to, from, next) { - expect(typeof this.counter).toBe('number') - next() - }), + beforeRouteLeave: vi.fn().mockImplementationOnce(function ( + this: any, + to, + from, + next + ) { + expect(typeof this.counter).toBe('number') + next() + }), }) const WithLeaveTwo = defineComponent({ template: `text`, // we use data to check if the context is the right one because saving `this` in a variable logs a few warnings data: () => ({ counter: 0 }), - beforeRouteLeave: vi - .fn() - .mockImplementationOnce(function (this: any, to, from, next) { - expect(typeof this.counter).toBe('number') - next() - }), + beforeRouteLeave: vi.fn().mockImplementationOnce(function ( + this: any, + to, + from, + next + ) { + expect(typeof this.counter).toBe('number') + next() + }), }) const router = createRouter({ @@ -108,23 +117,29 @@ describe('beforeRouteLeave', () => { template: ``, // we use data to check if the context is the right one because saving `this` in a variable logs a few warnings data: () => ({ counter: 0 }), - beforeRouteLeave: vi - .fn() - .mockImplementationOnce(function (this: any, to, from, next) { - expect(typeof this.counter).toBe('number') - next() - }), + beforeRouteLeave: vi.fn().mockImplementationOnce(function ( + this: any, + to, + from, + next + ) { + expect(typeof this.counter).toBe('number') + next() + }), }) const WithLeave = defineComponent({ template: `text`, // we use data to check if the context is the right one because saving `this` in a variable logs a few warnings data: () => ({ counter: 0 }), - beforeRouteLeave: vi - .fn() - .mockImplementationOnce(function (this: any, to, from, next) { - expect(typeof this.counter).toBe('number') - next() - }), + beforeRouteLeave: vi.fn().mockImplementationOnce(function ( + this: any, + to, + from, + next + ) { + expect(typeof this.counter).toBe('number') + next() + }), }) const router = createRouter({ @@ -167,34 +182,43 @@ describe('beforeRouteLeave', () => { `, // we use data to check if the context is the right one because saving `this` in a variable logs a few warnings data: () => ({ counter: 0 }), - beforeRouteLeave: vi - .fn() - .mockImplementationOnce(function (this: any, to, from, next) { - expect(typeof this.counter).toBe('number') - next() - }), + beforeRouteLeave: vi.fn().mockImplementationOnce(function ( + this: any, + to, + from, + next + ) { + expect(typeof this.counter).toBe('number') + next() + }), }) const WithLeaveOne = defineComponent({ template: `text`, // we use data to check if the context is the right one because saving `this` in a variable logs a few warnings data: () => ({ counter: 0 }), - beforeRouteLeave: vi - .fn() - .mockImplementationOnce(function (this: any, to, from, next) { - expect(typeof this.counter).toBe('number') - next() - }), + beforeRouteLeave: vi.fn().mockImplementationOnce(function ( + this: any, + to, + from, + next + ) { + expect(typeof this.counter).toBe('number') + next() + }), }) const WithLeaveTwo = defineComponent({ template: `text`, // we use data to check if the context is the right one because saving `this` in a variable logs a few warnings data: () => ({ counter: 0 }), - beforeRouteLeave: vi - .fn() - .mockImplementationOnce(function (this: any, to, from, next) { - expect(typeof this.counter).toBe('number') - next() - }), + beforeRouteLeave: vi.fn().mockImplementationOnce(function ( + this: any, + to, + from, + next + ) { + expect(typeof this.counter).toBe('number') + next() + }), }) const router = createRouter({ @@ -235,12 +259,15 @@ describe('beforeRouteLeave', () => { describe('beforeRouteUpdate', () => { it('invokes with the component context', async () => { expect.assertions(2) - const spy = vi - .fn() - .mockImplementationOnce(function (this: any, to, from, next) { - expect(typeof this.counter).toBe('number') - next() - }) + const spy = vi.fn().mockImplementationOnce(function ( + this: any, + to, + from, + next + ) { + expect(typeof this.counter).toBe('number') + next() + }) const WithParam = defineComponent({ template: `text`, // we use data to check if the context is the right one because saving `this` in a variable logs a few warnings diff --git a/packages/router/__tests__/lazyLoading.spec.ts b/packages/router/__tests__/lazyLoading.spec.ts index 03665566..1a821093 100644 --- a/packages/router/__tests__/lazyLoading.spec.ts +++ b/packages/router/__tests__/lazyLoading.spec.ts @@ -26,7 +26,7 @@ function createLazyComponent() { const [promise, resolve, reject] = fakePromise() return { - component: vi.fn(() => promise.then(() => ({} as RouteComponent))), + component: vi.fn(() => promise.then(() => ({}) as RouteComponent)), promise, resolve, reject, diff --git a/packages/router/e2e/encoding/index.html b/packages/router/e2e/encoding/index.html index 35c8aba9..17424f16 100644 --- a/packages/router/e2e/encoding/index.html +++ b/packages/router/e2e/encoding/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/router/e2e/guards-instances/index.html b/packages/router/e2e/guards-instances/index.html index da5b204e..869ba4b9 100644 --- a/packages/router/e2e/guards-instances/index.html +++ b/packages/router/e2e/guards-instances/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/router/e2e/hash/index.html b/packages/router/e2e/hash/index.html index 58125886..c8a7db71 100644 --- a/packages/router/e2e/hash/index.html +++ b/packages/router/e2e/hash/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/router/e2e/index.html b/packages/router/e2e/index.html index 4d5ad1e0..af9ce61c 100644 --- a/packages/router/e2e/index.html +++ b/packages/router/e2e/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/router/e2e/keep-alive/index.html b/packages/router/e2e/keep-alive/index.html index 9db3f3af..42749358 100644 --- a/packages/router/e2e/keep-alive/index.html +++ b/packages/router/e2e/keep-alive/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/router/e2e/modal/index.html b/packages/router/e2e/modal/index.html index 7e443a4d..59eb6fd0 100644 --- a/packages/router/e2e/modal/index.html +++ b/packages/router/e2e/modal/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/router/e2e/multi-app/index.html b/packages/router/e2e/multi-app/index.html index 683f593c..29dd3c6a 100644 --- a/packages/router/e2e/multi-app/index.html +++ b/packages/router/e2e/multi-app/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/router/e2e/scroll-behavior/index.html b/packages/router/e2e/scroll-behavior/index.html index 09306ce6..249d662e 100644 --- a/packages/router/e2e/scroll-behavior/index.html +++ b/packages/router/e2e/scroll-behavior/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/router/e2e/suspense/index.html b/packages/router/e2e/suspense/index.html index 6a12fe5d..dc123ca9 100644 --- a/packages/router/e2e/suspense/index.html +++ b/packages/router/e2e/suspense/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/router/e2e/transitions/index.html b/packages/router/e2e/transitions/index.html index b32a2874..e4eb21a3 100644 --- a/packages/router/e2e/transitions/index.html +++ b/packages/router/e2e/transitions/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/router/src/RouterLink.ts b/packages/router/src/RouterLink.ts index 6ca52508..81184565 100644 --- a/packages/router/src/RouterLink.ts +++ b/packages/router/src/RouterLink.ts @@ -455,5 +455,5 @@ const getLinkClass = ( propClass != null ? propClass : globalClass != null - ? globalClass - : defaultClass + ? globalClass + : defaultClass diff --git a/packages/router/src/RouterView.ts b/packages/router/src/RouterView.ts index 33a09b50..a456c2b6 100644 --- a/packages/router/src/RouterView.ts +++ b/packages/router/src/RouterView.ts @@ -154,8 +154,8 @@ export const RouterViewImpl = /*#__PURE__*/ defineComponent({ ? routePropsOption === true ? route.params : typeof routePropsOption === 'function' - ? routePropsOption(route) - : routePropsOption + ? routePropsOption(route) + : routePropsOption : null const onVnodeUnmounted: VNodeProps['onVnodeUnmounted'] = vnode => { diff --git a/packages/router/src/location.ts b/packages/router/src/location.ts index 08c2b744..c786e0ae 100644 --- a/packages/router/src/location.ts +++ b/packages/router/src/location.ts @@ -175,8 +175,8 @@ function isSameRouteLocationParamsValue( return isArray(a) ? isEquivalentArray(a, b) : isArray(b) - ? isEquivalentArray(b, a) - : a === b + ? isEquivalentArray(b, a) + : a === b } /** diff --git a/packages/router/src/navigationGuards.ts b/packages/router/src/navigationGuards.ts index 90c079f7..db53c3dc 100644 --- a/packages/router/src/navigationGuards.ts +++ b/packages/router/src/navigationGuards.ts @@ -360,35 +360,40 @@ export function loadRouteLocation( record => record.components && Promise.all( - Object.keys(record.components).reduce((promises, name) => { - const rawComponent = record.components![name] - if ( - typeof rawComponent === 'function' && - !('displayName' in rawComponent) - ) { - promises.push( - (rawComponent as Lazy)().then(resolved => { - if (!resolved) - return Promise.reject( - new Error( - `Couldn't resolve component "${name}" at "${record.path}". Ensure you passed a function that returns a promise.` - ) - ) + Object.keys(record.components).reduce( + (promises, name) => { + const rawComponent = record.components![name] + if ( + typeof rawComponent === 'function' && + !('displayName' in rawComponent) + ) { + promises.push( + (rawComponent as Lazy)().then( + resolved => { + if (!resolved) + return Promise.reject( + new Error( + `Couldn't resolve component "${name}" at "${record.path}". Ensure you passed a function that returns a promise.` + ) + ) - const resolvedComponent = isESModule(resolved) - ? resolved.default - : resolved - // keep the resolved module for plugins like data loaders - record.mods[name] = resolved - // replace the function with the resolved component - // cannot be null or undefined because we went into the for loop - record.components![name] = resolvedComponent - return - }) - ) - } - return promises - }, [] as Array>) + const resolvedComponent = isESModule(resolved) + ? resolved.default + : resolved + // keep the resolved module for plugins like data loaders + record.mods[name] = resolved + // replace the function with the resolved component + // cannot be null or undefined because we went into the for loop + record.components![name] = resolvedComponent + return + } + ) + ) + } + return promises + }, + [] as Array> + ) ) ) ).then(() => route as RouteLocationNormalizedLoaded) diff --git a/packages/router/src/query.ts b/packages/router/src/query.ts index 94d91461..35e2e9f8 100644 --- a/packages/router/src/query.ts +++ b/packages/router/src/query.ts @@ -140,8 +140,8 @@ export function normalizeQuery( normalizedQuery[key] = isArray(value) ? value.map(v => (v == null ? null : '' + v)) : value == null - ? value - : '' + value + ? value + : '' + value } } diff --git a/packages/router/src/typed-routes/params.ts b/packages/router/src/typed-routes/params.ts index 63dc8e9b..6e1dae5a 100644 --- a/packages/router/src/typed-routes/params.ts +++ b/packages/router/src/typed-routes/params.ts @@ -6,7 +6,7 @@ import type { RouteMap } from './route-map' */ export type ParamValueOneOrMore = [ ParamValue, - ...ParamValue[] + ...ParamValue[], ] /** diff --git a/packages/router/src/typed-routes/route-location.ts b/packages/router/src/typed-routes/route-location.ts index 3be52576..d370c99a 100644 --- a/packages/router/src/typed-routes/route-location.ts +++ b/packages/router/src/typed-routes/route-location.ts @@ -30,7 +30,7 @@ export interface RouteLocationGeneric extends _RouteLocationBase { */ export interface RouteLocationTyped< RouteMap extends RouteMapGeneric, - Name extends keyof RouteMap + Name extends keyof RouteMap, > extends RouteLocationGeneric { // Extract is needed because keyof can produce numbers name: Extract @@ -42,7 +42,7 @@ export interface RouteLocationTyped< * @internal */ export type RouteLocationTypedList< - RouteMap extends RouteMapGeneric = RouteMapGeneric + RouteMap extends RouteMapGeneric = RouteMapGeneric, > = { [N in keyof RouteMap]: RouteLocationTyped } /** @@ -62,7 +62,7 @@ export interface RouteLocationNormalizedGeneric extends _RouteLocationBase { */ export interface RouteLocationNormalizedTyped< RouteMap extends RouteMapGeneric = RouteMapGeneric, - Name extends keyof RouteMap = keyof RouteMap + Name extends keyof RouteMap = keyof RouteMap, > extends RouteLocationNormalizedGeneric { name: Extract // we don't override path because it could contain params and in practice it's just not useful @@ -79,7 +79,7 @@ export interface RouteLocationNormalizedTyped< * @internal */ export type RouteLocationNormalizedTypedList< - RouteMap extends RouteMapGeneric = RouteMapGeneric + RouteMap extends RouteMapGeneric = RouteMapGeneric, > = { [N in keyof RouteMap]: RouteLocationNormalizedTyped } /** @@ -101,7 +101,7 @@ export interface RouteLocationNormalizedLoadedGeneric */ export interface RouteLocationNormalizedLoadedTyped< RouteMap extends RouteMapGeneric = RouteMapGeneric, - Name extends keyof RouteMap = keyof RouteMap + Name extends keyof RouteMap = keyof RouteMap, > extends RouteLocationNormalizedLoadedGeneric { name: Extract // we don't override path because it could contain params and in practice it's just not useful @@ -113,7 +113,7 @@ export interface RouteLocationNormalizedLoadedTyped< * @internal */ export type RouteLocationNormalizedLoadedTypedList< - RouteMap extends RouteMapGeneric = RouteMapGeneric + RouteMap extends RouteMapGeneric = RouteMapGeneric, > = { [N in keyof RouteMap]: RouteLocationNormalizedLoadedTyped } /** @@ -135,7 +135,7 @@ export interface RouteLocationAsRelativeGeneric */ export interface RouteLocationAsRelativeTyped< RouteMap extends RouteMapGeneric = RouteMapGeneric, - Name extends keyof RouteMap = keyof RouteMap + Name extends keyof RouteMap = keyof RouteMap, > extends RouteLocationAsRelativeGeneric { name?: Extract params?: RouteMap[Name]['paramsRaw'] @@ -146,7 +146,7 @@ export interface RouteLocationAsRelativeTyped< * @internal */ export type RouteLocationAsRelativeTypedList< - RouteMap extends RouteMapGeneric = RouteMapGeneric + RouteMap extends RouteMapGeneric = RouteMapGeneric, > = { [N in keyof RouteMap]: RouteLocationAsRelativeTyped } /** @@ -166,7 +166,7 @@ export interface RouteLocationAsPathGeneric */ export interface RouteLocationAsPathTyped< RouteMap extends RouteMapGeneric = RouteMapGeneric, - Name extends keyof RouteMap = keyof RouteMap + Name extends keyof RouteMap = keyof RouteMap, > extends RouteLocationAsPathGeneric { path: _LiteralUnion @@ -179,7 +179,7 @@ export interface RouteLocationAsPathTyped< * @internal */ export type RouteLocationAsPathTypedList< - RouteMap extends RouteMapGeneric = RouteMapGeneric + RouteMap extends RouteMapGeneric = RouteMapGeneric, > = { [N in keyof RouteMap]: RouteLocationAsPathTyped } /** @@ -187,7 +187,7 @@ export type RouteLocationAsPathTypedList< */ export type RouteLocationAsStringTyped< RouteMap extends RouteMapGeneric = RouteMapGeneric, - Name extends keyof RouteMap = keyof RouteMap + Name extends keyof RouteMap = keyof RouteMap, > = RouteMap[Name]['path'] /** @@ -195,7 +195,7 @@ export type RouteLocationAsStringTyped< * @internal */ export type RouteLocationAsStringTypedList< - RouteMap extends RouteMapGeneric = RouteMapGeneric + RouteMap extends RouteMapGeneric = RouteMapGeneric, > = { [N in keyof RouteMap]: RouteLocationAsStringTyped } /** @@ -213,7 +213,7 @@ export interface RouteLocationResolvedGeneric extends RouteLocationGeneric { */ export interface RouteLocationResolvedTyped< RouteMap extends RouteMapGeneric, - Name extends keyof RouteMap + Name extends keyof RouteMap, > extends RouteLocationTyped { /** * Resolved `href` for the route location that will be set on the ``. @@ -226,7 +226,7 @@ export interface RouteLocationResolvedTyped< * @internal */ export type RouteLocationResolvedTypedList< - RouteMap extends RouteMapGeneric = RouteMapGeneric + RouteMap extends RouteMapGeneric = RouteMapGeneric, > = { [N in keyof RouteMap]: RouteLocationResolvedTyped } /** @@ -246,7 +246,7 @@ export type RouteLocation = * {@link RouteLocationNormalizedTyped.matched | `matched` property} cannot contain redirect records */ export type RouteLocationNormalized< - Name extends keyof RouteMap = keyof RouteMap + Name extends keyof RouteMap = keyof RouteMap, > = RouteMapGeneric extends RouteMap ? RouteLocationNormalizedGeneric : RouteLocationNormalizedTypedList[Name] @@ -256,7 +256,7 @@ export type RouteLocationNormalized< * In other words, it's ready to be rendered by ``. */ export type RouteLocationNormalizedLoaded< - Name extends keyof RouteMap = keyof RouteMap + Name extends keyof RouteMap = keyof RouteMap, > = RouteMapGeneric extends RouteMap ? RouteLocationNormalizedLoadedGeneric : RouteLocationNormalizedLoadedTypedList[Name] @@ -266,7 +266,7 @@ export type RouteLocationNormalizedLoaded< * `hash` to conveniently change them. */ export type RouteLocationAsRelative< - Name extends keyof RouteMap = keyof RouteMap + Name extends keyof RouteMap = keyof RouteMap, > = RouteMapGeneric extends RouteMap ? RouteLocationAsRelativeGeneric : RouteLocationAsRelativeTypedList[Name] @@ -275,7 +275,7 @@ export type RouteLocationAsRelative< * Route location resolved with {@link Router | `router.resolve()`}. */ export type RouteLocationResolved< - Name extends keyof RouteMap = keyof RouteMap + Name extends keyof RouteMap = keyof RouteMap, > = RouteMapGeneric extends RouteMap ? RouteLocationResolvedGeneric : RouteLocationResolvedTypedList[Name] @@ -284,7 +284,7 @@ export type RouteLocationResolved< * Same as {@link RouteLocationAsPath} but as a string literal. */ export type RouteLocationAsString< - Name extends keyof RouteMap = keyof RouteMap + Name extends keyof RouteMap = keyof RouteMap, > = RouteMapGeneric extends RouteMap ? string : _LiteralUnion[Name], string> diff --git a/packages/router/src/typed-routes/route-map.ts b/packages/router/src/typed-routes/route-map.ts index b2601409..b68c72a2 100644 --- a/packages/router/src/typed-routes/route-map.ts +++ b/packages/router/src/typed-routes/route-map.ts @@ -17,7 +17,7 @@ export interface RouteRecordInfo< // TODO: could probably be inferred from the Params ParamsRaw extends RouteParamsRawGeneric = RouteParamsRawGeneric, Params extends RouteParamsGeneric = RouteParamsGeneric, - Meta extends RouteMeta = RouteMeta + Meta extends RouteMeta = RouteMeta, > { name: Name path: Path @@ -30,12 +30,10 @@ export interface RouteRecordInfo< /** * Convenience type to get the typed RouteMap or a generic one if not provided. It is extracted from the {@link TypesConfig} if it exists, it becomes {@link RouteMapGeneric} otherwise. */ -export type RouteMap = TypesConfig extends Record< - 'RouteNamedMap', - infer RouteNamedMap -> - ? RouteNamedMap - : RouteMapGeneric +export type RouteMap = + TypesConfig extends Record<'RouteNamedMap', infer RouteNamedMap> + ? RouteNamedMap + : RouteMapGeneric /** * Generic version of the `RouteMap`. diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 648c9efe..cdafc5d6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,8 +39,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 prettier: - specifier: ^2.8.8 - version: 2.8.8 + specifier: ^3.5.2 + version: 3.5.2 semver: specifier: ^7.6.3 version: 7.6.3 @@ -2821,9 +2821,9 @@ packages: preact@10.25.0: resolution: {integrity: sha512-6bYnzlLxXV3OSpUxLdaxBmE7PMOu0aR3pG6lryK/0jmvcDFPlcXGQAt5DpK3RITWiDrfYZRI0druyaK/S9kYLg==} - prettier@2.8.8: - resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} - engines: {node: '>=10.13.0'} + prettier@3.5.2: + resolution: {integrity: sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==} + engines: {node: '>=14'} hasBin: true pretty-ms@9.1.0: @@ -6498,7 +6498,7 @@ snapshots: preact@10.25.0: {} - prettier@2.8.8: {} + prettier@3.5.2: {} pretty-ms@9.1.0: dependencies: