Revert "refactor(service-worker): make SwPush and SwUpdate tree-shakable (angular#61670)" (angular#61923)

thePunderWoman · AndrewKushnir · commit 29e892a35ea6 · 2025-06-06T07:48:45.000-07:00
This reverts commit f8c1b6e. PR Close angular#61923
diff --git a/packages/service-worker/src/module.ts b/packages/service-worker/src/module.ts
@@ -9,11 +9,13 @@
 import {ModuleWithProviders, NgModule} from '@angular/core';
 
 import {provideServiceWorker, SwRegistrationOptions} from './provider';
+import {SwPush} from './push';
+import {SwUpdate} from './update';
 
 /**
  * @publicApi
  */
-@NgModule()
+@NgModule({providers: [SwPush, SwUpdate]})
 export class ServiceWorkerModule {
   /**
    * Register the given Angular Service Worker script.
diff --git a/packages/service-worker/src/provider.ts b/packages/service-worker/src/provider.ts
@@ -21,6 +21,8 @@ import {
 import type {Observable} from 'rxjs';
 
 import {NgswCommChannel} from './low_level';
+import {SwPush} from './push';
+import {SwUpdate} from './update';
 import {RuntimeErrorCode} from './errors';
 
 export const SCRIPT = new InjectionToken<string>(ngDevMode ? 'NGSW_REGISTER_SCRIPT' : '');
@@ -211,6 +213,8 @@ export function provideServiceWorker(
   options: SwRegistrationOptions = {},
 ): EnvironmentProviders {
   return makeEnvironmentProviders([
+    SwPush,
+    SwUpdate,
     {provide: SCRIPT, useValue: script},
     {provide: SwRegistrationOptions, useValue: options},
     {
diff --git a/packages/service-worker/src/push.ts b/packages/service-worker/src/push.ts
@@ -92,7 +92,7 @@ import {ERR_SW_NOT_SUPPORTED, NgswCommChannel, PushEvent} from './low_level';
  *
  * @publicApi
  */
-@Injectable({providedIn: 'root'})
+@Injectable()
 export class SwPush {
   /**
    * Emits the payloads of the received push notification messages.
diff --git a/packages/service-worker/src/update.ts b/packages/service-worker/src/update.ts
@@ -25,7 +25,7 @@ import {
  *
  * @publicApi
  */
-@Injectable({providedIn: 'root'})
+@Injectable()
 export class SwUpdate {
   /**
    * Emits a `VersionDetectedEvent` event whenever a new version is detected on the server.

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ import {ERR_SW_NOT_SUPPORTED, NgswCommChannel, PushEvent} from './low_level';`
`92`	`92`	`*`
`93`	`93`	`* @publicApi`
`94`	`94`	`*/`
`95`		`-@Injectable({providedIn: 'root'})`
	`95`	`+@Injectable()`
`96`	`96`	`export class SwPush {`
`97`	`97`	`/**`
`98`	`98`	`* Emits the payloads of the received push notification messages.`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import {`
`25`	`25`	`*`
`26`	`26`	`* @publicApi`
`27`	`27`	`*/`
`28`		`-@Injectable({providedIn: 'root'})`
	`28`	`+@Injectable()`
`29`	`29`	`export class SwUpdate {`
`30`	`30`	`/**`
`31`	`31`	* Emits a `VersionDetectedEvent` event whenever a new version is detected on the server.