@angular-devkit/build-angular 17.1.0-rc.0 → 17.1.0

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "17.1.0-rc.0",
+  "version": "17.1.0",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.1",
-    "@angular-devkit/architect": "0.1701.0-rc.0",
-    "@angular-devkit/build-webpack": "0.1701.0-rc.0",
-    "@angular-devkit/core": "17.1.0-rc.0",
+    "@angular-devkit/architect": "0.1701.0",
+    "@angular-devkit/build-webpack": "0.1701.0",
+    "@angular-devkit/core": "17.1.0",
     "@babel/core": "7.23.7",
     "@babel/generator": "7.23.6",
     "@babel/helper-annotate-as-pure": "7.22.5",
@@ -20,7 +20,7 @@
     "@babel/preset-env": "7.23.7",
     "@babel/runtime": "7.23.7",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "17.1.0-rc.0",
+    "@ngtools/webpack": "17.1.0",
     "@vitejs/plugin-basic-ssl": "1.0.2",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.16",
@@ -49,21 +49,21 @@
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "3.0.1",
     "piscina": "4.2.1",
-    "postcss": "8.4.32",
+    "postcss": "8.4.33",
     "postcss-loader": "7.3.4",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
     "sass": "1.69.7",
     "sass-loader": "13.3.3",
     "semver": "7.5.4",
-    "source-map-loader": "4.0.2",
+    "source-map-loader": "5.0.0",
     "source-map-support": "0.5.21",
     "terser": "5.26.0",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.6.2",
     "undici": "6.2.1",
-    "vite": "5.0.10",
+    "vite": "5.0.11",
     "watchpack": "2.4.0",
     "webpack": "5.89.0",
     "webpack-dev-middleware": "6.1.1",
@@ -75,16 +75,16 @@
     "esbuild": "0.19.11"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^17.0.0 || ^17.1.0-next.0",
-    "@angular/localize": "^17.0.0 || ^17.1.0-next.0",
-    "@angular/platform-server": "^17.0.0 || ^17.1.0-next.0",
-    "@angular/service-worker": "^17.0.0 || ^17.1.0-next.0",
-    "@web/test-runner": "^0.17.3",
+    "@angular/compiler-cli": "^17.0.0",
+    "@angular/localize": "^17.0.0",
+    "@angular/platform-server": "^17.0.0",
+    "@angular/service-worker": "^17.0.0",
+    "@web/test-runner": "^0.18.0",
     "browser-sync": "^3.0.2",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "karma": "^6.3.0",
-    "ng-packagr": "^17.0.0 || ^17.1.0-next.0",
+    "ng-packagr": "^17.0.0",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
     "typescript": ">=5.2 <5.4"

package/src/builders/application/build-action.js

