7af63b4 refactor(@angular-devkit/build-angular): reduce custom code in browser-esbuild implementation

Author: Angular Builds

package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "18.3.0-next.0+sha-8d650d3",
+  "version": "18.3.0-next.0+sha-7af63b4",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#8d650d3",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#8d650d3",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#8d650d3",
-    "@angular/build": "github:angular/angular-build-builds#8d650d3",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#7af63b4",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#7af63b4",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#7af63b4",
+    "@angular/build": "github:angular/angular-build-builds#7af63b4",
     "@babel/core": "7.25.2",
     "@babel/generator": "7.25.0",
     "@babel/helper-annotate-as-pure": "7.24.7",
@@ -21,7 +21,7 @@
     "@babel/preset-env": "7.25.3",
     "@babel/runtime": "7.25.0",
     "@discoveryjs/json-ext": "0.6.1",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#8d650d3",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#7af63b4",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",

src/builders/browser-esbuild/index.d.ts

@@ -5,10 +5,12 @@
  * 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 { Result } from '@angular/build/private';
-import { BuilderContext } from '@angular-devkit/architect';
+import { type ApplicationBuilderOptions } from '@angular/build';
+import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
 import type { Plugin } from 'esbuild';
 import type { Schema as BrowserBuilderOptions } from './schema';
+export type { BrowserBuilderOptions };
+type OutputPathClass = Exclude<ApplicationBuilderOptions['outputPath'], string | undefined>;
 /**
  * Main execution function for the esbuild-based application builder.
  * The options are compatible with the Webpack-based builder.
@@ -18,9 +20,9 @@ import type { Schema as BrowserBuilderOptions } from './schema';
  */
 export declare function buildEsbuildBrowser(userOptions: BrowserBuilderOptions, context: BuilderContext, infrastructureSettings?: {
     write?: boolean;
-}, plugins?: Plugin[]): AsyncIterable<Result>;
-export declare function buildEsbuildBrowserArchitect(options: BrowserBuilderOptions, context: BuilderContext): AsyncGenerator<{
-    success: boolean;
-}, void, unknown>;
+}, plugins?: Plugin[]): AsyncIterable<BuilderOutput>;
+export declare function convertBrowserOptions(options: BrowserBuilderOptions): Omit<ApplicationBuilderOptions, 'outputPath'> & {
+    outputPath: OutputPathClass;
+};
 declare const _default: import("../../../../architect/src/internal").Builder<BrowserBuilderOptions & import("../../../../core/src").JsonObject>;
 export default _default;

src/builders/browser-esbuild/index.js

@@ -6,16 +6,11 @@
  * 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.buildEsbuildBrowser = buildEsbuildBrowser;
-exports.buildEsbuildBrowserArchitect = buildEsbuildBrowserArchitect;
-const private_1 = require("@angular/build/private");
+exports.convertBrowserOptions = convertBrowserOptions;
+const build_1 = require("@angular/build");
 const architect_1 = require("@angular-devkit/architect");
