refactor(@angular-devkit/build-angular): add index HTML transformer to application programmatic usage

goldens/public-api/angular_devkit/build_angular/index.md

@@ -149,13 +149,10 @@ export interface Budget {
 }
 
 // @public
-export function buildApplication(options: ApplicationBuilderOptions, context: BuilderContext, plugins?: Plugin_2[]): AsyncIterable<BuilderOutput & {
-    outputFiles?: BuildOutputFile[];
-    assetFiles?: {
-        source: string;
-        destination: string;
-    }[];
-}>;
+export function buildApplication(options: ApplicationBuilderOptions, context: BuilderContext, plugins?: Plugin_2[]): AsyncIterable<ApplicationBuilderOutput>;
+
+// @public
+export function buildApplication(options: ApplicationBuilderOptions, context: BuilderContext, extensions?: ApplicationBuilderExtensions): AsyncIterable<ApplicationBuilderOutput>;
 
 // @public
 export enum CrossOrigin {

packages/angular_devkit/build_angular/src/builders/application/index.ts

@@ -13,7 +13,11 @@ import { purgeStaleBuildCache } from '../../utils/purge-cache';
 import { assertCompatibleAngularVersion } from '../../utils/version';
 import { runEsBuildBuildAction } from './build-action';
 import { executeBuild } from './execute-build';
-import { ApplicationBuilderInternalOptions, normalizeOptions } from './options';
+import {
+  ApplicationBuilderExtensions,
+  ApplicationBuilderInternalOptions,
+  normalizeOptions,
+} from './options';
 import { Schema as ApplicationBuilderOptions } from './schema';
 
 export { ApplicationBuilderOptions };
@@ -25,13 +29,8 @@ export async function* buildApplicationInternal(
   infrastructureSettings?: {
     write?: boolean;
   },
-  plugins?: Plugin[],
-): AsyncIterable<
-  BuilderOutput & {
-    outputFiles?: BuildOutputFile[];
-    assetFiles?: { source: string; destination: string }[];
-  }
-> {
+  extensions?: ApplicationBuilderExtensions,
+): AsyncIterable<ApplicationBuilderOutput> {
   // Check Angular version.
   assertCompatibleAngularVersion(context.workspaceRoot);
 
@@ -46,7 +45,7 @@ export async function* buildApplicationInternal(
     return;
   }
 
-  const normalizedOptions = await normalizeOptions(context, projectName, options, plugins);
+  const normalizedOptions = await normalizeOptions(context, projectName, options, extensions);
 
   // Setup an abort controller with a builder teardown if no signal is present
   let signal = context.signal;
@@ -94,6 +93,11 @@ export async function* buildApplicationInternal(
   );
 }
 
+export interface ApplicationBuilderOutput extends BuilderOutput {
+  outputFiles?: BuildOutputFile[];
+  assetFiles?: { source: string; destination: string }[];
+}
+
 /**
  * Builds an application using the `application` builder with the provided
  * options.
@@ -112,13 +116,41 @@ export function buildApplication(
   options: ApplicationBuilderOptions,
   context: BuilderContext,
   plugins?: Plugin[],
-): AsyncIterable<
-  BuilderOutput & {
-    outputFiles?: BuildOutputFile[];
-    assetFiles?: { source: string; destination: string }[];
+): AsyncIterable<ApplicationBuilderOutput>;
+
+/**
+ * Builds an application using the `application` builder with the provided
+ * options.
+ *
+ * Usage of the `extensions` parameter is NOT supported and may cause unexpected
+ * build output or build failures.
+ *
+ * @experimental Direct usage of this function is considered experimental.
+ *
+ * @param options The options defined by the builder's schema to use.
+ * @param context An Architect builder context instance.
+ * @param extensions An object contain extension points for the build.
+ * @returns The build output results of the build.
+ */
+export function buildApplication(
+  options: ApplicationBuilderOptions,
+  context: BuilderContext,
+  extensions?: ApplicationBuilderExtensions,
+): AsyncIterable<ApplicationBuilderOutput>;
+
+export function buildApplication(
+  options: ApplicationBuilderOptions,
+  context: BuilderContext,
+  pluginsOrExtensions?: Plugin[] | ApplicationBuilderExtensions,
+): AsyncIterable<ApplicationBuilderOutput> {
+  let extensions;
+  if (pluginsOrExtensions && Array.isArray(pluginsOrExtensions)) {
+    extensions = {
+      codePlugins: pluginsOrExtensions,
+    };
   }
-> {
-  return buildApplicationInternal(options, context, undefined, plugins);
+
+  return buildApplicationInternal(options, context, undefined, extensions);
 }
 
 export default createBuilder(buildApplication);

packages/angular_devkit/build_angular/src/builders/application/options.ts

@@ -18,6 +18,7 @@ import {
 } from '../../tools/webpack/utils/helpers';
 import { normalizeAssetPatterns, normalizeOptimization, normalizeSourceMaps } from '../../utils';
 import { I18nOptions, createI18nOptions } from '../../utils/i18n-options';
+import { IndexHtmlTransform } from '../../utils/index-file/index-html-generator';
 import { normalizeCacheOptions } from '../../utils/normalize-cache';
 import { generateEntryPoints } from '../../utils/package-chunk-sort';
 import { findTailwindConfigurationFile } from '../../utils/tailwind';
@@ -26,6 +27,11 @@ import { Schema as ApplicationBuilderOptions, I18NTranslation, OutputHashing } f
 
 export type NormalizedApplicationBuildOptions = Awaited<ReturnType<typeof normalizeOptions>>;
 
+export interface ApplicationBuilderExtensions {
+  codePlugins?: Plugin[];
+  indexHtmlTransformer?: IndexHtmlTransform;
+}
+
 /** Internal options hidden from builder schema but available when invoked programmatically. */
 interface InternalOptions {
   /**
@@ -82,7 +88,7 @@ export async function normalizeOptions(
   context: BuilderContext,
   projectName: string,
   options: ApplicationBuilderInternalOptions,
-  plugins?: Plugin[],
+  extensions?: ApplicationBuilderExtensions,
 ) {
   // If not explicitly set, default to the Node.js process argument
   const preserveSymlinks =
@@ -217,6 +223,7 @@ export async function normalizeOptions(
         scripts: options.scripts ?? [],
         styles: options.styles ?? [],
       }),
+      transformer: extensions?.indexHtmlTransformer,
     };
   }
 
@@ -329,7 +336,7 @@ export async function normalizeOptions(
     namedChunks,
     budgets: budgets?.length ? budgets : undefined,
     publicPath: deployUrl ? deployUrl : undefined,
-    plugins: plugins?.length ? plugins : undefined,
+    plugins: extensions?.codePlugins?.length ? extensions?.codePlugins : undefined,
     loaderExtensions,
   };
 }

packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts

@@ -56,7 +56,7 @@ export async function* buildEsbuildBrowser(
     {
       write: false,
     },
-    plugins,
+    plugins && { codePlugins: plugins },
   )) {
     if (infrastructureSettings?.write !== false && result.outputFiles) {
       // Write output files

packages/angular_devkit/build_angular/src/tools/esbuild/index-html-generator.ts

@@ -82,6 +82,7 @@ export async function generateIndexHtml(
     },
     crossOrigin: crossOrigin,
     deployUrl: buildOptions.publicPath,
+    postTransform: indexHtmlOptions.transformer,
   });
 
   indexHtmlGenerator.readAsset = readAsset;
@@ -110,6 +111,7 @@ export async function generateIndexHtml(
 
   const inlineCriticalCssProcessor = new InlineCriticalCssProcessor({
     minify: false, // CSS has already been minified during the build.
+    deployUrl: buildOptions.publicPath,
     readAsset,
   });