@@ -52,7 +52,10 @@ async function* runEsBuildBuildAction(action, options) {
     // Initial build
     let result;
     try {
+        // Perform the build action
         result = await withProgress('Building...', () => action());
+        // Log all diagnostic (error/warning) messages from the build
+        await (0, utils_1.logMessages)(logger, result);
     }
     finally {
         // Ensure Sass workers are shutdown if not watching
@@ -139,6 +142,8 @@ async function* runEsBuildBuildAction(action, options) {
                 logger.info(changes.toDebugString());
             }
             result = await withProgress('Changes detected. Rebuilding...', () => action(result.createRebuildState(changes)));
+            // Log all diagnostic (error/warning) messages from the rebuild
+            await (0, utils_1.logMessages)(logger, result);
             // Update watched locations provided by the new build result.
             // Keep watching all previous files if there are any errors; otherwise consider all
             // files stale until confirmed present in the new result's watch files.

package/src/builders/application/execute-build.js

@@ -9,13 +9,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeBuild = void 0;
 const source_file_cache_1 = require("../../tools/esbuild/angular/source-file-cache");
-const application_code_bundle_1 = require("../../tools/esbuild/application-code-bundle");
 const budget_stats_1 = require("../../tools/esbuild/budget-stats");
 const bundler_context_1 = require("../../tools/esbuild/bundler-context");
 const bundler_execution_result_1 = require("../../tools/esbuild/bundler-execution-result");
 const commonjs_checker_1 = require("../../tools/esbuild/commonjs-checker");
-const global_scripts_1 = require("../../tools/esbuild/global-scripts");
-const global_styles_1 = require("../../tools/esbuild/global-styles");
 const license_extractor_1 = require("../../tools/esbuild/license-extractor");
 const utils_1 = require("../../tools/esbuild/utils");
 const bundle_calculator_1 = require("../../utils/bundle-calculator");
@@ -24,11 +21,11 @@ const copy_assets_1 = require("../../utils/copy-assets");
 const supported_browsers_1 = require("../../utils/supported-browsers");
 const execute_post_bundle_1 = require("./execute-post-bundle");
 const i18n_1 = require("./i18n");
-// eslint-disable-next-line max-lines-per-function
+const setup_bundling_1 = require("./setup-bundling");
 async function executeBuild(options, context, rebuildState) {
-    const { projectRoot, workspaceRoot, i18nOptions, optimizationOptions, serverEntryPoint, assets, cacheOptions, prerenderOptions, appShellOptions, ssrOptions, } = options;
+    const { projectRoot, workspaceRoot, i18nOptions, optimizationOptions, assets, cacheOptions, prerenderOptions, } = options;
+    // TODO: Consider integrating into watch mode. Would require full rebuild on target changes.
     const browsers = (0, supported_browsers_1.getSupportedBrowsers)(projectRoot, context.logger);
-    const target = (0, utils_1.transformSupportedBrowsersToTargets)(browsers);
     // Load active translations if inlining
     // TODO: Integrate into watch mode and only load changed translations
     if (i18nOptions.shouldInline) {
@@ -39,53 +36,11 @@ async function executeBuild(options, context, rebuildState) {
     const codeBundleCache = rebuildState?.codeBundleCache ??
         new source_file_cache_1.SourceFileCache(cacheOptions.enabled ? cacheOptions.path : undefined);
     if (bundlerContexts === undefined) {
-        bundlerContexts = [];
-        // Browser application code
-        bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, (0, application_code_bundle_1.createBrowserCodeBundleOptions)(options, target, codeBundleCache)));
-        // Browser polyfills code
-        const browserPolyfillBundleOptions = (0, application_code_bundle_1.createBrowserPolyfillBundleOptions)(options, target, codeBundleCache);
-        if (browserPolyfillBundleOptions) {
-            bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, browserPolyfillBundleOptions));
-        }
-        // Global Stylesheets
-        if (options.globalStyles.length > 0) {
-            for (const initial of [true, false]) {
-                const bundleOptions = (0, global_styles_1.createGlobalStylesBundleOptions)(options, target, initial);
-                if (bundleOptions) {
-                    bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, bundleOptions, () => initial));
-                }
-            }
-        }
-        // Global Scripts
-        if (options.globalScripts.length > 0) {
-            for (const initial of [true, false]) {
-                const bundleOptions = (0, global_scripts_1.createGlobalScriptsBundleOptions)(options, target, initial);
-                if (bundleOptions) {
-                    bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, bundleOptions, () => initial));
-                }
-            }
-        }
-        // Skip server build when none of the features are enabled.
-        if (serverEntryPoint && (prerenderOptions || appShellOptions || ssrOptions)) {
-            const nodeTargets = [...target, ...(0, utils_1.getSupportedNodeTargets)()];
-            // Server application code
-            bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, (0, application_code_bundle_1.createServerCodeBundleOptions)({
-                ...options,
-                // Disable external deps for server bundles.
-                // This is because it breaks Vite 'optimizeDeps' for SSR.
-                externalPackages: false,
-            }, nodeTargets, codeBundleCache), () => false));
-            // Server polyfills code
-            const serverPolyfillBundleOptions = (0, application_code_bundle_1.createServerPolyfillBundleOptions)(options, nodeTargets, codeBundleCache);
-            if (serverPolyfillBundleOptions) {
-                bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, serverPolyfillBundleOptions, () => false));
-            }
-        }
+        bundlerContexts = (0, setup_bundling_1.setupBundlerContexts)(options, browsers, codeBundleCache);
     }
     const bundlingResult = await bundler_context_1.BundlerContext.bundleAll(bundlerContexts, rebuildState?.fileChanges.all);
