@angular-devkit/build-angular 13.2.3 → 14.0.0-next.2

package/package.json

@@ -1,37 +1,36 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.2.3",
+  "version": "14.0.0-next.2",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@ampproject/remapping": "1.1.1",
-    "@angular-devkit/architect": "0.1302.3",
-    "@angular-devkit/build-webpack": "0.1302.3",
-    "@angular-devkit/core": "13.2.3",
-    "@babel/core": "7.16.12",
-    "@babel/generator": "7.16.8",
+    "@ampproject/remapping": "2.1.2",
+    "@angular-devkit/architect": "0.1400.0-next.2",
+    "@angular-devkit/build-webpack": "0.1400.0-next.2",
+    "@angular-devkit/core": "14.0.0-next.2",
+    "@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.16.10",
+    "@babel/plugin-transform-runtime": "7.17.0",
     "@babel/preset-env": "7.16.11",
-    "@babel/runtime": "7.16.7",
+    "@babel/runtime": "7.17.2",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.6",
-    "@ngtools/webpack": "13.2.3",
+    "@ngtools/webpack": "14.0.0-next.2",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.9.1",
     "cacache": "15.3.0",
-    "circular-dependency-plugin": "5.2.2",
-    "copy-webpack-plugin": "10.2.1",
-    "core-js": "3.20.3",
+    "copy-webpack-plugin": "10.2.4",
+    "core-js": "3.21.1",
     "critters": "0.0.16",
-    "css-loader": "6.5.1",
-    "esbuild-wasm": "0.14.14",
+    "css-loader": "6.6.0",
+    "esbuild-wasm": "0.14.22",
     "glob": "7.2.0",
     "https-proxy-agent": "5.0.0",
     "inquirer": "8.2.0",
@@ -39,23 +38,23 @@
     "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.4",
+    "minimatch": "5.0.0",
     "open": "8.4.0",
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "6.0.1",
     "piscina": "3.2.0",
-    "postcss": "8.4.5",
+    "postcss": "8.4.6",
     "postcss-import": "14.0.2",
     "postcss-loader": "6.2.1",
-    "postcss-preset-env": "7.2.3",
+    "postcss-preset-env": "7.4.1",
     "regenerator-runtime": "0.13.9",
     "resolve-url-loader": "5.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.49.0",
-    "sass-loader": "12.4.0",
+    "sass": "1.49.7",
+    "sass-loader": "12.6.0",
     "semver": "7.3.5",
     "source-map-loader": "3.0.1",
     "source-map-support": "0.5.21",
@@ -65,21 +64,21 @@
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.3.1",
-    "webpack": "5.67.0",
-    "webpack-dev-middleware": "5.3.0",
-    "webpack-dev-server": "4.7.3",
+    "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.14"
+    "esbuild": "0.14.22"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^13.0.0",
-    "@angular/localize": "^13.0.0",
-    "@angular/service-worker": "^13.0.0",
+    "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next",
+    "@angular/localize": "^14.0.0 || ^14.0.0-next",
+    "@angular/service-worker": "^14.0.0 || ^14.0.0-next",
     "karma": "^6.3.0",
-    "ng-packagr": "^13.0.0",
+    "ng-packagr": "^14.0.0 || ^14.0.0-next",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
     "typescript": ">=4.4.3 <4.6"

package/src/babel/webpack-loader.js

@@ -6,11 +6,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
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const remapping_1 = __importDefault(require("@ampproject/remapping"));
 const babel_loader_1 = require("babel-loader");
 const typescript_1 = require("typescript");
 const load_esm_1 = require("../utils/load-esm");
