From 416767fdc3d302eca2d48a116dae7e781d8bb988 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 9 Oct 2024 16:27:41 -0400
Subject: [PATCH] refactor(@angular/build): reduce inline style language value
 per call usage

The configured inline style language for Angular components is now set during
the construction of the component stylesheet bundler. This avoids needing to
repeatedly pass the value into each inline bundling call. The ability to
customize the language per call is retained to allow individual style control
if needed.
---
 .../build/src/tools/esbuild/angular/compiler-plugin.ts    | 6 +++---
 .../src/tools/esbuild/angular/component-stylesheets.ts    | 8 +++++++-
 .../src/tools/esbuild/angular/jit-plugin-callbacks.ts     | 7 +------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts b/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts
index 558a19e4c4b6..d0e326dae65c 100644
--- a/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts
+++ b/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts
@@ -130,6 +130,7 @@ export function createCompilerPlugin(
       // Track incremental component stylesheet builds
       const stylesheetBundler = new ComponentStylesheetBundler(
         styleOptions,
+        styleOptions.inlineStyleLanguage,
         pluginOptions.incremental,
       );
       let sharedTSCompilationState: SharedTSCompilationState | undefined;
@@ -190,8 +191,8 @@ export function createCompilerPlugin(
               stylesheetResult = await stylesheetBundler.bundleInline(
                 data,
                 containingFile,
-                // Inline stylesheets from a template style element are always CSS
-                containingFile.endsWith('.html') ? 'css' : styleOptions.inlineStyleLanguage,
+                // Inline stylesheets from a template style element are always CSS; Otherwise, use default.
+                containingFile.endsWith('.html') ? 'css' : undefined,
                 // When external runtime styles are enabled, an identifier for the style that does not change
                 // based on the content is required to avoid emitted JS code changes. Any JS code changes will
                 // invalid the output and force a full page reload for HMR cases. The containing file and order
@@ -490,7 +491,6 @@ export function createCompilerPlugin(
           build,
           stylesheetBundler,
           additionalResults,
-          styleOptions.inlineStyleLanguage,
           pluginOptions.loadResultCache,
         );
       }
diff --git a/packages/angular/build/src/tools/esbuild/angular/component-stylesheets.ts b/packages/angular/build/src/tools/esbuild/angular/component-stylesheets.ts
index 97c1b18ab5e1..711723ac8bf6 100644
--- a/packages/angular/build/src/tools/esbuild/angular/component-stylesheets.ts
+++ b/packages/angular/build/src/tools/esbuild/angular/component-stylesheets.ts
@@ -33,6 +33,7 @@ export class ComponentStylesheetBundler {
    */
   constructor(
     private readonly options: BundleStylesheetOptions,
+    private readonly defaultInlineLanguage: string,
     private readonly incremental: boolean,
   ) {}
 
@@ -63,7 +64,12 @@ export class ComponentStylesheetBundler {
     );
   }
 
-  async bundleInline(data: string, filename: string, language: string, externalId?: string) {
+  async bundleInline(
+    data: string,
+    filename: string,
+    language = this.defaultInlineLanguage,
+    externalId?: string,
+  ) {
     // Use a hash of the inline stylesheet content to ensure a consistent identifier. External stylesheets will resolve
     // to the actual stylesheet file path.
     // TODO: Consider xxhash instead for hashing
diff --git a/packages/angular/build/src/tools/esbuild/angular/jit-plugin-callbacks.ts b/packages/angular/build/src/tools/esbuild/angular/jit-plugin-callbacks.ts
index 44ea408cb1b2..b70baa48d1d6 100644
--- a/packages/angular/build/src/tools/esbuild/angular/jit-plugin-callbacks.ts
+++ b/packages/angular/build/src/tools/esbuild/angular/jit-plugin-callbacks.ts
@@ -66,7 +66,6 @@ export function setupJitPluginCallbacks(
   build: PluginBuild,
   stylesheetBundler: ComponentStylesheetBundler,
   additionalResultFiles: Map<string, { outputFiles?: OutputFile[]; metafile?: Metafile }>,
-  inlineStyleLanguage: string,
   loadCache?: LoadResultCache,
 ): void {
   const root = build.initialOptions.absWorkingDir ?? '';
@@ -114,11 +113,7 @@ export function setupJitPluginCallbacks(
       if (entry.contents === undefined) {
         stylesheetResult = await stylesheetBundler.bundleFile(entry.path);
       } else {
-        stylesheetResult = await stylesheetBundler.bundleInline(
-          entry.contents,
-          entry.path,
-          inlineStyleLanguage,
-        );
+        stylesheetResult = await stylesheetBundler.bundleInline(entry.contents, entry.path);
       }
 
       const { contents, outputFiles, errors, warnings, metafile, referencedFiles } =