-    // Log all warnings and errors generated during bundling
-    await (0, utils_1.logMessages)(context, bundlingResult);
     const executionResult = new bundler_execution_result_1.ExecutionResult(bundlerContexts, codeBundleCache);
+    executionResult.addWarnings(bundlingResult.warnings);
     // Return if the bundling has errors
     if (bundlingResult.errors) {
         executionResult.addErrors(bundlingResult.errors);
@@ -111,14 +66,13 @@ async function executeBuild(options, context, rebuildState) {
     if (options.budgets) {
         const compatStats = (0, budget_stats_1.generateBudgetStats)(metafile, initialFiles);
         budgetFailures = [...(0, bundle_calculator_1.checkBudgets)(options.budgets, compatStats, true)];
-        if (budgetFailures.length > 0) {
-            const errors = budgetFailures
-                .filter((failure) => failure.severity === 'error')
-                .map(({ message }) => message);
-            const warnings = budgetFailures
-                .filter((failure) => failure.severity !== 'error')
-                .map(({ message }) => message);
-            await printWarningsAndErrorsToConsoleAndAddToResult(context, executionResult, warnings, errors);
+        for (const { message, severity } of budgetFailures) {
+            if (severity === 'error') {
+                executionResult.addError(message);
+            }
+            else {
+                executionResult.addWarning(message);
+            }
         }
     }
     // Calculate estimated transfer size if scripts are optimized
@@ -129,7 +83,7 @@ async function executeBuild(options, context, rebuildState) {
     // Check metafile for CommonJS module usage if optimizing scripts
     if (optimizationOptions.scripts) {
         const messages = (0, commonjs_checker_1.checkCommonJSModules)(metafile, options.allowedCommonJsDependencies);
-        await (0, utils_1.logMessages)(context, { warnings: messages });
+        executionResult.addWarnings(messages);
     }
     // Copy assets
     if (assets) {
@@ -143,25 +97,22 @@ async function executeBuild(options, context, rebuildState) {
     }
     // Perform i18n translation inlining if enabled
     let prerenderedRoutes;
-    let errors;
-    let warnings;
     if (i18nOptions.shouldInline) {
         const result = await (0, i18n_1.inlineI18n)(options, executionResult, initialFiles);
-        errors = result.errors;
-        warnings = result.warnings;
+        executionResult.addErrors(result.errors);
+        executionResult.addWarnings(result.warnings);
         prerenderedRoutes = result.prerenderedRoutes;
     }
     else {
         const result = await (0, execute_post_bundle_1.executePostBundleSteps)(options, executionResult.outputFiles, executionResult.assetFiles, initialFiles, 
         // Set lang attribute to the defined source locale if present
         i18nOptions.hasDefinedSourceLocale ? i18nOptions.sourceLocale : undefined);
-        errors = result.errors;
-        warnings = result.warnings;
+        executionResult.addErrors(result.errors);
+        executionResult.addWarnings(result.warnings);
         prerenderedRoutes = result.prerenderedRoutes;
         executionResult.outputFiles.push(...result.additionalOutputFiles);
         executionResult.assetFiles.push(...result.additionalAssets);
     }
-    await printWarningsAndErrorsToConsoleAndAddToResult(context, executionResult, warnings, errors);
     if (prerenderOptions) {
         executionResult.addOutputFile('prerendered-routes.json', JSON.stringify({ routes: prerenderedRoutes.sort((a, b) => a.localeCompare(b)) }, null, 2), bundler_context_1.BuildOutputFileType.Root);
         let prerenderMsg = `Prerendered ${prerenderedRoutes.length} static route`;
@@ -173,7 +124,7 @@ async function executeBuild(options, context, rebuildState) {
         }
         context.logger.info(color_1.colors.magenta(prerenderMsg) + '\n');
     }
-    (0, utils_1.logBuildStats)(context, metafile, initialFiles, budgetFailures, changedFiles, estimatedTransferSizes);
+    (0, utils_1.logBuildStats)(context.logger, metafile, initialFiles, budgetFailures, changedFiles, estimatedTransferSizes);
     // Write metafile if stats option is enabled
     if (options.stats) {
         executionResult.addOutputFile('stats.json', JSON.stringify(metafile, null, 2), bundler_context_1.BuildOutputFileType.Root);
@@ -181,13 +132,3 @@ async function executeBuild(options, context, rebuildState) {
     return executionResult;
 }
 exports.executeBuild = executeBuild;
-async function printWarningsAndErrorsToConsoleAndAddToResult(context, executionResult, warnings, errors) {
-    const errorMessages = errors.map((text) => ({ text, location: null }));
-    if (errorMessages.length) {
-        executionResult.addErrors(errorMessages);
-    }
-    await (0, utils_1.logMessages)(context, {
-        errors: errorMessages,
-        warnings: warnings.map((text) => ({ text, location: null })),
-    });
-}

package/src/builders/application/index.js

@@ -92,6 +92,9 @@ function buildApplication(options, context, pluginsOrExtensions) {
             codePlugins: pluginsOrExtensions,
         };
     }
+    else {
+        extensions = pluginsOrExtensions;
+    }
     return buildApplicationInternal(options, context, undefined, extensions);
 }
 exports.buildApplication = buildApplication;

package/src/builders/application/setup-bundling.d.ts

@@ -0,0 +1,19 @@
+/**
+ * @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
+ */
+import { SourceFileCache } from '../../tools/esbuild/angular/source-file-cache';
+import { BundlerContext } from '../../tools/esbuild/bundler-context';
+import { NormalizedApplicationBuildOptions } from './options';
+/**
+ * Generates one or more BundlerContext instances based on the builder provided
+ * configuration.
+ * @param options The normalized application builder options to use.
+ * @param browsers An string array of browserslist browsers to support.
+ * @param codeBundleCache An instance of the TypeScript source file cache.
+ * @returns An array of BundlerContext objects.
+ */
+export declare function setupBundlerContexts(options: NormalizedApplicationBuildOptions, browsers: string[], codeBundleCache: SourceFileCache): BundlerContext[];

package/src/builders/application/setup-bundling.js

@@ -0,0 +1,71 @@
+"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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupBundlerContexts = void 0;
+const application_code_bundle_1 = require("../../tools/esbuild/application-code-bundle");
+const bundler_context_1 = require("../../tools/esbuild/bundler-context");
+const global_scripts_1 = require("../../tools/esbuild/global-scripts");
+const global_styles_1 = require("../../tools/esbuild/global-styles");
+const utils_1 = require("../../tools/esbuild/utils");
+/**
+ * Generates one or more BundlerContext instances based on the builder provided
+ * configuration.
+ * @param options The normalized application builder options to use.
+ * @param browsers An string array of browserslist browsers to support.
+ * @param codeBundleCache An instance of the TypeScript source file cache.
+ * @returns An array of BundlerContext objects.
+ */
+function setupBundlerContexts(options, browsers, codeBundleCache) {
+    const { appShellOptions, prerenderOptions, serverEntryPoint, ssrOptions, workspaceRoot } = options;
+    const target = (0, utils_1.transformSupportedBrowsersToTargets)(browsers);
+    const bundlerContexts = [];
+    // Browser application code
+    bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, (0, application_code_bundle_1.createBrowserCodeBundleOptions)(options, target, codeBundleCache)));
+    // Browser polyfills code
+    const browserPolyfillBundleOptions = (0, application_code_bundle_1.createBrowserPolyfillBundleOptions)(options, target, codeBundleCache);
+    if (browserPolyfillBundleOptions) {
+        bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, browserPolyfillBundleOptions));
+    }
+    // Global Stylesheets
+    if (options.globalStyles.length > 0) {
+        for (const initial of [true, false]) {
+            const bundleOptions = (0, global_styles_1.createGlobalStylesBundleOptions)(options, target, initial);
+            if (bundleOptions) {
+                bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, bundleOptions, () => initial));
+            }
+        }
+    }
+    // Global Scripts
+    if (options.globalScripts.length > 0) {
+        for (const initial of [true, false]) {
+            const bundleOptions = (0, global_scripts_1.createGlobalScriptsBundleOptions)(options, target, initial);
+            if (bundleOptions) {
+                bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, bundleOptions, () => initial));
+            }
+        }
+    }
+    // Skip server build when none of the features are enabled.
+    if (serverEntryPoint && (prerenderOptions || appShellOptions || ssrOptions)) {
+        const nodeTargets = [...target, ...(0, utils_1.getSupportedNodeTargets)()];
+        // Server application code
+        bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, (0, application_code_bundle_1.createServerCodeBundleOptions)({
+            ...options,
+            // Disable external deps for server bundles.
+            // This is because it breaks Vite 'optimizeDeps' for SSR.
+            externalPackages: false,
+        }, nodeTargets, codeBundleCache), () => false));
+        // Server polyfills code
+        const serverPolyfillBundleOptions = (0, application_code_bundle_1.createServerPolyfillBundleOptions)(options, nodeTargets, codeBundleCache);
+        if (serverPolyfillBundleOptions) {
+            bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, serverPolyfillBundleOptions, () => false));
+        }
+    }
+    return bundlerContexts;
+}
+exports.setupBundlerContexts = setupBundlerContexts;

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

