@angular-devkit/build-angular 15.0.0-next.6 → 15.0.0-rc.1

package/package.json

@@ -1,37 +1,37 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "15.0.0-next.6",
+  "version": "15.0.0-rc.1",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.0",
-    "@angular-devkit/architect": "0.1500.0-next.6",
-    "@angular-devkit/build-webpack": "0.1500.0-next.6",
-    "@angular-devkit/core": "15.0.0-next.6",
-    "@babel/core": "7.19.3",
-    "@babel/generator": "7.19.5",
+    "@angular-devkit/architect": "0.1500.0-rc.1",
+    "@angular-devkit/build-webpack": "0.1500.0-rc.1",
+    "@angular-devkit/core": "15.0.0-rc.1",
+    "@babel/core": "7.19.6",
+    "@babel/generator": "7.19.6",
     "@babel/helper-annotate-as-pure": "7.18.6",
     "@babel/plugin-proposal-async-generator-functions": "7.19.1",
     "@babel/plugin-transform-async-to-generator": "7.18.6",
-    "@babel/plugin-transform-runtime": "7.19.1",
+    "@babel/plugin-transform-runtime": "7.19.6",
     "@babel/preset-env": "7.19.4",
     "@babel/runtime": "7.19.4",
     "@babel/template": "7.18.10",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "15.0.0-next.6",
+    "@ngtools/webpack": "15.0.0-rc.1",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.12",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.9.1",
-    "cacache": "17.0.0",
+    "cacache": "17.0.1",
     "chokidar": "3.5.3",
     "copy-webpack-plugin": "11.0.0",
     "critters": "0.0.16",
     "css-loader": "6.7.1",
-    "esbuild-wasm": "0.15.10",
+    "esbuild-wasm": "0.15.12",
     "glob": "8.0.3",
     "https-proxy-agent": "5.0.1",
     "inquirer": "8.2.4",
@@ -68,7 +68,7 @@
     "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.15.10"
+    "esbuild": "0.15.12"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^15.0.0-next",

package/src/builders/browser-esbuild/compiler-plugin.d.ts

@@ -11,6 +11,7 @@ import { BundleStylesheetOptions } from './stylesheets';
 export declare class SourceFileCache extends Map<string, ts.SourceFile> {
     readonly modifiedFiles: Set<string>;
     readonly babelFileCache: Map<string, Uint8Array>;
+    readonly typeScriptFileCache: Map<string, Uint8Array>;
     invalidate(files: Iterable<string>): void;
 }
 export interface CompilerPluginOptions {

package/src/builders/browser-esbuild/compiler-plugin.js

@@ -35,10 +35,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompilerPlugin = exports.SourceFileCache = void 0;
 const core_1 = require("@babel/core");
-const assert = __importStar(require("assert"));
-const fs_1 = require("fs");
-const os_1 = require("os");
-const path = __importStar(require("path"));
+const assert = __importStar(require("node:assert"));
+const fs = __importStar(require("node:fs/promises"));
+const node_os_1 = require("node:os");
+const path = __importStar(require("node:path"));
+const node_url_1 = require("node:url");
 const typescript_1 = __importDefault(require("typescript"));
 const application_1 = __importDefault(require("../../babel/presets/application"));
 const webpack_loader_1 = require("../../babel/webpack-loader");
@@ -108,18 +109,20 @@ function convertTypeScriptDiagnostic(diagnostic, host) {
     }
     return message;
 }
