vmuresanu · Sep 29, 2022
diff --git a/packages/router/src/index.ts b/packages/router/src/index.ts
@@ -6,15 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-
 export {createUrlTreeFromSnapshot} from './create_url_tree';
 export {RouterLink, RouterLinkWithHref} from './directives/router_link';
 export {RouterLinkActive} from './directives/router_link_active';
 export {RouterOutlet, RouterOutletContract} from './directives/router_outlet';
 export {ActivationEnd, ActivationStart, ChildActivationEnd, ChildActivationStart, Event, EventType, GuardsCheckEnd, GuardsCheckStart, NavigationCancel, NavigationCancellationCode as NavigationCancellationCode, NavigationEnd, NavigationError, NavigationStart, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RouterEvent, RoutesRecognized, Scroll} from './events';
 export {CanActivate, CanActivateChild, CanActivateChildFn, CanActivateFn, CanDeactivate, CanDeactivateFn, CanLoad, CanLoadFn, CanMatch, CanMatchFn, Data, LoadChildren, LoadChildrenCallback, NavigationBehaviorOptions, QueryParamsHandling, Resolve, ResolveData, ResolveFn, Route, Routes, RunGuardsAndResolvers, UrlMatcher, UrlMatchResult} from './models';
 export {DefaultTitleStrategy, TitleStrategy} from './page_title_strategy';
-export {DebugTracingFeature, DisabledInitialNavigationFeature, EnabledBlockingInitialNavigationFeature, InitialNavigationFeature, InMemoryScrollingFeature, PreloadingFeature, provideRouter, provideRoutes, RouterConfigurationFeature, RouterFeature, RouterFeatures, withDebugTracing, withDisabledInitialNavigation, withEnabledBlockingInitialNavigation, withInMemoryScrolling, withPreloading, withRouterConfig} from './provide_router';
+export {DebugTracingFeature, DisabledInitialNavigationFeature, EnabledBlockingInitialNavigationFeature, InitialNavigationFeature, InMemoryScrollingFeature, PreloadingFeature, provideRouter, provideRoutes, RouterConfigurationFeature, RouterFeature, RouterFeatures, withDebugTracing, withDisabledInitialNavigation, withEnabledBlockingInitialNavigation, withInMemoryScrolling, withLocationStrategy, withPreloading, withRouterConfig} from './provide_router';
 export {BaseRouteReuseStrategy, DetachedRouteHandle, RouteReuseStrategy} from './route_reuse_strategy';
 export {Navigation, NavigationExtras, Router, UrlCreationOptions} from './router';
 export {ExtraOptions, InitialNavigation, InMemoryScrollingOptions, ROUTER_CONFIGURATION, RouterConfigOptions} from './router_config';

diff --git a/packages/router/src/private_export.ts b/packages/router/src/private_export.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-
 export {ɵEmptyOutletComponent} from './components/empty_outlet';
-export {withPreloading as ɵwithPreloading} from './provide_router';
+export {withLocationStrategy as ɵwithLocationStrategy, withPreloading as ɵwithPreloading} from './provide_router';
 export {assignExtraOptionsToRouter as ɵassignExtraOptionsToRouter, RestoredState as ɵRestoredState} from './router';
 export {ROUTER_PROVIDERS as ɵROUTER_PROVIDERS} from './router_module';
 export {flatten as ɵflatten} from './utils/collection';
diff --git a/packages/router/src/provide_router.ts b/packages/router/src/provide_router.ts
@@ -6,16 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {LOCATION_INITIALIZED, ViewportScroller} from '@angular/common';
+import {HashLocationStrategy, LOCATION_INITIALIZED, LocationStrategy, PathLocationStrategy, ViewportScroller} from '@angular/common';
 import {APP_BOOTSTRAP_LISTENER, APP_INITIALIZER, ApplicationRef, ComponentRef, ENVIRONMENT_INITIALIZER, inject, InjectFlags, InjectionToken, Injector, Provider, Type} from '@angular/core';
 import {of, Subject} from 'rxjs';
 import {filter, map, take} from 'rxjs/operators';
 
 import {Event, NavigationCancel, NavigationCancellationCode, NavigationEnd, NavigationError, stringifyEvent} from './events';
 import {Routes} from './models';
 import {Router} from './router';
-import {InMemoryScrollingOptions, ROUTER_CONFIGURATION, RouterConfigOptions} from './router_config';
+import {InMemoryScrollingOptions, LocationStrategyOptions, ROUTER_CONFIGURATION, RouterConfigOptions} from './router_config';
 import {ROUTES} from './router_config_loader';
+import {provideHashLocationStrategy, providePathLocationStrategy} from './router_module';
 import {PreloadingStrategy, RouterPreloader} from './router_preloader';
 import {ROUTER_SCROLLER, RouterScroller} from './router_scroller';
 import {ActivatedRoute} from './router_state';
