@angular/build 18.1.0-rc.0 → 18.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "18.1.0-rc.0",
+  "version": "18.1.0",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,18 +23,19 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1801.0-rc.0",
+    "@angular-devkit/architect": "0.1801.0",
     "@babel/core": "7.24.7",
     "@babel/helper-annotate-as-pure": "7.24.7",
     "@babel/helper-split-export-declaration": "7.24.7",
-    "@inquirer/confirm": "3.1.10",
+    "@babel/plugin-syntax-import-attributes": "7.24.7",
+    "@inquirer/confirm": "3.1.11",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "browserslist": "^4.23.0",
     "critters": "0.0.24",
     "esbuild": "0.21.5",
     "fast-glob": "3.3.2",
-    "https-proxy-agent": "7.0.4",
+    "https-proxy-agent": "7.0.5",
     "lmdb": "3.0.12",
     "magic-string": "0.30.10",
     "mrmime": "2.0.0",
@@ -42,17 +43,18 @@
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
     "piscina": "4.6.1",
+    "rollup": "4.18.0",
     "sass": "1.77.6",
     "semver": "7.6.2",
     "undici": "6.19.2",
-    "vite": "5.3.1",
+    "vite": "5.3.2",
     "watchpack": "2.4.1"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^18.0.0 || ^18.1.0-next.0",
-    "@angular/localize": "^18.0.0 || ^18.1.0-next.0",
-    "@angular/platform-server": "^18.0.0 || ^18.1.0-next.0",
-    "@angular/service-worker": "^18.0.0 || ^18.1.0-next.0",
+    "@angular/compiler-cli": "^18.0.0",
+    "@angular/localize": "^18.0.0",
+    "@angular/platform-server": "^18.0.0",
+    "@angular/service-worker": "^18.0.0",
     "less": "^4.2.0",
     "postcss": "^8.4.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",

package/src/builders/application/chunk-optimizer.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @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.dev/license
+ */
+import { BundleContextResult } from '../../tools/esbuild/bundler-context';
+export declare function optimizeChunks(original: BundleContextResult, sourcemap: boolean | 'hidden'): Promise<BundleContextResult>;

package/src/builders/application/chunk-optimizer.js