@@ -166,12 +162,13 @@ exports.default = (0, babel_loader_1.custom)(() => {
             return { custom: customOptions, loader: loaderOptions };
         },
         config(configuration, { customOptions }) {
+            var _a;
             return {
                 ...configuration.options,
                 // Using `false` disables babel from attempting to locate sourcemaps or process any inline maps.
                 // The babel types do not include the false option even though it is valid
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                inputSourceMap: false,
+                inputSourceMap: (_a = configuration.options.inputSourceMap) !== null && _a !== void 0 ? _a : false,
                 presets: [
                     ...(configuration.options.presets || []),
                     [
@@ -195,22 +192,5 @@ exports.default = (0, babel_loader_1.custom)(() => {
                 ],
             };
         },
-        result(result, { map: inputSourceMap }) {
-            if (result.map && inputSourceMap) {
-                // Merge the intermediate sourcemap generated by babel with the input source map.
-                // The casting is required due to slight differences in the types for babel and
-                // `@ampproject/remapping` source map objects but both are compatible with Webpack.
-                // This method for merging is used because it provides more accurate output
-                // and is faster while using less memory.
-                result.map = {
-                    // Convert the SourceMap back to simple plain object.
-                    // This is needed because otherwise code-coverage will fail with `don't know how to turn this value into a node`
-                    // Which is thrown by Babel if it is invoked again from `istanbul-lib-instrument`.
-                    // https://github.com/babel/babel/blob/780aa48d2a34dc55f556843074b6aed45e7eabeb/packages/babel-types/src/converters/valueToNode.ts#L115-L130
-                    ...(0, remapping_1.default)([result.map, inputSourceMap], () => null),
-                };
-            }
-            return result;
-        },
     };
 });

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

@@ -24,7 +24,7 @@ export interface Schema {
      */
     budgets?: Budget[];
     /**
-     * Enables '@angular-devkit/build-optimizer' optimizations when using the 'aot' option.
+     * Enables advanced build optimizations when using the 'aot' option.
      */
     buildOptimizer?: boolean;
     /**
@@ -126,17 +126,11 @@ export interface Schema {
     /**
      * Global scripts to be included in the build.
      */
-    scripts?: ExtraEntryPoint[];
+    scripts?: ScriptElement[];
     /**
      * Generates a service worker config for production builds.
      */
     serviceWorker?: boolean;
-    /**
-     * Show circular dependency warnings on builds.
-     * @deprecated The recommended method to detect circular dependencies in project code is to
-     * use either a lint rule or other external tooling.
-     */
-    showCircularDependencies?: boolean;
     /**
      * Output source maps for scripts and styles. For more information, see
      * https://angular.io/guide/workspace-config#source-map-configuration.
@@ -154,7 +148,7 @@ export interface Schema {
     /**
      * Global styles to be included in the build.
      */
-    styles?: ExtraEntryPoint[];
+    styles?: StyleElement[];
     /**
      * Enables the use of subresource integrity validation.
      */
@@ -366,8 +360,8 @@ export declare enum OutputHashing {
     Media = "media",
     None = "none"
 }
-export declare type ExtraEntryPoint = ExtraEntryPointClass | string;
-export interface ExtraEntryPointClass {
+export declare type ScriptElement = ScriptClass | string;
+export interface ScriptClass {
     /**
      * The bundle name for this extra entry point.
      */
@@ -413,3 +407,18 @@ export interface StylePreprocessorOptions {
      */
     includePaths?: string[];
 }
+export declare type StyleElement = StyleClass | string;
+export interface StyleClass {
+    /**
+     * The bundle name for this extra entry point.
+     */
+    bundleName?: string;
+    /**
+     * If the bundle will be referenced in the HTML file.
+     */
+    inject?: boolean;
+    /**
+     * The file to include.
+     */
+    input: string;
+}

package/src/builders/browser/schema.json

@@ -29,7 +29,35 @@
       "type": "array",
       "default": [],
       "items": {
-        "$ref": "#/definitions/extraEntryPoint"
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
+              "input": {
+                "type": "string",
+                "description": "The file to include.",
+                "pattern": "\\.[cm]?jsx?$"
+              },
+              "bundleName": {
+                "type": "string",
+                "pattern": "^[\\w\\-.]*$",
+                "description": "The bundle name for this extra entry point."
+              },
+              "inject": {
+                "type": "boolean",
+                "description": "If the bundle will be referenced in the HTML file.",
+                "default": true
+              }
+            },
+            "additionalProperties": false,
+            "required": ["input"]
+          },
+          {
+            "type": "string",
+            "description": "The file to include.",
+            "pattern": "\\.[cm]?jsx?$"
+          }
+        ]
       }
     },
     "styles": {
@@ -37,7 +65,35 @@
       "type": "array",
       "default": [],
       "items": {
-        "$ref": "#/definitions/extraEntryPoint"
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
+              "input": {
+                "type": "string",
+                "description": "The file to include.",
+                "pattern": "\\.(?:css|scss|sass|less|styl)$"
+              },
+              "bundleName": {
+                "type": "string",
+                "pattern": "^[\\w\\-.]*$",
+                "description": "The bundle name for this extra entry point."
+              },
+              "inject": {
+                "type": "boolean",
+                "description": "If the bundle will be referenced in the HTML file.",
+                "default": true
+              }
+            },
+            "additionalProperties": false,
+            "required": ["input"]
+          },
+          {
+            "type": "string",
+            "description": "The file to include.",
+            "pattern": "\\.(?:css|scss|sass|less|styl)$"
+          }
+        ]
       }
     },
     "inlineStyleLanguage": {
@@ -273,15 +329,9 @@
       "description": "Extract all licenses in a separate file.",
       "default": true
     },
