refactor(common): cleanup platformLocation (#50054)

* Drop the usage of @Inject() * Drop `supportsState` as its supported by evergreen browsers. PR Close #50054
angular · May 9, 2023 · bc65112 · bc65112
1 parent 258de81
commit bc65112
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 34 deletions.
diff --git a/goldens/public-api/common/index.md b/goldens/public-api/common/index.md
@@ -52,7 +52,7 @@ export class AsyncPipe implements OnDestroy, PipeTransform {
 
 // @public
 export class BrowserPlatformLocation extends PlatformLocation {
-    constructor(_doc: any);
+    constructor();
     // (undocumented)
     back(): void;
     // (undocumented)

diff --git a/packages/common/src/location/platform_location.ts b/packages/common/src/location/platform_location.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, InjectionToken, ɵɵinject} from '@angular/core';
+import {inject, Injectable, InjectionToken} from '@angular/core';
 
 import {getDOM} from '../dom_adapter';
 import {DOCUMENT} from '../dom_tokens';
@@ -33,11 +33,7 @@ import {DOCUMENT} from '../dom_tokens';
  *
  * @publicApi
  */
-@Injectable({
-  providedIn: 'platform',
-  // See #23917
-  useFactory: useBrowserPlatformLocation
-})
+@Injectable({providedIn: 'platform', useFactory: () => inject(BrowserPlatformLocation)})
 export abstract class PlatformLocation {
   abstract getBaseHrefFromDOM(): string;
   abstract getState(): unknown;
@@ -71,10 +67,6 @@ export abstract class PlatformLocation {
   }
 }
 
-export function useBrowserPlatformLocation() {
-  return ɵɵinject(BrowserPlatformLocation);
-}
-
 /**
  * @description
  * Indicates when a location is initialized.
@@ -112,14 +104,14 @@ export interface LocationChangeListener {
  */
 @Injectable({
   providedIn: 'platform',
-  // See #23917
-  useFactory: createBrowserPlatformLocation,
+  useFactory: () => new BrowserPlatformLocation(),
 })
 export class BrowserPlatformLocation extends PlatformLocation {
   private _location: Location;
   private _history: History;
+  private _doc = inject(DOCUMENT);
 
-  constructor(@Inject(DOCUMENT) private _doc: any) {
+  constructor() {
     super();
     this._location = window.location;
     this._history = window.history;
@@ -167,19 +159,11 @@ export class BrowserPlatformLocation extends PlatformLocation {
   }
 
   override pushState(state: any, title: string, url: string): void {
-    if (supportsState()) {
-      this._history.pushState(state, title, url);
-    } else {
-      this._location.hash = url;
-    }
+    this._history.pushState(state, title, url);
   }
 
   override replaceState(state: any, title: string, url: string): void {
-    if (supportsState()) {
-      this._history.replaceState(state, title, url);
-    } else {
-      this._location.hash = url;
-    }
+    this._history.replaceState(state, title, url);
   }
 
   override forward(): void {
@@ -198,10 +182,3 @@ export class BrowserPlatformLocation extends PlatformLocation {
     return this._history.state;
   }
 }
-
-export function supportsState(): boolean {
-  return !!window.history.pushState;
-}
-export function createBrowserPlatformLocation() {
-  return new BrowserPlatformLocation(ɵɵinject(DOCUMENT));
-}
diff --git a/packages/core/test/bundling/router/bundle.golden_symbols.json b/packages/core/test/bundling/router/bundle.golden_symbols.json
@@ -1988,9 +1988,6 @@
   {
     "name": "subsetMatchOptions"
   },
-  {
-    "name": "supportsState"
-  },
   {
     "name": "switchMap"
   },