@@ -0,0 +1,169 @@
+"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.dev/license
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.optimizeChunks = optimizeChunks;
+const node_assert_1 = __importDefault(require("node:assert"));
+const rollup_1 = require("rollup");
+const bundler_context_1 = require("../../tools/esbuild/bundler-context");
+const utils_1 = require("../../tools/esbuild/utils");
+const error_1 = require("../../utils/error");
+async function optimizeChunks(original, sourcemap) {
+    // Failed builds cannot be optimized
+    if (original.errors) {
+        return original;
+    }
+    // Find the main browser entrypoint
+    let mainFile;
+    for (const [file, record] of original.initialFiles) {
+        if (record.name === 'main' &&
+            record.entrypoint &&
+            !record.serverFile &&
+            record.type === 'script') {
+            mainFile = file;
+            break;
+        }
+    }
+    // No action required if no browser main entrypoint
+    if (!mainFile) {
+        return original;
+    }
+    const chunks = {};
+    const maps = {};
+    for (const originalFile of original.outputFiles) {
+        if (originalFile.type !== bundler_context_1.BuildOutputFileType.Browser) {
+            continue;
+        }
+        if (originalFile.path.endsWith('.js')) {
+            chunks[originalFile.path] = originalFile;
+        }
+        else if (originalFile.path.endsWith('.js.map')) {
+            // Create mapping of JS file to sourcemap content
+            maps[originalFile.path.slice(0, -4)] = originalFile;
+        }
+    }
+    const usedChunks = new Set();
+    let bundle;
+    let optimizedOutput;
+    try {
+        bundle = await (0, rollup_1.rollup)({
+            input: mainFile,
+            plugins: [
+                {
+                    name: 'angular-bundle',
+                    resolveId(source) {
+                        // Remove leading `./` if present
+                        const file = source[0] === '.' && source[1] === '/' ? source.slice(2) : source;
+                        if (chunks[file]) {
+                            return file;
+                        }
+                        // All other identifiers are considered external to maintain behavior
+                        return { id: source, external: true };
+                    },
+                    load(id) {
+                        (0, node_assert_1.default)(chunks[id], `Angular chunk content should always be present in chunk optimizer [${id}].`);
+                        usedChunks.add(id);
+                        const result = {
+                            code: chunks[id].text,
+                            map: maps[id]?.text,
+                        };
+                        return result;
+                    },
+                },
+            ],
+        });
+        const result = await bundle.generate({
+            compact: true,
+            sourcemap,
+            chunkFileNames(chunkInfo) {
+                // Do not add hash to file name if already present
+                return /-[a-zA-Z0-9]{8}$/.test(chunkInfo.name) ? '[name].js' : '[name]-[hash].js';
+            },
+        });
+        optimizedOutput = result.output;
+    }
+    catch (e) {
+        (0, error_1.assertIsError)(e);
+        return {
+            errors: [
+                // Most of these fields are not actually needed for printing the error
+                {
+                    id: '',
+                    text: 'Chunk optimization failed',
+                    detail: undefined,
+                    pluginName: '',
+                    location: null,
+                    notes: [
+                        {
+                            text: e.message,
+                            location: null,
+                        },
+                    ],
+                },
+            ],
+            warnings: original.warnings,
+        };
+    }
+    finally {
+        await bundle?.close();
+    }
+    // Remove used chunks and associated sourcemaps from the original result
+    original.outputFiles = original.outputFiles.filter((file) => !usedChunks.has(file.path) &&
+        !(file.path.endsWith('.map') && usedChunks.has(file.path.slice(0, -4))));
+    // Add new optimized chunks
+    const importsPerFile = {};
+    for (const optimizedFile of optimizedOutput) {
+        if (optimizedFile.type !== 'chunk') {
+            continue;
+        }
+        importsPerFile[optimizedFile.fileName] = optimizedFile.imports;
+        original.outputFiles.push((0, utils_1.createOutputFile)(optimizedFile.fileName, optimizedFile.code, bundler_context_1.BuildOutputFileType.Browser));
+        if (optimizedFile.map && optimizedFile.sourcemapFileName) {
+            original.outputFiles.push((0, utils_1.createOutputFile)(optimizedFile.sourcemapFileName, optimizedFile.map.toString(), bundler_context_1.BuildOutputFileType.Browser));
+        }
+    }
+    // Update initial files to reflect optimized chunks
+    const entriesToAnalyze = [];
+    for (const usedFile of usedChunks) {
+        // Leave the main file since its information did not change
+        if (usedFile === mainFile) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            entriesToAnalyze.push([mainFile, original.initialFiles.get(mainFile)]);
+            continue;
+        }
+        // Remove all other used chunks
+        original.initialFiles.delete(usedFile);
+    }
+    // Analyze for transitive initial files
+    let currentEntry;
+    while ((currentEntry = entriesToAnalyze.pop())) {
+        const [entryPath, entryRecord] = currentEntry;
+        for (const importPath of importsPerFile[entryPath]) {
+            const existingRecord = original.initialFiles.get(importPath);
+            if (existingRecord) {
+                // Store the smallest value depth
+                if (existingRecord.depth > entryRecord.depth + 1) {
+                    existingRecord.depth = entryRecord.depth + 1;
+                }
+                continue;
+            }
+            const record = {
+                type: 'script',
+                entrypoint: false,
+                external: false,
+                serverFile: false,
+                depth: entryRecord.depth + 1,
+            };
+            entriesToAnalyze.push([importPath, record]);
+        }
+    }
+    return original;
+}

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

@@ -14,10 +14,13 @@ 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 license_extractor_1 = require("../../tools/esbuild/license-extractor");
+const profiling_1 = require("../../tools/esbuild/profiling");
 const utils_1 = require("../../tools/esbuild/utils");
 const bundle_calculator_1 = require("../../utils/bundle-calculator");