-const promises_1 = __importDefault(require("node:fs/promises"));
-const node_path_1 = __importDefault(require("node:path"));
 const builder_status_warnings_1 = require("./builder-status-warnings");
 /**
  * Main execution function for the esbuild-based application builder.
@@ -27,55 +22,22 @@ const builder_status_warnings_1 = require("./builder-status-warnings");
 async function* buildEsbuildBrowser(userOptions, context, infrastructureSettings, plugins) {
     // Inform user of status of builder and options
     (0, builder_status_warnings_1.logBuilderStatusWarnings)(userOptions, context);
-    const normalizedOptions = normalizeOptions(userOptions);
-    const { deleteOutputPath, outputPath } = normalizedOptions;
-    const fullOutputPath = node_path_1.default.join(context.workspaceRoot, outputPath.base);
-    if (deleteOutputPath && infrastructureSettings?.write !== false) {
-        await (0, private_1.deleteOutputDir)(context.workspaceRoot, outputPath.base);
-    }
-    for await (const result of (0, private_1.buildApplicationInternal)(normalizedOptions, context, plugins && { codePlugins: plugins })) {
-        // Write the file directly from this builder to maintain webpack output compatibility
-        // and not output browser files into '/browser'.
-        if (infrastructureSettings?.write !== false &&
-            (result.kind === private_1.ResultKind.Full || result.kind === private_1.ResultKind.Incremental)) {
-            const directoryExists = new Set();
-            // Writes the output file to disk and ensures the containing directories are present
-            await (0, private_1.emitFilesToDisk)(Object.entries(result.files), async ([filePath, file]) => {
-                // Ensure output subdirectories exist
-                const basePath = node_path_1.default.dirname(filePath);
-                if (basePath && !directoryExists.has(basePath)) {
-                    await promises_1.default.mkdir(node_path_1.default.join(fullOutputPath, basePath), { recursive: true });
-                    directoryExists.add(basePath);
-                }
-                if (file.origin === 'memory') {
-                    // Write file contents
-                    await promises_1.default.writeFile(node_path_1.default.join(fullOutputPath, filePath), file.contents);
-                }
-                else {
-                    // Copy file contents
-                    await promises_1.default.copyFile(file.inputPath, node_path_1.default.join(fullOutputPath, filePath), promises_1.default.constants.COPYFILE_FICLONE);
-                }
-            });
-        }
-        yield result;
-    }
+    const normalizedOptions = convertBrowserOptions(userOptions);
+    yield* (0, build_1.buildApplication)(normalizedOptions, context, { codePlugins: plugins });
 }
-function normalizeOptions(options) {
-    const { main: browser, outputPath, ngswConfigPath, serviceWorker, polyfills, ...otherOptions } = options;
+function convertBrowserOptions(options) {
+    const { main: browser, outputPath, ngswConfigPath, serviceWorker, polyfills, resourcesOutputPath, ...otherOptions } = options;
     return {
         browser,
         serviceWorker: serviceWorker ? ngswConfigPath : false,
         polyfills: typeof polyfills === 'string' ? [polyfills] : polyfills,
         outputPath: {
             base: outputPath,
             browser: '',
+            server: '',
+            media: resourcesOutputPath ?? 'media',
         },
         ...otherOptions,
     };
 }
-async function* buildEsbuildBrowserArchitect(options, context) {
-    for await (const result of buildEsbuildBrowser(options, context)) {
-        yield { success: result.kind !== private_1.ResultKind.Failure };
-    }
-}
-exports.default = (0, architect_1.createBuilder)(buildEsbuildBrowserArchitect);
+exports.default = (0, architect_1.createBuilder)(buildEsbuildBrowser);

src/builders/dev-server/builder.js

@@ -72,10 +72,12 @@ function execute(options, context, transforms = {}, extensions) {
             if (options.disableHostCheck) {
                 context.logger.warn(`The "disableHostCheck" option will not be used because it is not supported by the "${builderName}" builder.`);
             }
-            return (0, rxjs_1.defer)(() => Promise.all([Promise.resolve().then(() => __importStar(require('@angular/build/private'))), Promise.resolve().then(() => __importStar(require('../browser-esbuild')))])).pipe((0, rxjs_1.switchMap)(([{ serveWithVite, buildApplicationInternal }, { buildEsbuildBrowser }]) => serveWithVite(normalizedOptions, builderName, (options, context, codePlugins) => {
+            return (0, rxjs_1.defer)(() => Promise.all([Promise.resolve().then(() => __importStar(require('@angular/build/private'))), Promise.resolve().then(() => __importStar(require('../browser-esbuild')))])).pipe((0, rxjs_1.switchMap)(([{ serveWithVite, buildApplicationInternal }, { convertBrowserOptions }]) => serveWithVite(normalizedOptions, builderName, (options, context, codePlugins) => {
                 return builderName === '@angular-devkit/build-angular:browser-esbuild'
                     ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        buildEsbuildBrowser(options, context, { write: false }, codePlugins)
+                        buildApplicationInternal(convertBrowserOptions(options), context, {
+                            codePlugins,
+                        })
                     : buildApplicationInternal(options, context, { codePlugins });
             }, context, transforms, extensions)));
         }

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

@@ -17,25 +17,23 @@ const browser_esbuild_1 = require("../browser-esbuild");
 async function extractMessages(options, builderName, context, extractorConstructor) {
     const messages = [];
     // Setup the build options for the application based on the buildTarget option
-    const buildOptions = (await context.validateOptions(await context.getTargetOptions(options.buildTarget), builderName));
+    let buildOptions;
+    if (builderName === '@angular-devkit/build-angular:application') {
+        buildOptions = (await context.validateOptions(await context.getTargetOptions(options.buildTarget), builderName));
+    }
+    else {
+        buildOptions = (0, browser_esbuild_1.convertBrowserOptions)((await context.validateOptions(await context.getTargetOptions(options.buildTarget), builderName)));
+    }
     buildOptions.optimization = false;
     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 = private_1.buildApplicationInternal;
-        buildOptions.ssr = false;
-        buildOptions.appShell = false;
-        buildOptions.prerender = false;
-    }
-    else {
-        build = browser_esbuild_1.buildEsbuildBrowser;
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const builderResult = await first(build(buildOptions, context, { write: false }));
+    buildOptions.ssr = false;
+    buildOptions.appShell = false;
+    buildOptions.prerender = false;
+    const builderResult = await first((0, private_1.buildApplicationInternal)(buildOptions, context));
     let success = false;
     if (!builderResult || builderResult.kind === private_1.ResultKind.Failure) {
         context.logger.error('Application build failed.');

src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = normalizeCacheOptions;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '18.3.0-next.0+sha-8d650d3';
+const VERSION = '18.3.0-next.0+sha-7af63b4';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

uniqueId

@@ -1 +1 @@
-Tue Aug 13 2024 09:40:19 GMT+0000 (Coordinated Universal Time)
+Tue Aug 13 2024 11:58:17 GMT+0000 (Coordinated Universal Time)