From cec7feb2e975c135a7aefe44ab8ce6ca328d226f Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Tue, 7 Oct 2025 16:42:20 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#73848=20Update=20t?= =?UTF-8?q?ype=20for=20@ember/routing=20router.location=20because=20it's?= =?UTF-8?q?=20incorrect=20by=20@mansona?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- types/ember__routing/router.d.ts | 2 +- types/ember__routing/test/router.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/types/ember__routing/router.d.ts b/types/ember__routing/router.d.ts index 4eaf7beedc75d8..eb6ee94d7a434a 100644 --- a/types/ember__routing/router.d.ts +++ b/types/ember__routing/router.d.ts @@ -24,7 +24,7 @@ export default class Router extends EmberObject { * * @note the `'auto'` location is [deprecated](https://deprecations.emberjs.com/v4.x/#toc_deprecate-auto-location). */ - location: "history" | "hash" | "none" | "auto"; + location: string; /** * Represents the URL of the root of the application, often '/'. This prefix is * assumed on all routes defined on this router. diff --git a/types/ember__routing/test/router.ts b/types/ember__routing/test/router.ts index 1641390dae2356..3b71bfd636b83b 100755 --- a/types/ember__routing/test/router.ts +++ b/types/ember__routing/test/router.ts @@ -2,7 +2,9 @@ import EmberObject, { get } from "@ember/object"; import Router from "@ember/routing/router"; import Service, { inject as service } from "@ember/service"; -const AppRouter = Router.extend({}); +const AppRouter = Router.extend({ + location: "history", +}); AppRouter.map(function() { this.route("index", { path: "/" });