From bb6ec10cfdffbdffd40f87c91d4c26390b4f860b Mon Sep 17 00:00:00 2001
From: Jessica Janiuk <jessica.janiuk@gmail.com>
Date: Fri, 6 Jun 2025 10:00:58 +0200
Subject: [PATCH] Revert "refactor(service-worker): make `SwPush` and
 `SwUpdate` tree-shakable (#61670)" (#61923)

This reverts commit f8c1b6e779d5aba76d3d5e71aa72c143bab4d3b1.

PR Close #61923
---
 packages/service-worker/src/module.ts   | 4 +++-
 packages/service-worker/src/provider.ts | 4 ++++
 packages/service-worker/src/push.ts     | 2 +-
 packages/service-worker/src/update.ts   | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/service-worker/src/module.ts b/packages/service-worker/src/module.ts
index 0d59e2f09af..101fcc4cc13 100644
--- 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
index 591433df219..ca20ad30635 100644
--- 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
index 0c367a3f8ae..a8491a711fb 100644
--- 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
index 43f4a7d0b15..5839ced701a 100644
--- 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.