@angular/build 18.2.0 → 19.0.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "18.2.0",
+  "version": "19.0.0-next.0",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,7 +23,7 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1802.0",
+    "@angular-devkit/architect": "0.1900.0-next.0",
     "@babel/core": "7.25.2",
     "@babel/helper-annotate-as-pure": "7.24.7",
     "@babel/helper-split-export-declaration": "7.24.7",
@@ -46,13 +46,14 @@
     "sass": "1.77.8",
     "semver": "7.6.3",
     "vite": "5.4.0",
-    "watchpack": "2.4.1"
+    "watchpack": "2.4.2"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^18.0.0",
-    "@angular/localize": "^18.0.0",
-    "@angular/platform-server": "^18.0.0",
-    "@angular/service-worker": "^18.0.0",
+    "@angular/compiler-cli": "^19.0.0-next.0",
+    "@angular/localize": "^19.0.0-next.0",
+    "@angular/platform-server": "^19.0.0-next.0",
+    "@angular/service-worker": "^19.0.0-next.0",
+    "@angular/ssr": "^19.0.0-next.0",
     "less": "^4.2.0",
     "postcss": "^8.4.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
@@ -68,6 +69,9 @@
     "@angular/service-worker": {
       "optional": true
     },
+    "@angular/ssr": {
+      "optional": true
+    },
     "less": {
       "optional": true
     },

package/src/tools/esbuild/application-code-bundle.js

@@ -16,7 +16,6 @@ exports.createServerCodeBundleOptions = createServerCodeBundleOptions;
 exports.createServerPolyfillBundleOptions = createServerPolyfillBundleOptions;
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_crypto_1 = require("node:crypto");
-const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const environment_options_1 = require("../../utils/environment-options");
 const compiler_plugin_1 = require("./angular/compiler-plugin");
