@angular-devkit/build-angular 17.2.0-next.0 → 17.2.0-next.1

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "17.2.0-next.0",
+  "version": "17.2.0-next.1",
   "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.1702.0-next.0",
-    "@angular-devkit/build-webpack": "0.1702.0-next.0",
-    "@angular-devkit/core": "17.2.0-next.0",
-    "@babel/core": "7.23.7",
+    "@angular-devkit/architect": "0.1702.0-next.1",
+    "@angular-devkit/build-webpack": "0.1702.0-next.1",
+    "@angular-devkit/core": "17.2.0-next.1",
+    "@babel/core": "7.23.9",
     "@babel/generator": "7.23.6",
     "@babel/helper-annotate-as-pure": "7.22.5",
     "@babel/helper-split-export-declaration": "7.22.6",
-    "@babel/plugin-transform-async-generator-functions": "7.23.7",
+    "@babel/plugin-transform-async-generator-functions": "7.23.9",
     "@babel/plugin-transform-async-to-generator": "7.23.3",
-    "@babel/plugin-transform-runtime": "7.23.7",
-    "@babel/preset-env": "7.23.8",
-    "@babel/runtime": "7.23.8",
+    "@babel/plugin-transform-runtime": "7.23.9",
+    "@babel/preset-env": "7.23.9",
+    "@babel/runtime": "7.23.9",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "17.2.0-next.0",
+    "@ngtools/webpack": "17.2.0-next.1",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.17",
@@ -29,12 +29,12 @@
     "browserslist": "^4.21.5",
     "copy-webpack-plugin": "12.0.2",
     "critters": "0.0.20",
-    "css-loader": "6.9.1",
-    "esbuild-wasm": "0.19.12",
+    "css-loader": "6.10.0",
+    "esbuild-wasm": "0.20.0",
     "fast-glob": "3.3.2",
     "https-proxy-agent": "7.0.2",
     "http-proxy-middleware": "2.0.6",
-    "inquirer": "9.2.12",
+    "inquirer": "9.2.13",
     "jsonc-parser": "3.2.1",
     "karma-source-map-support": "1.4.0",
     "less": "4.2.0",
@@ -48,31 +48,30 @@
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "3.0.1",
-    "piscina": "4.3.0",
+    "piscina": "4.3.1",
     "postcss": "8.4.33",
-    "postcss-loader": "8.0.0",
+    "postcss-loader": "8.1.0",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
     "sass": "1.70.0",
-    "sass-loader": "14.0.0",
+    "sass-loader": "14.1.0",
     "semver": "7.5.4",
     "source-map-loader": "5.0.0",
     "source-map-support": "0.5.21",
     "terser": "5.27.0",
-    "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.6.2",
-    "undici": "6.4.0",
+    "undici": "6.5.0",
     "vite": "5.0.12",
     "watchpack": "2.4.0",
-    "webpack": "5.89.0",
+    "webpack": "5.90.0",
     "webpack-dev-middleware": "6.1.1",
     "webpack-dev-server": "4.15.1",
     "webpack-merge": "5.10.0",
     "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.19.12"
+    "esbuild": "0.20.0"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^17.0.0 || ^17.2.0-next.0",

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

