@angular-devkit/build-angular 13.3.3 → 13.3.6

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.3.3",
+  "version": "13.3.6",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@ampproject/remapping": "1.1.1",
-    "@angular-devkit/architect": "0.1303.3",
-    "@angular-devkit/build-webpack": "0.1303.3",
-    "@angular-devkit/core": "13.3.3",
+    "@ampproject/remapping": "2.2.0",
+    "@angular-devkit/architect": "0.1303.6",
+    "@angular-devkit/build-webpack": "0.1303.6",
+    "@angular-devkit/core": "13.3.6",
     "@babel/core": "7.16.12",
     "@babel/generator": "7.16.8",
     "@babel/helper-annotate-as-pure": "7.16.7",
@@ -20,9 +20,9 @@
     "@babel/runtime": "7.16.7",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.6",
-    "@ngtools/webpack": "13.3.3",
+    "@ngtools/webpack": "13.3.6",
     "ansi-colors": "4.1.1",
-    "babel-loader": "8.2.3",
+    "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.9.1",
     "cacache": "15.3.0",

package/src/builders/app-shell/index.js

@@ -95,7 +95,7 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
         }
         await fs.promises.writeFile(outputIndexPath, html);
         if (browserOptions.serviceWorker) {
-            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, (0, core_1.normalize)(outputPath), browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
+            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, context.workspaceRoot, (0, core_1.normalize)(outputPath), browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
         }
     }
     return browserResult;

package/src/builders/browser/index.js

@@ -253,7 +253,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                         spinner.start('Generating service worker...');
                         for (const [locale, outputPath] of outputPaths.entries()) {
                             try {
-                                await (0, service_worker_1.augmentAppWithServiceWorker)((0, core_1.normalize)(projectRoot), (0, core_1.normalize)(outputPath), getLocaleBaseHref(i18n, locale) || options.baseHref || '/', options.ngswConfigPath);
+                                await (0, service_worker_1.augmentAppWithServiceWorker)((0, core_1.normalize)(projectRoot), context.workspaceRoot, (0, core_1.normalize)(outputPath), getLocaleBaseHref(i18n, locale) || options.baseHref || '/', options.ngswConfigPath);
                             }
                             catch (error) {
                                 spinner.fail('Service worker generation failed.');

package/src/utils/service-worker.d.ts

@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Path } from '@angular-devkit/core';
-export declare function augmentAppWithServiceWorker(appRoot: Path, outputPath: Path, baseHref: string, ngswConfigPath?: string): Promise<void>;
+export declare function augmentAppWithServiceWorker(appRoot: Path, workspaceRoot: string, outputPath: Path, baseHref: string, ngswConfigPath?: string): Promise<void>;

package/src/utils/service-worker.js

@@ -76,11 +76,11 @@ class CliFilesystem {
         return items;
     }
 }
-async function augmentAppWithServiceWorker(appRoot, outputPath, baseHref, ngswConfigPath) {
+async function augmentAppWithServiceWorker(appRoot, workspaceRoot, outputPath, baseHref, ngswConfigPath) {
     const distPath = (0, core_1.getSystemPath)((0, core_1.normalize)(outputPath));
     // Determine the configuration file path
     const configPath = ngswConfigPath
-        ? (0, core_1.getSystemPath)((0, core_1.normalize)(ngswConfigPath))
+        ? path.join(workspaceRoot, (0, core_1.getSystemPath)((0, core_1.normalize)(ngswConfigPath)))
         : path.join((0, core_1.getSystemPath)(appRoot), 'ngsw-config.json');
     // Read the configuration file
     let config;