@@ -177,10 +176,7 @@ function createServerCodeBundleOptions(options, target, sourceFileCache) {
                 contents.push(`export { ɵresetCompiledComponents } from '@angular/core';`);
             }
             if (prerenderOptions?.discoverRoutes) {
-                // We do not import it directly so that node.js modules are resolved using the correct context.
-                const routesExtractorCode = await (0, promises_1.readFile)((0, node_path_1.join)(__dirname, '../../utils/routes-extractor/extractor.js'), 'utf-8');
-                // Remove source map URL comments from the code if a sourcemap is present as this will not match the file.
-                contents.push(routesExtractorCode.replace(/^\/\/# sourceMappingURL=[^\r\n]*/gm, ''));
+                contents.push(`export { ɵgetRoutesFromAngularRouterConfig } from '@angular/ssr';`);
             }
             return {
                 contents: contents.join('\n'),

package/src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = normalizeCacheOptions;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '18.2.0';
+const VERSION = '19.0.0-next.0';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

package/src/utils/server-rendering/main-bundle-exports.d.ts

@@ -7,7 +7,7 @@
  */
 import type { ApplicationRef, Type, ɵConsole } from '@angular/core';
 import type { renderApplication, renderModule, ɵSERVER_CONTEXT } from '@angular/platform-server';
-import type { extractRoutes } from '../routes-extractor/extractor';
+import type { ɵgetRoutesFromAngularRouterConfig } from '@angular/ssr';
 export interface MainServerBundleExports {
     /** Standalone application bootstrapping function. */
     default: (() => Promise<ApplicationRef>) | Type<unknown>;
@@ -20,7 +20,7 @@ export interface RenderUtilsServerBundleExports {
     /** Method to render a standalone application. */
     renderApplication: typeof renderApplication;
     /** Method to extract routes from the router config. */
-    extractRoutes: typeof extractRoutes;
+    ɵgetRoutesFromAngularRouterConfig: typeof ɵgetRoutesFromAngularRouterConfig;
     ɵresetCompiledComponents?: () => void;
     /** Angular Console token/class. */
     ɵConsole: typeof ɵConsole;

package/src/utils/server-rendering/routes-extractor-worker.js

@@ -16,22 +16,22 @@ const load_esm_from_memory_1 = require("./load-esm-from-memory");
 const { document, verbose } = node_worker_threads_1.workerData;
 /** Renders an application based on a provided options. */
 async function extractRoutes() {
-    const { extractRoutes } = await (0, load_esm_from_memory_1.loadEsmModuleFromMemory)('./render-utils.server.mjs');
+    const { ɵgetRoutesFromAngularRouterConfig: getRoutesFromAngularRouterConfig } = await (0, load_esm_from_memory_1.loadEsmModuleFromMemory)('./render-utils.server.mjs');
     const { default: bootstrapAppFnOrModule } = await (0, load_esm_from_memory_1.loadEsmModuleFromMemory)('./main.server.mjs');
     const skippedRedirects = [];
     const skippedOthers = [];
     const routes = [];
-    for await (const { route, success, redirect } of extractRoutes(bootstrapAppFnOrModule, document)) {
-        if (success) {
-            routes.push(route);
-            continue;
-        }
-        if (redirect) {
+    const { routes: extractRoutes } = await getRoutesFromAngularRouterConfig(bootstrapAppFnOrModule, document, new URL('http://localhost'));
+    for (const { route, redirectTo } of extractRoutes) {
+        if (redirectTo !== undefined) {
             skippedRedirects.push(route);
         }
-        else {
+        else if (/[:*]/.test(route)) {
             skippedOthers.push(route);
         }
+        else {
+            routes.push(route);
+        }
     }
     if (!verbose) {
         return { routes };

package/src/utils/routes-extractor/extractor.d.ts

@@ -1,15 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * 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 { ApplicationRef, Type } from '@angular/core';
-interface RouterResult {
-    route: string;
-    success: boolean;
-    redirect: boolean;
-}
-export declare function extractRoutes(bootstrapAppFnOrModule: (() => Promise<ApplicationRef>) | Type<unknown>, document: string): AsyncIterableIterator<RouterResult>;
-export {};

package/src/utils/routes-extractor/extractor.js

@@ -1,97 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * 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 { ApplicationRef, Compiler, createPlatformFactory, platformCore, ɵwhenStable as whenStable, ɵConsole, } from '@angular/core';
-import { INITIAL_CONFIG, ɵINTERNAL_SERVER_PLATFORM_PROVIDERS as INTERNAL_SERVER_PLATFORM_PROVIDERS, } from '@angular/platform-server';
-import { Router, ɵloadChildren as loadChildrenHelper } from '@angular/router';
-async function* getRoutesFromRouterConfig(routes, compiler, parentInjector, parentRoute = '') {
-    for (const route of routes) {
-        const { path, redirectTo, loadChildren, children } = route;
-        if (path === undefined) {
-            continue;
-        }
-        const currentRoutePath = buildRoutePath(parentRoute, path);
-        if (redirectTo !== undefined) {
-            // TODO: handle `redirectTo`.
-            yield { route: currentRoutePath, success: false, redirect: true };
-            continue;
-        }
-        if (/[:*]/.test(path)) {
-            // TODO: handle parameterized routes population.
-            yield { route: currentRoutePath, success: false, redirect: false };
-            continue;
-        }
-        yield { route: currentRoutePath, success: true, redirect: false };
-        if (children?.length) {
-            yield* getRoutesFromRouterConfig(children, compiler, parentInjector, currentRoutePath);
-        }
-        if (loadChildren) {
-            const loadedChildRoutes = await loadChildrenHelper(route, compiler, parentInjector).toPromise();
-            if (loadedChildRoutes) {
-                const { routes: childRoutes, injector = parentInjector } = loadedChildRoutes;
-                yield* getRoutesFromRouterConfig(childRoutes, compiler, injector, currentRoutePath);
-            }
-        }
-    }
-}
-export async function* extractRoutes(bootstrapAppFnOrModule, document) {
-    const platformRef = createPlatformFactory(platformCore, 'server', [
-        {
-            provide: INITIAL_CONFIG,
-            useValue: { document, url: '' },
-        },
-        {
-            provide: ɵConsole,
-            /** An Angular Console Provider that does not print a set of predefined logs. */
-            useFactory: () => {
-                class Console extends ɵConsole {
-                    ignoredLogs = new Set(['Angular is running in development mode.']);
-                    log(message) {
-                        if (!this.ignoredLogs.has(message)) {
-                            super.log(message);
-                        }
-                    }
-                }
-                return new Console();
-            },
-        },
-        ...INTERNAL_SERVER_PLATFORM_PROVIDERS,
-    ])();
-    try {
-        let applicationRef;
-        if (isBootstrapFn(bootstrapAppFnOrModule)) {
-            applicationRef = await bootstrapAppFnOrModule();
-        }
-        else {
-            const moduleRef = await platformRef.bootstrapModule(bootstrapAppFnOrModule);
-            applicationRef = moduleRef.injector.get(ApplicationRef);
-        }
-        // Wait until the application is stable.
-        await whenStable(applicationRef);
-        const injector = applicationRef.injector;
-        const router = injector.get(Router);
-        if (router.config.length === 0) {
-            // In case there are no routes available
-            yield { route: '', success: true, redirect: false };
-        }
-        else {
-            const compiler = injector.get(Compiler);
-            // Extract all the routes from the config.
-            yield* getRoutesFromRouterConfig(router.config, compiler, injector);
-        }
-    }
-    finally {
-        platformRef.destroy();
-    }
-}
-function isBootstrapFn(value) {
-    // We can differentiate between a module and a bootstrap function by reading compiler-generated `ɵmod` static property:
-    return typeof value === 'function' && !('ɵmod' in value);
-}
-function buildRoutePath(...routeParts) {
-    return routeParts.filter(Boolean).join('/');
-}