@angular-devkit/build-angular 14.0.0-next.0 → 14.0.0-next.11

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

@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
+import { json } from '@angular-devkit/core';
 import { Schema as ProtractorBuilderOptions } from './schema';
 export { ProtractorBuilderOptions };
 /**
  * @experimental Direct usage of this function is considered experimental.
  */
 export declare function execute(options: ProtractorBuilderOptions, context: BuilderContext): Promise<BuilderOutput>;
-declare const _default: import("@angular-devkit/architect/src/internal").Builder<ProtractorBuilderOptions & import("@angular-devkit/core").JsonObject>;
+declare const _default: import("@angular-devkit/architect/src/internal").Builder<ProtractorBuilderOptions & json.JsonObject>;
 export default _default;

package/src/builders/protractor/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

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

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
-import { json } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import webpack from 'webpack';
 import { ExecutionTransformer } from '../../transforms';
@@ -14,7 +13,7 @@ import { Schema as ServerBuilderOptions } from './schema';
 /**
  * @experimental Direct usage of this type is considered experimental.
  */
-export declare type ServerBuilderOutput = json.JsonObject & BuilderOutput & {
+export declare type ServerBuilderOutput = BuilderOutput & {
     baseOutputPath: string;
     outputPaths: string[];
     /**
@@ -29,5 +28,5 @@ export { ServerBuilderOptions };
 export declare function execute(options: ServerBuilderOptions, context: BuilderContext, transforms?: {
     webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
 }): Observable<ServerBuilderOutput>;
-declare const _default: import("@angular-devkit/architect/src/internal").Builder<ServerBuilderOptions & json.JsonObject>;
+declare const _default: import("@angular-devkit/architect/src/internal").Builder<ServerBuilderOptions & import("@angular-devkit/core").JsonObject>;
 export default _default;

package/src/builders/server/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/src/builders/server/schema.json

@@ -74,8 +74,7 @@
     },
     "resourcesOutputPath": {
       "type": "string",
-      "description": "The path where style resources will be placed, relative to outputPath.",
-      "default": ""
+      "description": "The path where style resources will be placed, relative to outputPath."
     },
     "sourceMap": {
       "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",

package/src/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

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

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -27,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) {
@@ -49,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/color.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/src/utils/copy-assets.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/src/utils/delete-output-dir.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -37,13 +41,6 @@ function deleteOutputDir(root, outputPath) {
     if (resolvedOutputPath === root) {
         throw new Error('Output path MUST not be project root directory!');
     }
-    // The below should be removed and replace with just `rmSync` when support for Node.Js 12 is removed.
-    const { rmSync, rmdirSync } = fs;
-    if (rmSync) {
-        rmSync(resolvedOutputPath, { force: true, recursive: true, maxRetries: 3 });
-    }
-    else {
-        rmdirSync(resolvedOutputPath, { recursive: true, maxRetries: 3 });
-    }
+    fs.rmSync(resolvedOutputPath, { force: true, recursive: true, maxRetries: 3 });
 }
 exports.deleteOutputDir = deleteOutputDir;

package/src/utils/environment-options.d.ts

@@ -9,4 +9,3 @@ export declare const allowMangle: boolean;
 export declare const shouldBeautify: boolean;
 export declare const allowMinify: boolean;
 export declare const maxWorkers: number;
-export declare const cachingDisabled: boolean | null;

package/src/utils/environment-options.js

@@ -7,8 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cachingDisabled = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
-const color_1 = require("./color");
+exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
 function isDisabled(variable) {
     return variable === '0' || variable.toLowerCase() === 'false';
 }
@@ -68,14 +67,3 @@ exports.allowMinify = debugOptimize.minify;
  */
 const maxWorkersVariable = process.env['NG_BUILD_MAX_WORKERS'];
 exports.maxWorkers = isPresent(maxWorkersVariable) ? +maxWorkersVariable : 4;
-// Build cache
-const cacheVariable = process.env['NG_BUILD_CACHE'];
-exports.cachingDisabled = (() => {
-    if (!isPresent(cacheVariable)) {
-        return null;
-    }
-    // eslint-disable-next-line no-console
-    console.warn(color_1.colors.yellow(`Warning: 'NG_BUILD_CACHE' environment variable support will be removed in version 14.\n` +
-        `Configure 'cli.cache' in the workspace configuration instead.`));
-    return isDisabled(cacheVariable);
-})();

package/src/utils/i18n-inlining.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/src/utils/i18n-options.js

@@ -203,15 +203,8 @@ function findLocaleDataPath(locale, resolver) {
 }
 /** Remove temporary directory used for i18n processing. */
 function deleteTempDirectory(tempPath) {
-    // The below should be removed and replaced with just `rmSync` when support for Node.Js 12 is removed.
-    const { rmSync, rmdirSync } = fs_1.default;
     try {
-        if (rmSync) {
-            rmSync(tempPath, { force: true, recursive: true, maxRetries: 3 });
-        }
-        else {
-            rmdirSync(tempPath, { recursive: true, maxRetries: 3 });
-        }
+        fs_1.default.rmSync(tempPath, { force: true, recursive: true, maxRetries: 3 });
     }
     catch { }
 }

package/src/utils/index-file/html-rewriting-stream.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/src/utils/index-file/index-html-generator.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/src/utils/index-file/inline-critical-css.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/src/utils/index-file/inline-fonts.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/src/utils/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/src/utils/load-translations.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

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

@@ -5,7 +5,7 @@
  * 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, json } from '@angular-devkit/core';
+import { json } from '@angular-devkit/core';
 import { AssetPatternClass, Schema as BrowserBuilderSchema, SourceMapClass } from '../builders/browser/schema';
 import { BuildOptions } from './build-options';
 import { NormalizedFileReplacement } from './normalize-file-replacements';
@@ -19,4 +19,4 @@ export declare type NormalizedBrowserBuilderSchema = BrowserBuilderSchema & Buil
     fileReplacements: NormalizedFileReplacement[];
     optimization: NormalizedOptimizationOptions;
 };