-    "showCircularDependencies": {
-      "type": "boolean",
-      "description": "Show circular dependency warnings on builds.",
-      "default": false,
-      "x-deprecated": "The recommended method to detect circular dependencies in project code is to use either a lint rule or other external tooling."
-    },
     "buildOptimizer": {
       "type": "boolean",
-      "description": "Enables '@angular-devkit/build-optimizer' optimizations when using the 'aot' option.",
+      "description": "Enables advanced build optimizations when using the 'aot' option.",
       "default": true
     },
     "namedChunks": {
@@ -437,35 +487,6 @@
         }
       ]
     },
-    "extraEntryPoint": {
-      "oneOf": [
-        {
-          "type": "object",
-          "properties": {
-            "input": {
-              "type": "string",
-              "description": "The file to include."
-            },
-            "bundleName": {
-              "type": "string",
-              "pattern": "^[\\w\\-.]*$",
-              "description": "The bundle name for this extra entry point."
-            },
-            "inject": {
-              "type": "boolean",
-              "description": "If the bundle will be referenced in the HTML file.",
-              "default": true
-            }
-          },
-          "additionalProperties": false,
-          "required": ["input"]
-        },
-        {
-          "type": "string",
-          "description": "The file to include."
-        }
-      ]
-    },
     "budget": {
       "type": "object",
       "properties": {

package/src/builders/karma/find-tests.d.ts

@@ -5,4 +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
  */
-export declare function findTests(patterns: string[], cwd: string, workspaceRoot: string): string[];
+export declare function findTests(patterns: string[], workspaceRoot: string, projectSourceRoot: string): Promise<string[]>;

package/src/builders/karma/find-tests.js

@@ -28,48 +28,62 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findTests = void 0;
 const fs_1 = require("fs");
-const glob = __importStar(require("glob"));
+const glob_1 = __importStar(require("glob"));
 const path_1 = require("path");
-const is_directory_1 = require("../../utils/is-directory");
+const util_1 = require("util");
+const globPromise = (0, util_1.promisify)(glob_1.default);
 // go through all patterns and find unique list of files
-function findTests(patterns, cwd, workspaceRoot) {
-    return patterns.reduce((files, pattern) => {
-        const relativePathToMain = cwd.replace(workspaceRoot, '').substr(1); // remove leading slash
-        const tests = findMatchingTests(pattern, cwd, relativePathToMain);
-        tests.forEach((file) => {
-            if (!files.includes(file)) {
-                files.push(file);
-            }
-        });
-        return files;
-    }, []);
+async function findTests(patterns, workspaceRoot, projectSourceRoot) {
+    const matchingTestsPromises = patterns.map((pattern) => findMatchingTests(pattern, workspaceRoot, projectSourceRoot));
+    const files = await Promise.all(matchingTestsPromises);
+    // Unique file names
+    return [...new Set(files.flat())];
 }
 exports.findTests = findTests;
-function findMatchingTests(pattern, cwd, relativePathToMain) {
+const normalizePath = (path) => path.replace(/\\/g, '/');
+async function findMatchingTests(pattern, workspaceRoot, projectSourceRoot) {
     // normalize pattern, glob lib only accepts forward slashes
-    pattern = pattern.replace(/\\/g, '/');
-    relativePathToMain = relativePathToMain.replace(/\\/g, '/');
-    // remove relativePathToMain to support relative paths from root
+    let normalizedPattern = normalizePath(pattern);
+    const relativeProjectRoot = normalizePath((0, path_1.relative)(workspaceRoot, projectSourceRoot) + '/');
+    // remove relativeProjectRoot to support relative paths from root
     // such paths are easy to get when running scripts via IDEs
-    if (pattern.startsWith(relativePathToMain + '/')) {
-        pattern = pattern.substr(relativePathToMain.length + 1); // +1 to include slash
+    if (normalizedPattern.startsWith(relativeProjectRoot)) {
+        normalizedPattern = normalizedPattern.substring(relativeProjectRoot.length);
     }
     // special logic when pattern does not look like a glob
-    if (!glob.hasMagic(pattern)) {
-        if ((0, is_directory_1.isDirectory)((0, path_1.join)(cwd, pattern))) {
-            pattern = `${pattern}/**/*.spec.@(ts|tsx)`;
+    if (!(0, glob_1.hasMagic)(normalizedPattern)) {
+        if (await isDirectory((0, path_1.join)(projectSourceRoot, normalizedPattern))) {
+            normalizedPattern = `${normalizedPattern}/**/*.spec.@(ts|tsx)`;
         }
         else {
             // see if matching spec file exists
-            const extension = (0, path_1.extname)(pattern);
-            const matchingSpec = `${(0, path_1.basename)(pattern, extension)}.spec${extension}`;
-            if ((0, fs_1.existsSync)((0, path_1.join)(cwd, (0, path_1.dirname)(pattern), matchingSpec))) {
-                pattern = (0, path_1.join)((0, path_1.dirname)(pattern), matchingSpec).replace(/\\/g, '/');
+            const fileExt = (0, path_1.extname)(normalizedPattern);
+            // Replace extension to `.spec.ext`. Example: `src/app/app.component.ts`-> `src/app/app.component.spec.ts`
+            const potentialSpec = (0, path_1.join)((0, path_1.dirname)(normalizedPattern), `${(0, path_1.basename)(normalizedPattern, fileExt)}.spec${fileExt}`);
+            if (await exists((0, path_1.join)(projectSourceRoot, potentialSpec))) {
+                return [normalizePath(potentialSpec)];
             }
         }
     }
-    const files = glob.sync(pattern, {
-        cwd,
+    return globPromise(normalizedPattern, {
+        cwd: projectSourceRoot,
     });
-    return files;
+}
+async function isDirectory(path) {
+    try {
+        const stats = await fs_1.promises.stat(path);
+        return stats.isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
+async function exists(path) {
+    try {
+        await fs_1.promises.access(path, fs_1.constants.F_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
 }

package/src/builders/karma/index.js

@@ -80,7 +80,7 @@ function execute(options, context, transforms = {}) {
         singleRun = !options.watch;
     }
     return (0, rxjs_1.from)(initialize(options, context, transforms.webpackConfiguration)).pipe((0, operators_1.switchMap)(async ([karma, webpackConfig]) => {
-        var _a;
+        var _a, _b, _c, _d, _e;
         const karmaOptions = {
             singleRun,
         };
@@ -98,15 +98,20 @@ function execute(options, context, transforms = {}) {
             }
         }
         // prepend special webpack loader that will transform test.ts
-        if (options.include && options.include.length > 0) {
-            const mainFilePath = (0, core_1.getSystemPath)((0, core_1.join)((0, core_1.normalize)(context.workspaceRoot), options.main));
-            const files = (0, find_tests_1.findTests)(options.include, (0, path_1.dirname)(mainFilePath), context.workspaceRoot);
+        if ((_a = options.include) === null || _a === void 0 ? void 0 : _a.length) {
+            const projectName = (_b = context.target) === null || _b === void 0 ? void 0 : _b.project;
+            if (!projectName) {
+                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 files = await (0, find_tests_1.findTests)(options.include, context.workspaceRoot, projectSourceRoot);
             // early exit, no reason to start karma
             if (!files.length) {
                 throw new Error(`Specified patterns: "${options.include.join(', ')}" did not match any spec files.`);
             }
             // Get the rules and ensure the Webpack configuration is setup properly
-            const rules = ((_a = webpackConfig.module) === null || _a === void 0 ? void 0 : _a.rules) || [];
+            const rules = ((_e = webpackConfig.module) === null || _e === void 0 ? void 0 : _e.rules) || [];
             if (!webpackConfig.module) {
                 webpackConfig.module = { rules };
             }
@@ -114,7 +119,7 @@ function execute(options, context, transforms = {}) {
                 webpackConfig.module.rules = rules;
             }
             rules.unshift({
-                test: mainFilePath,
+                test: (0, path_1.resolve)(context.workspaceRoot, options.main),
                 use: {
                     // cannot be a simple path as it differs between environments
                     loader: single_test_transform_1.SingleTestTransformLoader,

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

@@ -67,7 +67,7 @@ export interface Schema {
     /**
      * Global scripts to be included in the build.
      */
-    scripts?: ExtraEntryPoint[];
+    scripts?: ScriptElement[];
     /**
      * Output source maps for scripts and styles. For more information, see
      * https://angular.io/guide/workspace-config#source-map-configuration.
@@ -80,7 +80,7 @@ export interface Schema {
     /**
      * Global styles to be included in the build.
      */
-    styles?: ExtraEntryPoint[];
+    styles?: StyleElement[];
     /**
      * The name of the TypeScript configuration file.
      */
@@ -128,8 +128,8 @@ export declare enum InlineStyleLanguage {
     Sass = "sass",
     Scss = "scss"
 }
-export declare type ExtraEntryPoint = ExtraEntryPointClass | string;
-export interface ExtraEntryPointClass {
+export declare type ScriptElement = ScriptClass | string;
+export interface ScriptClass {
     /**
      * The bundle name for this extra entry point.
      */
@@ -171,3 +171,18 @@ export interface StylePreprocessorOptions {
      */
     includePaths?: string[];
 }
+export declare type StyleElement = StyleClass | string;
+export interface StyleClass {
+    /**
+     * The bundle name for this extra entry point.
+     */
+    bundleName?: string;
+    /**
+     * If the bundle will be referenced in the HTML file.
+     */
+    inject?: boolean;
+    /**
+     * The file to include.
+     */
+    input: string;
+}

package/src/builders/karma/schema.json

@@ -33,7 +33,35 @@
       "type": "array",
       "default": [],
       "items": {
-        "$ref": "#/definitions/extraEntryPoint"
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
+              "input": {
+                "type": "string",
+                "description": "The file to include.",
+                "pattern": "\\.[cm]?jsx?$"
+              },
+              "bundleName": {
+                "type": "string",
+                "pattern": "^[\\w\\-.]*$",
+                "description": "The bundle name for this extra entry point."
+              },
+              "inject": {
+                "type": "boolean",
+                "description": "If the bundle will be referenced in the HTML file.",
+                "default": true
+              }
+            },
+            "additionalProperties": false,
+            "required": ["input"]
+          },
+          {
+            "type": "string",
+            "description": "The file to include.",
+            "pattern": "\\.[cm]?jsx?$"
+          }
+        ]
       }
     },
     "styles": {
@@ -41,7 +69,35 @@
       "type": "array",
       "default": [],
       "items": {
-        "$ref": "#/definitions/extraEntryPoint"
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
+              "input": {
+                "type": "string",
+                "description": "The file to include.",
+                "pattern": "\\.(?:css|scss|sass|less|styl)$"
+              },
+              "bundleName": {
+                "type": "string",
+                "pattern": "^[\\w\\-.]*$",
+                "description": "The bundle name for this extra entry point."
+              },
+              "inject": {
+                "type": "boolean",
+                "description": "If the bundle will be referenced in the HTML file.",
+                "default": true
+              }
+            },
+            "additionalProperties": false,
+            "required": ["input"]
+          },
+          {
+            "type": "string",
+            "description": "The file to include.",
+            "pattern": "\\.(?:css|scss|sass|less|styl)$"
+          }
+        ]
       }
     },
     "inlineStyleLanguage": {
@@ -218,35 +274,6 @@
           "type": "string"
         }
       ]
-    },
-    "extraEntryPoint": {
-      "oneOf": [
-        {
-          "type": "object",
-          "properties": {
-            "input": {
-              "type": "string",
-              "description": "The file to include."
-            },
-            "bundleName": {
-              "type": "string",
-              "pattern": "^[\\w\\-.]*$",
-              "description": "The bundle name for this extra entry point."
-            },
-            "inject": {
-              "type": "boolean",
-              "description": "If the bundle will be referenced in the HTML file.",
-              "default": true
-            }
-          },
-          "additionalProperties": false,
-          "required": ["input"]
-        },
-        {
-          "type": "string",
-          "description": "The file to include."
-        }
-      ]
     }
   }
 }

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

@@ -83,12 +83,6 @@ export interface Schema {
      * The path where style resources will be placed, relative to outputPath.
      */
     resourcesOutputPath?: string;
-    /**
-     * Show circular dependency warnings on builds.
-     * @deprecated The recommended method to detect circular dependencies in project code is to
-     * use either a lint rule or other external tooling.
-     */
-    showCircularDependencies?: boolean;
     /**
      * Output source maps for scripts and styles. For more information, see
      * https://angular.io/guide/workspace-config#source-map-configuration.

package/src/builders/server/schema.json

@@ -177,12 +177,6 @@
       "description": "Extract all licenses in a separate file, in the case of production builds only.",
       "default": true
     },
-    "showCircularDependencies": {
-      "type": "boolean",
-      "description": "Show circular dependency warnings on builds.",
-      "default": false,
-      "x-deprecated": "The recommended method to detect circular dependencies in project code is to use either a lint rule or other external tooling."
-    },
     "namedChunks": {
       "type": "boolean",
       "description": "Use file name for lazy loaded chunks.",

package/src/index.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 export * from './transforms';
-export { AssetPattern, AssetPatternClass as AssetPatternObject, Budget, CrossOrigin, ExtraEntryPoint, ExtraEntryPointClass as ExtraEntryPointObject, FileReplacement, OptimizationClass as OptimizationObject, OptimizationUnion, OutputHashing, Schema as BrowserBuilderOptions, SourceMapClass as SourceMapObject, SourceMapUnion, StylePreprocessorOptions, Type, } from './builders/browser/schema';
+export { AssetPattern, AssetPatternClass as AssetPatternObject, Budget, CrossOrigin, FileReplacement, OptimizationClass as OptimizationObject, OptimizationUnion, OutputHashing, Schema as BrowserBuilderOptions, SourceMapClass as SourceMapObject, SourceMapUnion, StylePreprocessorOptions, Type, } from './builders/browser/schema';
 export { buildWebpackBrowser as executeBrowserBuilder, BrowserBuilderOutput, } from './builders/browser';
 export { serveWebpackBrowser as executeDevServerBuilder, DevServerBuilderOptions, DevServerBuilderOutput, } from './builders/dev-server';
 export { execute as executeExtractI18nBuilder, ExtractI18nBuilderOptions, } from './builders/extract-i18n';

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

@@ -7,7 +7,7 @@
  */
 import { logging } from '@angular-devkit/core';
 import type { ParsedConfiguration } from '@angular/compiler-cli';
-import { AssetPatternClass, Budget, CrossOrigin, ExtraEntryPoint, I18NTranslation, IndexUnion, InlineStyleLanguage, Localize, OutputHashing, SourceMapClass } from '../builders/browser/schema';
+import { AssetPatternClass, Budget, CrossOrigin, I18NTranslation, IndexUnion, InlineStyleLanguage, Localize, OutputHashing, ScriptElement, SourceMapClass, StyleElement } from '../builders/browser/schema';
 import { Schema as DevServerSchema } from '../builders/dev-server/schema';
 import { NormalizedCachedOptions } from './normalize-cache';
 import { NormalizedFileReplacement } from './normalize-file-replacements';
@@ -36,7 +36,6 @@ export interface BuildOptions {
     deleteOutputPath?: boolean;
     preserveSymlinks?: boolean;
     extractLicenses?: boolean;
-    showCircularDependencies?: boolean;
     buildOptimizer?: boolean;
     namedChunks?: boolean;
     crossOrigin?: CrossOrigin;
@@ -49,8 +48,8 @@ export interface BuildOptions {
     polyfills?: string;
     budgets: Budget[];
     assets: AssetPatternClass[];
-    scripts: ExtraEntryPoint[];
-    styles: ExtraEntryPoint[];
+    scripts: ScriptElement[];
+    styles: StyleElement[];
     stylePreprocessorOptions?: {
         includePaths: string[];
     };

package/src/utils/package-chunk-sort.d.ts

@@ -5,10 +5,10 @@
  * 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 { ExtraEntryPoint } from '../builders/browser/schema';
+import { ScriptElement, StyleElement } from '../builders/browser/schema';
 export declare type EntryPointsType = [name: string, isModule: boolean];
 export declare function generateEntryPoints(options: {
-    styles: ExtraEntryPoint[];
-    scripts: ExtraEntryPoint[];
+    styles: StyleElement[];
+    scripts: ScriptElement[];
     isHMREnabled?: boolean;
 }): EntryPointsType[];

package/src/webpack/configs/common.js

@@ -116,12 +116,6 @@ async function getCommonConfig(wco) {
             patterns: (0, helpers_1.assetPatterns)(root, buildOptions.assets),
         }));
     }
-    if (buildOptions.showCircularDependencies) {
-        const CircularDependencyPlugin = require('circular-dependency-plugin');
-        extraPlugins.push(new CircularDependencyPlugin({
-            exclude: /[\\/]node_modules[\\/]/,
-        }));
-    }
     if (buildOptions.extractLicenses) {
         const LicenseWebpackPlugin = require('license-webpack-plugin').LicenseWebpackPlugin;
         extraPlugins.push(new LicenseWebpackPlugin({

package/src/webpack/configs/styles.js

@@ -350,6 +350,7 @@ function getStylesConfig(wco) {
                             {
                                 use: componentStyleLoaders,
                                 type: 'asset/source',
+                                resourceQuery: /\?ngResource/,
                             },
                         ],
                     },

package/src/webpack/utils/helpers.d.ts

@@ -8,7 +8,7 @@
 import type { ObjectPattern } from 'copy-webpack-plugin';
 import { ScriptTarget } from 'typescript';
 import type { Configuration, WebpackOptionsNormalized } from 'webpack';
-import { AssetPatternClass, ExtraEntryPoint, ExtraEntryPointClass, OutputHashing } from '../../builders/browser/schema';
+import { AssetPatternClass, OutputHashing, ScriptElement, StyleElement } from '../../builders/browser/schema';
 import { WebpackConfigOptions } from '../../utils/build-options';
 export interface HashFormat {
     chunk: string;
@@ -17,12 +17,12 @@ export interface HashFormat {
     script: string;
 }
 export declare function getOutputHashFormat(outputHashing?: OutputHashing, length?: number): HashFormat;
-export declare type NormalizedEntryPoint = Required<ExtraEntryPointClass>;
-export declare function normalizeExtraEntryPoints(extraEntryPoints: ExtraEntryPoint[], defaultBundleName: string): NormalizedEntryPoint[];
+export declare type NormalizedEntryPoint = Required<Exclude<ScriptElement | StyleElement, string>>;
+export declare function normalizeExtraEntryPoints(extraEntryPoints: (ScriptElement | StyleElement)[], defaultBundleName: string): NormalizedEntryPoint[];
 export declare function assetNameTemplateFactory(hashFormat: HashFormat): (resourcePath: string) => string;
 export declare function getInstrumentationExcludedPaths(sourceRoot: string, excludedPaths: string[]): Set<string>;
 export declare function getCacheSettings(wco: WebpackConfigOptions, angularVersion: string): WebpackOptionsNormalized['cache'];
-export declare function globalScriptsByBundleName(root: string, scripts: ExtraEntryPoint[]): {
+export declare function globalScriptsByBundleName(root: string, scripts: ScriptElement[]): {
     bundleName: string;
     inject: boolean;
     paths: string[];

package/src/utils/is-directory.d.ts

@@ -1,8 +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
- */
-export declare function isDirectory(path: string): boolean;

package/src/utils/is-directory.js

@@ -1,40 +0,0 @@
-"use strict";
-/**
- * @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
- */
-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]; } });
-}) : (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.isDirectory = void 0;
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-const fs = __importStar(require("fs"));
-function isDirectory(path) {
-    try {
-        return fs.statSync(path).isDirectory();
-    }
-    catch (_) {
-        return false;
-    }
-}
-exports.isDirectory = isDirectory;