@angular-devkit/build-angular 14.0.0-next.7 → 14.0.0-next.8

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.0.0-next.7",
+  "version": "14.0.0-next.8",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.1.2",
-    "@angular-devkit/architect": "0.1400.0-next.7",
-    "@angular-devkit/build-webpack": "0.1400.0-next.7",
-    "@angular-devkit/core": "14.0.0-next.7",
+    "@angular-devkit/architect": "0.1400.0-next.8",
+    "@angular-devkit/build-webpack": "0.1400.0-next.8",
+    "@angular-devkit/core": "14.0.0-next.8",
     "@babel/core": "7.17.8",
     "@babel/generator": "7.17.7",
     "@babel/helper-annotate-as-pure": "7.16.7",
@@ -20,16 +20,16 @@
     "@babel/runtime": "7.17.8",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.0.0-next.7",
+    "@ngtools/webpack": "14.0.0-next.8",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.4",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.9.1",
-    "cacache": "16.0.3",
+    "cacache": "16.0.4",
     "copy-webpack-plugin": "10.2.4",
     "critters": "0.0.16",
     "css-loader": "6.7.1",
-    "esbuild-wasm": "0.14.29",
+    "esbuild-wasm": "0.14.32",
     "glob": "7.2.0",
     "https-proxy-agent": "5.0.0",
     "inquirer": "8.2.2",
@@ -52,7 +52,7 @@
     "regenerator-runtime": "0.13.9",
     "resolve-url-loader": "5.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.49.9",
+    "sass": "1.49.11",
     "sass-loader": "12.6.0",
     "semver": "7.3.5",
     "source-map-loader": "3.0.1",
@@ -63,14 +63,14 @@
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.3.1",
-    "webpack": "5.70.0",
+    "webpack": "5.71.0",
     "webpack-dev-middleware": "5.3.1",
-    "webpack-dev-server": "4.7.4",
+    "webpack-dev-server": "4.8.1",
     "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.14.29"
+    "esbuild": "0.14.32"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next",

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

@@ -31,7 +31,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const architect_1 = require("@angular-devkit/architect");
-const core_1 = require("@angular-devkit/core");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const utils_1 = require("../../utils");
@@ -96,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)((0, core_1.normalize)(projectRoot), (0, core_1.normalize)(outputPath), browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
+            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, outputPath, browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
         }
     }
     return browserResult;

package/src/builders/browser/index.js

@@ -33,7 +33,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildWebpackBrowser = exports.BUILD_TIMEOUT = void 0;
 const architect_1 = require("@angular-devkit/architect");
 const build_webpack_1 = require("@angular-devkit/build-webpack");
