@angular/build 18.2.1 → 19.0.0-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "18.2.1",
+  "version": "19.0.0-next.1",
   "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.1",
+    "@angular-devkit/architect": "0.1900.0-next.1",
     "@babel/core": "7.25.2",
     "@babel/helper-annotate-as-pure": "7.24.7",
     "@babel/helper-split-export-declaration": "7.24.7",
@@ -32,27 +32,28 @@
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "browserslist": "^4.23.0",
     "critters": "0.0.24",
-    "esbuild": "0.23.0",
+    "esbuild": "0.23.1",
     "fast-glob": "3.3.2",
     "https-proxy-agent": "7.0.5",
     "listr2": "8.2.4",
-    "lmdb": "3.0.13",
+    "lmdb": "3.0.14",
     "magic-string": "0.30.11",
     "mrmime": "2.0.0",
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
     "piscina": "4.6.1",
-    "rollup": "4.20.0",
-    "sass": "1.77.6",
+    "rollup": "4.21.0",
+    "sass": "1.77.8",
     "semver": "7.6.3",
-    "vite": "5.4.0",
-    "watchpack": "2.4.1"
+    "vite": "5.4.2",
+    "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.1",
     "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/angular/compilation/jit-compilation.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JitCompilation = void 0;
 const node_assert_1 = __importDefault(require("node:assert"));
 const typescript_1 = __importDefault(require("typescript"));
+const load_esm_1 = require("../../../utils/load-esm");
 const profiling_1 = require("../../esbuild/profiling");
 const angular_host_1 = require("../angular-host");
 const jit_resource_transformer_1 = require("../transformers/jit-resource-transformer");
@@ -36,7 +37,7 @@ class JitCompilation extends angular_compilation_1.AngularCompilation {
     #state;
     async initialize(tsconfig, hostOptions, compilerOptionsTransformer) {
         // Dynamically load the Angular compiler CLI package
-        const { constructorParametersDownlevelTransform } = await angular_compilation_1.AngularCompilation.loadCompilerCli();
+        const { constructorParametersDownlevelTransform } = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli/private/tooling');
         // Load the compiler configuration and transform as needed
         const { options: originalCompilerOptions, rootNames, errors: configurationDiagnostics, } = await this.loadConfiguration(tsconfig);
         const compilerOptions = compilerOptionsTransformer?.(originalCompilerOptions) ?? originalCompilerOptions;

package/src/tools/esbuild/angular/compiler-plugin.js

@@ -145,7 +145,9 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                             stylesheetResult = await stylesheetBundler.bundleFile(stylesheetFile);
                         }
                         else {
-                            stylesheetResult = await stylesheetBundler.bundleInline(data, containingFile, styleOptions.inlineStyleLanguage);
+                            stylesheetResult = await stylesheetBundler.bundleInline(data, containingFile, 
+                            // Inline stylesheets from a template style element are always CSS
+                            containingFile.endsWith('.html') ? 'css' : styleOptions.inlineStyleLanguage);
                         }
                         const { contents, outputFiles, metafile, referencedFiles, errors, warnings } = stylesheetResult;
                         if (errors) {

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'),
@@ -326,12 +322,10 @@ function getEsBuildCommonPolyfillsOptions(options, namespace, tryToResolvePolyfi
         namespace,
         cache: sourceFileCache?.loadResultCache,
         loadContent: async (_, build) => {
-            let hasLocalizePolyfill = false;
             let polyfillPaths = polyfills;
             let warnings;
             if (tryToResolvePolyfillsAsRelative) {
                 polyfillPaths = await Promise.all(polyfills.map(async (path) => {
-                    hasLocalizePolyfill ||= path.startsWith('@angular/localize');
                     if (path.startsWith('zone.js') || !(0, node_path_1.extname)(path)) {
                         return path;
                     }
@@ -343,29 +337,6 @@ function getEsBuildCommonPolyfillsOptions(options, namespace, tryToResolvePolyfi
                     return result.path ? potentialPathRelative : path;
                 }));
             }
-            else {
-                hasLocalizePolyfill = polyfills.some((p) => p.startsWith('@angular/localize'));
-            }
-            // Add localize polyfill if needed.
-            // TODO: remove in version 19 or later.
-            if (!i18nOptions.shouldInline && !hasLocalizePolyfill) {
-                const result = await build.resolve('@angular/localize', {
-                    kind: 'import-statement',
-                    resolveDir: workspaceRoot,
-                });
-                if (result.path) {
-                    polyfillPaths.push('@angular/localize/init');
-                    (warnings ??= []).push({
-                        text: 'Polyfill for "@angular/localize/init" was added automatically.',
-                        notes: [
-                            {
-                                text: 'In the future, this functionality will be removed. ' +
-                                    'Please add this polyfill in the "polyfills" section of your "angular.json" instead.',
-                            },
-                        ],
-                    });
-                }
-            }
             // Generate module contents with an import statement per defined polyfill
             let contents = polyfillPaths
                 .map((file) => `import '${file.replace(/\\/g, '/')}';`)

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.1';
+const VERSION = '19.0.0-next.1';
 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('/');
-}