-const USING_WINDOWS = (0, os_1.platform)() === 'win32';
+const USING_WINDOWS = (0, node_os_1.platform)() === 'win32';
 const WINDOWS_SEP_REGEXP = new RegExp(`\\${path.win32.sep}`, 'g');
 class SourceFileCache extends Map {
     constructor() {
         super(...arguments);
         this.modifiedFiles = new Set();
         this.babelFileCache = new Map();
+        this.typeScriptFileCache = new Map();
     }
     invalidate(files) {
         this.modifiedFiles.clear();
         for (let file of files) {
             this.babelFileCache.delete(file);
+            this.typeScriptFileCache.delete((0, node_url_1.pathToFileURL)(file).href);
             // Normalize separators to allow matching TypeScript Host paths
             if (USING_WINDOWS) {
                 file = file.replace(WINDOWS_SEP_REGEXP, path.posix.sep);
@@ -186,7 +189,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                     notes: [
                         {
                             text: `To control ECMA version and features use the Browerslist configuration. ' +
-              'For more information, see https://github.com/browserslist/browserslist#queries'`,
+              'For more information, see https://angular.io/guide/build#configuring-browser-compatibility'`,
                         },
                     ],
                 });
@@ -269,6 +272,12 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                 const builder = typescript_1.default.createEmitAndSemanticDiagnosticsBuilderProgram(typeScriptProgram, host, previousBuilder, configurationDiagnostics);
                 previousBuilder = builder;
                 await (0, profiling_1.profileAsync)('NG_ANALYZE_PROGRAM', () => angularCompiler.analyzeAsync());
+                const affectedFiles = (0, profiling_1.profileSync)('NG_FIND_AFFECTED', () => findAffectedFiles(builder, angularCompiler));
+                if (pluginOptions.sourceFileCache) {
+                    for (const affected of affectedFiles) {
+                        pluginOptions.sourceFileCache.typeScriptFileCache.delete((0, node_url_1.pathToFileURL)(affected.fileName).href);
+                    }
+                }
                 function* collectDiagnostics() {
                     // Collect program level diagnostics
                     yield* builder.getConfigFileParsingDiagnostics();
@@ -276,7 +285,6 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                     yield* builder.getOptionsDiagnostics();
                     yield* builder.getGlobalDiagnostics();
                     // Collect source file specific diagnostics
-                    const affectedFiles = findAffectedFiles(builder, angularCompiler);
                     const optimizeFor = affectedFiles.size > 1 ? OptimizeFor.WholeProgram : OptimizeFor.SingleFile;
                     for (const sourceFile of builder.getSourceFiles()) {
                         if (angularCompiler.ignoreForDiagnostics.has(sourceFile)) {
@@ -286,6 +294,10 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                         // changed or affected for this build when using incremental building.
                         yield* (0, profiling_1.profileSync)('NG_DIAGNOSTICS_SYNTACTIC', () => builder.getSyntacticDiagnostics(sourceFile), true);
                         yield* (0, profiling_1.profileSync)('NG_DIAGNOSTICS_SEMANTIC', () => builder.getSemanticDiagnostics(sourceFile), true);
+                        // Declaration files cannot have template diagnostics
+                        if (sourceFile.isDeclarationFile) {
+                            continue;
+                        }
                         // Only request Angular template diagnostics for affected files to avoid
                         // overhead of template diagnostics for unchanged files.
                         if (affectedFiles.has(sourceFile)) {
@@ -319,39 +331,47 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                 return result;
             });
             build.onLoad({ filter: compilerOptions.allowJs ? /\.[cm]?[jt]sx?$/ : /\.[cm]?tsx?$/ }, (args) => (0, profiling_1.profileAsync)('NG_EMIT_TS*', async () => {
-                var _a, _b, _c;
+                var _a, _b, _c, _d, _e;
                 assert.ok(fileEmitter, 'Invalid plugin execution order');
-                const typescriptResult = await fileEmitter((_b = (_a = pluginOptions.fileReplacements) === null || _a === void 0 ? void 0 : _a[args.path]) !== null && _b !== void 0 ? _b : args.path);
-                if (!typescriptResult) {
-                    // No TS result indicates the file is not part of the TypeScript program.
-                    // If allowJs is enabled and the file is JS then defer to the next load hook.
-                    if (compilerOptions.allowJs && /\.[cm]?js$/.test(args.path)) {
-                        return undefined;
-                    }
-                    // Otherwise return an error
-                    return {
-                        errors: [
-                            {
-                                text: `File '${args.path}' is missing from the TypeScript compilation.`,
-                                notes: [
-                                    {
-                                        text: `Ensure the file is part of the TypeScript program via the 'files' or 'include' property.`,
-                                    },
-                                ],
-                            },
-                        ],
-                    };
-                }
-                const data = (_c = typescriptResult.content) !== null && _c !== void 0 ? _c : '';
-                // The pre-transformed data is used as a cache key. Since the cache is memory only,
+                // The filename is currently used as a cache key. Since the cache is memory only,
                 // the options cannot change and do not need to be represented in the key. If the
                 // cache is later stored to disk, then the options that affect transform output
-                // would need to be added to the key as well.
-                let contents = babelDataCache.get(data);
+                // would need to be added to the key as well as a check for any change of content.
+                let contents = (_a = pluginOptions.sourceFileCache) === null || _a === void 0 ? void 0 : _a.typeScriptFileCache.get((0, node_url_1.pathToFileURL)(args.path).href);
                 if (contents === undefined) {
-                    const transformedData = await transformWithBabel(args.path, data, pluginOptions);
-                    contents = Buffer.from(transformedData, 'utf-8');
-                    babelDataCache.set(data, contents);
+                    const typescriptResult = await fileEmitter((_c = (_b = pluginOptions.fileReplacements) === null || _b === void 0 ? void 0 : _b[args.path]) !== null && _c !== void 0 ? _c : args.path);
+                    if (!typescriptResult) {
+                        // No TS result indicates the file is not part of the TypeScript program.
+                        // If allowJs is enabled and the file is JS then defer to the next load hook.
+                        if (compilerOptions.allowJs && /\.[cm]?js$/.test(args.path)) {
+                            return undefined;
+                        }
+                        // Otherwise return an error
+                        return {
+                            errors: [
+                                {
+                                    text: `File '${args.path}' is missing from the TypeScript compilation.`,
+                                    notes: [
+                                        {
+                                            text: `Ensure the file is part of the TypeScript program via the 'files' or 'include' property.`,
+                                        },
+                                    ],
+                                },
+                            ],
+                        };
+                    }
+                    const data = (_d = typescriptResult.content) !== null && _d !== void 0 ? _d : '';
+                    // The pre-transformed data is used as a cache key. Since the cache is memory only,
+                    // the options cannot change and do not need to be represented in the key. If the
+                    // cache is later stored to disk, then the options that affect transform output
+                    // would need to be added to the key as well.
+                    contents = babelDataCache.get(data);
+                    if (contents === undefined) {
+                        const transformedData = await transformWithBabel(args.path, data, pluginOptions);
+                        contents = Buffer.from(transformedData, 'utf-8');
+                        babelDataCache.set(data, contents);
+                    }
+                    (_e = pluginOptions.sourceFileCache) === null || _e === void 0 ? void 0 : _e.typeScriptFileCache.set((0, node_url_1.pathToFileURL)(args.path).href, contents);
                 }
                 return {
                     contents,
@@ -366,7 +386,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                 // would need to be added to the key as well as a check for any change of content.
                 let contents = (_a = pluginOptions.sourceFileCache) === null || _a === void 0 ? void 0 : _a.babelFileCache.get(args.path);
                 if (contents === undefined) {
-                    const data = await fs_1.promises.readFile(args.path, 'utf-8');
+                    const data = await fs.readFile(args.path, 'utf-8');
                     const transformedData = await transformWithBabel(args.path, data, pluginOptions);
                     contents = Buffer.from(transformedData, 'utf-8');
                     (_b = pluginOptions.sourceFileCache) === null || _b === void 0 ? void 0 : _b.babelFileCache.set(args.path, contents);

package/src/builders/browser-esbuild/index.js

@@ -352,8 +352,8 @@ async function* buildEsbuildBrowser(initialOptions, context) {
     const watcher = (0, watcher_1.createWatcher)({
         polling: typeof initialOptions.poll === 'number',
         interval: initialOptions.poll,
-        // Ignore the output path to avoid infinite rebuild cycles
-        ignored: [normalizedOptions.outputPath],
+        // Ignore the output and cache paths to avoid infinite rebuild cycles
+        ignored: [normalizedOptions.outputPath, normalizedOptions.cacheOptions.basePath],
     });
     // Temporarily watch the entire project
     watcher.add(normalizedOptions.projectRoot);

package/src/builders/browser-esbuild/options.d.ts

@@ -21,6 +21,7 @@ export declare type NormalizedBrowserOptions = Awaited<ReturnType<typeof normali
 export declare function normalizeOptions(context: BuilderContext, projectName: string, options: BrowserBuilderOptions): Promise<{
     advancedOptimizations: boolean | undefined;
     baseHref: string | undefined;
+    cacheOptions: import("../../utils/normalize-cache").NormalizedCachedOptions;
     crossOrigin: import("./schema").CrossOrigin | undefined;
     externalDependencies: string[] | undefined;
     poll: number | undefined;

package/src/builders/browser-esbuild/options.js

@@ -33,6 +33,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const path = __importStar(require("path"));
 const utils_1 = require("../../utils");
+const normalize_cache_1 = require("../../utils/normalize-cache");
 const normalize_polyfills_1 = require("../../utils/normalize-polyfills");
 const package_chunk_sort_1 = require("../../utils/package-chunk-sort");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
@@ -54,7 +55,7 @@ async function normalizeOptions(context, projectName, options) {
     const projectMetadata = await context.getProjectMetadata(projectName);
     const projectRoot = path.join(workspaceRoot, (_a = projectMetadata.root) !== null && _a !== void 0 ? _a : '');
     const projectSourceRoot = path.join(workspaceRoot, (_b = projectMetadata.sourceRoot) !== null && _b !== void 0 ? _b : 'src');
-    // Normalize options
+    const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
     const mainEntryPoint = path.join(workspaceRoot, options.main);
     // Currently esbuild do not support multiple files per entry-point
     const [polyfillsEntryPoint, ...remainingPolyfills] = (0, normalize_polyfills_1.normalizePolyfills)(options.polyfills, workspaceRoot);
@@ -126,6 +127,7 @@ async function normalizeOptions(context, projectName, options) {
     return {
         advancedOptimizations: buildOptimizer,
         baseHref,
+        cacheOptions,
         crossOrigin,
         externalDependencies,
         poll,

package/src/builders/browser-esbuild/profiling.js

@@ -18,9 +18,22 @@ function logCumulativeDurations() {
     if (!environment_options_1.debugPerformance || !cumulativeDurations) {
         return;
     }
-    for (const [name, duration] of cumulativeDurations) {
+    for (const [name, durations] of cumulativeDurations) {
+        let total = 0;
+        let min;
+        let max;
+        for (const duration of durations) {
+            total += duration;
+            if (min === undefined || duration < min) {
+                min = duration;
+            }
+            if (max === undefined || duration > max) {
+                max = duration;
+            }
+        }
+        const average = total / durations.length;
         // eslint-disable-next-line no-console
-        console.log(`DURATION[${name}]: ${duration.toFixed(9)} seconds`);
+        console.log(`DURATION[${name}]: ${total.toFixed(9)}s [count: ${durations.length}; avg: ${average.toFixed(9)}s; min: ${min === null || min === void 0 ? void 0 : min.toFixed(9)}s; max: ${max === null || max === void 0 ? void 0 : max.toFixed(9)}s]`);
     }
 }
 exports.logCumulativeDurations = logCumulativeDurations;
@@ -29,11 +42,13 @@ function recordDuration(name, startTime, cumulative) {
     const duration = Number(process.hrtime.bigint() - startTime) / 10 ** 9;
     if (cumulative) {
         cumulativeDurations !== null && cumulativeDurations !== void 0 ? cumulativeDurations : (cumulativeDurations = new Map());
-        cumulativeDurations.set(name, ((_a = cumulativeDurations.get(name)) !== null && _a !== void 0 ? _a : 0) + duration);
+        const durations = (_a = cumulativeDurations.get(name)) !== null && _a !== void 0 ? _a : [];
+        durations.push(duration);
+        cumulativeDurations.set(name, durations);
     }
     else {
         // eslint-disable-next-line no-console
-        console.log(`DURATION[${name}]: ${duration.toFixed(9)} seconds`);
+        console.log(`DURATION[${name}]: ${duration.toFixed(9)}s`);
     }
 }
 async function profileAsync(name, action, cumulative) {

package/src/builders/dev-server/index.js

@@ -114,6 +114,12 @@ function serveWebpackBrowser(options, context, transforms = {}) {
         const metadata = await context.getProjectMetadata(projectName);
         const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(metadata, context.workspaceRoot);
         const browserName = await context.getBuilderNameForTarget(browserTarget);
+        // Issue a warning that the dev-server does not currently support the experimental esbuild-
+        // based builder and will use Webpack.
+        if (browserName === '@angular-devkit/build-angular:browser-esbuild') {
+            logger.warn('WARNING: The experimental esbuild-based builder is not currently supported ' +
+                'by the dev-server. The stable Webpack-based builder will be used instead.');
+        }
         const browserOptions = (await context.validateOptions({
             ...rawBrowserOptions,
             watch: options.watch,

package/src/webpack/plugins/typescript.js

@@ -28,7 +28,7 @@ function createIvyPlugin(wco, aot, tsconfig) {
         (_a = (_c = tsConfig.options).useDefineForClassFields) !== null && _a !== void 0 ? _a : (_c.useDefineForClassFields = false);
         wco.logger.warn('TypeScript compiler options "target" and "useDefineForClassFields" are set to "ES2022" and ' +
             '"false" respectively by the Angular CLI. To control ECMA version and features use the Browerslist configuration. ' +
-            'For more information, see https://github.com/browserslist/browserslist');
+            'For more information, see https://angular.io/guide/build#configuring-browser-compatibility');
     }
     if (buildOptions.preserveSymlinks !== undefined) {
         compilerOptions.preserveSymlinks = buildOptions.preserveSymlinks;