From 44b5eb37d50b62fc7aee9c031d454e333db71296 Mon Sep 17 00:00:00 2001
From: Alan Agius <alanagius@google.com>
Date: Tue, 6 Sep 2022 16:14:15 +0000
Subject: [PATCH] fix(@angular-devkit/build-angular): change service worker
 errors to compilation errors

Previously, when there was an error during a build that had service workers enabled, the dev-server crashed as the promise was rejected instead of emitting a compilation error.

With this change we update the logic so that any errors during the SW augmentation phase are changed to a compilation error and also update the logic so that when there are compilation errors we don't try to generate a SW.
---
 .../webpack/plugins/service-worker-plugin.ts  | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/service-worker-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/service-worker-plugin.ts
index 8d556ae7e365..a42a6fa89db9 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/service-worker-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/service-worker-plugin.ts
@@ -20,8 +20,15 @@ export class ServiceWorkerPlugin {
   constructor(private readonly options: ServiceWorkerPluginOptions) {}
 
   apply(compiler: Compiler) {
-    compiler.hooks.done.tapPromise('angular-service-worker', async ({ compilation }) => {
+    compiler.hooks.done.tapPromise('angular-service-worker', async (stats) => {
+      if (stats.hasErrors()) {
+        // Don't generate a service worker if the compilation has errors.
+        // When there are errors some files will not be emitted which would cause other errors down the line such as readdir failures.
+        return;
+      }
+
       const { projectRoot, root, baseHref = '', ngswConfigPath } = this.options;
+      const { compilation } = stats;
       // We use the output path from the compilation instead of build options since during
       // localization the output path is modified to a temp directory.
       // See: https://github.com/angular/angular-cli/blob/7e64b1537d54fadb650559214fbb12707324cd75/packages/angular_devkit/build_angular/src/utils/i18n-options.ts#L251-L252
@@ -31,17 +38,25 @@ export class ServiceWorkerPlugin {
         throw new Error('Compilation output path cannot be empty.');
       }
 
-      await augmentAppWithServiceWorker(
-        projectRoot,
-        root,
-        outputPath,
-        baseHref,
-        ngswConfigPath,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (compiler.inputFileSystem as any).promises,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (compiler.outputFileSystem as any).promises,
-      );
+      try {
+        await augmentAppWithServiceWorker(
+          projectRoot,
+          root,
+          outputPath,
+          baseHref,
+          ngswConfigPath,
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          (compiler.inputFileSystem as any).promises,
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          (compiler.outputFileSystem as any).promises,
+        );
+      } catch (error) {
+        compilation.errors.push(
+          new compilation.compiler.webpack.WebpackError(
+            `Failed to generate service worker - ${error instanceof Error ? error.message : error}`,
+          ),
+        );
+      }
     });
   }
 }