@@ -38,4 +38,10 @@ export declare function execute(options: DevServerBuilderOptions, context: Build
 }, extensions?: {
     buildPlugins?: Plugin[];
     middleware?: ((req: http.IncomingMessage, res: http.ServerResponse, next: (err?: unknown) => void) => void)[];
+    builderSelector?: (info: BuilderSelectorInfo, logger: BuilderContext['logger']) => string;
 }): Observable<DevServerBuilderOutput>;
+interface BuilderSelectorInfo {
+    builderName: string;
+    forceEsbuild: boolean;
+}
+export {};

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

@@ -57,19 +57,12 @@ function execute(options, context, transforms = {}, extensions) {
         context.logger.error(`The 'dev-server' builder requires a target to be specified.`);
         return rxjs_1.EMPTY;
     }
-    return (0, rxjs_1.defer)(() => initialize(options, projectName, context)).pipe((0, rxjs_1.switchMap)(({ builderName, normalizedOptions }) => {
+    return (0, rxjs_1.defer)(() => initialize(options, projectName, context, extensions?.builderSelector)).pipe((0, rxjs_1.switchMap)(({ builderName, normalizedOptions }) => {
         // Use vite-based development server for esbuild-based builds
-        if (builderName === '@angular-devkit/build-angular:application' ||
-            builderName === '@angular-devkit/build-angular:browser-esbuild' ||
-            normalizedOptions.forceEsbuild) {
+        if (isEsbuildBased(builderName)) {
             if (transforms?.logging || transforms?.webpackConfiguration) {
                 throw new Error('The `application` and `browser-esbuild` builders do not support Webpack transforms.');
             }
-            if (normalizedOptions.forceEsbuild &&
-                builderName === '@angular-devkit/build-angular:browser') {
-                // The compatibility builder should be used if esbuild is force enabled with the official Webpack-based builder.
-                builderName = '@angular-devkit/build-angular:browser-esbuild';
-            }
             return (0, rxjs_1.defer)(() => Promise.resolve().then(() => __importStar(require('./vite-server')))).pipe((0, rxjs_1.switchMap)(({ serveWithVite }) => serveWithVite(normalizedOptions, builderName, context, transforms, extensions)));
         }
         if (extensions?.buildPlugins?.length) {
@@ -83,7 +76,7 @@ function execute(options, context, transforms = {}, extensions) {
     }));
 }
 exports.execute = execute;
-async function initialize(initialOptions, projectName, context) {
+async function initialize(initialOptions, projectName, context, builderSelector = defaultBuilderSelector) {
     // Purge old build disk cache.
     await (0, purge_cache_1.purgeStaleBuildCache)(context);
     const normalizedOptions = await (0, options_1.normalizeOptions)(context, projectName, initialOptions);
@@ -105,10 +98,30 @@ case.
         context.logger.warn('Warning: Running a server with --disable-host-check is a security risk. ' +
             'See https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a for more information.');
     }
-    if (normalizedOptions.forceEsbuild && !builderName.startsWith('@angular-devkit/build-angular:')) {
-        context.logger.warn('Warning: Forcing the use of the esbuild-based build system with third-party builders' +
-            ' may cause unexpected behavior and/or build failures.');
-    }
     normalizedOptions.port = await (0, check_port_1.checkPort)(normalizedOptions.port, normalizedOptions.host);
-    return { builderName, normalizedOptions };
+    return {
+        builderName: builderSelector({ builderName, forceEsbuild: !!normalizedOptions.forceEsbuild }, context.logger),
+        normalizedOptions,
+    };
+}
+function isEsbuildBased(builderName) {
+    if (builderName === '@angular-devkit/build-angular:application' ||
+        builderName === '@angular-devkit/build-angular:browser-esbuild') {
+        return true;
+    }
+    return false;
+}
+function defaultBuilderSelector(info, logger) {
+    if (isEsbuildBased(info.builderName)) {
+        return info.builderName;
+    }
+    if (info.forceEsbuild) {
+        if (!info.builderName.startsWith('@angular-devkit/build-angular:')) {
+            logger.warn('Warning: Forcing the use of the esbuild-based build system with third-party builders' +
+                ' may cause unexpected behavior and/or build failures.');
+        }
+        // The compatibility builder should be used if esbuild is force enabled.
+        return '@angular-devkit/build-angular:browser-esbuild';
+    }
+    return info.builderName;
 }

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

@@ -361,6 +361,10 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
             open: serverOptions.open,
             headers: serverOptions.headers,
             proxy,
+            cors: {
+                // Allow preflight requests to be proxied.
+                preflightContinue: true,
+            },
             // File watching is handled by the build directly. `null` disables file watching for Vite.
             watch: null,
             fs: {

package/src/builders/web-test-runner/index.js

@@ -41,7 +41,7 @@ exports.default = (0, architect_1.createBuilder)(async (schema, ctx) => {
     // Parallelize startup work.
     const [testFiles] = await Promise.all([
         // Glob for files to test.
-        (0, test_files_1.findTestFiles)(options.include, options.exclude, ctx.workspaceRoot).then((files) => Array.from(files).map((file) => node_path_1.default.relative(process.cwd(), file))),
+        (0, test_files_1.findTestFiles)(options.include, options.exclude, ctx.workspaceRoot),
         // Clean build output path.
         node_fs_1.promises.rm(testDir, { recursive: true, force: true }),
     ]);

package/src/tools/esbuild/bundler-execution-result.d.ts

@@ -33,11 +33,15 @@ export declare class ExecutionResult {
     outputFiles: BuildOutputFile[];
     assetFiles: BuildOutputAsset[];
     errors: (Message | PartialMessage)[];
+    warnings: (Message | PartialMessage)[];
     externalMetadata?: ExternalResultMetadata;
     constructor(rebuildContexts: BundlerContext[], codeBundleCache?: SourceFileCache | undefined);
     addOutputFile(path: string, content: string, type: BuildOutputFileType): void;
     addAssets(assets: BuildOutputAsset[]): void;
-    addErrors(errors: (Message | PartialMessage)[]): void;
+    addError(error: PartialMessage | string): void;
+    addErrors(errors: (PartialMessage | string)[]): void;
+    addWarning(error: PartialMessage | string): void;
+    addWarnings(errors: (PartialMessage | string)[]): void;
     /**
      * Add external JavaScript import metadata to the result. This is currently used
      * by the development server to optimize the prebundling process.

package/src/tools/esbuild/bundler-execution-result.js

@@ -19,6 +19,7 @@ class ExecutionResult {
     outputFiles = [];
     assetFiles = [];
     errors = [];
+    warnings = [];
     externalMetadata;
     constructor(rebuildContexts, codeBundleCache) {
         this.rebuildContexts = rebuildContexts;
@@ -30,8 +31,31 @@ class ExecutionResult {
     addAssets(assets) {
         this.assetFiles.push(...assets);
     }
+    addError(error) {
+        if (typeof error === 'string') {
+            this.errors.push({ text: error, location: null });
+        }
+        else {
+            this.errors.push(error);
+        }
+    }
     addErrors(errors) {
-        this.errors.push(...errors);
+        for (const error of errors) {
+            this.addError(error);
+        }
+    }
+    addWarning(error) {
+        if (typeof error === 'string') {
+            this.warnings.push({ text: error, location: null });
+        }
+        else {
+            this.warnings.push(error);
+        }
+    }
+    addWarnings(errors) {
+        for (const error of errors) {
+            this.addWarning(error);
+        }
     }
     /**
      * Add external JavaScript import metadata to the result. This is currently used

package/src/tools/esbuild/utils.d.ts

@@ -5,17 +5,17 @@
  * 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 { BuilderContext } from '@angular-devkit/architect';
+import { logging } from '@angular-devkit/core';
 import { BuildOptions, Metafile, OutputFile, PartialMessage } from 'esbuild';
 import { NormalizedOutputOptions } from '../../builders/application/options';
 import { BudgetCalculatorResult } from '../../utils/bundle-calculator';
 import { BuildOutputFile, BuildOutputFileType, InitialFileRecord } from './bundler-context';
 import { BuildOutputAsset } from './bundler-execution-result';
-export declare function logBuildStats(context: BuilderContext, metafile: Metafile, initial: Map<string, InitialFileRecord>, budgetFailures: BudgetCalculatorResult[] | undefined, changedFiles?: Set<string>, estimatedTransferSizes?: Map<string, number>): void;
+export declare function logBuildStats(logger: logging.LoggerApi, metafile: Metafile, initial: Map<string, InitialFileRecord>, budgetFailures: BudgetCalculatorResult[] | undefined, changedFiles?: Set<string>, estimatedTransferSizes?: Map<string, number>): void;
 export declare function calculateEstimatedTransferSizes(outputFiles: OutputFile[]): Promise<Map<string, number>>;
 export declare function withSpinner<T>(text: string, action: () => T | Promise<T>): Promise<T>;
 export declare function withNoProgress<T>(text: string, action: () => T | Promise<T>): Promise<T>;
-export declare function logMessages(context: BuilderContext, { errors, warnings }: {
+export declare function logMessages(logger: logging.LoggerApi, { errors, warnings }: {
     errors?: PartialMessage[];
     warnings?: PartialMessage[];
 }): Promise<void>;

package/src/tools/esbuild/utils.js

@@ -21,7 +21,7 @@ const semver_1 = require("semver");
 const spinner_1 = require("../../utils/spinner");
 const stats_1 = require("../webpack/utils/stats");
 const bundler_context_1 = require("./bundler-context");
-function logBuildStats(context, metafile, initial, budgetFailures, changedFiles, estimatedTransferSizes) {
+function logBuildStats(logger, metafile, initial, budgetFailures, changedFiles, estimatedTransferSizes) {
     const stats = [];
     let unchangedCount = 0;
     for (const [file, output] of Object.entries(metafile.outputs)) {
@@ -53,13 +53,13 @@ function logBuildStats(context, metafile, initial, budgetFailures, changedFiles,
     }
     if (stats.length > 0) {
         const tableText = (0, stats_1.generateBuildStatsTable)(stats, true, unchangedCount === 0, !!estimatedTransferSizes, budgetFailures);
-        context.logger.info('\n' + tableText + '\n');
+        logger.info('\n' + tableText + '\n');
     }
     else if (changedFiles !== undefined) {
-        context.logger.info('\nNo output file changes.\n');
+        logger.info('\nNo output file changes.\n');
     }
     if (unchangedCount > 0) {
-        context.logger.info(`Unchanged output files: ${unchangedCount}`);
+        logger.info(`Unchanged output files: ${unchangedCount}`);
     }
 }
 exports.logBuildStats = logBuildStats;
@@ -117,14 +117,14 @@ async function withNoProgress(text, action) {
     return action();
 }
 exports.withNoProgress = withNoProgress;
-async function logMessages(context, { errors, warnings }) {
+async function logMessages(logger, { errors, warnings }) {
     if (warnings?.length) {
         const warningMessages = await (0, esbuild_1.formatMessages)(warnings, { kind: 'warning', color: true });
-        context.logger.warn(warningMessages.join('\n'));
+        logger.warn(warningMessages.join('\n'));
     }
     if (errors?.length) {
         const errorMessages = await (0, esbuild_1.formatMessages)(errors, { kind: 'error', color: true });
-        context.logger.error(errorMessages.join('\n'));
+        logger.error(errorMessages.join('\n'));
     }
 }
 exports.logMessages = logMessages;