-export declare function normalizeBrowserSchema(root: Path, projectRoot: Path, sourceRoot: Path | undefined, options: BrowserBuilderSchema, metadata: json.JsonObject): NormalizedBrowserBuilderSchema;
+export declare function normalizeBrowserSchema(workspaceRoot: string, projectRoot: string, projectSourceRoot: string | undefined, options: BrowserBuilderSchema, metadata: json.JsonObject): NormalizedBrowserBuilderSchema;

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

@@ -8,20 +8,19 @@
  */
 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");
 const normalize_optimization_1 = require("./normalize-optimization");
 const normalize_source_maps_1 = require("./normalize-source-maps");
 const supported_browsers_1 = require("./supported-browsers");
-function normalizeBrowserSchema(root, projectRoot, sourceRoot, options, metadata) {
+function normalizeBrowserSchema(workspaceRoot, projectRoot, projectSourceRoot, options, metadata) {
     const normalizedSourceMapOptions = (0, normalize_source_maps_1.normalizeSourceMaps)(options.sourceMap || false);
     return {
         ...options,
-        cache: (0, normalize_cache_1.normalizeCacheOptions)(metadata, (0, core_1.getSystemPath)(root)),
-        assets: (0, normalize_asset_patterns_1.normalizeAssetPatterns)(options.assets || [], root, projectRoot, sourceRoot),
-        fileReplacements: (0, normalize_file_replacements_1.normalizeFileReplacements)(options.fileReplacements || [], root),
+        cache: (0, normalize_cache_1.normalizeCacheOptions)(metadata, 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
@@ -38,7 +37,7 @@ function normalizeBrowserSchema(root, projectRoot, sourceRoot, options, metadata
         // A value of 0 is falsy and will disable polling rather then enable
         // 500 ms is a sensible default in this case
         poll: options.poll === 0 ? 500 : options.poll,
-        supportedBrowsers: (0, supported_browsers_1.getSupportedBrowsers)((0, core_1.getSystemPath)(projectRoot)),
+        supportedBrowsers: (0, supported_browsers_1.getSupportedBrowsers)(projectRoot),
     };
 }
 exports.normalizeBrowserSchema = normalizeBrowserSchema;

package/src/utils/normalize-cache.js

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = void 0;
 const core_1 = require("@angular-devkit/core");
 const path_1 = require("path");
-const environment_options_1 = require("./environment-options");
 const package_version_1 = require("./package-version");
 function normalizeCacheOptions(metadata, worspaceRoot) {
     var _a;
@@ -20,9 +19,6 @@ function normalizeCacheOptions(metadata, worspaceRoot) {
     const { enabled = true, environment = 'local', path = '.angular/cache' } = cacheMetadata;
     const isCI = process.env['CI'] === '1' || ((_a = process.env['CI']) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'true';
     let cacheEnabled = enabled;
-    if (environment_options_1.cachingDisabled !== null) {
-        cacheEnabled = !environment_options_1.cachingDisabled;
-    }
     if (cacheEnabled) {
         switch (environment) {
             case 'ci':

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),
+    };
 }