@angular/build 19.0.5 → 19.1.0-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "19.0.5",
+  "version": "19.1.0-next.1",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,45 +23,45 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1900.5",
+    "@angular-devkit/architect": "0.1901.0-next.1",
     "@babel/core": "7.26.0",
     "@babel/helper-annotate-as-pure": "7.25.9",
     "@babel/helper-split-export-declaration": "7.24.7",
     "@babel/plugin-syntax-import-attributes": "7.26.0",
-    "@inquirer/confirm": "5.0.2",
-    "@vitejs/plugin-basic-ssl": "1.1.0",
-    "beasties": "0.1.0",
+    "@inquirer/confirm": "5.1.0",
+    "@vitejs/plugin-basic-ssl": "1.2.0",
+    "beasties": "0.2.0",
     "browserslist": "^4.23.0",
     "esbuild": "0.24.0",
     "fast-glob": "3.3.2",
-    "https-proxy-agent": "7.0.5",
+    "https-proxy-agent": "7.0.6",
     "istanbul-lib-instrument": "6.0.3",
     "listr2": "8.2.5",
-    "magic-string": "0.30.12",
+    "magic-string": "0.30.15",
     "mrmime": "2.0.0",
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
-    "piscina": "4.7.0",
-    "rollup": "4.26.0",
-    "sass": "1.80.7",
+    "piscina": "4.8.0",
+    "rollup": "4.28.1",
+    "sass": "1.82.0",
     "semver": "7.6.3",
