@nx/angular-rspack-compiler 24.0.0-beta.2 → 24.0.0-beta.4

package/dist/compilation/build-and-analyze.d.ts

@@ -1,5 +1,6 @@
 import { JavaScriptTransformer } from '@angular/build/private';
 import { AngularCompilation } from '../models';
+import type { JavaScriptTransformerAdapter } from '../utils/javascript-transformer';
 import { type TransformedSource } from '../utils/source-file-cache';
 /**
  * Emits the affected files of the Angular compilation into the given file
@@ -12,5 +13,5 @@ import { type TransformedSource } from '../utils/source-file-cache';
  * @param javascriptTransformer Unused. Kept for signature compatibility; the
  * transformer now runs in the loaders.
  */
-export declare function buildAndAnalyze(angularCompilation: AngularCompilation, typescriptFileCache: Map<string, string | TransformedSource>, javascriptTransformer: JavaScriptTransformer): Promise<void>;
+export declare function buildAndAnalyze(angularCompilation: AngularCompilation, typescriptFileCache: Map<string, string | TransformedSource>, javascriptTransformer: JavaScriptTransformer | JavaScriptTransformerAdapter): Promise<void>;
 //# sourceMappingURL=build-and-analyze.d.ts.map

package/dist/compilation/build-and-analyze.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-and-analyze.d.ts","sourceRoot":"","sources":["../../src/compilation/build-and-analyze.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,4BAA4B,CAAC;AAEpC;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,kBAAkB,EAAE,kBAAkB,EACtC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAAC,EAC5D,qBAAqB,EAAE,qBAAqB,iBAgB7C"}
+{"version":3,"file":"build-and-analyze.d.ts","sourceRoot":"","sources":["../../src/compilation/build-and-analyze.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAEpF,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,4BAA4B,CAAC;AAEpC;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,kBAAkB,EAAE,kBAAkB,EACtC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAAC,EAC5D,qBAAqB,EAAE,qBAAqB,GAAG,4BAA4B,iBAgB5E"}

package/dist/compilation/setup-compilation.d.ts

@@ -59,7 +59,8 @@ export declare function setupCompilation(config: Pick<RsbuildConfig, 'mode' | 's
  * esbuild service - a child process and its sockets - alive until disposed,
  * which prevents a one-shot `rspack build` from exiting once the bundle is
  * written. Angular's own application builder disposes it in a `finally` block;
- * we must do the same since we drive the bundler directly.
+ * we must do the same since we drive the bundler directly. The Sass compiler
+ * the bundler uses is stopped with it (see `shutdownAngularBuildSass`).
  */
 export declare function disposeComponentStylesheetBundler(): Promise<void>;
 export declare function styleTransform(componentStylesheetBundler: ComponentStylesheetBundler): (styles: string, containingFile: string, stylesheetFile?: string) => Promise<StylesheetTransformResult>;

package/dist/compilation/setup-compilation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-compilation.d.ts","sourceRoot":"","sources":["../../src/compilation/setup-compilation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,KAAK,IAAI,EAAE,MAAM,WAAW,CAAC;AAI5E,OAAO,EACL,0BAA0B,EAK3B,MAAM,wBAAwB,CAAC;AAIhC,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,uEAAuE;IACvE,QAAQ,CAAC,EAAE;QACT,OAAO,EAAE,MAAM,CACb,MAAM,EACN;YAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;gBAAE,aAAa,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,CACtD,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,gBAAgB,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;IACzC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,eAAO,MAAM,2BAA2B,EAAE,EAAE,CAAC,eAa5C,CAAC;AAKF;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,QAAQ,CAAC,EAC9C,OAAO,EAAE,uBAAuB;;;;;GAsIjC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,IAAI,CAAC,CAMvE;AAED,wBAAgB,cAAc,CAC5B,0BAA0B,EAAE,0BAA0B,YAG5C,MAAM,kBACE,MAAM,mBACL,MAAM,KACtB,OAAO,CAAC,yBAAyB,CAAC,CAmCtC"}
+{"version":3,"file":"setup-compilation.d.ts","sourceRoot":"","sources":["../../src/compilation/setup-compilation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,KAAK,IAAI,EAAE,MAAM,WAAW,CAAC;AAO5E,OAAO,EACL,0BAA0B,EAK3B,MAAM,wBAAwB,CAAC;AAIhC,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,uEAAuE;IACvE,QAAQ,CAAC,EAAE;QACT,OAAO,EAAE,MAAM,CACb,MAAM,EACN;YAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;gBAAE,aAAa,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,CACtD,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,gBAAgB,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;IACzC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,eAAO,MAAM,2BAA2B,EAAE,EAAE,CAAC,eAe5C,CAAC;AAKF;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,QAAQ,CAAC,EAC9C,OAAO,EAAE,uBAAuB;;;;;GAkJjC;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,IAAI,CAAC,CAUvE;AAED,wBAAgB,cAAc,CAC5B,0BAA0B,EAAE,0BAA0B,YAG5C,MAAM,kBACE,MAAM,mBACL,MAAM,KACtB,OAAO,CAAC,yBAAyB,CAAC,CAmCtC"}

package/dist/compilation/setup-compilation.js

@@ -9,6 +9,9 @@ const ts = tslib_1.__importStar(require("typescript"));
 const utils_1 = require("../utils");
 const typescript_compiler_options_1 = require("../utils/typescript-compiler-options");
 const assert_supported_versions_1 = require("../utils/assert-supported-versions");
+const angular_build_hash_1 = require("../utils/angular-build-hash");
+const angular_build_sass_1 = require("../utils/angular-build-sass");
+const angular_build_version_1 = require("../utils/angular-build-version");
 const private_1 = require("@angular/build/private");
 const targets_from_browsers_1 = require("../utils/targets-from-browsers");
 const node_module_1 = require("node:module");
@@ -25,6 +28,8 @@ exports.DEFAULT_NG_COMPILER_OPTIONS = {
     sourceRoot: undefined,
     supportTestBed: false,
     supportJitMode: false,
+    // TypeScript would also strip annotations such as `/* @__PURE__ */`.
+    removeComments: false,
 };
 let COMPONENT_STYLESHEET_BUNDLER = undefined;
 /**
@@ -40,12 +45,16 @@ let COMPONENT_STYLESHEET_BUNDLER = undefined;
  */
 async function setupCompilation(config, options) {
     (0, assert_supported_versions_1.assertSupportedAngularRspackCompilerVersions)();
+    await (0, angular_build_hash_1.initializeAngularBuildHash)();
+    // From @angular/build 22.2 the compilation reads the tsconfig itself and
+    // takes no `isolatedModules` override, so the option can't apply.
+    const ignoreTsProjectReferences = !!options.useTsProjectReferences && (0, angular_build_version_1.isAngularBuildVersionAtLeast)('22.2.0');
     const { readConfiguration } = await (0, utils_1.loadCompilerCli)();
     const { options: tsCompilerOptions, rootNames } = readConfiguration(config.source?.tsconfigPath ?? options.tsConfig, {
         ...exports.DEFAULT_NG_COMPILER_OPTIONS,
-        // Sourcemaps must be inline to survive the loader chain, and emitting
-        // them forgoes Angular's fast raw-TS emit path, so only emit them when
-        // script sourcemaps are requested.
+        // Sourcemaps must be inline to survive the loader chain. Before
+        // @angular/build 22.1, emitting them forgoes the raw-TS emit path, so
+        // only emit them when script sourcemaps are requested.
         inlineSources: !!options.sourceMap,
         inlineSourceMap: !!options.sourceMap,
         sourceMap: undefined,
@@ -55,7 +64,7 @@ async function setupCompilation(config, options) {
         // The bundler resolves symlinks based on this option alone; the
         // program must resolve the same way, so the tsconfig value is ignored.
         preserveSymlinks: options.preserveSymlinks,
-        ...(options.useTsProjectReferences
+        ...(options.useTsProjectReferences && !ignoreTsProjectReferences
             ? {
                 sourceMap: false,
                 inlineSourceMap: false,
@@ -66,6 +75,10 @@ async function setupCompilation(config, options) {
     });
     const compilerOptions = tsCompilerOptions;
     const setupWarnings = [];
+    if (ignoreTsProjectReferences) {
+        setupWarnings.push("The 'useTsProjectReferences' option has no effect with Angular 22.2 and later. " +
+            "If the TypeScript configuration sets 'noEmit', set 'isolatedModules' to 'true' or remove 'noEmit'.");
+    }
     const hasExplicitUseDefineForClassFields = compilerOptions.useDefineForClassFields !== undefined;
     if ((0, typescript_compiler_options_1.applyEs2022TargetDefaults)(compilerOptions)) {
         setupWarnings.push(hasExplicitUseDefineForClassFields
@@ -149,13 +162,19 @@ async function setupCompilation(config, options) {
  * esbuild service - a child process and its sockets - alive until disposed,
  * which prevents a one-shot `rspack build` from exiting once the bundle is
  * written. Angular's own application builder disposes it in a `finally` block;
- * we must do the same since we drive the bundler directly.
+ * we must do the same since we drive the bundler directly. The Sass compiler
+ * the bundler uses is stopped with it (see `shutdownAngularBuildSass`).
  */
 async function disposeComponentStylesheetBundler() {
     if (COMPONENT_STYLESHEET_BUNDLER) {
         const bundler = COMPONENT_STYLESHEET_BUNDLER;
         COMPONENT_STYLESHEET_BUNDLER = undefined;
-        await bundler.dispose();
+        try {
+            await bundler.dispose();
+        }
+        finally {
+            (0, angular_build_sass_1.shutdownAngularBuildSass)();
+        }
     }
 }
 function styleTransform(componentStylesheetBundler) {

package/dist/compilation/setup-with-angular-compilation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-with-angular-compilation.d.ts","sourceRoot":"","sources":["../../src/compilation/setup-with-angular-compilation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAEL,kBAAkB,EAClB,eAAe,EAEhB,MAAM,WAAW,CAAC;AACnB,OAAO,EAGL,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACnD;AAED,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,EACrC,OAAO,EAAE,uBAAuB,EAChC,eAAe,CAAC,EAAE,eAAe,EACjC,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;;;cA0DoB,MAAM;cAAQ,MAAM;;;;;;GA+GpE"}
+{"version":3,"file":"setup-with-angular-compilation.d.ts","sourceRoot":"","sources":["../../src/compilation/setup-with-angular-compilation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAEL,kBAAkB,EAClB,eAAe,EAEhB,MAAM,WAAW,CAAC;AAGnB,OAAO,EAGL,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACnD;AAwBD,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,EACrC,OAAO,EAAE,uBAAuB,EAChC,eAAe,CAAC,EAAE,eAAe,EACjC,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;;;cA4CoB,MAAM;cAAQ,MAAM;;;;;;GAmJpE"}

package/dist/compilation/setup-with-angular-compilation.js

@@ -3,19 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupCompilationWithAngularCompilation = setupCompilationWithAngularCompilation;
 const node_path_1 = require("node:path");
 const models_1 = require("../models");
+const angular_build_sass_1 = require("../utils/angular-build-sass");
+const angular_build_version_1 = require("../utils/angular-build-version");
 const setup_compilation_1 = require("./setup-compilation");
+// The declarations are those of the installed @angular/build, so only its
+// version tells whether `initialize` has the pre-22.2 signature.
+function hasLegacyInitialize(compilation) {
+    return !(0, angular_build_version_1.isAngularBuildVersionAtLeast)('22.2.0');
+}
 async function setupCompilationWithAngularCompilation(config, options, sourceFileCache, angularCompilation, modifiedFiles) {
     const { rootNames, compilerOptions, componentStylesheetBundler, setupWarnings, } = await (0, setup_compilation_1.setupCompilation)(config, options);
-    // Persist the TypeScript incremental state to the cache directory when one
-    // is available so later cold builds resume from it.
-    if (sourceFileCache?.persistentCachePath &&
-        compilerOptions.incremental !== false) {
-        compilerOptions.incremental = true;
-        compilerOptions.tsBuildInfoFile = (0, node_path_1.join)(sourceFileCache.persistentCachePath, '.tsbuildinfo');
-    }
-    else {
-        compilerOptions.incremental = false;
-    }
     // Mirrors @angular/build's NG_BUILD_PARALLEL_TS switch: anything but
     // 0/false runs the Angular compilation in a worker thread, so type
     // checking overlaps with the bundling work.
@@ -35,6 +32,7 @@ async function setupCompilationWithAngularCompilation(config, options, sourceFil
     // stylesheets get rebuilt; there's nothing to invalidate on the first build.
     if (modifiedFiles) {
         componentStylesheetBundler.invalidate(modifiedFiles);
+        (0, angular_build_sass_1.resetAngularBuildSassCaches)(modifiedFiles);
     }
     modifiedFiles ?? (modifiedFiles = new Set(rootNames));
     const fileReplacements = options.fileReplacements.reduce((r, f) => {
@@ -68,20 +66,50 @@ async function setupCompilationWithAngularCompilation(config, options, sourceFil
         // Return just the contents string as expected by Angular compilation
         return result.contents;
     };
+    const tsconfig = config.source?.tsconfigPath ?? options.tsConfig;
+    const hostOptions = {
+        fileReplacements,
+        modifiedFiles,
+        transformStylesheet: wrappedTransformStylesheet,
+        processWebWorker(workerFile) {
+            return workerFile;
+        },
+    };
     // Initialization errors are rethrown for callers to surface as build
     // errors instead of continuing with a compilation that was never
     // initialized.
     let initializationResult;
     try {
-        initializationResult = await angularCompilation.initialize(config.source?.tsconfigPath ?? options.tsConfig, {
-            sourceFileCache,
-            fileReplacements,
-            modifiedFiles,
-            transformStylesheet: wrappedTransformStylesheet,
-            processWebWorker(workerFile) {
-                return workerFile;
-            },
-        }, () => compilerOptions);
+        if (hasLegacyInitialize(angularCompilation)) {
+            // Persist the TypeScript incremental state to the cache directory when
+            // one is available so later cold builds resume from it.
+            if (sourceFileCache?.persistentCachePath &&
+                compilerOptions.incremental !== false) {
+                compilerOptions.incremental = true;
+                compilerOptions.tsBuildInfoFile = (0, node_path_1.join)(sourceFileCache.persistentCachePath, '.tsbuildinfo');
+            }
+            else {
+                compilerOptions.incremental = false;
+            }
+            // @angular/build 22.1 gates the emit on this flag, and its application
+            // builder sets it to `!isolatedModules`. Earlier versions ignore it and
+            // use the fallback's expression.
+            if ((0, angular_build_version_1.isAngularBuildVersionAtLeast)('22.1.0')) {
+                compilerOptions['_useTypeScriptTranspilation'] =
+                    !compilerOptions.isolatedModules;
+            }
+            initializationResult = await angularCompilation.initialize(tsconfig, { ...hostOptions, sourceFileCache }, () => compilerOptions);
+        }
+        else {
+            // The compilation reads and adjusts the tsconfig itself, like
+            // `setupCompilation` does; only these overrides reach it.
+            initializationResult = await angularCompilation.initialize(tsconfig, hostOptions, {
+                sourcemap: !!options.sourceMap,
+                preserveSymlinks: options.preserveSymlinks,
+                cachePath: sourceFileCache?.persistentCachePath,
+                customConditions: options.customConditions,
+            });
+        }
     }
     catch (error) {
         // A worker-based compilation spawns its worker thread on construction;
@@ -115,15 +143,12 @@ async function setupCompilationWithAngularCompilation(config, options, sourceFil
         }
     }
     // Only the AOT emit branches between TypeScript transpilation and raw
-    // Angular-transformed TypeScript, on this exact expression over the
-    // program's options (JIT always transpiles). The loaders classify the
-    // emitted cache entries with this flag, so it must never diverge from the
-    // emit's gate. The worker-based initialize reports only four options; the
-    // three the gate reads are among them, and any other option would be
-    // undefined here.
-    const useTypeScriptTranspilation = !initializedCompilerOptions?.isolatedModules ||
-        !!initializedCompilerOptions?.sourceMap ||
-        !!initializedCompilerOptions?.inlineSourceMap;
+    // Angular-transformed TypeScript (JIT always transpiles). The loaders
+    // classify the emitted cache entries with this flag, so it must never
+    // diverge from the emit's gate. Worker-based compilations before
+    // @angular/build 22.1 report only `allowJs` and the options the fallback
+    // reads.
+    const useTypeScriptTranspilation = initializedCompilerOptions?.['_useTypeScriptTranspilation'] ?? isTypeScriptTranspiled(initializedCompilerOptions);
     return {
         angularCompilation,
         collectedStylesheetAssets,
@@ -133,6 +158,12 @@ async function setupCompilationWithAngularCompilation(config, options, sourceFil
         setupWarnings,
     };
 }
+// The AOT emit gate of @angular/build < 22.1.
+function isTypeScriptTranspiled(compilerOptions) {
+    return (!compilerOptions?.isolatedModules ||
+        !!compilerOptions.sourceMap ||
+        !!compilerOptions.inlineSourceMap);
+}
 // Callers report initialization failures as build errors; hand them the
 // setup warnings so they are not lost with the failed build.
 function attachSetupWarnings(error, setupWarnings) {

package/dist/utils/angular-build-file.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Loads a file of the installed `@angular/build` that its exports map does not
+ * expose. Loading it by path shares the module instance its own tools use.
+ */
+export declare function requireAngularBuildFile(relativePath: string): any;
+//# sourceMappingURL=angular-build-file.d.ts.map

package/dist/utils/angular-build-file.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"angular-build-file.d.ts","sourceRoot":"","sources":["../../src/utils/angular-build-file.ts"],"names":[],"mappings":"AAKA;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,OAK3D"}

package/dist/utils/angular-build-file.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireAngularBuildFile = requireAngularBuildFile;
+const node_module_1 = require("node:module");
+const node_path_1 = require("node:path");
+const requireFn = (0, node_module_1.createRequire)(__filename);
+/**
+ * Loads a file of the installed `@angular/build` that its exports map does not
+ * expose. Loading it by path shares the module instance its own tools use.
+ */
+function requireAngularBuildFile(relativePath) {
+    const angularBuildDir = (0, node_path_1.dirname)(requireFn.resolve('@angular/build/package.json'));
+    return requireFn((0, node_path_1.join)(angularBuildDir, relativePath));
+}

package/dist/utils/angular-build-hash.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Initializes the hashing that `@angular/build` >= 22.2 tools assert on. Its
+ * builders run this at startup; it is not exported, so it is loaded by path,
+ * which shares the module instance those tools use.
+ */
+export declare function initializeAngularBuildHash(): Promise<void>;
+//# sourceMappingURL=angular-build-hash.d.ts.map

package/dist/utils/angular-build-hash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"angular-build-hash.d.ts","sourceRoot":"","sources":["../../src/utils/angular-build-hash.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC,CAQhE"}

package/dist/utils/angular-build-hash.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initializeAngularBuildHash = initializeAngularBuildHash;
+const angular_build_file_1 = require("./angular-build-file");
+const angular_build_version_1 = require("./angular-build-version");
+/**
+ * Initializes the hashing that `@angular/build` >= 22.2 tools assert on. Its
+ * builders run this at startup; it is not exported, so it is loaded by path,
+ * which shares the module instance those tools use.
+ */
+async function initializeAngularBuildHash() {
+    if (!(0, angular_build_version_1.isAngularBuildVersionAtLeast)('22.2.0')) {
+        return;
+    }
+    const { initializeHash } = (0, angular_build_file_1.requireAngularBuildFile)('src/utils/hash.js');
+    await initializeHash();
+}

package/dist/utils/angular-build-sass.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Stops the Sass compiler `@angular/build` keeps for component stylesheets.
+ * From 22.2 it runs Dart Sass in a child process, which keeps a one-shot build
+ * from exiting until stopped.
+ */
+export declare function shutdownAngularBuildSass(): void;
+/**
+ * `@angular/build` >= 22.2 keeps the directory listings Sass imports resolve
+ * from across compilations, so a stylesheet change must drop them for added or
+ * removed files to resolve.
+ */
+export declare function resetAngularBuildSassCaches(changedFiles: Set<string>): void;
+//# sourceMappingURL=angular-build-sass.d.ts.map

package/dist/utils/angular-build-sass.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"angular-build-sass.d.ts","sourceRoot":"","sources":["../../src/utils/angular-build-sass.ts"],"names":[],"mappings":"AAcA;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAE/C;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAQ3E"}

package/dist/utils/angular-build-sass.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shutdownAngularBuildSass = shutdownAngularBuildSass;
+exports.resetAngularBuildSassCaches = resetAngularBuildSassCaches;
+const angular_build_file_1 = require("./angular-build-file");
+function loadSassLanguage() {
+    return (0, angular_build_file_1.requireAngularBuildFile)('src/tools/esbuild/stylesheets/sass-language.js');
+}
+/**
+ * Stops the Sass compiler `@angular/build` keeps for component stylesheets.
+ * From 22.2 it runs Dart Sass in a child process, which keeps a one-shot build
+ * from exiting until stopped.
+ */
+function shutdownAngularBuildSass() {
+    loadSassLanguage().shutdownSassWorkerPool();
+}
+/**
+ * `@angular/build` >= 22.2 keeps the directory listings Sass imports resolve
+ * from across compilations, so a stylesheet change must drop them for added or
+ * removed files to resolve.
+ */
+function resetAngularBuildSassCaches(changedFiles) {
+    const { resetSassWorkerPoolCaches } = loadSassLanguage();
+    if (resetSassWorkerPoolCaches &&
+        [...changedFiles].some((file) => /\.(scss|sass|css)$/i.test(file))) {
+        resetSassWorkerPoolCaches();
+    }
+}

package/dist/utils/angular-build-version.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Whether the `@angular/build` this package loads `@angular/build/private`
+ * from is at least `version`. Prereleases count as their release, since
+ * private API changes land in them first.
+ */
+export declare function isAngularBuildVersionAtLeast(version: string): boolean;
+//# sourceMappingURL=angular-build-version.d.ts.map

package/dist/utils/angular-build-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"angular-build-version.d.ts","sourceRoot":"","sources":["../../src/utils/angular-build-version.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAKrE"}

package/dist/utils/angular-build-version.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAngularBuildVersionAtLeast = isAngularBuildVersionAtLeast;
+const node_module_1 = require("node:module");
+const semver_1 = require("semver");
+/**
+ * Whether the `@angular/build` this package loads `@angular/build/private`
+ * from is at least `version`. Prereleases count as their release, since
+ * private API changes land in them first.
+ */
+function isAngularBuildVersionAtLeast(version) {
+    const { version: installedVersion } = (0, node_module_1.createRequire)(__filename)('@angular/build/package.json');
+    return (0, semver_1.gte)((0, semver_1.coerce)(installedVersion), version);
+}

package/dist/utils/index.d.ts

@@ -1,5 +1,7 @@
 export * from './regex-filters';
+export * from './angular-build-version';
 export * from './component-resolvers';
+export * from './javascript-transformer';
 export * from './javascript-transformer-cache';
 export * from './load-compiler-cli';
 export * from './typescript-compiler-options';

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC"}

package/dist/utils/index.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.maxWorkers = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./regex-filters"), exports);
+tslib_1.__exportStar(require("./angular-build-version"), exports);
 tslib_1.__exportStar(require("./component-resolvers"), exports);
+tslib_1.__exportStar(require("./javascript-transformer"), exports);
 tslib_1.__exportStar(require("./javascript-transformer-cache"), exports);
 tslib_1.__exportStar(require("./load-compiler-cli"), exports);
 tslib_1.__exportStar(require("./typescript-compiler-options"), exports);

package/dist/utils/javascript-transformer-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"javascript-transformer-cache.d.ts","sourceRoot":"","sources":["../../src/utils/javascript-transformer-cache.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAEpD,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAOD;;;;;;;;;;GAUG;AACH,wBAAgB,gCAAgC,CAC9C,mBAAmB,EAAE,MAAM,GAC1B,0BAA0B,GAAG,SAAS,CAmBxC"}
+{"version":3,"file":"javascript-transformer-cache.d.ts","sourceRoot":"","sources":["../../src/utils/javascript-transformer-cache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAGpD,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAaD;;;;;;;;;;GAUG;AACH,wBAAgB,gCAAgC,CAC9C,mBAAmB,EAAE,MAAM,GAC1B,0BAA0B,GAAG,SAAS,CAmBxC"}

package/dist/utils/javascript-transformer-cache.js

@@ -1,8 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createJavascriptTransformerCache = createJavascriptTransformerCache;
-const node_module_1 = require("node:module");
 const node_path_1 = require("node:path");
+const angular_build_file_1 = require("./angular-build-file");
+// `@angular/build` 22.2 moved the store out of `src/tools/esbuild`.
+const LMDB_CACHE_STORE_PATHS = [
+    'src/utils/cache/lmdb-cache-store.js',
+    'src/tools/esbuild/lmdb-cache-store.js',
+];
 /**
  * Creates the persistent store the esbuild application builder uses for
  * `JavaScriptTransformer` results, so Angular package linking is only paid
@@ -15,17 +20,18 @@ const node_path_1 = require("node:path");
  * case the transformer runs uncached.
  */
 function createJavascriptTransformerCache(persistentCachePath) {
-    try {
-        const requireFn = (0, node_module_1.createRequire)(__filename);
-        const angularBuildDir = (0, node_path_1.dirname)(requireFn.resolve('@angular/build/package.json'));
-        const { LmdbCacheStore } = requireFn((0, node_path_1.join)(angularBuildDir, 'src/tools/esbuild/lmdb-cache-store.js'));
-        const store = new LmdbCacheStore((0, node_path_1.join)(persistentCachePath, 'angular-compiler.db'));
-        return {
-            cache: store.createCache('jstransformer'),
-            close: () => store.close(),
-        };
-    }
-    catch {
-        return undefined;
+    for (const storePath of LMDB_CACHE_STORE_PATHS) {
+        try {
+            const { LmdbCacheStore, } = (0, angular_build_file_1.requireAngularBuildFile)(storePath);
+            const store = new LmdbCacheStore((0, node_path_1.join)(persistentCachePath, 'angular-compiler.db'));
+            return {
+                cache: store.createCache('jstransformer'),
+                close: () => store.close(),
+            };
+        }
+        catch {
+            // Not loadable from this location; try the next one.
+        }
     }
+    return undefined;
 }

package/dist/utils/javascript-transformer.d.ts

@@ -0,0 +1,21 @@
+import { Cache, JavaScriptTransformer } from '@angular/build/private';
+type JavaScriptTransformerOptions = Omit<ConstructorParameters<typeof JavaScriptTransformer>[0], 'maxConcurrency'>;
+/**
+ * The `JavaScriptTransformer` API as it was before `@angular/build` 22.2,
+ * which moved the per-transform flags into an options object, plus
+ * `transformFileUncached`.
+ */
+export interface JavaScriptTransformerAdapter {
+    transformData(filename: string, data: string, skipLinker: boolean, sideEffects?: boolean): Promise<Uint8Array>;
+    transformFile(filename: string, skipLinker?: boolean, sideEffects?: boolean): Promise<Uint8Array>;
+    /** Like `transformFile`, but never reads or writes the cache. */
+    transformFileUncached(filename: string, skipLinker?: boolean, sideEffects?: boolean): Promise<Uint8Array>;
+    close(): Promise<void>;
+}
+/**
+ * Creates the `@angular/build` JavaScript transformer for the installed
+ * version, sized with that version's worker count, exposing the pre-22.2 API.
+ */
+export declare function createJavaScriptTransformer(options: JavaScriptTransformerOptions, cache?: Cache<Uint8Array>): JavaScriptTransformerAdapter;
+export {};
+//# sourceMappingURL=javascript-transformer.d.ts.map

package/dist/utils/javascript-transformer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"javascript-transformer.d.ts","sourceRoot":"","sources":["../../src/utils/javascript-transformer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAItE,KAAK,4BAA4B,GAAG,IAAI,CACtC,qBAAqB,CAAC,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAAC,EACtD,gBAAgB,CACjB,CAAC;AAEF;;;;GAIG;AACH,MAAM,WAAW,4BAA4B;IAC3C,aAAa,CACX,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,OAAO,EACnB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,UAAU,CAAC,CAAC;IACvB,aAAa,CACX,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,OAAO,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,UAAU,CAAC,CAAC;IACvB,iEAAiE;IACjE,qBAAqB,CACnB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,OAAO,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,UAAU,CAAC,CAAC;IACvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAiBD;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,4BAA4B,EACrC,KAAK,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,GACxB,4BAA4B,CAkD9B"}

package/dist/utils/javascript-transformer.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createJavaScriptTransformer = createJavaScriptTransformer;
+const node_async_hooks_1 = require("node:async_hooks");
+const promises_1 = require("node:fs/promises");
+const private_1 = require("@angular/build/private");
+const angular_build_version_1 = require("./angular-build-version");
+const utils_1 = require("./utils");
+// The declarations are those of the installed @angular/build, so only its
+// version tells whether the class has the pre-22.2 constructor.
+function hasLegacyConstructor(transformer) {
+    return !(0, angular_build_version_1.isAngularBuildVersionAtLeast)('22.2.0');
+}
+/**
+ * Creates the `@angular/build` JavaScript transformer for the installed
+ * version, sized with that version's worker count, exposing the pre-22.2 API.
+ */
+function createJavaScriptTransformer(options, cache) {
+    if (hasLegacyConstructor(private_1.JavaScriptTransformer)) {
+        const transformer = new private_1.JavaScriptTransformer(options, (0, utils_1.maxWorkers)(), cache);
+        return {
+            transformData: transformer.transformData.bind(transformer),
+            transformFile: transformer.transformFile.bind(transformer),
+            // `transformData` never uses the cache before 22.2.
+            transformFileUncached: async (filename, skipLinker, sideEffects) => transformer.transformData(filename, await (0, promises_1.readFile)(filename, 'utf8'), skipLinker, sideEffects),
+            close: transformer.close.bind(transformer),
+        };
+    }
+    const skipCache = new node_async_hooks_1.AsyncLocalStorage();
+    const transformer = new private_1.JavaScriptTransformer({ ...options, maxConcurrency: (0, utils_1.maxTransformWorkers)() }, cache && createSkippableCache(cache, skipCache));
+    const toTransformOptions = (skipLinker, sideEffects) => ({
+        skipLinker,
+        sideEffects: sideEffects === undefined ? undefined : async () => sideEffects,
+    });
+    return {
+        transformData: (filename, data, skipLinker, sideEffects) => transformer.transformData(filename, data, toTransformOptions(skipLinker, sideEffects)),
+        transformFile: (filename, skipLinker, sideEffects) => transformer.transformFile(filename, toTransformOptions(skipLinker, sideEffects)),
+        transformFileUncached: (filename, skipLinker, sideEffects) => skipCache.run(true, () => transformer.transformFile(filename, toTransformOptions(skipLinker, sideEffects))),
+        close: () => transformer.close(),
+    };
+}
+// `@angular/build` 20 does not export `Cache`, so it may only be referenced
+// at runtime on the 22.2 path.
+function createSkippableCache(cache, skipCache) {
+    return new private_1.Cache({
+        get: (key) => (skipCache.getStore() ? undefined : cache.get(key)),
+        has: async (key) => !skipCache.getStore() && (await cache.get(key)) !== undefined,
+        async set(key, value) {
+            if (!skipCache.getStore()) {
+                await cache.put(key, value);
+            }
+            return this;
+        },
+    });
+}

package/dist/utils/utils.d.ts

@@ -2,4 +2,10 @@ export declare const isUsingWindows: () => boolean;
 export declare function isPresent(variable: string | undefined): variable is string;
 export declare function parseMaxWorkers(value: string | undefined): number | null;
 export declare const maxWorkers: () => number;
+/**
+ * The JavaScript transformer's worker count on `@angular/build` >= 22.2, as
+ * its `maxTransformWorkers` computes it. That transformer keeps a fixed pool of
+ * this size and rejects anything but an integer >= 1.
+ */
+export declare const maxTransformWorkers: () => number;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc,eAA+B,CAAC;AAE3D,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,IAAI,MAAM,CAE1E;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAIxE;AAED,eAAO,MAAM,UAAU,cAKtB,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc,eAA+B,CAAC;AAE3D,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,IAAI,MAAM,CAE1E;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAIxE;AAED,eAAO,MAAM,UAAU,cAKtB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,cAM/B,CAAC"}

package/dist/utils/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maxWorkers = exports.isUsingWindows = void 0;
+exports.maxTransformWorkers = exports.maxWorkers = exports.isUsingWindows = void 0;
 exports.isPresent = isPresent;
 exports.parseMaxWorkers = parseMaxWorkers;
 const node_os_1 = require("node:os");
@@ -23,3 +23,16 @@ const maxWorkers = () => {
         : Math.min(4, Math.max((0, node_os_1.availableParallelism)() - 1, 1));
 };
 exports.maxWorkers = maxWorkers;
+/**
+ * The JavaScript transformer's worker count on `@angular/build` >= 22.2, as
+ * its `maxTransformWorkers` computes it. That transformer keeps a fixed pool of
+ * this size and rejects anything but an integer >= 1.
+ */
+const maxTransformWorkers = () => {
+    const value = process.env[constants_1.ENV_NG_BUILD_MAX_WORKERS];
+    const parsed = isPresent(value) ? Number(value) : NaN;
+    return Number.isInteger(parsed) && parsed >= 1
+        ? parsed
+        : Math.max(1, Math.min(6, Math.floor((0, node_os_1.availableParallelism)() / 4)));
+};
+exports.maxTransformWorkers = maxTransformWorkers;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/angular-rspack-compiler",
   "private": false,
-  "version": "24.0.0-beta.2",
+  "version": "24.0.0-beta.4",
   "publishConfig": {
     "access": "public"
   },
@@ -40,7 +40,7 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "24.0.0-beta.2",
+    "@nx/devkit": "24.0.0-beta.4",
     "sass-embedded": "^1.97.2",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",