@angular-devkit/build-angular 14.0.0-next.1 → 14.0.0-next.4

package/package.json

@@ -1,36 +1,36 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.0.0-next.1",
+  "version": "14.0.0-next.4",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@ampproject/remapping": "2.1.0",
-    "@angular-devkit/architect": "0.1400.0-next.1",
-    "@angular-devkit/build-webpack": "0.1400.0-next.1",
-    "@angular-devkit/core": "14.0.0-next.1",
-    "@babel/core": "7.17.0",
-    "@babel/generator": "7.17.0",
+    "@ampproject/remapping": "2.1.2",
+    "@angular-devkit/architect": "0.1400.0-next.4",
+    "@angular-devkit/build-webpack": "0.1400.0-next.4",
+    "@angular-devkit/core": "14.0.0-next.4",
+    "@babel/core": "7.17.5",
+    "@babel/generator": "7.17.3",
     "@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.0",
+    "@babel/runtime": "7.17.2",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.6",
-    "@ngtools/webpack": "14.0.0-next.1",
+    "@ngtools/webpack": "14.0.0-next.4",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.9.1",
     "cacache": "15.3.0",
     "copy-webpack-plugin": "10.2.4",
-    "core-js": "3.21.0",
+    "core-js": "3.21.1",
     "critters": "0.0.16",
     "css-loader": "6.6.0",
-    "esbuild-wasm": "0.14.20",
+    "esbuild-wasm": "0.14.23",
     "glob": "7.2.0",
     "https-proxy-agent": "5.0.0",
     "inquirer": "8.2.0",
@@ -38,40 +38,40 @@
     "karma-source-map-support": "1.4.0",
     "less": "4.1.2",
     "less-loader": "10.2.0",
-    "license-webpack-plugin": "4.0.1",
+    "license-webpack-plugin": "4.0.2",
     "loader-utils": "3.2.0",
     "mini-css-extract-plugin": "2.5.3",
-    "minimatch": "3.0.5",
+    "minimatch": "5.0.1",
     "open": "8.4.0",
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "6.0.1",
     "piscina": "3.2.0",
-    "postcss": "8.4.6",
+    "postcss": "8.4.7",
     "postcss-import": "14.0.2",
     "postcss-loader": "6.2.1",
-    "postcss-preset-env": "7.3.1",
+    "postcss-preset-env": "7.4.1",
     "regenerator-runtime": "0.13.9",
     "resolve-url-loader": "5.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.49.7",
-    "sass-loader": "12.4.0",
+    "sass": "1.49.9",
+    "sass-loader": "12.6.0",
     "semver": "7.3.5",
     "source-map-loader": "3.0.1",
     "source-map-support": "0.5.21",
     "stylus": "0.56.0",
     "stylus-loader": "6.2.0",
-    "terser": "5.10.0",
+    "terser": "5.12.0",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.3.1",
-    "webpack": "5.68.0",
+    "webpack": "5.69.1",
     "webpack-dev-middleware": "5.3.1",
     "webpack-dev-server": "4.7.4",
     "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.14.20"
+    "esbuild": "0.14.23"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next",

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