-const core_1 = require("@angular-devkit/core");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const rxjs_1 = require("rxjs");
@@ -75,7 +74,7 @@ async function initialize(options, context, webpackConfigurationTransform) {
     ]);
     // Validate asset option values if processed directly
     if (((_a = options.assets) === null || _a === void 0 ? void 0 : _a.length) && !((_b = adjustedOptions.assets) === null || _b === void 0 ? void 0 : _b.length)) {
-        (0, utils_1.normalizeAssetPatterns)(options.assets, (0, core_1.normalize)(context.workspaceRoot), (0, core_1.normalize)(projectRoot), projectSourceRoot === undefined ? undefined : (0, core_1.normalize)(projectSourceRoot)).forEach(({ output }) => {
+        (0, utils_1.normalizeAssetPatterns)(options.assets, context.workspaceRoot, projectRoot, projectSourceRoot).forEach(({ output }) => {
             if (output.startsWith('..')) {
                 throw new Error('An asset cannot be written to a location outside of the output path.');
             }
@@ -189,7 +188,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     if (!options.watch && ((_c = options.assets) === null || _c === void 0 ? void 0 : _c.length)) {
                         spinner.start('Copying assets...');
                         try {
-                            await (0, copy_assets_1.copyAssets)((0, utils_1.normalizeAssetPatterns)(options.assets, (0, core_1.normalize)(context.workspaceRoot), (0, core_1.normalize)(projectRoot), projectSourceRoot === undefined ? undefined : (0, core_1.normalize)(projectSourceRoot)), Array.from(outputPaths.values()), context.workspaceRoot);
+                            await (0, copy_assets_1.copyAssets)((0, utils_1.normalizeAssetPatterns)(options.assets, context.workspaceRoot, projectRoot, projectSourceRoot), Array.from(outputPaths.values()), context.workspaceRoot);
                             spinner.succeed('Copying assets complete.');
                         }
                         catch (err) {
@@ -253,7 +252,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)(projectRoot, outputPath, getLocaleBaseHref(i18n, locale) || options.baseHref || '/', options.ngswConfigPath);
                             }
                             catch (error) {
                                 spinner.fail('Service worker generation failed.');

package/src/builders/karma/index.d.ts

@@ -23,5 +23,5 @@ export declare function execute(options: KarmaBuilderOptions, context: BuilderCo
     karmaOptions?: (options: KarmaConfigOptions) => KarmaConfigOptions;
 }): Observable<BuilderOutput>;
 export { KarmaBuilderOptions };
-declare const _default: import("@angular-devkit/architect/src/internal").Builder<Record<string, string> & KarmaBuilderOptions & import("@angular-devkit/core").JsonObject>;
+declare const _default: import("@angular-devkit/architect/src/internal").Builder<Record<string, string> & KarmaBuilderOptions & import("../../../../core/src").JsonObject>;
 export default _default;

package/src/builders/karma/index.js

@@ -32,8 +32,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.execute = void 0;
 const architect_1 = require("@angular-devkit/architect");
-const core_1 = require("@angular-devkit/core");
-const path_1 = require("path");
+const path = __importStar(require("path"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const purge_cache_1 = require("../../utils/purge-cache");
@@ -108,7 +107,8 @@ function execute(options, context, transforms = {}) {
                 throw new Error('The builder requires a target.');
             }
             const projectMetadata = await context.getProjectMetadata(projectName);
-            const projectSourceRoot = (0, core_1.getSystemPath)((0, core_1.join)((0, core_1.normalize)(context.workspaceRoot), (_c = projectMetadata.root) !== null && _c !== void 0 ? _c : '', (_d = projectMetadata.sourceRoot) !== null && _d !== void 0 ? _d : ''));
+            const projectRoot = path.join(context.workspaceRoot, (_c = projectMetadata.root) !== null && _c !== void 0 ? _c : '');
+            const projectSourceRoot = path.join(projectRoot, (_d = projectMetadata.sourceRoot) !== null && _d !== void 0 ? _d : '');
             const files = await (0, find_tests_1.findTests)(options.include, context.workspaceRoot, projectSourceRoot);
             // early exit, no reason to start karma
             if (!files.length) {
@@ -123,7 +123,7 @@ function execute(options, context, transforms = {}) {
                 webpackConfig.module.rules = rules;
             }
             rules.unshift({
-                test: (0, path_1.resolve)(context.workspaceRoot, options.main),
+                test: path.resolve(context.workspaceRoot, options.main),
                 use: {
                     // cannot be a simple path as it differs between environments
                     loader: single_test_transform_1.SingleTestTransformLoader,
@@ -139,7 +139,7 @@ function execute(options, context, transforms = {}) {
             webpackConfig,
             logger: context.logger,
         };
-        const config = await karma.config.parseConfig((0, path_1.resolve)(context.workspaceRoot, options.karmaConfig), transforms.karmaOptions ? transforms.karmaOptions(karmaOptions) : karmaOptions, { promiseConfig: true, throwErrors: true });
+        const config = await karma.config.parseConfig(path.resolve(context.workspaceRoot, options.karmaConfig), transforms.karmaOptions ? transforms.karmaOptions(karmaOptions) : karmaOptions, { promiseConfig: true, throwErrors: true });
         return [karma, config];
     }), (0, operators_1.switchMap)(([karma, karmaConfig]) => new rxjs_1.Observable((subscriber) => {
         var _a, _b, _c;

package/src/utils/normalize-asset-patterns.d.ts

@@ -5,9 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BaseException, Path } from '@angular-devkit/core';
+import { BaseException } from '@angular-devkit/core';
 import { AssetPattern, AssetPatternClass } from '../builders/browser/schema';
 export declare class MissingAssetSourceRootException extends BaseException {
     constructor(path: String);
 }
-export declare function normalizeAssetPatterns(assetPatterns: AssetPattern[], root: Path, projectRoot: Path, maybeSourceRoot: Path | undefined): AssetPatternClass[];
+export declare function normalizeAssetPatterns(assetPatterns: AssetPattern[], workspaceRoot: string, projectRoot: string, projectSourceRoot: string | undefined): AssetPatternClass[];

package/src/utils/normalize-asset-patterns.js

@@ -6,28 +6,52 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeAssetPatterns = exports.MissingAssetSourceRootException = void 0;
 const core_1 = require("@angular-devkit/core");
 const fs_1 = require("fs");
+const path = __importStar(require("path"));
 class MissingAssetSourceRootException extends core_1.BaseException {
     constructor(path) {
         super(`The ${path} asset path must start with the project source root.`);
     }
 }
 exports.MissingAssetSourceRootException = MissingAssetSourceRootException;
-function normalizeAssetPatterns(assetPatterns, root, projectRoot, maybeSourceRoot) {
-    // When sourceRoot is not available, we default to ${projectRoot}/src.
-    const sourceRoot = maybeSourceRoot || (0, core_1.join)(projectRoot, 'src');
-    const resolvedSourceRoot = (0, core_1.resolve)(root, sourceRoot);
+function normalizeAssetPatterns(assetPatterns, workspaceRoot, projectRoot, projectSourceRoot) {
     if (assetPatterns.length === 0) {
         return [];
     }
+    // When sourceRoot is not available, we default to ${projectRoot}/src.
+    const sourceRoot = projectSourceRoot || path.join(projectRoot, 'src');
+    const resolvedSourceRoot = path.resolve(workspaceRoot, sourceRoot);
     return assetPatterns.map((assetPattern) => {
         // Normalize string asset patterns to objects.
         if (typeof assetPattern === 'string') {
-            const assetPath = (0, core_1.normalize)(assetPattern);
-            const resolvedAssetPath = (0, core_1.resolve)(root, assetPath);
+            const assetPath = path.normalize(assetPattern);
+            const resolvedAssetPath = path.resolve(workspaceRoot, assetPath);
             // Check if the string asset is within sourceRoot.
             if (!resolvedAssetPath.startsWith(resolvedSourceRoot)) {
                 throw new MissingAssetSourceRootException(assetPattern);
@@ -35,7 +59,7 @@ function normalizeAssetPatterns(assetPatterns, root, projectRoot, maybeSourceRoo
             let glob, input;
             let isDirectory = false;
             try {
-                isDirectory = (0, fs_1.statSync)((0, core_1.getSystemPath)(resolvedAssetPath)).isDirectory();
+                isDirectory = (0, fs_1.statSync)(resolvedAssetPath).isDirectory();
             }
             catch {
                 isDirectory = true;
@@ -48,12 +72,12 @@ function normalizeAssetPatterns(assetPatterns, root, projectRoot, maybeSourceRoo
             }
             else {
                 // Files are their own glob.
-                glob = (0, core_1.basename)(assetPath);
+                glob = path.basename(assetPath);
                 // Input directory is their original dirname.
-                input = (0, core_1.dirname)(assetPath);
+                input = path.dirname(assetPath);
             }
             // Output directory for both is the relative path from source root to input.
-            const output = (0, core_1.relative)(resolvedSourceRoot, (0, core_1.resolve)(root, input));
+            const output = path.relative(resolvedSourceRoot, path.resolve(workspaceRoot, input));
             // Return the asset pattern in object format.
             return { glob, input, output };
         }

package/src/utils/normalize-builder-schema.js

@@ -8,7 +8,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeBrowserSchema = void 0;
-const core_1 = require("@angular-devkit/core");
 const normalize_asset_patterns_1 = require("./normalize-asset-patterns");
 const normalize_cache_1 = require("./normalize-cache");
 const normalize_file_replacements_1 = require("./normalize-file-replacements");
@@ -20,8 +19,8 @@ function normalizeBrowserSchema(workspaceRoot, projectRoot, projectSourceRoot, o
     return {
         ...options,
         cache: (0, normalize_cache_1.normalizeCacheOptions)(metadata, workspaceRoot),
-        assets: (0, normalize_asset_patterns_1.normalizeAssetPatterns)(options.assets || [], (0, core_1.normalize)(workspaceRoot), (0, core_1.normalize)(projectRoot), projectSourceRoot ? (0, core_1.normalize)(projectSourceRoot) : undefined),
-        fileReplacements: (0, normalize_file_replacements_1.normalizeFileReplacements)(options.fileReplacements || [], (0, core_1.normalize)(workspaceRoot)),
+        assets: (0, normalize_asset_patterns_1.normalizeAssetPatterns)(options.assets || [], workspaceRoot, projectRoot, projectSourceRoot),
+        fileReplacements: (0, normalize_file_replacements_1.normalizeFileReplacements)(options.fileReplacements || [], workspaceRoot),
         optimization: (0, normalize_optimization_1.normalizeOptimization)(options.optimization),
         sourceMap: normalizedSourceMapOptions,
         preserveSymlinks: options.preserveSymlinks === undefined

package/src/utils/normalize-file-replacements.d.ts

@@ -5,13 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BaseException, Path } from '@angular-devkit/core';
+import { BaseException } from '@angular-devkit/core';
 import { FileReplacement } from '../builders/browser/schema';
 export declare class MissingFileReplacementException extends BaseException {
     constructor(path: String);
 }
 export interface NormalizedFileReplacement {
-    replace: Path;
-    with: Path;
+    replace: string;
+    with: string;
 }
-export declare function normalizeFileReplacements(fileReplacements: FileReplacement[], root: Path): NormalizedFileReplacement[];
+export declare function normalizeFileReplacements(fileReplacements: FileReplacement[], workspaceRoot: string): NormalizedFileReplacement[];

package/src/utils/normalize-file-replacements.js

@@ -6,27 +6,51 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeFileReplacements = exports.MissingFileReplacementException = void 0;
 const core_1 = require("@angular-devkit/core");
 const fs_1 = require("fs");
+const path = __importStar(require("path"));
 class MissingFileReplacementException extends core_1.BaseException {
     constructor(path) {
         super(`The ${path} path in file replacements does not exist.`);
     }
 }
 exports.MissingFileReplacementException = MissingFileReplacementException;
-function normalizeFileReplacements(fileReplacements, root) {
+function normalizeFileReplacements(fileReplacements, workspaceRoot) {
     if (fileReplacements.length === 0) {
         return [];
     }
-    const normalizedReplacement = fileReplacements.map((replacement) => normalizeFileReplacement(replacement, root));
+    const normalizedReplacement = fileReplacements.map((replacement) => normalizeFileReplacement(replacement, workspaceRoot));
     for (const { replace, with: replacementWith } of normalizedReplacement) {
-        if (!(0, fs_1.existsSync)((0, core_1.getSystemPath)(replacementWith))) {
-            throw new MissingFileReplacementException((0, core_1.getSystemPath)(replacementWith));
+        if (!(0, fs_1.existsSync)(replacementWith)) {
+            throw new MissingFileReplacementException(replacementWith);
         }
-        if (!(0, fs_1.existsSync)((0, core_1.getSystemPath)(replace))) {
-            throw new MissingFileReplacementException((0, core_1.getSystemPath)(replace));
+        if (!(0, fs_1.existsSync)(replace)) {
+            throw new MissingFileReplacementException(replace);
         }
     }
     return normalizedReplacement;
@@ -36,22 +60,18 @@ function normalizeFileReplacement(fileReplacement, root) {
     let replacePath;
     let withPath;
     if (fileReplacement.src && fileReplacement.replaceWith) {
-        replacePath = (0, core_1.normalize)(fileReplacement.src);
-        withPath = (0, core_1.normalize)(fileReplacement.replaceWith);
+        replacePath = fileReplacement.src;
+        withPath = fileReplacement.replaceWith;
     }
     else if (fileReplacement.replace && fileReplacement.with) {
-        replacePath = (0, core_1.normalize)(fileReplacement.replace);
-        withPath = (0, core_1.normalize)(fileReplacement.with);
+        replacePath = fileReplacement.replace;
+        withPath = fileReplacement.with;
     }
     else {
         throw new Error(`Invalid file replacement: ${JSON.stringify(fileReplacement)}`);
     }
-    // TODO: For 7.x should this only happen if not absolute?
-    if (root) {
-        replacePath = (0, core_1.join)(root, replacePath);
-    }
-    if (root) {
-        withPath = (0, core_1.join)(root, withPath);
-    }
-    return { replace: replacePath, with: withPath };
+    return {
+        replace: path.join(root, replacePath),
+        with: path.join(root, withPath),
+    };
 }

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

@@ -5,5 +5,4 @@
  * Use of this source code is governed by an MIT-style license that can be
  * 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: string, outputPath: string, baseHref: string, ngswConfigPath?: string): Promise<void>;

package/src/utils/service-worker.js

@@ -31,7 +31,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.augmentAppWithServiceWorker = void 0;
-const core_1 = require("@angular-devkit/core");
 const crypto = __importStar(require("crypto"));
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
@@ -77,11 +76,10 @@ class CliFilesystem {
     }
 }
 async function augmentAppWithServiceWorker(appRoot, 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((0, core_1.getSystemPath)(appRoot), 'ngsw-config.json');
+        ? path.normalize(ngswConfigPath)
+        : path.join(appRoot, 'ngsw-config.json');
     // Read the configuration file
     let config;
     try {
@@ -91,7 +89,7 @@ async function augmentAppWithServiceWorker(appRoot, outputPath, baseHref, ngswCo
     catch (error) {
         if (error.code === 'ENOENT') {
             throw new Error('Error: Expected to find an ngsw-config.json configuration file' +
-                ` in the ${(0, core_1.getSystemPath)(appRoot)} folder. Either provide one or` +
+                ` in the ${appRoot} folder. Either provide one or` +
                 ' disable Service Worker in the angular.json configuration file.');
         }
         else {
@@ -103,20 +101,20 @@ async function augmentAppWithServiceWorker(appRoot, outputPath, baseHref, ngswCo
     // changed to a direct dynamic import.
     const GeneratorConstructor = (await (0, load_esm_1.loadEsmModule)('@angular/service-worker/config')).Generator;
     // Generate the manifest
-    const generator = new GeneratorConstructor(new CliFilesystem(distPath), baseHref);
+    const generator = new GeneratorConstructor(new CliFilesystem(outputPath), baseHref);
     const output = await generator.process(config);
     // Write the manifest
     const manifest = JSON.stringify(output, null, 2);
-    await fs_1.promises.writeFile(path.join(distPath, 'ngsw.json'), manifest);
+    await fs_1.promises.writeFile(path.join(outputPath, 'ngsw.json'), manifest);
     // Find the service worker package
     const workerPath = require.resolve('@angular/service-worker/ngsw-worker.js');
     // Write the worker code
-    await fs_1.promises.copyFile(workerPath, path.join(distPath, 'ngsw-worker.js'), fs_1.constants.COPYFILE_FICLONE);
+    await fs_1.promises.copyFile(workerPath, path.join(outputPath, 'ngsw-worker.js'), fs_1.constants.COPYFILE_FICLONE);
     // If present, write the safety worker code
     const safetyPath = path.join(path.dirname(workerPath), 'safety-worker.js');
     try {
-        await fs_1.promises.copyFile(safetyPath, path.join(distPath, 'worker-basic.min.js'), fs_1.constants.COPYFILE_FICLONE);
-        await fs_1.promises.copyFile(safetyPath, path.join(distPath, 'safety-worker.js'), fs_1.constants.COPYFILE_FICLONE);
+        await fs_1.promises.copyFile(safetyPath, path.join(outputPath, 'worker-basic.min.js'), fs_1.constants.COPYFILE_FICLONE);
+        await fs_1.promises.copyFile(safetyPath, path.join(outputPath, 'safety-worker.js'), fs_1.constants.COPYFILE_FICLONE);
     }
     catch (error) {
         if (error.code !== 'ENOENT') {

package/src/webpack/plugins/typescript.js

@@ -8,7 +8,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createIvyPlugin = void 0;
-const core_1 = require("@angular-devkit/core");
 const webpack_1 = require("@ngtools/webpack");
 const typescript_1 = require("typescript");
 function ensureIvy(wco) {
@@ -44,7 +43,7 @@ function createIvyPlugin(wco, aot, tsconfig) {
     const fileReplacements = {};
     if (buildOptions.fileReplacements) {
         for (const replacement of buildOptions.fileReplacements) {
-            fileReplacements[(0, core_1.getSystemPath)(replacement.replace)] = (0, core_1.getSystemPath)(replacement.with);
+            fileReplacements[replacement.replace] = replacement.with;
         }
     }
     let inlineStyleFileExtension;