@angular-devkit/build-angular 14.0.0-next.6 → 14.0.0-next.9

package/package.json

@@ -1,39 +1,38 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.0.0-next.6",
+  "version": "14.0.0-next.9",
   "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.6",
-    "@angular-devkit/build-webpack": "0.1400.0-next.6",
-    "@angular-devkit/core": "14.0.0-next.6",
-    "@babel/core": "7.17.7",
-    "@babel/generator": "7.17.7",
+    "@angular-devkit/architect": "0.1400.0-next.9",
+    "@angular-devkit/build-webpack": "0.1400.0-next.9",
+    "@angular-devkit/core": "14.0.0-next.9",
+    "@babel/core": "7.17.9",
+    "@babel/generator": "7.17.9",
     "@babel/helper-annotate-as-pure": "7.16.7",
     "@babel/plugin-proposal-async-generator-functions": "7.16.8",
     "@babel/plugin-transform-async-to-generator": "7.16.8",
     "@babel/plugin-transform-runtime": "7.17.0",
     "@babel/preset-env": "7.16.11",
-    "@babel/runtime": "7.17.7",
+    "@babel/runtime": "7.17.9",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.0.0-next.6",
+    "@ngtools/webpack": "14.0.0-next.9",
     "ansi-colors": "4.1.1",
-    "babel-loader": "8.2.3",
+    "babel-loader": "8.2.4",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.9.1",
-    "cacache": "16.0.1",
+    "cacache": "16.0.4",
     "copy-webpack-plugin": "10.2.4",
-    "core-js": "3.21.1",
     "critters": "0.0.16",
     "css-loader": "6.7.1",
-    "esbuild-wasm": "0.14.27",
+    "esbuild-wasm": "0.14.36",
     "glob": "7.2.0",
     "https-proxy-agent": "5.0.0",
-    "inquirer": "8.2.1",
+    "inquirer": "8.2.2",
     "jsonc-parser": "3.0.0",
     "karma-source-map-support": "1.4.0",
     "less": "4.1.2",
@@ -47,31 +46,31 @@
     "parse5-html-rewriting-stream": "6.0.1",
     "piscina": "3.2.0",
     "postcss": "8.4.12",
-    "postcss-import": "14.0.2",
+    "postcss-import": "14.1.0",
     "postcss-loader": "6.2.1",
-    "postcss-preset-env": "7.4.2",
+    "postcss-preset-env": "7.4.3",
     "regenerator-runtime": "0.13.9",
     "resolve-url-loader": "5.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.49.9",
+    "sass": "1.50.0",
     "sass-loader": "12.6.0",
-    "semver": "7.3.5",
+    "semver": "7.3.6",
     "source-map-loader": "3.0.1",
     "source-map-support": "0.5.21",
-    "stylus": "0.56.0",
+    "stylus": "0.57.0",
     "stylus-loader": "6.2.0",
     "terser": "5.12.1",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.3.1",
-    "webpack": "5.70.0",
+    "webpack": "5.72.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.27"
+    "esbuild": "0.14.36"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next",
@@ -81,7 +80,7 @@
     "ng-packagr": "^14.0.0 || ^14.0.0-next",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