@@ -54,8 +54,6 @@ async function* runEsBuildBuildAction(action, options) {
     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
@@ -142,8 +140,6 @@ 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

@@ -16,14 +16,13 @@ const commonjs_checker_1 = require("../../tools/esbuild/commonjs-checker");
 const license_extractor_1 = require("../../tools/esbuild/license-extractor");
 const utils_1 = require("../../tools/esbuild/utils");
 const bundle_calculator_1 = require("../../utils/bundle-calculator");
-const color_1 = require("../../utils/color");
 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");
 const setup_bundling_1 = require("./setup-bundling");
 async function executeBuild(options, context, rebuildState) {
-    const { projectRoot, workspaceRoot, i18nOptions, optimizationOptions, assets, cacheOptions, prerenderOptions, } = options;
+    const { projectRoot, workspaceRoot, i18nOptions, optimizationOptions, assets, cacheOptions, prerenderOptions, ssrOptions, verbose, colors, jsonLogs, } = options;
     // TODO: Consider integrating into watch mode. Would require full rebuild on target changes.
     const browsers = (0, supported_browsers_1.getSupportedBrowsers)(projectRoot, context.logger);
     // Load active translations if inlining
@@ -96,12 +95,11 @@ async function executeBuild(options, context, rebuildState) {
         executionResult.addOutputFile('3rdpartylicenses.txt', await (0, license_extractor_1.extractLicenses)(metafile, workspaceRoot), bundler_context_1.BuildOutputFileType.Root);
     }
     // Perform i18n translation inlining if enabled
-    let prerenderedRoutes;
     if (i18nOptions.shouldInline) {
         const result = await (0, i18n_1.inlineI18n)(options, executionResult, initialFiles);
         executionResult.addErrors(result.errors);
         executionResult.addWarnings(result.warnings);
-        prerenderedRoutes = result.prerenderedRoutes;
+        executionResult.addPrerenderedRoutes(result.prerenderedRoutes);
     }
     else {
         const result = await (0, execute_post_bundle_1.executePostBundleSteps)(options, executionResult.outputFiles, executionResult.assetFiles, initialFiles, 
@@ -109,26 +107,21 @@ async function executeBuild(options, context, rebuildState) {
         i18nOptions.hasDefinedSourceLocale ? i18nOptions.sourceLocale : undefined);
         executionResult.addErrors(result.errors);
         executionResult.addWarnings(result.warnings);
-        prerenderedRoutes = result.prerenderedRoutes;
+        executionResult.addPrerenderedRoutes(result.prerenderedRoutes);
         executionResult.outputFiles.push(...result.additionalOutputFiles);
         executionResult.assetFiles.push(...result.additionalAssets);
     }
     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`;
-        if (prerenderedRoutes.length > 1) {
-            prerenderMsg += 's.';
-        }
-        else {
-            prerenderMsg += '.';
-        }
-        context.logger.info(color_1.colors.magenta(prerenderMsg) + '\n');
+        const prerenderedRoutes = executionResult.prerenderedRoutes;
+        executionResult.addOutputFile('prerendered-routes.json', JSON.stringify({ routes: prerenderedRoutes }, null, 2), bundler_context_1.BuildOutputFileType.Root);
     }
-    (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);
     }
+    if (!jsonLogs) {
+        context.logger.info((0, utils_1.logBuildStats)(metafile, initialFiles, budgetFailures, colors, changedFiles, estimatedTransferSizes, !!ssrOptions, verbose));
+    }
     return executionResult;
 }
 exports.executeBuild = executeBuild;

package/src/builders/application/index.js

@@ -10,6 +10,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildApplication = exports.buildApplicationInternal = void 0;
 const architect_1 = require("@angular-devkit/architect");
 const bundler_context_1 = require("../../tools/esbuild/bundler-context");
+const utils_1 = require("../../tools/esbuild/utils");
+const color_1 = require("../../utils/color");
 const purge_cache_1 = require("../../utils/purge-cache");
 const version_1 = require("../../utils/version");
 const build_action_1 = require("./build-action");
@@ -57,11 +59,25 @@ context, infrastructureSettings, extensions) {
         context.addTeardown(() => controller.abort('builder-teardown'));
     }
     yield* (0, build_action_1.runEsBuildBuildAction)(async (rebuildState) => {
+        const { prerenderOptions, outputOptions, jsonLogs } = normalizedOptions;
         const startTime = process.hrtime.bigint();
         const result = await (0, execute_build_1.executeBuild)(normalizedOptions, context, rebuildState);
-        const buildTime = Number(process.hrtime.bigint() - startTime) / 10 ** 9;
-        const status = result.errors.length > 0 ? 'failed' : 'complete';
-        logger.info(`Application bundle generation ${status}. [${buildTime.toFixed(3)} seconds]`);
+        if (!jsonLogs) {
+            if (prerenderOptions) {
+                const prerenderedRoutesLength = result.prerenderedRoutes.length;
+                let prerenderMsg = `Prerendered ${prerenderedRoutesLength} static route`;
+                prerenderMsg += prerenderedRoutesLength !== 1 ? 's.' : '.';
+                logger.info(color_1.colors.magenta(prerenderMsg));
+            }
+            const buildTime = Number(process.hrtime.bigint() - startTime) / 10 ** 9;
+            const hasError = result.errors.length > 0;
+            if (writeToFileSystem && !hasError) {
+                logger.info(`Output location: ${outputOptions.base}\n`);
+            }
+            logger.info(`Application bundle generation ${hasError ? 'failed' : 'complete'}. [${buildTime.toFixed(3)} seconds]`);
+        }
+        // Log all diagnostic (error/warning) messages
+        await (0, utils_1.logMessages)(logger, result, normalizedOptions);
         return result;
     }, {
         watch: normalizedOptions.watch,

package/src/builders/application/options.d.ts

@@ -127,6 +127,7 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
         file: string;
         package: string;
     } | undefined;
+    postcssConfiguration: import("../../utils/postcss-configuration").PostcssConfiguration | undefined;
     i18nOptions: I18nOptions & {
         duplicateTranslationBehavior?: I18NTranslation | undefined;
         missingTranslationBehavior?: I18NTranslation | undefined;
@@ -136,5 +137,7 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
     publicPath: string | undefined;
     plugins: Plugin[] | undefined;
     loaderExtensions: Record<string, "binary" | "file" | "text"> | undefined;
+    jsonLogs: boolean;
+    colors: boolean;
 }>;
 export {};

package/src/builders/application/options.js

@@ -17,9 +17,12 @@ const node_module_1 = require("node:module");
 const node_path_1 = __importDefault(require("node:path"));
 const helpers_1 = require("../../tools/webpack/utils/helpers");
 const utils_1 = require("../../utils");
+const color_1 = require("../../utils/color");
+const environment_options_1 = require("../../utils/environment-options");
 const i18n_options_1 = require("../../utils/i18n-options");
 const normalize_cache_1 = require("../../utils/normalize-cache");
 const package_chunk_sort_1 = require("../../utils/package-chunk-sort");
+const postcss_configuration_1 = require("../../utils/postcss-configuration");
 const tailwind_1 = require("../../utils/tailwind");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 const schema_1 = require("./schema");
@@ -70,7 +73,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
         server: 'server',
         media: 'media',
         ...(typeof outputPath === 'string' ? undefined : outputPath),
-        base: normalizeDirectoryPath(node_path_1.default.join(workspaceRoot, typeof outputPath === 'string' ? outputPath : outputPath.base)),
+        base: normalizeDirectoryPath(node_path_1.default.resolve(workspaceRoot, typeof outputPath === 'string' ? outputPath : outputPath.base)),
     };
     const outputNames = {
         bundles: options.outputHashing === schema_1.OutputHashing.All || options.outputHashing === schema_1.OutputHashing.Bundles
@@ -108,6 +111,11 @@ async function normalizeOptions(context, projectName, options, extensions) {
             loaderExtensions[extension] = value;
         }
     }
+    const postcssConfiguration = await (0, postcss_configuration_1.loadPostcssConfiguration)(workspaceRoot, projectRoot);
+    // Skip tailwind configuration if postcss is customized
+    const tailwindConfiguration = postcssConfiguration
+        ? undefined
+        : await getTailwindConfig(workspaceRoot, projectRoot, context);
     const globalStyles = [];
     if (options.styles?.length) {
         const { entryPoints: stylesheetEntrypoints, noInjectNames } = (0, helpers_1.normalizeGlobalStyles)(options.styles || []);
@@ -212,13 +220,16 @@ async function normalizeOptions(context, projectName, options, extensions) {
         globalScripts,
         serviceWorker: typeof serviceWorker === 'string' ? node_path_1.default.join(workspaceRoot, serviceWorker) : undefined,
         indexHtmlOptions,
-        tailwindConfiguration: await getTailwindConfig(workspaceRoot, projectRoot, context),
+        tailwindConfiguration,
+        postcssConfiguration,
         i18nOptions,
         namedChunks,
         budgets: budgets?.length ? budgets : undefined,
         publicPath: deployUrl ? deployUrl : undefined,
         plugins: extensions?.codePlugins?.length ? extensions?.codePlugins : undefined,
         loaderExtensions,
+        jsonLogs: environment_options_1.useJSONBuildLogs,
+        colors: color_1.colors.enabled,
     };
 }
 exports.normalizeOptions = normalizeOptions;

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

@@ -59,11 +59,11 @@ function setupBundlerContexts(options, browsers, codeBundleCache) {
             // Disable external deps for server bundles.
             // This is because it breaks Vite 'optimizeDeps' for SSR.
             externalPackages: false,
-        }, nodeTargets, codeBundleCache), () => false));
+        }, nodeTargets, codeBundleCache)));
         // 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.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, serverPolyfillBundleOptions));
         }
     }
     return bundlerContexts;

package/src/builders/extract-i18n/application-extraction.js

@@ -20,9 +20,11 @@ async function extractMessages(options, builderName, context, extractorConstruct
     // Setup the build options for the application based on the buildTarget option
     const buildOptions = (await context.validateOptions(await context.getTargetOptions(options.buildTarget), builderName));
     buildOptions.optimization = false;
-    buildOptions.sourceMap = { scripts: true, vendor: true };
+    buildOptions.sourceMap = { scripts: true, vendor: true, styles: false };
     buildOptions.localize = false;
     buildOptions.budgets = undefined;
+    buildOptions.index = false;
+    buildOptions.serviceWorker = false;
     let build;
     if (builderName === '@angular-devkit/build-angular:application') {
         build = application_1.buildApplicationInternal;

package/src/tools/babel/plugins/elide-angular-metadata.d.ts

@@ -7,7 +7,7 @@
  */
 /// <reference path="../../../../../../../../../../packages/angular_devkit/build_angular/src/babel-bazel.d.ts" />
 /// <reference types="@angular/compiler-cli/private/babel" />
-import { PluginObj } from '@babel/core';
+import type { PluginObj } from '@babel/core';
 /**
  * Provides one or more keywords that if found within the content of a source file indicate
  * that this plugin should be used with a source file.

package/src/tools/babel/plugins/elide-angular-metadata.js

@@ -8,7 +8,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getKeywords = void 0;
-const core_1 = require("@babel/core");
 /**
  * The name of the Angular class metadata function created by the Angular compiler.
  */
@@ -28,9 +27,18 @@ const SET_CLASS_DEBUG_INFO_NAME = 'ɵsetClassDebugInfo';
  * @returns An a string iterable containing one or more keywords.
  */
 function getKeywords() {
-    return [SET_CLASS_METADATA_NAME, SET_CLASS_METADATA_ASYNC_NAME, SET_CLASS_DEBUG_INFO_NAME];
+    return Object.keys(angularMetadataFunctions);
 }
 exports.getKeywords = getKeywords;
+/**
+ * An object map of function names and related value checks for discovery of Angular generated
+ * metadata calls.
+ */
+const angularMetadataFunctions = {
+    [SET_CLASS_METADATA_NAME]: isSetClassMetadataCall,
+    [SET_CLASS_METADATA_ASYNC_NAME]: isSetClassMetadataAsyncCall,
+    [SET_CLASS_DEBUG_INFO_NAME]: isSetClassDebugInfoCall,
+};
 /**
  * A babel plugin factory function for eliding the Angular class metadata function (`ɵsetClassMetadata`).
  *
@@ -40,20 +48,23 @@ function default_1() {
     return {
         visitor: {
             CallExpression(path) {
-                const callee = path.node.callee;
-                const callArguments = path.node.arguments;
+                const callee = path.get('callee');
                 // The function being called must be the metadata function name
                 let calleeName;
-                if (core_1.types.isMemberExpression(callee) && core_1.types.isIdentifier(callee.property)) {
-                    calleeName = callee.property.name;
+                if (callee.isMemberExpression()) {
+                    const calleeProperty = callee.get('property');
+                    if (calleeProperty.isIdentifier()) {
+                        calleeName = calleeProperty.node.name;
+                    }
+                }
+                else if (callee.isIdentifier()) {
+                    calleeName = callee.node.name;
                 }
-                else if (core_1.types.isIdentifier(callee)) {
-                    calleeName = callee.name;
+                if (!calleeName) {
+                    return;
                 }
-                if (calleeName !== undefined &&
-                    (isRemoveClassMetadataCall(calleeName, callArguments) ||
-                        isRemoveClassmetadataAsyncCall(calleeName, callArguments) ||
-                        isSetClassDebugInfoCall(calleeName, callArguments))) {
+                if (Object.hasOwn(angularMetadataFunctions, calleeName) &&
+                    angularMetadataFunctions[calleeName](path.get('arguments'))) {
                     // The metadata function is always emitted inside a function expression
                     const parent = path.getFunctionParent();
                     if (parent && (parent.isFunctionExpression() || parent.isArrowFunctionExpression())) {
@@ -68,35 +79,32 @@ function default_1() {
 }
 exports.default = default_1;
 /** Determines if a function call is a call to `setClassMetadata`. */
-function isRemoveClassMetadataCall(name, args) {
+function isSetClassMetadataCall(callArguments) {
     // `setClassMetadata` calls have to meet the following criteria:
     // * First must be an identifier
     // * Second must be an array literal
-    return (name === SET_CLASS_METADATA_NAME &&
-        args.length === 4 &&
-        core_1.types.isIdentifier(args[0]) &&
-        core_1.types.isArrayExpression(args[1]));
+    return (callArguments.length === 4 &&
+        callArguments[0].isIdentifier() &&
+        callArguments[1].isArrayExpression());
 }
 /** Determines if a function call is a call to `setClassMetadataAsync`. */
-function isRemoveClassmetadataAsyncCall(name, args) {
+function isSetClassMetadataAsyncCall(callArguments) {
     // `setClassMetadataAsync` calls have to meet the following criteria:
     // * First argument must be an identifier.
     // * Second argument must be an inline function.
     // * Third argument must be an inline function.
-    return (name === SET_CLASS_METADATA_ASYNC_NAME &&
-        args.length === 3 &&
-        core_1.types.isIdentifier(args[0]) &&
-        isInlineFunction(args[1]) &&
-        isInlineFunction(args[2]));
+    return (callArguments.length === 3 &&
+        callArguments[0].isIdentifier() &&
+        isInlineFunction(callArguments[1]) &&
+        isInlineFunction(callArguments[2]));
 }
 /** Determines if a function call is a call to `setClassDebugInfo`. */
-function isSetClassDebugInfoCall(name, args) {
-    return (name === SET_CLASS_DEBUG_INFO_NAME &&
-        args.length === 2 &&
-        core_1.types.isIdentifier(args[0]) &&
-        core_1.types.isObjectExpression(args[1]));
+function isSetClassDebugInfoCall(callArguments) {
+    return (callArguments.length === 2 &&
+        callArguments[0].isIdentifier() &&
+        callArguments[1].isObjectExpression());
 }
 /** Determines if a node is an inline function expression. */
-function isInlineFunction(node) {
-    return core_1.types.isFunctionExpression(node) || core_1.types.isArrowFunctionExpression(node);
+function isInlineFunction(path) {
+    return path.isFunctionExpression() || path.isArrowFunctionExpression();
 }

package/src/tools/babel/plugins/pure-toplevel-functions.d.ts

@@ -7,7 +7,7 @@
  */
 /// <reference path="../../../../../../../../../../packages/angular_devkit/build_angular/src/babel-bazel.d.ts" />
 /// <reference types="@angular/compiler-cli/private/babel" />
-import { PluginObj } from '@babel/core';
+import type { PluginObj } from '@babel/core';
 /**
  * A babel plugin factory function for adding the PURE annotation to top-level new and call expressions.
  *

package/src/tools/babel/plugins/pure-toplevel-functions.js

@@ -33,7 +33,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@babel/core");
 const helper_annotate_as_pure_1 = __importDefault(require("@babel/helper-annotate-as-pure"));
 const tslib = __importStar(require("tslib"));
 /**
@@ -67,14 +66,14 @@ function default_1() {
                 if (path.getFunctionParent()) {
                     return;
                 }
-                const callee = path.node.callee;
-                if ((core_1.types.isFunctionExpression(callee) || core_1.types.isArrowFunctionExpression(callee)) &&
+                const callee = path.get('callee');
+                if ((callee.isFunctionExpression() || callee.isArrowFunctionExpression()) &&
                     path.node.arguments.length !== 0) {
                     return;
                 }
                 // Do not annotate TypeScript helpers emitted by the TypeScript compiler.
                 // TypeScript helpers are intended to cause side effects.
-                if (core_1.types.isIdentifier(callee) && isTslibHelperName(callee.name)) {
+                if (callee.isIdentifier() && isTslibHelperName(callee.node.name)) {
                     return;
                 }
                 (0, helper_annotate_as_pure_1.default)(path);

package/src/tools/esbuild/application-code-bundle.js

@@ -230,7 +230,7 @@ function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
 }
 exports.createServerPolyfillBundleOptions = createServerPolyfillBundleOptions;
 function getEsBuildCommonOptions(options) {
-    const { workspaceRoot, outExtension, optimizationOptions, sourcemapOptions, tsconfig, externalDependencies, outputNames, preserveSymlinks, jit, loaderExtensions, } = options;
+    const { workspaceRoot, outExtension, optimizationOptions, sourcemapOptions, tsconfig, externalDependencies, outputNames, preserveSymlinks, jit, loaderExtensions, jsonLogs, } = options;
     // Ensure unique hashes for i18n translation changes when using post-process inlining.
     // This hash value is added as a footer to each file and ensures that the output file names (with hashes)
     // change when translation files have changed. If this is not done the post processed files may have
@@ -250,7 +250,7 @@ function getEsBuildCommonOptions(options) {
         resolveExtensions: ['.ts', '.tsx', '.mjs', '.js'],
         metafile: true,
         legalComments: options.extractLicenses ? 'none' : 'eof',
-        logLevel: options.verbose ? 'debug' : 'silent',
+        logLevel: options.verbose && !jsonLogs ? 'debug' : 'silent',
         minifyIdentifiers: optimizationOptions.scripts && environment_options_1.allowMangle,
         minifySyntax: optimizationOptions.scripts,
         minifyWhitespace: optimizationOptions.scripts,

package/src/tools/esbuild/budget-stats.js

@@ -26,6 +26,11 @@ function generateBudgetStats(metafile, initialFiles) {
         if (!file.endsWith('.js') && !file.endsWith('.css')) {
             continue;
         }
+        // Exclude server bundles
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        if (entry['ng-platform-server']) {
+            continue;
+        }
         const initialRecord = initialFiles.get(file);
         let name = initialRecord?.name;
         if (name === undefined && entry.entryPoint) {

package/src/tools/esbuild/bundler-context.js

@@ -162,6 +162,12 @@ class BundlerContext {
                 // For non-incremental builds, perform a single build
                 result = await (0, esbuild_1.build)(this.#esbuildOptions);
             }
+            if (this.#esbuildOptions?.platform === 'node') {
+                for (const entry of Object.values(result.metafile.outputs)) {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    entry['ng-platform-server'] = true;
+                }
+            }
         }
         catch (failure) {
             // Build failures will throw an exception which contains errors/warnings
@@ -260,7 +266,9 @@ class BundlerContext {
         for (const { imports } of Object.values(result.metafile.outputs)) {
             for (const importData of imports) {
                 if (!importData.external ||
-                    (importData.kind !== 'import-statement' && importData.kind !== 'dynamic-import')) {
+                    (importData.kind !== 'import-statement' &&
+                        importData.kind !== 'dynamic-import' &&
+                        importData.kind !== 'require-call')) {
                     continue;
                 }
                 externalImports.add(importData.path);

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

@@ -33,6 +33,7 @@ export declare class ExecutionResult {
     outputFiles: BuildOutputFile[];
     assetFiles: BuildOutputAsset[];
     errors: (Message | PartialMessage)[];
+    prerenderedRoutes: string[];
     warnings: (Message | PartialMessage)[];
     externalMetadata?: ExternalResultMetadata;
     constructor(rebuildContexts: BundlerContext[], codeBundleCache?: SourceFileCache | undefined);
@@ -40,6 +41,7 @@ export declare class ExecutionResult {
     addAssets(assets: BuildOutputAsset[]): void;
     addError(error: PartialMessage | string): void;
     addErrors(errors: (PartialMessage | string)[]): void;
+    addPrerenderedRoutes(routes: string[]): void;
     addWarning(error: PartialMessage | string): void;
     addWarnings(errors: (PartialMessage | string)[]): void;
     /**

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

@@ -19,6 +19,7 @@ class ExecutionResult {
     outputFiles = [];
     assetFiles = [];
     errors = [];
+    prerenderedRoutes = [];
     warnings = [];
     externalMetadata;
     constructor(rebuildContexts, codeBundleCache) {
@@ -44,6 +45,11 @@ class ExecutionResult {
             this.addError(error);
         }
     }
+    addPrerenderedRoutes(routes) {
+        this.prerenderedRoutes.push(...routes);
+        // Sort the prerendered routes.
+        this.prerenderedRoutes.sort((a, b) => a.localeCompare(b));
+    }
     addWarning(error) {
         if (typeof error === 'string') {
             this.warnings.push({ text: error, location: null });

package/src/tools/esbuild/compiler-plugin-options.js

@@ -9,7 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompilerPluginOptions = void 0;
 function createCompilerPluginOptions(options, target, sourceFileCache) {
-    const { workspaceRoot, optimizationOptions, sourcemapOptions, tsconfig, outputNames, fileReplacements, externalDependencies, preserveSymlinks, stylePreprocessorOptions, advancedOptimizations, inlineStyleLanguage, jit, cacheOptions, tailwindConfiguration, publicPath, } = options;
+    const { workspaceRoot, optimizationOptions, sourcemapOptions, tsconfig, outputNames, fileReplacements, externalDependencies, preserveSymlinks, stylePreprocessorOptions, advancedOptimizations, inlineStyleLanguage, jit, cacheOptions, tailwindConfiguration, postcssConfiguration, publicPath, } = options;
     return {
         // JS/TS options
         pluginOptions: {
@@ -40,6 +40,7 @@ function createCompilerPluginOptions(options, target, sourceFileCache) {
             inlineStyleLanguage,
             preserveSymlinks,
             tailwindConfiguration,
+            postcssConfiguration,
             cacheOptions,
             publicPath,
         },

package/src/tools/esbuild/global-scripts.js

@@ -49,7 +49,7 @@ const virtual_module_plugin_1 = require("./virtual-module-plugin");
  * @returns An esbuild BuildOptions object.
  */
 function createGlobalScriptsBundleOptions(options, target, initial) {
-    const { globalScripts, optimizationOptions, outputNames, preserveSymlinks, sourcemapOptions, workspaceRoot, } = options;
+    const { globalScripts, optimizationOptions, outputNames, preserveSymlinks, sourcemapOptions, jsonLogs, workspaceRoot, } = options;
     const namespace = 'angular:script/global';
     const entryPoints = {};
     let found = false;
@@ -74,7 +74,7 @@ function createGlobalScriptsBundleOptions(options, target, initial) {
             mainFields: ['script', 'browser', 'main'],
             conditions: ['script'],
             resolveExtensions: ['.mjs', '.js'],
-            logLevel: options.verbose ? 'debug' : 'silent',
+            logLevel: options.verbose && !jsonLogs ? 'debug' : 'silent',
             metafile: true,
             minify: optimizationOptions.scripts,
             outdir: workspaceRoot,
@@ -91,8 +91,7 @@ function createGlobalScriptsBundleOptions(options, target, initial) {
                     // Add the `js` extension here so that esbuild generates an output file with the extension
                     transformPath: (path) => path.slice(namespace.length + 1) + '.js',
                     loadContent: (args, build) => (0, load_result_cache_1.createCachedLoad)(loadCache, async (args) => {
-                        const files = globalScripts.find(({ name }) => name === args.path.slice(0, -3))
-                            ?.files;
+                        const files = globalScripts.find(({ name }) => name === args.path.slice(0, -3))?.files;
                         (0, node_assert_1.default)(files, `Invalid operation: global scripts name not found [${args.path}]`);
                         // Global scripts are concatenated using magic-string instead of bundled via esbuild.
                         const bundleContent = new magic_string_1.Bundle();

package/src/tools/esbuild/global-styles.js

@@ -15,7 +15,7 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const bundle_options_1 = require("./stylesheets/bundle-options");
 const virtual_module_plugin_1 = require("./virtual-module-plugin");
 function createGlobalStylesBundleOptions(options, target, initial) {
-    const { workspaceRoot, optimizationOptions, sourcemapOptions, outputNames, globalStyles, preserveSymlinks, externalDependencies, stylePreprocessorOptions, tailwindConfiguration, cacheOptions, publicPath, } = options;
+    const { workspaceRoot, optimizationOptions, sourcemapOptions, outputNames, globalStyles, preserveSymlinks, externalDependencies, stylePreprocessorOptions, tailwindConfiguration, postcssConfiguration, cacheOptions, publicPath, } = options;
     const namespace = 'angular:styles/global';
     const entryPoints = {};
     let found = false;
@@ -46,6 +46,7 @@ function createGlobalStylesBundleOptions(options, target, initial) {
                 },
             includePaths: stylePreprocessorOptions?.includePaths,
             tailwindConfiguration,
+            postcssConfiguration,
             cacheOptions,
             publicPath,
         }, loadCache);