@@ -110,9 +111,7 @@ function routerFeature<FeatureKind extends RouterFeatureKind>(
  * @publicApi
  */
 export function provideRoutes(routes: Routes): Provider[] {
-  return [
-    {provide: ROUTES, multi: true, useValue: routes},
-  ];
+  return [{provide: ROUTES, multi: true, useValue: routes}];
 }
 
 /**
@@ -478,6 +477,39 @@ export function withDebugTracing(): DebugTracingFeature {
   return routerFeature(RouterFeatureKind.DebugTracingFeature, providers);
 }
 
+/**
+ * Indicates whether Hash or Path strategy should be used
+ *
+ * @usageNotes
+ *
+ * Basic example of how you can enable location strategy;
+ * ```
+ * const appRoutes: Routes = [];
+ * bootstrapApplication(AppComponent,
+ *   {
+ *     providers: [
+ *       provideRouter(appRoutes, withLocationStrategy({useHash: true}))
+ *     ]
+ *   }
+ * );
+ * ```
+ *
+ * @see `provideRouter`
+ *
+ * @returns A set of providers for use with `provideRouter`.
+ *
+ * @publicApi
+ * @developerPreview
+ */
+export function withLocationStrategy(options: LocationStrategyOptions):
+    RouterLocationStrategyFeature {
+  let providers: Provider[] = [];
+  options.useHash ? providers.push(provideHashLocationStrategy()) :
+                    providers.push(providePathLocationStrategy());
+
+  return routerFeature(RouterFeatureKind.RouterLocationStrategyFeature, providers);
+}
+
 const ROUTER_PRELOADER = new InjectionToken<RouterPreloader>(NG_DEV_MODE ? 'router preloader' : '');
 
 /**
@@ -539,6 +571,8 @@ export function withPreloading(preloadingStrategy: Type<PreloadingStrategy>): Pr
 export type RouterConfigurationFeature =
     RouterFeature<RouterFeatureKind.RouterConfigurationFeature>;
 
+export type RouterLocationStrategyFeature =
+    RouterFeature<RouterFeatureKind.RouterLocationStrategyFeature>;
 /**
  * Allows to provide extra parameters to configure Router.
  *
@@ -568,9 +602,7 @@ export type RouterConfigurationFeature =
  * @developerPreview
  */
 export function withRouterConfig(options: RouterConfigOptions): RouterConfigurationFeature {
-  const providers = [
-    {provide: ROUTER_CONFIGURATION, useValue: options},
-  ];
+  const providers = [{provide: ROUTER_CONFIGURATION, useValue: options}];
   return routerFeature(RouterFeatureKind.RouterConfigurationFeature, providers);
 }
 
@@ -586,7 +618,7 @@ export function withRouterConfig(options: RouterConfigOptions): RouterConfigurat
  * @developerPreview
  */
 export type RouterFeatures = PreloadingFeature|DebugTracingFeature|InitialNavigationFeature|
-    InMemoryScrollingFeature|RouterConfigurationFeature;
+    InMemoryScrollingFeature|RouterConfigurationFeature|RouterLocationStrategyFeature;
 
 /**
  * The list of features as an enum to uniquely type each feature.
@@ -597,5 +629,6 @@ export const enum RouterFeatureKind {
   EnabledBlockingInitialNavigationFeature,
   DisabledInitialNavigationFeature,
   InMemoryScrollingFeature,
-  RouterConfigurationFeature
+  RouterConfigurationFeature,
+  RouterLocationStrategyFeature
 }
diff --git a/packages/router/src/router_config.ts b/packages/router/src/router_config.ts
@@ -163,6 +163,14 @@ export interface InMemoryScrollingOptions {
   scrollPositionRestoration?: 'disabled'|'enabled'|'top';
 }
 
+/**
+ * A set of configuration options for a location strategy,
+ * either enabling HashLocationStrategy or PathlocationStrategy
+ */
+export interface LocationStrategyOptions {
+  useHash: boolean;
+}
+
 /**
  * A set of configuration options for a router module, provided in the
  * `forRoot()` method.

diff --git a/packages/router/src/router_module.ts b/packages/router/src/router_module.ts
@@ -166,13 +166,13 @@ export function provideRouterScroller(): Provider {
 
 // Note: For internal use only with `RouterModule`. Standalone setup via `provideRouter` should
 // provide hash location directly via `{provide: LocationStrategy, useClass: HashLocationStrategy}`.
-function provideHashLocationStrategy(): Provider {
+export function provideHashLocationStrategy(): Provider {
   return {provide: LocationStrategy, useClass: HashLocationStrategy};
 }
 
 // Note: For internal use only with `RouterModule`. Standalone setup via `provideRouter` does not
 // need this at all because `PathLocationStrategy` is the default factory for `LocationStrategy`.
-function providePathLocationStrategy(): Provider {
+export function providePathLocationStrategy(): Provider {
   return {provide: LocationStrategy, useClass: PathLocationStrategy};
 }
 

diff --git a/packages/router/test/integration.spec.ts b/packages/router/test/integration.spec.ts
@@ -17,7 +17,7 @@ import {concat, defer, EMPTY, from, Observable, Observer, of, Subscription} from
 import {delay, filter, first, last, map, mapTo, takeWhile, tap} from 'rxjs/operators';
 
 import {CanActivateChildFn, CanActivateFn, CanMatch, CanMatchFn, ResolveFn} from '../src/models';
-import {withRouterConfig} from '../src/provide_router';
+import {withLocationStrategy, withRouterConfig} from '../src/provide_router';
 import {forEach, wrapIntoObservable} from '../src/utils/collection';
 import {getLoadedRoutes} from '../src/utils/config';
 import {provideRouterForTesting} from '../testing/src/provide_router_for_testing';
@@ -6985,6 +6985,21 @@ describe('Testing router options', () => {
       expect(router.urlUpdateStrategy).toBe('eager');
     });
   });
+
+  describe('should use the appropriate location strategy', () => {
+    it('using hash location',
+       () => {fakeAsync(() => {
+         TestBed.configureTestingModule({
+           declarations: [RootCmp],
+           providers: [provideRouterForTesting([], withLocationStrategy({useHash: true}))]
+         });
+         const router: Router = TestBed.inject(Router);
+         const fixture = createRoot(router, RootCmp);
+         router.navigateByUrl('/someUrl');
+         advance(fixture);
+         expect(router.url).toBe('/#/someUrl');
+       })});
+  });
 });
 
 function expectEvents(events: Event[], pairs: any[]) {