+const environment_options_1 = require("../../utils/environment-options");
 const resolve_assets_1 = require("../../utils/resolve-assets");
 const supported_browsers_1 = require("../../utils/supported-browsers");
+const chunk_optimizer_1 = require("./chunk-optimizer");
 const execute_post_bundle_1 = require("./execute-post-bundle");
 const i18n_1 = require("./i18n");
 const setup_bundling_1 = require("./setup-bundling");
@@ -37,7 +40,10 @@ async function executeBuild(options, context, rebuildState) {
     if (bundlerContexts === undefined) {
         bundlerContexts = (0, setup_bundling_1.setupBundlerContexts)(options, browsers, codeBundleCache);
     }
-    const bundlingResult = await bundler_context_1.BundlerContext.bundleAll(bundlerContexts, rebuildState?.fileChanges.all);
+    let bundlingResult = await bundler_context_1.BundlerContext.bundleAll(bundlerContexts, rebuildState?.fileChanges.all);
+    if (options.optimizationOptions.scripts && environment_options_1.shouldOptimizeChunks) {
+        bundlingResult = await (0, profiling_1.profileAsync)('OPTIMIZE_CHUNKS', () => (0, chunk_optimizer_1.optimizeChunks)(bundlingResult, options.sourcemapOptions.scripts ? !options.sourcemapOptions.hidden || 'hidden' : false));
+    }
     const executionResult = new bundler_execution_result_1.ExecutionResult(bundlerContexts, codeBundleCache);
     executionResult.addWarnings(bundlingResult.warnings);
     // Return if the bundling has errors
@@ -63,7 +69,7 @@ async function executeBuild(options, context, rebuildState) {
     // Analyze files for bundle budget failures if present
     let budgetFailures;
     if (options.budgets) {
-        const compatStats = (0, budget_stats_1.generateBudgetStats)(metafile, initialFiles);
+        const compatStats = (0, budget_stats_1.generateBudgetStats)(metafile, outputFiles, initialFiles);
         budgetFailures = [...(0, bundle_calculator_1.checkBudgets)(options.budgets, compatStats, true)];
         for (const { message, severity } of budgetFailures) {
             if (severity === 'error') {
@@ -122,7 +128,7 @@ async function executeBuild(options, context, rebuildState) {
         executionResult.addOutputFile('stats.json', JSON.stringify(metafile, null, 2), bundler_context_1.BuildOutputFileType.Root);
     }
     if (!jsonLogs) {
-        executionResult.addLog((0, utils_1.logBuildStats)(metafile, initialFiles, budgetFailures, colors, changedFiles, estimatedTransferSizes, !!ssrOptions, verbose));
+        executionResult.addLog((0, utils_1.logBuildStats)(metafile, outputFiles, initialFiles, budgetFailures, colors, changedFiles, estimatedTransferSizes, !!ssrOptions, verbose));
     }
     return executionResult;
 }

package/src/builders/application/execute-post-bundle.js

@@ -48,10 +48,10 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
         const { csrContent, ssrContent, errors, warnings } = await (0, index_html_generator_1.generateIndexHtml)(initialFiles, outputFiles, options, locale);
         allErrors.push(...errors);
         allWarnings.push(...warnings);
-        additionalHtmlOutputFiles.set(indexHtmlOptions.output, (0, utils_1.createOutputFileFromText)(indexHtmlOptions.output, csrContent, bundler_context_1.BuildOutputFileType.Browser));
+        additionalHtmlOutputFiles.set(indexHtmlOptions.output, (0, utils_1.createOutputFile)(indexHtmlOptions.output, csrContent, bundler_context_1.BuildOutputFileType.Browser));
         if (ssrContent) {
             const serverIndexHtmlFilename = 'index.server.html';
-            additionalHtmlOutputFiles.set(serverIndexHtmlFilename, (0, utils_1.createOutputFileFromText)(serverIndexHtmlFilename, ssrContent, bundler_context_1.BuildOutputFileType.Server));
+            additionalHtmlOutputFiles.set(serverIndexHtmlFilename, (0, utils_1.createOutputFile)(serverIndexHtmlFilename, ssrContent, bundler_context_1.BuildOutputFileType.Server));
             ssrIndexContent = ssrContent;
         }
     }
@@ -64,7 +64,7 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
         allWarnings.push(...warnings);
         prerenderedRoutes.push(...Array.from(generatedRoutes));
         for (const [path, content] of Object.entries(output)) {
-            additionalHtmlOutputFiles.set(path, (0, utils_1.createOutputFileFromText)(path, content, bundler_context_1.BuildOutputFileType.Browser));
+            additionalHtmlOutputFiles.set(path, (0, utils_1.createOutputFile)(path, content, bundler_context_1.BuildOutputFileType.Browser));
         }
     }
     additionalOutputFiles.push(...additionalHtmlOutputFiles.values());
@@ -75,7 +75,7 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
             const serviceWorkerResult = await (0, service_worker_1.augmentAppWithServiceWorkerEsbuild)(workspaceRoot, serviceWorker, options.baseHref || '/', options.indexHtmlOptions?.output, 
             // Ensure additional files recently added are used
             [...outputFiles, ...additionalOutputFiles], assetFiles);
-            additionalOutputFiles.push((0, utils_1.createOutputFileFromText)('ngsw.json', serviceWorkerResult.manifest, bundler_context_1.BuildOutputFileType.Browser));
+            additionalOutputFiles.push((0, utils_1.createOutputFile)('ngsw.json', serviceWorkerResult.manifest, bundler_context_1.BuildOutputFileType.Browser));
             additionalAssets.push(...serviceWorkerResult.assetFiles);
         }
         catch (error) {

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

@@ -436,7 +436,6 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
                 outputFiles,
                 assets,
                 ssr,
-                extraHeaders: serverOptions.headers,
                 external: externalMetadata.explicit,
                 indexHtmlTransformer,
                 extensionMiddleware,

package/src/tools/angular/compilation/aot-compilation.js

@@ -136,7 +136,9 @@ class AotCompilation extends angular_compilation_1.AngularCompilation {
         const { affectedFiles, angularCompiler, compilerHost, typeScriptProgram, webWorkerTransform } = this.#state;
         const compilerOptions = typeScriptProgram.getCompilerOptions();
         const buildInfoFilename = compilerOptions.tsBuildInfoFile ?? '.tsbuildinfo';
-        const useTypeScriptTranspilation = !compilerOptions.isolatedModules || !!compilerOptions.sourceMap;
+        const useTypeScriptTranspilation = !compilerOptions.isolatedModules ||
+            !!compilerOptions.sourceMap ||
+            !!compilerOptions.inlineSourceMap;
         const emittedFiles = new Map();
         const writeFileCallback = (filename, contents, _a, _b, sourceFiles) => {
             if (!sourceFiles?.length && filename.endsWith(buildInfoFilename)) {

package/src/tools/angular/compilation/parallel-worker.d.ts

@@ -24,6 +24,7 @@ export declare function initialize(request: InitRequest): Promise<{
         allowJs: boolean | undefined;
         isolatedModules: boolean | undefined;
         sourceMap: boolean | undefined;
+        inlineSourceMap: boolean | undefined;
     };
 }>;
 export declare function diagnose(modes: DiagnosticModes): Promise<{

package/src/tools/angular/compilation/parallel-worker.js

@@ -70,11 +70,12 @@ async function initialize(request) {
     });
     return {
         referencedFiles,
-        // TODO: Expand? `allowJs`, `isolatedModules`, `sourceMap` are the only fields needed currently.
+        // TODO: Expand? `allowJs`, `isolatedModules`, `sourceMap`, `inlineSourceMap` are the only fields needed currently.
         compilerOptions: {
             allowJs: compilerOptions.allowJs,
             isolatedModules: compilerOptions.isolatedModules,
             sourceMap: compilerOptions.sourceMap,
+            inlineSourceMap: compilerOptions.inlineSourceMap,
         },
     };
 }

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

@@ -206,7 +206,8 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                     // Typescript printing support for sourcemaps is not yet integrated.
                     useTypeScriptTranspilation =
                         !initializationResult.compilerOptions.isolatedModules ||
-                            !!initializationResult.compilerOptions.sourceMap;
+                            !!initializationResult.compilerOptions.sourceMap ||
+                            !!initializationResult.compilerOptions.inlineSourceMap;
                     referencedFiles = initializationResult.referencedFiles;
                 }
                 catch (error) {
@@ -425,6 +426,7 @@ function createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserve
             noEmitOnError: false,
             inlineSources: !!pluginOptions.sourcemap,
             inlineSourceMap: !!pluginOptions.sourcemap,
+            sourceMap: undefined,
             mapRoot: undefined,
             sourceRoot: undefined,
             preserveSymlinks,

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

@@ -27,9 +27,11 @@ const rxjs_esm_resolution_plugin_1 = require("./rxjs-esm-resolution-plugin");
 const sourcemap_ignorelist_plugin_1 = require("./sourcemap-ignorelist-plugin");
 const utils_1 = require("./utils");
 const virtual_module_plugin_1 = require("./virtual-module-plugin");
+const wasm_plugin_1 = require("./wasm-plugin");
 function createBrowserCodeBundleOptions(options, target, sourceFileCache) {
     const { entryPoints, outputNames, polyfills } = options;
     const { pluginOptions, styleOptions } = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, target, sourceFileCache);
+    const zoneless = (0, utils_1.isZonelessApp)(polyfills);
     const buildOptions = {
         ...getEsBuildCommonOptions(options),
         platform: 'browser',
@@ -41,8 +43,9 @@ function createBrowserCodeBundleOptions(options, target, sourceFileCache) {
         entryNames: outputNames.bundles,
         entryPoints,
         target,
-        supported: (0, utils_1.getFeatureSupport)(target, (0, utils_1.isZonelessApp)(polyfills)),
+        supported: (0, utils_1.getFeatureSupport)(target, zoneless),
         plugins: [
+            (0, wasm_plugin_1.createWasmPlugin)({ allowAsync: zoneless, cache: sourceFileCache?.loadResultCache }),
             (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
             (0, compiler_plugin_1.createCompilerPlugin)(
             // JS/TS options
@@ -124,6 +127,7 @@ function createServerCodeBundleOptions(options, target, sourceFileCache) {
     if (ssrEntryPoint) {
         entryPoints['server'] = ssrEntryPoint;
     }
+    const zoneless = (0, utils_1.isZonelessApp)(polyfills);
     const buildOptions = {
         ...getEsBuildCommonOptions(options),
         platform: 'node',
@@ -140,8 +144,9 @@ function createServerCodeBundleOptions(options, target, sourceFileCache) {
             js: `import './polyfills.server.mjs';`,
         },
         entryPoints,
-        supported: (0, utils_1.getFeatureSupport)(target, (0, utils_1.isZonelessApp)(polyfills)),
+        supported: (0, utils_1.getFeatureSupport)(target, zoneless),
         plugins: [
+            (0, wasm_plugin_1.createWasmPlugin)({ allowAsync: zoneless, cache: sourceFileCache?.loadResultCache }),
             (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
             (0, compiler_plugin_1.createCompilerPlugin)(
             // JS/TS options

package/src/tools/esbuild/budget-stats.d.ts

@@ -7,7 +7,7 @@
  */
 import type { Metafile } from 'esbuild';
 import type { BudgetStats } from '../../utils/bundle-calculator';
-import type { InitialFileRecord } from './bundler-context';
+import { type BuildOutputFile, type InitialFileRecord } from './bundler-context';
 /**
  * Generates a bundle budget calculator compatible stats object that provides
  * the necessary information for the Webpack-based bundle budget code to
@@ -16,4 +16,4 @@ import type { InitialFileRecord } from './bundler-context';
  * @param initialFiles The records of all initial files of a build.
  * @returns A bundle budget compatible stats object.
  */
-export declare function generateBudgetStats(metafile: Metafile, initialFiles: Map<string, InitialFileRecord>): BudgetStats;
+export declare function generateBudgetStats(metafile: Metafile, outputFiles: BuildOutputFile[], initialFiles: Map<string, InitialFileRecord>): BudgetStats;

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

@@ -8,7 +8,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateBudgetStats = generateBudgetStats;
-const node_path_1 = require("node:path");
+const bundler_context_1 = require("./bundler-context");
+const utils_1 = require("./utils");
 /**
  * Generates a bundle budget calculator compatible stats object that provides
  * the necessary information for the Webpack-based bundle budget code to
@@ -17,39 +18,43 @@ const node_path_1 = require("node:path");
  * @param initialFiles The records of all initial files of a build.
  * @returns A bundle budget compatible stats object.
  */
-function generateBudgetStats(metafile, initialFiles) {
+function generateBudgetStats(metafile, outputFiles, initialFiles) {
     const stats = {
         chunks: [],
         assets: [],
     };
-    for (const [file, entry] of Object.entries(metafile.outputs)) {
+    for (const { path: file, size, type } of outputFiles) {
         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']) {
+        if (type === bundler_context_1.BuildOutputFileType.Server) {
             continue;
         }
         const initialRecord = initialFiles.get(file);
-        let name = initialRecord?.name;
-        if (name === undefined && entry.entryPoint) {
-            // For non-initial lazy modules, convert the entry point file into a Webpack compatible name
-            name = (0, node_path_1.basename)(entry.entryPoint)
-                .replace(/\.[cm]?[jt]s$/, '')
-                .replace(/[\\/.]/g, '-');
-        }
+        const name = initialRecord?.name ?? (0, utils_1.getChunkNameFromMetafile)(metafile, file);
         stats.chunks.push({
             files: [file],
             initial: !!initialRecord,
             names: name ? [name] : undefined,
         });
+        stats.assets.push({
+            name: file,
+            size,
+        });
+    }
+    // Add component styles from metafile
+    // TODO: Provide this information directly from the AOT compiler
+    for (const entry of Object.values(metafile.outputs)) {
         // 'ng-component' is set by the angular plugin's component stylesheet bundler
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const componentStyle = entry['ng-component'];
+        if (!componentStyle) {
+            continue;
+        }
         stats.assets.push({
-            // Component styles use the input file while all other outputs use the result file
-            name: (componentStyle && Object.keys(entry.inputs)[0]) || file,
+            // Component styles use the input file
+            name: Object.keys(entry.inputs)[0],
             size: entry.bytes,
             componentStyle,
         });

package/src/tools/esbuild/bundler-context.d.ts

@@ -38,6 +38,7 @@ export declare enum BuildOutputFileType {
 }
 export interface BuildOutputFile extends OutputFile {
     type: BuildOutputFileType;
+    readonly size: number;
     clone: () => BuildOutputFile;
 }
 export type BundlerOptionsFactory<T extends BuildOptions = BuildOptions> = (loadCache: LoadResultCache | undefined) => T;

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

@@ -39,7 +39,7 @@ export declare class ExecutionResult {
     externalMetadata?: ExternalResultMetadata;
     extraWatchFiles: string[];
     constructor(rebuildContexts: BundlerContext[], codeBundleCache?: SourceFileCache | undefined);
-    addOutputFile(path: string, content: string, type: BuildOutputFileType): void;
+    addOutputFile(path: string, content: string | Uint8Array, type: BuildOutputFileType): void;
     addAssets(assets: BuildOutputAsset[]): void;
     addLog(value: string): void;
     addError(error: PartialMessage | string): void;

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

@@ -29,7 +29,7 @@ class ExecutionResult {
         this.codeBundleCache = codeBundleCache;
     }
     addOutputFile(path, content, type) {
-        this.outputFiles.push((0, utils_1.createOutputFileFromText)(path, content, type));
+        this.outputFiles.push((0, utils_1.createOutputFile)(path, content, type));
     }
     addAssets(assets) {
         this.assetFiles.push(...assets);

package/src/tools/esbuild/i18n-inliner.js

@@ -117,9 +117,9 @@ class I18nInliner {
             ...rawResults.flatMap(({ file, code, map, messages }) => {
                 const type = this.#fileToType.get(file);
                 (0, node_assert_1.default)(type !== undefined, 'localized file should always have a type' + file);
-                const resultFiles = [(0, utils_1.createOutputFileFromText)(file, code, type)];
+                const resultFiles = [(0, utils_1.createOutputFile)(file, code, type)];
                 if (map) {
-                    resultFiles.push((0, utils_1.createOutputFileFromText)(file + '.map', map, type));
+                    resultFiles.push((0, utils_1.createOutputFile)(file + '.map', map, type));
                 }
                 for (const message of messages) {
                     if (message.type === 'error') {

package/src/tools/esbuild/javascript-transformer-worker.js

@@ -60,7 +60,9 @@ async function transformWithBabel(filename, data, options) {
     const shouldLink = !options.skipLinker && (await requiresLinking(filename, data));
     const useInputSourcemap = options.sourcemap &&
         (!!options.thirdPartySourcemaps || !/[\\/]node_modules[\\/]/.test(filename));
-    const plugins = [];
+    // @ts-expect-error Import attribute syntax plugin does not currently have type definitions
+    const { default: importAttributePlugin } = await Promise.resolve().then(() => __importStar(require('@babel/plugin-syntax-import-attributes')));
+    const plugins = [importAttributePlugin];
     // Lazy load the linker plugin only when linking is required
     if (shouldLink) {
         const linkerPlugin = await createLinkerPlugin(options);

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

@@ -11,7 +11,8 @@ import { NormalizedApplicationBuildOptions, NormalizedOutputOptions } from '../.
 import { BudgetCalculatorResult } from '../../utils/bundle-calculator';
 import { BuildOutputFile, BuildOutputFileType, InitialFileRecord } from './bundler-context';
 import { BuildOutputAsset, ExecutionResult } from './bundler-execution-result';
-export declare function logBuildStats(metafile: Metafile, initial: Map<string, InitialFileRecord>, budgetFailures: BudgetCalculatorResult[] | undefined, colors: boolean, changedFiles?: Set<string>, estimatedTransferSizes?: Map<string, number>, ssrOutputEnabled?: boolean, verbose?: boolean): string;
+export declare function logBuildStats(metafile: Metafile, outputFiles: BuildOutputFile[], initial: Map<string, InitialFileRecord>, budgetFailures: BudgetCalculatorResult[] | undefined, colors: boolean, changedFiles?: Set<string>, estimatedTransferSizes?: Map<string, number>, ssrOutputEnabled?: boolean, verbose?: boolean): string;
+export declare function getChunkNameFromMetafile(metafile: Metafile, file: string): string | undefined;
 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>;
@@ -25,8 +26,7 @@ export declare function withNoProgress<T>(text: string, action: () => T | Promis
 export declare function getFeatureSupport(target: string[], nativeAsyncAwait: boolean): BuildOptions['supported'];
 export declare function writeResultFiles(outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[] | undefined, { base, browser, server }: NormalizedOutputOptions): Promise<void>;
 export declare function emitFilesToDisk<T = BuildOutputAsset | BuildOutputFile>(files: T[], writeFileCallback: (file: T) => Promise<void>): Promise<void>;
-export declare function createOutputFileFromText(path: string, text: string, type: BuildOutputFileType): BuildOutputFile;
-export declare function createOutputFileFromData(path: string, data: Uint8Array, type: BuildOutputFileType): BuildOutputFile;
+export declare function createOutputFile(path: string, data: string | Uint8Array, type: BuildOutputFileType): BuildOutputFile;
 export declare function convertOutputFile(file: OutputFile, type: BuildOutputFileType): BuildOutputFile;
 /**
  * Transform browserlists result to esbuild target.
@@ -47,3 +47,4 @@ export declare function logMessages(logger: BuilderContext['logger'], executionR
  * @returns true, when the application is considered as zoneless.
  */
 export declare function isZonelessApp(polyfills: string[] | undefined): boolean;
+export declare function getEntryPointName(entryPoint: string): string;