@@ -35,6 +35,7 @@ const inline_critical_css_1 = require("../../utils/index-file/inline-critical-cs
 const service_worker_1 = require("../../utils/service-worker");
 const spinner_1 = require("../../utils/spinner");
 async function _renderUniversal(options, context, browserResult, serverResult, spinner) {
+    var _a;
     // Get browser target options.
     const browserTarget = (0, architect_1.targetFromTargetString)(options.browserTarget);
     const rawBrowserOptions = (await context.getTargetOptions(browserTarget));
@@ -49,7 +50,7 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
         throw new Error('The builder requires a target.');
     }
     const projectMetadata = await context.getProjectMetadata(projectName);
-    const projectRoot = (0, core_1.resolve)((0, core_1.normalize)(root), (0, core_1.normalize)(projectMetadata.root || ''));
+    const projectRoot = path.join(root, (_a = projectMetadata.root) !== null && _a !== void 0 ? _a : '');
     const { styles } = (0, utils_1.normalizeOptimization)(browserOptions.optimization);
     const inlineCriticalCssProcessor = styles.inlineCritical
         ? new inline_critical_css_1.InlineCriticalCssProcessor({
@@ -91,7 +92,7 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
         }
         await fs.promises.writeFile(outputIndexPath, html);
         if (browserOptions.serviceWorker) {
-            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, (0, core_1.normalize)(outputPath), browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
+            await (0, service_worker_1.augmentAppWithServiceWorker)((0, core_1.normalize)(projectRoot), (0, core_1.normalize)(outputPath), browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
         }
     }
     return browserResult;

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

@@ -7,7 +7,6 @@
  */
 import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
 import { WebpackLoggingCallback } from '@angular-devkit/build-webpack';
-import { json } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import webpack from 'webpack';
 import { ExecutionTransformer } from '../../transforms';
@@ -16,7 +15,7 @@ import { Schema as BrowserBuilderSchema } from './schema';
 /**
  * @experimental Direct usage of this type is considered experimental.
  */
-export declare type BrowserBuilderOutput = json.JsonObject & BuilderOutput & {
+export declare type BrowserBuilderOutput = BuilderOutput & {
     baseOutputPath: string;
     outputPaths: string[];
     /**
@@ -37,5 +36,5 @@ export declare function buildWebpackBrowser(options: BrowserBuilderSchema, conte
     logging?: WebpackLoggingCallback;
     indexHtml?: IndexHtmlTransform;
 }): Observable<BrowserBuilderOutput>;
-declare const _default: import("@angular-devkit/architect/src/internal").Builder<json.JsonObject & BrowserBuilderSchema>;
+declare const _default: import("@angular-devkit/architect/src/internal").Builder<BrowserBuilderSchema & import("@angular-devkit/core").JsonObject>;
 export default _default;

package/src/builders/browser/index.js

@@ -92,7 +92,6 @@ async function initialize(options, context, webpackConfigurationTransform) {
 // eslint-disable-next-line max-lines-per-function
 function buildWebpackBrowser(options, context, transforms = {}) {
     var _a;
-    const root = (0, core_1.normalize)(context.workspaceRoot);
     const projectName = (_a = context.target) === null || _a === void 0 ? void 0 : _a.project;
     if (!projectName) {
         throw new Error('The builder requires a target.');
@@ -102,13 +101,14 @@ function buildWebpackBrowser(options, context, transforms = {}) {
     // Check Angular version.
     (0, version_1.assertCompatibleAngularVersion)(context.workspaceRoot);
     return (0, rxjs_1.from)(context.getProjectMetadata(projectName)).pipe((0, operators_1.switchMap)(async (projectMetadata) => {
-        var _a;
-        const sysProjectRoot = (0, core_1.getSystemPath)((0, core_1.resolve)((0, core_1.normalize)(context.workspaceRoot), (0, core_1.normalize)((_a = projectMetadata.root) !== null && _a !== void 0 ? _a : '')));
         // Purge old build disk cache.
         await (0, purge_cache_1.purgeStaleBuildCache)(context);
-        checkInternetExplorerSupport(sysProjectRoot, context.logger);
+        // Initialize builder
+        const initialization = await initialize(options, context, transforms.webpackConfiguration);
+        // Check and warn about IE browser support
+        checkInternetExplorerSupport(initialization.projectRoot, context.logger);
         return {
-            ...(await initialize(options, context, transforms.webpackConfiguration)),
+            ...initialization,
             cacheOptions: (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, context.workspaceRoot),
         };
     }), (0, operators_1.switchMap)(
@@ -185,7 +185,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, root, (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, (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);
                             spinner.succeed('Copying assets complete.');
                         }
                         catch (err) {

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

@@ -13,7 +13,7 @@ import webpack from 'webpack';
 import { ExecutionTransformer } from '../../transforms';
 import { IndexHtmlTransform } from '../../utils/index-file/index-html-generator';
 import { Schema } from './schema';
-export declare type DevServerBuilderOptions = Schema & json.JsonObject;
+export declare type DevServerBuilderOptions = Schema;
 /**
  * @experimental Direct usage of this type is considered experimental.
  */

package/src/builders/extract-i18n/index.d.ts

@@ -11,7 +11,7 @@ import { JsonObject } from '@angular-devkit/core';
 import webpack from 'webpack';
 import { ExecutionTransformer } from '../../transforms';
 import { Schema } from './schema';
-export declare type ExtractI18nBuilderOptions = Schema & JsonObject;
+export declare type ExtractI18nBuilderOptions = Schema;
 /**
  * @experimental Direct usage of this function is considered experimental.
  */

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/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/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

@@ -15,13 +15,13 @@ 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 || [], (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)),
         optimization: (0, normalize_optimization_1.normalizeOptimization)(options.optimization),
         sourceMap: normalizedSourceMapOptions,
         preserveSymlinks: options.preserveSymlinks === undefined
@@ -38,7 +38,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/webpack-browser-config.js

@@ -27,7 +27,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIndexInputFile = exports.getIndexOutputFile = exports.generateBrowserWebpackConfigFromContext = exports.generateI18nBrowserWebpackConfigFromContext = exports.generateWebpackConfig = void 0;
-const core_1 = require("@angular-devkit/core");
 const path = __importStar(require("path"));
 const typescript_1 = require("typescript");
 const webpack_1 = require("webpack");
@@ -108,19 +107,18 @@ async function generateI18nBrowserWebpackConfigFromContext(options, context, web
 }
 exports.generateI18nBrowserWebpackConfigFromContext = generateI18nBrowserWebpackConfigFromContext;
 async function generateBrowserWebpackConfigFromContext(options, context, webpackPartialGenerator, extraBuildOptions = {}) {
+    var _a;
     const projectName = context.target && context.target.project;
     if (!projectName) {
         throw new Error('The builder requires a target.');
     }
-    const workspaceRoot = (0, core_1.normalize)(context.workspaceRoot);
+    const workspaceRoot = context.workspaceRoot;
     const projectMetadata = await context.getProjectMetadata(projectName);
-    const projectRoot = (0, core_1.resolve)(workspaceRoot, (0, core_1.normalize)(projectMetadata.root || ''));
-    const projectSourceRoot = projectMetadata.sourceRoot;
-    const sourceRoot = projectSourceRoot
-        ? (0, core_1.resolve)(workspaceRoot, (0, core_1.normalize)(projectSourceRoot))
-        : undefined;
-    const normalizedOptions = (0, utils_1.normalizeBrowserSchema)(workspaceRoot, projectRoot, sourceRoot, options, projectMetadata);
-    const config = await generateWebpackConfig((0, core_1.getSystemPath)(workspaceRoot), (0, core_1.getSystemPath)(projectRoot), sourceRoot && (0, core_1.getSystemPath)(sourceRoot), projectName, normalizedOptions, webpackPartialGenerator, context.logger, extraBuildOptions);
+    const projectRoot = path.join(workspaceRoot, (_a = projectMetadata.root) !== null && _a !== void 0 ? _a : '');
+    const sourceRoot = projectMetadata.sourceRoot;
+    const projectSourceRoot = sourceRoot ? path.join(workspaceRoot, sourceRoot) : undefined;
+    const normalizedOptions = (0, utils_1.normalizeBrowserSchema)(workspaceRoot, projectRoot, projectSourceRoot, options, projectMetadata);
+    const config = await generateWebpackConfig(workspaceRoot, projectRoot, projectSourceRoot, projectName, normalizedOptions, webpackPartialGenerator, context.logger, extraBuildOptions);
     // If builder watch support is present in the context, add watch plugin
     // This is internal only and currently only used for testing
     const watcherFactory = context.watcherFactory;
@@ -132,8 +130,8 @@ async function generateBrowserWebpackConfigFromContext(options, context, webpack
     }
     return {
         config,
-        projectRoot: (0, core_1.getSystemPath)(projectRoot),
-        projectSourceRoot: sourceRoot && (0, core_1.getSystemPath)(sourceRoot),
+        projectRoot,
+        projectSourceRoot,
     };
 }
 exports.generateBrowserWebpackConfigFromContext = generateBrowserWebpackConfigFromContext;

package/src/webpack/plugins/named-chunks-plugin.js

@@ -37,6 +37,10 @@ class NamedChunksPlugin {
             if (!(block instanceof webpack_1.AsyncDependenciesBlock)) {
                 continue;
             }
+            if (block.groupOptions.name) {
+                // Ignore groups which have been named already.
+                return undefined;
+            }
             for (const dependency of block.dependencies) {
                 if (dependency instanceof ImportDependency) {
                     return webpack_1.Template.toPath(dependency.request);