-    "vite": "5.4.11",
+    "vite": "6.0.3",
     "watchpack": "2.4.2"
   },
   "optionalDependencies": {
-    "lmdb": "3.1.5"
+    "lmdb": "3.2.0"
   },
   "peerDependencies": {
-    "@angular/compiler": "^19.0.0",
-    "@angular/compiler-cli": "^19.0.0",
-    "@angular/localize": "^19.0.0",
-    "@angular/platform-server": "^19.0.0",
-    "@angular/service-worker": "^19.0.0",
-    "@angular/ssr": "^19.0.5",
+    "@angular/compiler": "^19.0.0 || ^19.1.0-next.0",
+    "@angular/compiler-cli": "^19.0.0 || ^19.1.0-next.0",
+    "@angular/localize": "^19.0.0 || ^19.1.0-next.0",
+    "@angular/platform-server": "^19.0.0 || ^19.1.0-next.0",
+    "@angular/service-worker": "^19.0.0 || ^19.1.0-next.0",
+    "@angular/ssr": "^19.1.0-next.1",
     "less": "^4.2.0",
     "postcss": "^8.4.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
-    "typescript": ">=5.5 <5.7"
+    "typescript": ">=5.5 <5.8"
   },
   "peerDependenciesMeta": {
     "@angular/localize": {

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

@@ -22,13 +22,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

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

@@ -161,13 +161,13 @@ async function executeBuild(options, context, rebuildState) {
     }
     // Perform i18n translation inlining if enabled
     if (i18nOptions.shouldInline) {
-        const result = await (0, i18n_1.inlineI18n)(options, executionResult, initialFiles);
+        const result = await (0, i18n_1.inlineI18n)(metafile, options, executionResult, initialFiles);
         executionResult.addErrors(result.errors);
         executionResult.addWarnings(result.warnings);
         executionResult.addPrerenderedRoutes(result.prerenderedRoutes);
     }
     else {
-        const result = await (0, execute_post_bundle_1.executePostBundleSteps)(options, executionResult.outputFiles, executionResult.assetFiles, initialFiles, 
+        const result = await (0, execute_post_bundle_1.executePostBundleSteps)(metafile, options, executionResult.outputFiles, executionResult.assetFiles, initialFiles, 
         // Set lang attribute to the defined source locale if present
         i18nOptions.hasDefinedSourceLocale ? i18nOptions.sourceLocale : undefined);
         executionResult.addErrors(result.errors);

package/src/builders/application/execute-post-bundle.d.ts

@@ -5,18 +5,20 @@
  * 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 type { Metafile } from 'esbuild';
 import { BuildOutputFile, InitialFileRecord } from '../../tools/esbuild/bundler-context';
 import { BuildOutputAsset, PrerenderedRoutesRecord } from '../../tools/esbuild/bundler-execution-result';
 import { NormalizedApplicationBuildOptions } from './options';
 /**
  * Run additional builds steps including SSG, AppShell, Index HTML file and Service worker generation.
+ * @param metafile An esbuild metafile object.
  * @param options The normalized application builder options used to create the build.
  * @param outputFiles The output files of an executed build.
  * @param assetFiles The assets of an executed build.
  * @param initialFiles A map containing initial file information for the executed build.
  * @param locale A language locale to insert in the index.html.
  */
-export declare function executePostBundleSteps(options: NormalizedApplicationBuildOptions, outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[], initialFiles: Map<string, InitialFileRecord>, locale: string | undefined): Promise<{
+export declare function executePostBundleSteps(metafile: Metafile, options: NormalizedApplicationBuildOptions, outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[], initialFiles: Map<string, InitialFileRecord>, locale: string | undefined): Promise<{
     errors: string[];
     warnings: string[];
     additionalOutputFiles: BuildOutputFile[];

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

@@ -24,6 +24,7 @@ const options_1 = require("./options");
 const schema_1 = require("./schema");
 /**
  * Run additional builds steps including SSG, AppShell, Index HTML file and Service worker generation.
+ * @param metafile An esbuild metafile object.
  * @param options The normalized application builder options used to create the build.
  * @param outputFiles The output files of an executed build.
  * @param assetFiles The assets of an executed build.
@@ -31,13 +32,13 @@ const schema_1 = require("./schema");
  * @param locale A language locale to insert in the index.html.
  */
 // eslint-disable-next-line max-lines-per-function
-async function executePostBundleSteps(options, outputFiles, assetFiles, initialFiles, locale) {
+async function executePostBundleSteps(metafile, options, outputFiles, assetFiles, initialFiles, locale) {
     const additionalAssets = [];
     const additionalOutputFiles = [];
     const allErrors = [];
     const allWarnings = [];
     const prerenderedRoutes = {};
-    const { baseHref = '/', serviceWorker, i18nOptions, indexHtmlOptions, optimizationOptions, sourcemapOptions, outputMode, serverEntryPoint, prerenderOptions, appShellOptions, workspaceRoot, partialSSRBuild, } = options;
+    const { baseHref = '/', serviceWorker, i18nOptions, indexHtmlOptions, optimizationOptions, sourcemapOptions, outputMode, serverEntryPoint, prerenderOptions, appShellOptions, publicPath, workspaceRoot, partialSSRBuild, } = options;
     // Index HTML content without CSS inlining to be used for server rendering (AppShell, SSG and SSR).
     // NOTE: Critical CSS inlining is deliberately omitted here, as it will be handled during server rendering.
     // Additionally, when using prerendering or AppShell, the index HTML file may be regenerated.
@@ -55,8 +56,9 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
         }
     }
     // Create server manifest
+    const initialFilesPaths = new Set(initialFiles.keys());
     if (serverEntryPoint) {
-        const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, undefined, locale, baseHref);
+        const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, undefined, locale, baseHref, initialFilesPaths, metafile, publicPath);
         additionalOutputFiles.push(...serverAssetsChunks, (0, utils_1.createOutputFile)(manifest_1.SERVER_APP_MANIFEST_FILENAME, manifestContent, bundler_context_1.BuildOutputFileType.ServerApplication));
     }
     // Pre-render (SSG) and App-shell
@@ -95,7 +97,7 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
             // Regenerate the manifest to append route tree. This is only needed if SSR is enabled.
             const manifest = additionalOutputFiles.find((f) => f.path === manifest_1.SERVER_APP_MANIFEST_FILENAME);
             (0, node_assert_1.default)(manifest, `${manifest_1.SERVER_APP_MANIFEST_FILENAME} was not found in output files.`);
-            const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, serializableRouteTreeNodeForManifest, locale, baseHref);
+            const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, serializableRouteTreeNodeForManifest, locale, baseHref, initialFilesPaths, metafile, publicPath);
             for (const chunk of serverAssetsChunks) {
                 const idx = additionalOutputFiles.findIndex(({ path }) => path === chunk.path);
                 if (idx === -1) {

package/src/builders/application/i18n.d.ts

@@ -6,17 +6,19 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import { BuilderContext } from '@angular-devkit/architect';
+import type { Metafile } from 'esbuild';
 import { InitialFileRecord } from '../../tools/esbuild/bundler-context';
 import { ExecutionResult, PrerenderedRoutesRecord } from '../../tools/esbuild/bundler-execution-result';
 import { NormalizedApplicationBuildOptions } from './options';
 /**
  * Inlines all active locales as specified by the application build options into all
  * application JavaScript files created during the build.
+ * @param metafile An esbuild metafile object.
  * @param options The normalized application builder options used to create the build.
  * @param executionResult The result of an executed build.
  * @param initialFiles A map containing initial file information for the executed build.
  */
-export declare function inlineI18n(options: NormalizedApplicationBuildOptions, executionResult: ExecutionResult, initialFiles: Map<string, InitialFileRecord>): Promise<{
+export declare function inlineI18n(metafile: Metafile, options: NormalizedApplicationBuildOptions, executionResult: ExecutionResult, initialFiles: Map<string, InitialFileRecord>): Promise<{
     errors: string[];
     warnings: string[];
     prerenderedRoutes: PrerenderedRoutesRecord;

package/src/builders/application/i18n.js

@@ -20,16 +20,18 @@ const options_1 = require("./options");
 /**
  * Inlines all active locales as specified by the application build options into all
  * application JavaScript files created during the build.
+ * @param metafile An esbuild metafile object.
  * @param options The normalized application builder options used to create the build.
  * @param executionResult The result of an executed build.
  * @param initialFiles A map containing initial file information for the executed build.
  */
-async function inlineI18n(options, executionResult, initialFiles) {
+async function inlineI18n(metafile, options, executionResult, initialFiles) {
+    const { i18nOptions, optimizationOptions, baseHref } = options;
     // Create the multi-threaded inliner with common options and the files generated from the build.
     const inliner = new i18n_inliner_1.I18nInliner({
-        missingTranslation: options.i18nOptions.missingTranslationBehavior ?? 'warning',
+        missingTranslation: i18nOptions.missingTranslationBehavior ?? 'warning',
         outputFiles: executionResult.outputFiles,
-        shouldOptimize: options.optimizationOptions.scripts,
+        shouldOptimize: optimizationOptions.scripts,
     }, environment_options_1.maxWorkers);
     const inlineResult = {
         errors: [],
@@ -40,29 +42,29 @@ async function inlineI18n(options, executionResult, initialFiles) {
     const updatedOutputFiles = [];
     const updatedAssetFiles = [];
     try {
-        for (const locale of options.i18nOptions.inlineLocales) {
+        for (const locale of i18nOptions.inlineLocales) {
             // A locale specific set of files is returned from the inliner.
-            const localeInlineResult = await inliner.inlineForLocale(locale, options.i18nOptions.locales[locale].translation);
+            const localeInlineResult = await inliner.inlineForLocale(locale, i18nOptions.locales[locale].translation);
             const localeOutputFiles = localeInlineResult.outputFiles;
             inlineResult.errors.push(...localeInlineResult.errors);
             inlineResult.warnings.push(...localeInlineResult.warnings);
-            const baseHref = (0, options_1.getLocaleBaseHref)(options.baseHref, options.i18nOptions, locale) ?? options.baseHref;
-            const { errors, warnings, additionalAssets, additionalOutputFiles, prerenderedRoutes: generatedRoutes, } = await (0, execute_post_bundle_1.executePostBundleSteps)({
+            const { errors, warnings, additionalAssets, additionalOutputFiles, prerenderedRoutes: generatedRoutes, } = await (0, execute_post_bundle_1.executePostBundleSteps)(metafile, {
                 ...options,
-                baseHref,
+                baseHref: (0, options_1.getLocaleBaseHref)(baseHref, i18nOptions, locale) ?? baseHref,
             }, localeOutputFiles, executionResult.assetFiles, initialFiles, locale);
             localeOutputFiles.push(...additionalOutputFiles);
             inlineResult.errors.push(...errors);
             inlineResult.warnings.push(...warnings);
-            // Update directory with locale base
-            if (options.i18nOptions.flatOutput !== true) {
+            // Update directory with locale base or subPath
+            const subPath = i18nOptions.locales[locale].subPath;
+            if (i18nOptions.flatOutput !== true) {
                 localeOutputFiles.forEach((file) => {
-                    file.path = (0, node_path_1.join)(locale, file.path);
+                    file.path = (0, node_path_1.join)(subPath, file.path);
                 });
                 for (const assetFile of [...executionResult.assetFiles, ...additionalAssets]) {
                     updatedAssetFiles.push({
                         source: assetFile.source,
-                        destination: (0, node_path_1.join)(locale, assetFile.destination),
+                        destination: (0, node_path_1.join)(subPath, assetFile.destination),
                     });
                 }
             }
@@ -84,7 +86,7 @@ async function inlineI18n(options, executionResult, initialFiles) {
         ...updatedOutputFiles,
     ];
     // Assets are only changed if not using the flat output option
-    if (options.i18nOptions.flatOutput !== true) {
+    if (!i18nOptions.flatOutput) {
         executionResult.assetFiles = updatedAssetFiles;
     }
     return inlineResult;

package/src/builders/application/options.js

@@ -63,7 +63,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
     // Gather persistent caching option and provide a project specific cache location
     const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
     cacheOptions.path = node_path_1.default.join(cacheOptions.path, projectName);
-    const i18nOptions = (0, i18n_options_1.createI18nOptions)(projectMetadata, options.localize);
+    const i18nOptions = (0, i18n_options_1.createI18nOptions)(projectMetadata, options.localize, context.logger);
     i18nOptions.duplicateTranslationBehavior = options.i18nDuplicateTranslation;
     i18nOptions.missingTranslationBehavior = options.i18nMissingTranslation;
     if (options.forceI18nFlatOutput) {
@@ -427,12 +427,14 @@ function normalizeGlobalEntries(rawEntries, defaultName) {
     }
     return [...bundles.values()];
 }
-function getLocaleBaseHref(baseHref, i18n, locale) {
+function getLocaleBaseHref(baseHref = '', i18n, locale) {
     if (i18n.flatOutput) {
         return undefined;
     }
-    if (i18n.locales[locale] && i18n.locales[locale].baseHref !== '') {
-        return (0, url_1.urlJoin)(baseHref || '', i18n.locales[locale].baseHref ?? `/${locale}/`);
+    const localeData = i18n.locales[locale];
+    if (!localeData) {
+        return undefined;
     }
-    return undefined;
+    const baseHrefSuffix = localeData.baseHref ?? localeData.subPath + '/';
+    return baseHrefSuffix !== '' ? (0, url_1.urlJoin)(baseHref, baseHrefSuffix) : undefined;
 }

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

@@ -22,13 +22,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -203,17 +213,10 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
                 continue;
         }
         // To avoid disconnecting the array objects from the option, these arrays need to be mutated instead of replaced.
-        let requiresServerRestart = false;
         if (result.detail?.['externalMetadata']) {
             const { implicitBrowser, implicitServer, explicit } = result.detail['externalMetadata'];
             const implicitServerFiltered = implicitServer.filter((m) => !(0, node_module_1.isBuiltin)(m) && !isAbsoluteUrl(m));
             const implicitBrowserFiltered = implicitBrowser.filter((m) => !isAbsoluteUrl(m));
-            if (browserOptions.ssr && serverOptions.prebundle !== false) {
-                const previousImplicitServer = new Set(externalMetadata.implicitServer);
-                // Restart the server to force SSR dep re-optimization when a dependency has been added.
-                // This is a workaround for: https://github.com/vitejs/vite/issues/14896
-                requiresServerRestart = implicitServerFiltered.some((dep) => !previousImplicitServer.has(dep));
-            }
             // Empty Arrays to avoid growing unlimited with every re-build.
             externalMetadata.explicitBrowser.length = 0;
             externalMetadata.explicitServer.length = 0;
@@ -235,14 +238,7 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
             server.config.server.fs.allow = [
                 ...new Set([...server.config.server.fs.allow, ...assetFiles.values()]),
             ];
-            if (requiresServerRestart) {
-                // Restart the server to force SSR dep re-optimization when a dependency has been added.
-                // This is a workaround for: https://github.com/vitejs/vite/issues/14896
-                await server.restart();
-            }
-            else {
-                await handleUpdate(normalizePath, generatedFiles, server, serverOptions, context.logger, componentStyles);
-            }
+            await handleUpdate(normalizePath, generatedFiles, server, serverOptions, context.logger, componentStyles);
         }
         else {
             const projectName = context.target?.project;
@@ -337,6 +333,10 @@ async function handleUpdate(normalizePath, generatedFiles, server, serverOptions
     if (!updatedFiles.length) {
         return;
     }
+    if (destroyAngularServerAppCalled) {
+        // Trigger module evaluation before reload to initiate dependency optimization.
+        await server.ssrLoadModule('/main.server.mjs');
+    }
     if (serverOptions.hmr) {
         if (updatedFiles.every((f) => f.endsWith('.css'))) {
             let requiresReload = false;
@@ -517,10 +517,6 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
                 // the Vite client-side code for browser reloading. These would be available by default but when
                 // the `allow` option is explicitly configured, they must be included manually.
                 allow: [cacheDir, (0, node_path_1.join)(serverOptions.workspaceRoot, 'node_modules'), ...assets.values()],
-                // Temporary disable cached FS checks.
-                // This is because we configure `config.base` to a virtual directory which causes `getRealPath` to fail.
-                // See: https://github.com/vitejs/vite/blob/b2873ac3936de25ca8784327cb9ef16bd4881805/packages/vite/src/node/fsUtils.ts#L45-L67
-                cachedChecks: false,
             },
             // This is needed when `externalDependencies` is used to prevent Vite load errors.
             // NOTE: If Vite adds direct support for externals, this can be removed.

package/src/builders/extract-i18n/builder.js

@@ -22,13 +22,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/src/builders/extract-i18n/options.js

@@ -33,7 +33,7 @@ async function normalizeOptions(context, projectName, options) {
     // Target specifier defaults to the current project's build target with no specified configuration
     const buildTargetSpecifier = options.buildTarget ?? ':';
     const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
-    const i18nOptions = (0, i18n_options_1.createI18nOptions)(projectMetadata);
+    const i18nOptions = (0, i18n_options_1.createI18nOptions)(projectMetadata, /** inline */ false, context.logger);
     // Normalize xliff format extensions
     let format = options.format;
     switch (format) {

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

@@ -22,13 +22,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AngularCompilation = exports.DiagnosticModes = void 0;
 const load_esm_1 = require("../../../utils/load-esm");

package/src/tools/angular/compilation/aot-compilation.d.ts

@@ -11,6 +11,8 @@ import { AngularHostOptions } from '../angular-host';
 import { AngularCompilation, DiagnosticModes, EmitFileResult } from './angular-compilation';
 export declare class AotCompilation extends AngularCompilation {
     #private;
+    private readonly browserOnlyBuild;
+    constructor(browserOnlyBuild: boolean);
     initialize(tsconfig: string, hostOptions: AngularHostOptions, compilerOptionsTransformer?: (compilerOptions: ng.CompilerOptions) => ng.CompilerOptions): Promise<{
         affectedFiles: ReadonlySet<ts.SourceFile>;
         compilerOptions: ng.CompilerOptions;

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

@@ -17,8 +17,16 @@ const typescript_1 = __importDefault(require("typescript"));
 const profiling_1 = require("../../esbuild/profiling");
 const angular_host_1 = require("../angular-host");
 const jit_bootstrap_transformer_1 = require("../transformers/jit-bootstrap-transformer");
+const lazy_routes_transformer_1 = require("../transformers/lazy-routes-transformer");
 const web_worker_transformer_1 = require("../transformers/web-worker-transformer");
 const angular_compilation_1 = require("./angular-compilation");
+const hmr_candidates_1 = require("./hmr-candidates");
+/**
+ * The modified files count limit for performing component HMR analysis.
+ * Performing content analysis for a large amount of files can result in longer rebuild times
+ * than a full rebuild would entail.
+ */
+const HMR_MODIFIED_FILE_LIMIT = 32;
 class AngularCompilationState {
     angularProgram;
     compilerHost;
@@ -41,7 +49,12 @@ class AngularCompilationState {
     }
 }
 class AotCompilation extends angular_compilation_1.AngularCompilation {
+    browserOnlyBuild;
     #state;
+    constructor(browserOnlyBuild) {
+        super();
+        this.browserOnlyBuild = browserOnlyBuild;
+    }
     async initialize(tsconfig, hostOptions, compilerOptionsTransformer) {
         // Dynamically load the Angular compiler CLI package
         const { NgtscProgram, OptimizeFor } = await angular_compilation_1.AngularCompilation.loadCompilerCli();
@@ -55,7 +68,9 @@ class AotCompilation extends angular_compilation_1.AngularCompilation {
         const packageJsonCache = this.#state?.compilerHost
             .getModuleResolutionCache?.()
             ?.getPackageJsonInfoCache();
-        const useHmr = compilerOptions['_enableHmr'];
+        const useHmr = compilerOptions['_enableHmr'] &&
+            hostOptions.modifiedFiles &&
+            hostOptions.modifiedFiles.size <= HMR_MODIFIED_FILE_LIMIT;
         let staleSourceFiles;
         let clearPackageJsonCache = false;
         if (hostOptions.modifiedFiles && this.#state) {
@@ -91,8 +106,8 @@ class AotCompilation extends angular_compilation_1.AngularCompilation {
         const typeScriptProgram = typescript_1.default.createEmitAndSemanticDiagnosticsBuilderProgram(angularTypeScriptProgram, host, oldProgram, configurationDiagnostics);
         await (0, profiling_1.profileAsync)('NG_ANALYZE_PROGRAM', () => angularCompiler.analyzeAsync());
         let templateUpdates;
-        if (compilerOptions['_enableHmr'] && hostOptions.modifiedFiles && this.#state) {
-            const componentNodes = collectHmrCandidates(hostOptions.modifiedFiles, angularProgram, staleSourceFiles);
+        if (useHmr && hostOptions.modifiedFiles && this.#state) {
+            const componentNodes = (0, hmr_candidates_1.collectHmrCandidates)(hostOptions.modifiedFiles, angularProgram, staleSourceFiles);
             for (const node of componentNodes) {
                 if (!typescript_1.default.isClassDeclaration(node)) {
                     continue;
@@ -214,8 +229,10 @@ class AotCompilation extends angular_compilation_1.AngularCompilation {
         };
         const transformers = angularCompiler.prepareEmit().transformers;
         transformers.before ??= [];
-        transformers.before.push((0, jit_bootstrap_transformer_1.replaceBootstrap)(() => typeScriptProgram.getProgram().getTypeChecker()));
-        transformers.before.push(webWorkerTransform);
+        transformers.before.push((0, jit_bootstrap_transformer_1.replaceBootstrap)(() => typeScriptProgram.getProgram().getTypeChecker()), webWorkerTransform);
+        if (!this.browserOnlyBuild) {
+            transformers.before.push((0, lazy_routes_transformer_1.lazyRoutesTransformer)(compilerOptions, compilerHost));
+        }
         // Emit is handled in write file callback when using TypeScript
         if (useTypeScriptTranspilation) {
             // TypeScript will loop until there are no more affected files in the program
@@ -317,35 +334,3 @@ function findAffectedFiles(builder, { ignoreForDiagnostics }, includeTTC) {
     }
     return affectedFiles;
 }
-function collectHmrCandidates(modifiedFiles, { compiler }, staleSourceFiles) {
-    const candidates = new Set();
-    for (const file of modifiedFiles) {
-        const templateFileNodes = compiler.getComponentsWithTemplateFile(file);
-        if (templateFileNodes.size) {
-            templateFileNodes.forEach((node) => candidates.add(node));
-            continue;
-        }
-        const styleFileNodes = compiler.getComponentsWithStyleFile(file);
-        if (styleFileNodes.size) {
-            styleFileNodes.forEach((node) => candidates.add(node));
-            continue;
-        }
-        const staleSource = staleSourceFiles?.get(file);
-        if (staleSource === undefined) {
-            // Unknown file requires a rebuild so clear out the candidates and stop collecting
-            candidates.clear();
-            break;
-        }
-        const updatedSource = compiler.getCurrentProgram().getSourceFile(file);
-        if (updatedSource === undefined) {
-            // No longer existing program file requires a rebuild so clear out the candidates and stop collecting
-            candidates.clear();
-            break;
-        }
-        // Compare the stale and updated file for changes
-        // TODO: Implement -- for now assume a rebuild is needed
-        candidates.clear();
-        break;
-    }
-    return candidates;
-}

package/src/tools/angular/compilation/factory.d.ts

@@ -11,6 +11,7 @@ import type { AngularCompilation } from './angular-compilation';
  * compilation either for AOT or JIT mode. By default a parallel compilation is created
  * that uses a Node.js worker thread.
  * @param jit True, for Angular JIT compilation; False, for Angular AOT compilation.
+ * @param browserOnlyBuild True, for browser only builds; False, for browser and server builds.
  * @returns An instance of an Angular compilation object.
  */
-export declare function createAngularCompilation(jit: boolean): Promise<AngularCompilation>;
+export declare function createAngularCompilation(jit: boolean, browserOnlyBuild: boolean): Promise<AngularCompilation>;