@angular/build 19.0.5 → 19.1.0-next.1

package/src/utils/server-rendering/manifest.d.ts

@@ -5,6 +5,7 @@
  * 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 { NormalizedApplicationBuildOptions } from '../../builders/application/options';
 import { type BuildOutputFile } from '../../tools/esbuild/bundler-context';
 export declare const SERVER_APP_MANIFEST_FILENAME = "angular-app-manifest.mjs";
@@ -42,12 +43,15 @@ export declare function generateAngularServerAppEngineManifest(i18nOptions: Norm
  * the application, helping with localization and rendering content specific to the locale.
  * @param baseHref - The base HREF for the application. This is used to set the base URL
  * for all relative URLs in the application.
+ * @param initialFiles - A list of initial files that preload tags have already been added for.
+ * @param metafile - An esbuild metafile object.
+ * @param publicPath - The configured public path.
  *
  * @returns An object containing:
  * - `manifestContent`: A string of the SSR manifest content.
  * - `serverAssetsChunks`: An array of build output files containing the generated assets for the server.
  */
-export declare function generateAngularServerAppManifest(additionalHtmlOutputFiles: Map<string, BuildOutputFile>, outputFiles: BuildOutputFile[], inlineCriticalCss: boolean, routes: readonly unknown[] | undefined, locale: string | undefined, baseHref: string): {
+export declare function generateAngularServerAppManifest(additionalHtmlOutputFiles: Map<string, BuildOutputFile>, outputFiles: BuildOutputFile[], inlineCriticalCss: boolean, routes: readonly unknown[] | undefined, locale: string | undefined, baseHref: string, initialFiles: Set<string>, metafile: Metafile, publicPath: string | undefined): {
     manifestContent: string;
     serverAssetsChunks: BuildOutputFile[];
 };

package/src/utils/server-rendering/manifest.js

@@ -11,9 +11,9 @@ exports.SERVER_APP_ENGINE_MANIFEST_FILENAME = exports.SERVER_APP_MANIFEST_FILENA
 exports.generateAngularServerAppEngineManifest = generateAngularServerAppEngineManifest;
 exports.generateAngularServerAppManifest = generateAngularServerAppManifest;
 const node_path_1 = require("node:path");
-const options_1 = require("../../builders/application/options");
 const bundler_context_1 = require("../../tools/esbuild/bundler-context");
 const utils_1 = require("../../tools/esbuild/utils");
+const environment_options_1 = require("../environment-options");
 exports.SERVER_APP_MANIFEST_FILENAME = 'angular-app-manifest.mjs';
 exports.SERVER_APP_ENGINE_MANIFEST_FILENAME = 'angular-app-engine-manifest.mjs';
 const MAIN_SERVER_OUTPUT_FILENAME = 'main.server.mjs';
@@ -49,23 +49,28 @@ function escapeUnsafeChars(str) {
  */
 function generateAngularServerAppEngineManifest(i18nOptions, baseHref) {
     const entryPoints = {};
-    if (i18nOptions.shouldInline) {
+    const supportedLocales = {};
+    if (i18nOptions.shouldInline && !i18nOptions.flatOutput) {
         for (const locale of i18nOptions.inlineLocales) {
-            const importPath = './' + (i18nOptions.flatOutput ? '' : locale + '/') + MAIN_SERVER_OUTPUT_FILENAME;
-            let localeWithBaseHref = (0, options_1.getLocaleBaseHref)('', i18nOptions, locale) || '/';
-            // Remove leading and trailing slashes.
-            const start = localeWithBaseHref[0] === '/' ? 1 : 0;
-            const end = localeWithBaseHref[localeWithBaseHref.length - 1] === '/' ? -1 : undefined;
-            localeWithBaseHref = localeWithBaseHref.slice(start, end);
-            entryPoints[localeWithBaseHref] = `() => import('${importPath}')`;
+            const { subPath } = i18nOptions.locales[locale];
+            const importPath = `${subPath ? `${subPath}/` : ''}${MAIN_SERVER_OUTPUT_FILENAME}`;
+            entryPoints[subPath] = `() => import('./${importPath}')`;
+            supportedLocales[locale] = subPath;
         }
     }
     else {
         entryPoints[''] = `() => import('./${MAIN_SERVER_OUTPUT_FILENAME}')`;
+        supportedLocales[i18nOptions.sourceLocale] = '';
+    }
+    // Remove trailing slash but retain leading slash.
+    let basePath = baseHref || '/';
+    if (basePath.length > 1 && basePath[basePath.length - 1] === '/') {
+        basePath = basePath.slice(0, -1);
     }
     const manifestContent = `
 export default {
-  basePath: '${baseHref ?? '/'}',
+  basePath: '${basePath}',
+  supportedLocales: ${JSON.stringify(supportedLocales, undefined, 2)},
   entryPoints: {
     ${Object.entries(entryPoints)
         .map(([key, value]) => `'${key}': ${value}`)
@@ -95,12 +100,15 @@ export default {
  * the application, helping with localization and rendering content specific to the locale.
  * @param baseHref - The base HREF for the application. This is used to set the base URL
  * for all relative URLs in the application.
+ * @param initialFiles - A list of initial files that preload tags have already been added for.
+ * @param metafile - An esbuild metafile object.
+ * @param publicPath - The configured public path.
  *
  * @returns An object containing:
  * - `manifestContent`: A string of the SSR manifest content.
  * - `serverAssetsChunks`: An array of build output files containing the generated assets for the server.
  */
-function generateAngularServerAppManifest(additionalHtmlOutputFiles, outputFiles, inlineCriticalCss, routes, locale, baseHref) {
+function generateAngularServerAppManifest(additionalHtmlOutputFiles, outputFiles, inlineCriticalCss, routes, locale, baseHref, initialFiles, metafile, publicPath) {
     const serverAssetsChunks = [];
     const serverAssets = {};
     for (const file of [...additionalHtmlOutputFiles.values(), ...outputFiles]) {
@@ -112,6 +120,11 @@ function generateAngularServerAppManifest(additionalHtmlOutputFiles, outputFiles
                 `{size: ${file.size}, hash: '${file.hash}', text: () => import('./${jsChunkFilePath}').then(m => m.default)}`;
         }
     }
+    // When routes have been extracted, mappings are no longer needed, as preloads will be included in the metadata.
+    // When shouldOptimizeChunks is enabled the metadata is no longer correct and thus we cannot generate the mappings.
+    const entryPointToBrowserMapping = routes?.length || environment_options_1.shouldOptimizeChunks
+        ? undefined
+        : generateLazyLoadedFilesMappings(metafile, initialFiles, publicPath);
     const manifestContent = `
 export default {
   bootstrap: () => import('./main.server.mjs').then(m => m.default),
@@ -119,6 +132,7 @@ export default {
   baseHref: '${baseHref}',
   locale: ${JSON.stringify(locale)},
   routes: ${JSON.stringify(routes, undefined, 2)},
+  entryPointToBrowserMapping: ${JSON.stringify(entryPointToBrowserMapping, undefined, 2)},
   assets: {
     ${Object.entries(serverAssets)
         .map(([key, value]) => `'${key}': ${value}`)
@@ -128,3 +142,38 @@ export default {
 `;
     return { manifestContent, serverAssetsChunks };
 }
+/**
+ * Maps entry points to their corresponding browser bundles for lazy loading.
+ *
+ * This function processes a metafile's outputs to generate a mapping between browser-side entry points
+ * and the associated JavaScript files that should be loaded in the browser. It includes the entry-point's
+ * own path and any valid imports while excluding initial files or external resources.
+ */
+function generateLazyLoadedFilesMappings(metafile, initialFiles, publicPath = '') {
+    const entryPointToBundles = {};
+    for (const [fileName, { entryPoint, exports, imports }] of Object.entries(metafile.outputs)) {
+        // Skip files that don't have an entryPoint, no exports, or are not .js
+        if (!entryPoint || exports?.length < 1 || !fileName.endsWith('.js')) {
+            continue;
+        }
+        const importedPaths = [
+            {
+                path: `${publicPath}${fileName}`,
+                dynamicImport: false,
+            },
+        ];
+        for (const { kind, external, path } of imports) {
+            if (external ||
+                initialFiles.has(path) ||
+                (kind !== 'dynamic-import' && kind !== 'import-statement')) {
+                continue;
+            }
+            importedPaths.push({
+                path: `${publicPath}${path}`,
+                dynamicImport: kind === 'dynamic-import',
+            });
+        }
+        entryPointToBundles[entryPoint] = importedPaths;
+    }
+    return entryPointToBundles;
+}

package/src/utils/server-rendering/prerender.js

@@ -122,7 +122,7 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
         const renderingPromises = [];
         const appShellRouteWithLeadingSlash = appShellRoute && addLeadingSlash(appShellRoute);
         const baseHrefWithLeadingSlash = addLeadingSlash(baseHref);
-        for (const { route, redirectTo, renderMode } of serializableRouteTreeNode) {
+        for (const { route, redirectTo } of serializableRouteTreeNode) {
             // Remove the base href from the file output path.
             const routeWithoutBaseHref = addTrailingSlash(route).startsWith(baseHrefWithLeadingSlash)
                 ? addLeadingSlash(route.slice(baseHrefWithLeadingSlash.length))

package/src/utils/service-worker.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.augmentAppWithServiceWorker = augmentAppWithServiceWorker;
 exports.augmentAppWithServiceWorkerEsbuild = augmentAppWithServiceWorkerEsbuild;