-    "typescript": "^4.6.2"
+    "typescript": "~4.6.2"
   },
   "peerDependenciesMeta": {
     "@angular/localize": {

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/typings.d.ts

@@ -6,10 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-declare module '@discoveryjs/json-ext' {
-  export function stringifyStream(value: unknown): import('stream').Readable;
-}
-
 declare module '@babel/helper-annotate-as-pure' {
   export default function annotateAsPure(
     pathOrNode: import('@babel/types').Node | { node: import('@babel/types').Node },

package/src/utils/check-port.js

@@ -31,7 +31,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkPort = void 0;
-const inquirer_1 = require("inquirer");
 const net = __importStar(require("net"));
 const tty_1 = require("./tty");
 function createInUseError(port) {
@@ -53,12 +52,13 @@ async function checkPort(port, host) {
                 reject(createInUseError(port));
                 return;
             }
-            (0, inquirer_1.prompt)({
+            Promise.resolve().then(() => __importStar(require('inquirer'))).then(({ prompt }) => prompt({
                 type: 'confirm',
                 name: 'useDifferent',
                 message: `Port ${port} is already in use.\nWould you like to use a different port?`,
                 default: true,
-            }).then((answers) => (answers.useDifferent ? resolve(0) : reject(createInUseError(port))), () => reject(createInUseError(port)));
+            }))
+                .then((answers) => (answers.useDifferent ? resolve(0) : reject(createInUseError(port))), () => reject(createInUseError(port)));
         })
             .once('listening', () => {
             server.close();

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/process-bundle.js

@@ -129,7 +129,7 @@ async function inlineLocales(options) {
             // Same errors will contain the full content of the file as the error message
             // Which makes it hard to find the actual error message.
             const index = error.message.indexOf(')\n');
-            const msg = index !== -1 ? error.message.substr(0, index + 1) : error.message;
+            const msg = index !== -1 ? error.message.slice(0, index + 1) : error.message;
             throw new Error(`${msg}\nAn error occurred inlining file "${options.filename}"`);
         }
     }

package/src/utils/purge-cache.js

@@ -27,10 +27,9 @@ async function purgeStaleBuildCache(context) {
         .filter((d) => (0, path_1.join)(basePath, d.name) !== path && d.isDirectory())
         .map((d) => {
         const subPath = (0, path_1.join)(basePath, d.name);
-        try {
-            return fs_1.promises.rm(subPath, { force: true, recursive: true, maxRetries: 3 });
-        }
-        catch { }
+        return fs_1.promises
+            .rm(subPath, { force: true, recursive: true, maxRetries: 3 })
+            .catch(() => void 0);
     });
     await Promise.all(entriesToDelete);
 }

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/configs/analytics.js

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAnalyticsConfig = void 0;
 const analytics_1 = require("../plugins/analytics");
 function getAnalyticsConfig(wco, context) {
-    var _a;
     if (!context.analytics) {
         return {};
     }
@@ -22,9 +21,7 @@ function getAnalyticsConfig(wco, context) {
     }
     // The category is the builder name if it's an angular builder.
     return {
-        plugins: [
-            new analytics_1.NgBuildAnalyticsPlugin(wco.projectRoot, context.analytics, category, (_a = wco.buildOptions.aot) !== null && _a !== void 0 ? _a : false),
-        ],
+        plugins: [new analytics_1.NgBuildAnalyticsPlugin(wco.projectRoot, context.analytics, category)],
     };
 }
 exports.getAnalyticsConfig = getAnalyticsConfig;

package/src/webpack/configs/common.js

@@ -84,15 +84,6 @@ async function getCommonConfig(wco) {
                 entryPoints['polyfills'] = [projectPolyfills];
             }
         }
-        if (!buildOptions.aot) {
-            const jitPolyfills = require.resolve('core-js/proposals/reflect-metadata');
-            if (entryPoints['polyfills']) {
-                entryPoints['polyfills'].push(jitPolyfills);
-            }
-            else {
-                entryPoints['polyfills'] = [jitPolyfills];
-            }
-        }
     }
     if (allowedCommonJsDependencies) {
         // When this is not defined it means the builder doesn't support showing common js usages.
@@ -183,7 +174,9 @@ async function getCommonConfig(wco) {
             test: tsConfig.options.allowJs ? /\.[cm]?[tj]sx?$/ : /\.[cm]?tsx?$/,
             loader: webpack_1.AngularWebpackLoaderPath,
             // The below are known paths that are not part of the TypeScript compilation even when allowJs is enabled.
-            exclude: [/[/\\](?:css-loader|mini-css-extract-plugin|webpack-dev-server|webpack)[/\\]/],
+            exclude: [
+                /[\\/]node_modules[/\\](?:css-loader|mini-css-extract-plugin|webpack-dev-server|webpack)[/\\]/,
+            ],
         });
         extraPlugins.push((0, typescript_2.createIvyPlugin)(wco, aot, tsConfigPath));
     }
@@ -297,7 +290,7 @@ async function getCommonConfig(wco) {
                     // The below is needed due to a bug in `@babel/runtime`. See: https://github.com/babel/babel/issues/12824
                     resolve: { fullySpecified: false },
                     exclude: [
-                        /[/\\](?:core-js|@babel|tslib|web-animations-js|web-streams-polyfill|whatwg-url)[/\\]/,
+                        /[\\/]node_modules[/\\](?:core-js|@babel|tslib|web-animations-js|web-streams-polyfill|whatwg-url)[/\\]/,
                     ],
                     use: [
                         {
@@ -326,6 +319,7 @@ async function getCommonConfig(wco) {
             asyncWebAssembly: true,
         },
         infrastructureLogging: {
+            debug: verbose,
             level: verbose ? 'verbose' : 'error',
         },
         stats: (0, helpers_1.getStatsOptions)(verbose),

package/src/webpack/configs/dev-server.js

@@ -118,7 +118,7 @@ function buildServePath(options, logger) {
         servePath = defaultPath || '';
     }
     if (servePath.endsWith('/')) {
-        servePath = servePath.substr(0, servePath.length - 1);
+        servePath = servePath.slice(0, -1);
     }
     if (!servePath.startsWith('/')) {
         servePath = `/${servePath}`;

package/src/webpack/configs/styles.js

@@ -98,16 +98,14 @@ function getStylesConfig(wco) {
         wco.logger.warn('Stylus usage is deprecated and will be removed in a future major version. ' +
             'To opt-out of the deprecated behaviour, please migrate to another stylesheet language.');
     }
-    const sassImplementation = getSassImplementation();
-    if (sassImplementation instanceof sass_service_1.SassWorkerImplementation) {
-        extraPlugins.push({
-            apply(compiler) {
-                compiler.hooks.shutdown.tap('sass-worker', () => {
-                    sassImplementation === null || sassImplementation === void 0 ? void 0 : sassImplementation.close();
-                });
-            },
-        });
-    }
+    const sassImplementation = new sass_service_1.SassWorkerImplementation();
+    extraPlugins.push({
+        apply(compiler) {
+            compiler.hooks.shutdown.tap('sass-worker', () => {
+                sassImplementation.close();
+            });
+        },
+    });
     const assetNameTemplate = (0, helpers_1.assetNameTemplateFactory)(hashFormat);
     const extraPostcssPlugins = [];
     // Attempt to setup Tailwind CSS
@@ -155,7 +153,7 @@ function getStylesConfig(wco) {
                 : undefined,
             plugins: [
                 postcssImports({
-                    resolve: (url) => (url.startsWith('~') ? url.substr(1) : url),
+                    resolve: (url) => (url.startsWith('~') ? url.slice(1) : url),
                     load: (filename) => {
                         return new Promise((resolve, reject) => {
                             loader.fs.readFile(filename, (err, data) => {
@@ -375,12 +373,3 @@ function getStylesConfig(wco) {
     };
 }
 exports.getStylesConfig = getStylesConfig;
-function getSassImplementation() {
-    const { webcontainer } = process.versions;
-    // When `webcontainer` is a truthy it means that we are running in a StackBlitz webcontainer.
-    // `SassWorkerImplementation` uses `receiveMessageOnPort` Node.js `worker_thread` API to ensure sync behavior which is ~2x faster.
-    // However, it is non trivial to support this in a webcontainer and while slower we choose to use `dart-sass`
-    // which in Webpack uses the slower async path.
-    // We should periodically check with StackBlitz folks (Mark Whitfeld / Dominic Elm) to determine if this workaround is still needed.
-    return webcontainer ? require('sass') : new sass_service_1.SassWorkerImplementation();
-}

package/src/webpack/plugins/analytics.d.ts

@@ -40,10 +40,9 @@ export declare class NgBuildAnalyticsPlugin {
     protected _projectRoot: string;
     protected _analytics: analytics.Analytics;
     protected _category: string;
-    private aotEnabled;
     protected _built: boolean;
     protected _stats: AnalyticsBuildStats;
-    constructor(_projectRoot: string, _analytics: analytics.Analytics, _category: string, aotEnabled: boolean);
+    constructor(_projectRoot: string, _analytics: analytics.Analytics, _category: string);
     protected _reset(): void;
     protected _getMetrics(stats: Stats): (string | number)[];
     protected _getDimensions(): (string | number | boolean)[];

package/src/webpack/plugins/analytics.js

@@ -73,11 +73,10 @@ class AnalyticsBuildStats {
  * Analytics plugin that reports the analytics we want from the CLI.
  */
 class NgBuildAnalyticsPlugin {
-    constructor(_projectRoot, _analytics, _category, aotEnabled) {
+    constructor(_projectRoot, _analytics, _category) {
         this._projectRoot = _projectRoot;
         this._analytics = _analytics;
         this._category = _category;
-        this.aotEnabled = aotEnabled;
         this._built = false;
         this._stats = new AnalyticsBuildStats();
     }
@@ -108,7 +107,6 @@ class NgBuildAnalyticsPlugin {
             // Adding commas before and after so the regex are easier to define filters.
             dimensions[core_1.analytics.NgCliAnalyticsDimensions.BuildErrors] = `,${this._stats.errors.join()},`;
         }
-        dimensions[core_1.analytics.NgCliAnalyticsDimensions.AotEnabled] = this.aotEnabled;
         return dimensions;
     }
     _reportBuildMetrics(stats) {

package/src/webpack/plugins/css-optimizer-plugin.js

@@ -52,9 +52,10 @@ class CssOptimizerPlugin {
                         const cachedOutput = await cacheItem.getPromise();
                         if (cachedOutput) {
                             await this.addWarnings(compilation, cachedOutput.warnings);
-                            compilation.updateAsset(name, cachedOutput.source, {
+                            compilation.updateAsset(name, cachedOutput.source, (assetInfo) => ({
+                                ...assetInfo,
                                 minimized: true,
-                            });
+                            }));
                             continue;
                         }
                     }
@@ -65,7 +66,10 @@ class CssOptimizerPlugin {
                     const optimizedAsset = map
                         ? new SourceMapSource(code, name, map)
                         : new OriginalSource(code, name);
-                    compilation.updateAsset(name, optimizedAsset, { minimized: true });
+                    compilation.updateAsset(name, optimizedAsset, (assetInfo) => ({
+                        ...assetInfo,
+                        minimized: true,
+                    }));
                     await (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.storePromise({
                         source: optimizedAsset,
                         warnings,

package/src/webpack/plugins/esbuild-executor.d.ts

@@ -28,9 +28,9 @@ export declare class EsbuildExecutor implements Pick<typeof import('esbuild'), '
     /**
      * Determines whether the native variant of esbuild can be used on the current platform.
      *
-     * @returns True, if the native variant of esbuild is support; False, if the WASM variant is required.
+     * @returns A promise which resolves to `true`, if the native variant of esbuild is support or `false`, if the WASM variant is required.
      */
-    static hasNativeSupport(): boolean;
+    static hasNativeSupport(): Promise<boolean>;
     /**
      * Initializes the esbuild transform and format messages functions.
      *

package/src/webpack/plugins/esbuild-executor.js

@@ -31,8 +31,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EsbuildExecutor = void 0;
-const child_process_1 = require("child_process");
-const path = __importStar(require("path"));
 /**
  * Provides the ability to execute esbuild regardless of the current platform's support
  * for using the native variant of esbuild. The native variant will be preferred (assuming
@@ -57,22 +55,14 @@ class EsbuildExecutor {
     /**
      * Determines whether the native variant of esbuild can be used on the current platform.
      *
-     * @returns True, if the native variant of esbuild is support; False, if the WASM variant is required.
+     * @returns A promise which resolves to `true`, if the native variant of esbuild is support or `false`, if the WASM variant is required.
      */
-    static hasNativeSupport() {
+    static async hasNativeSupport() {
         // Try to use native variant to ensure it is functional for the platform.
-        // Spawning a separate esbuild check process is used to determine if the native
-        // variant is viable. If check fails, the WASM variant is initialized instead.
-        // Attempting to call one of the native esbuild functions is not a viable test
-        // currently since esbuild spawn errors are currently not propagated through the
-        // call stack for the esbuild function. If this limitation is removed in the future
-        // then the separate process spawn check can be removed in favor of a direct function
-        // call check.
         try {
-            const { status, error } = (0, child_process_1.spawnSync)(process.execPath, [
-                path.join(__dirname, '../../../esbuild-check.js'),
-            ]);
-            return status === 0 && error === undefined;
+            const { formatMessages } = await Promise.resolve().then(() => __importStar(require('esbuild')));
+            await formatMessages([], { kind: 'error' });
+            return true;
         }
         catch {
             return false;
@@ -88,7 +78,7 @@ class EsbuildExecutor {
             return;
         }
         // If the WASM variant was preferred at class construction or native is not supported, use WASM
-        if (this.alwaysUseWasm || !EsbuildExecutor.hasNativeSupport()) {
+        if (this.alwaysUseWasm || !(await EsbuildExecutor.hasNativeSupport())) {
             await this.useWasm();
             this.initialized = true;
             return;

package/src/webpack/plugins/javascript-optimizer-plugin.js

@@ -61,9 +61,10 @@ class JavaScriptOptimizerPlugin {
                         cacheItem = cache.getItemCache(name, eTag);
                         const cachedOutput = await cacheItem.getPromise();
                         if (cachedOutput) {
-                            compilation.updateAsset(name, cachedOutput.source, {
+                            compilation.updateAsset(name, cachedOutput.source, (assetInfo) => ({
+                                ...assetInfo,
                                 minimized: true,
-                            });
+                            }));
                             continue;
                         }
                     }
@@ -110,7 +111,7 @@ class JavaScriptOptimizerPlugin {
                     // Perform a single native esbuild support check.
                     // This removes the need for each worker to perform the check which would
                     // otherwise require spawning a separate process per worker.
-                    alwaysUseWasm: !esbuild_executor_1.EsbuildExecutor.hasNativeSupport(),
+                    alwaysUseWasm: !(await esbuild_executor_1.EsbuildExecutor.hasNativeSupport()),
                 };
                 // Sort scripts so larger scripts start first - worker pool uses a FIFO queue
                 scriptsToOptimize.sort((a, b) => a.code.length - b.code.length);
@@ -137,7 +138,10 @@ class JavaScriptOptimizerPlugin {
                             const optimizedAsset = map
                                 ? new SourceMapSource(code, name, map)
                                 : new OriginalSource(code, name);
-                            compilation.updateAsset(name, optimizedAsset, { minimized: true });
+                            compilation.updateAsset(name, optimizedAsset, (assetInfo) => ({
+                                ...assetInfo,
+                                minimized: true,
+                            }));
                             return cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.storePromise({
                                 source: optimizedAsset,
                             });

package/src/webpack/plugins/postcss-cli-resources.js

@@ -70,7 +70,7 @@ function default_1(options) {
         // If starts with a caret, remove and return remainder
         // this supports bypassing asset processing
         if (inputUrl.startsWith('^')) {
-            return inputUrl.substr(1);
+            return inputUrl.slice(1);
         }
         const cacheKey = path.resolve(context, inputUrl);
         const cachedUrl = resourceCache.get(cacheKey);
@@ -78,7 +78,7 @@ function default_1(options) {
             return cachedUrl;
         }
         if (inputUrl.startsWith('~')) {
-            inputUrl = inputUrl.substr(1);
+            inputUrl = inputUrl.slice(1);
         }
         const { pathname, hash, search } = url.parse(inputUrl.replace(/\\/g, '/'));
         const resolver = (file, base) => new Promise((resolve, reject) => {

package/src/webpack/plugins/transfer-size-plugin.js

@@ -31,9 +31,10 @@ class TransferSizePlugin {
                     }
                     actions.push(brotliCompressAsync(scriptAsset.source.source())
                         .then((result) => {
-                        compilation.updateAsset(assetName, (s) => s, {
+                        compilation.updateAsset(assetName, (s) => s, (assetInfo) => ({
+                            ...assetInfo,
                             estimatedTransferSize: result.length,
-                        });
+                        }));
                     })
                         .catch((error) => {
                         compilation.warnings.push(new compilation.compiler.webpack.WebpackError(`Unable to calculate estimated transfer size for '${assetName}'. Reason: ${error.message}`));

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;

package/esbuild-check.js

@@ -1,16 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * 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
- */
-
-// If the platform does not support the native variant of esbuild, this will crash.
-// This script can then be spawned by the CLI to determine if native usage is supported.
-require('esbuild')
-  .formatMessages([], { kind: 'error ' })
-  .then(
-    () => {},
-    () => {},
-  );