@angular/build 19.0.0-rc.1 → 19.0.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "19.0.0-rc.1",
+  "version": "19.0.0-rc.3",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,12 +23,12 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1900.0-rc.1",
+    "@angular-devkit/architect": "0.1900.0-rc.3",
     "@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.1",
+    "@inquirer/confirm": "5.0.2",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "beasties": "0.1.0",
     "browserslist": "^4.23.0",
@@ -42,14 +42,14 @@
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
     "piscina": "4.7.0",
-    "rollup": "4.24.4",
-    "sass": "1.80.6",
+    "rollup": "4.26.0",
+    "sass": "1.80.7",
     "semver": "7.6.3",
-    "vite": "5.4.10",
+    "vite": "5.4.11",
     "watchpack": "2.4.2"
   },
   "optionalDependencies": {
-    "lmdb": "3.1.4"
+    "lmdb": "3.1.5"
   },
   "peerDependencies": {
     "@angular/compiler": "^19.0.0-next.9",
@@ -57,7 +57,7 @@
     "@angular/localize": "^19.0.0-next.9",
     "@angular/platform-server": "^19.0.0-next.9",
     "@angular/service-worker": "^19.0.0-next.9",
-    "@angular/ssr": "^19.0.0-rc.1",
+    "@angular/ssr": "^19.0.0-rc.3",
     "less": "^4.2.0",
     "postcss": "^8.4.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",

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

@@ -86,21 +86,9 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
         }
         const serializableRouteTreeNodeForManifest = [];
         for (const metadata of serializableRouteTreeNode) {
-            switch (metadata.renderMode) {
-                case models_1.RouteRenderMode.Prerender:
-                case /* Legacy building mode */ undefined: {
-                    if (!metadata.redirectTo) {
-                        serializableRouteTreeNodeForManifest.push(metadata);
-                        if (!metadata.route.includes('*')) {
-                            prerenderedRoutes[metadata.route] = { headers: metadata.headers };
-                        }
-                    }
-                    break;
-                }
-                case models_1.RouteRenderMode.Server:
-                case models_1.RouteRenderMode.Client:
-                    serializableRouteTreeNodeForManifest.push(metadata);
-                    break;
+            serializableRouteTreeNodeForManifest.push(metadata);
+            if (metadata.renderMode === models_1.RouteRenderMode.Prerender && !metadata.route.includes('*')) {
+                prerenderedRoutes[metadata.route] = { headers: metadata.headers };
             }
         }
         if (outputMode === schema_1.OutputMode.Server) {

package/src/builders/application/options.js

@@ -236,7 +236,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
         }
     }
     // Initial options to keep
-    const { allowedCommonJsDependencies, aot, baseHref, crossOrigin, externalDependencies, extractLicenses, inlineStyleLanguage = 'css', outExtension, serviceWorker, poll, polyfills, statsJson, outputMode, stylePreprocessorOptions, subresourceIntegrity, verbose, watch, progress = true, externalPackages, namedChunks, budgets, deployUrl, clearScreen, define, partialSSRBuild = false, externalRuntimeStyles, instrumentForCoverage, security, } = options;
+    const { allowedCommonJsDependencies, aot = true, baseHref, crossOrigin, externalDependencies, extractLicenses, inlineStyleLanguage = 'css', outExtension, serviceWorker, poll, polyfills, statsJson, outputMode, stylePreprocessorOptions, subresourceIntegrity, verbose, watch, progress = true, externalPackages, namedChunks, budgets, deployUrl, clearScreen, define, partialSSRBuild = false, externalRuntimeStyles, instrumentForCoverage, security, } = options;
     // Return all the normalized options
     return {
         advancedOptimizations: !!aot && optimizationOptions.scripts,
@@ -293,7 +293,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
         clearScreen,
         define,
         partialSSRBuild: environment_options_1.usePartialSsrBuild || partialSSRBuild,
-        externalRuntimeStyles,
+        externalRuntimeStyles: aot && externalRuntimeStyles,
         instrumentForCoverage,
         security,
         templateUpdates: !!options.templateUpdates,

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

@@ -119,7 +119,6 @@ function createCompilerPlugin(pluginOptions, stylesheetBundler) {
                 // dependencies or web worker processing.
                 let modifiedFiles;
                 if (pluginOptions.sourceFileCache?.modifiedFiles.size &&
-                    referencedFileTracker &&
                     !pluginOptions.noopTypeScriptCompilation) {
                     // TODO: Differentiate between changed input files and stale output files
                     modifiedFiles = referencedFileTracker.update(pluginOptions.sourceFileCache.modifiedFiles);
@@ -129,6 +128,8 @@ function createCompilerPlugin(pluginOptions, stylesheetBundler) {
                     if (!pluginOptions.externalRuntimeStyles) {
                         stylesheetBundler.invalidate(modifiedFiles);
                     }
+                    // Remove any stale additional results based on modified files
+                    modifiedFiles.forEach((file) => additionalResults.delete(file));
                 }
                 if (!pluginOptions.noopTypeScriptCompilation &&
                     compilation.update &&
@@ -142,6 +143,7 @@ function createCompilerPlugin(pluginOptions, stylesheetBundler) {
                     sourceFileCache: pluginOptions.sourceFileCache,
                     async transformStylesheet(data, containingFile, stylesheetFile, order, className) {
                         let stylesheetResult;
+                        let resultSource = stylesheetFile ?? containingFile;
                         // Stylesheet file only exists for external stylesheets
                         if (stylesheetFile) {
                             stylesheetResult = await stylesheetBundler.bundleFile(stylesheetFile);
@@ -161,6 +163,11 @@ function createCompilerPlugin(pluginOptions, stylesheetBundler) {
                                     .update(className ?? '')
                                     .digest('hex')
                                 : undefined);
+                            // Adjust result source for inline styles.
+                            // There may be multiple inline styles with the same containing file and to ensure that the results
+                            // do not overwrite each other the result source identifier needs to be unique for each. The class
+                            // name and order fields can be used for this. The structure is arbitrary as long as it is unique.
+                            resultSource += `?class=${className}&order=${order}`;
                         }
                         (result.warnings ??= []).push(...stylesheetResult.warnings);
                         if (stylesheetResult.errors) {
@@ -168,7 +175,7 @@ function createCompilerPlugin(pluginOptions, stylesheetBundler) {
                             return '';
                         }
                         const { contents, outputFiles, metafile, referencedFiles } = stylesheetResult;
-                        additionalResults.set(stylesheetFile ?? containingFile, {
+                        additionalResults.set(resultSource, {
                             outputFiles,
                             metafile,
                         });
@@ -362,12 +369,20 @@ function createCompilerPlugin(pluginOptions, stylesheetBundler) {
                 };
             });
             build.onLoad({ filter: /\.[cm]?js$/ }, (0, load_result_cache_1.createCachedLoad)(pluginOptions.loadResultCache, async (args) => {
+                let request = args.path;
+                if (pluginOptions.fileReplacements) {
+                    const replacement = pluginOptions.fileReplacements[path.normalize(args.path)];
+                    if (replacement) {
+                        request = path.normalize(replacement);
+                    }
+                }
                 return (0, profiling_1.profileAsync)('NG_EMIT_JS*', async () => {
-                    const sideEffects = await hasSideEffects(args.path);
-                    const contents = await javascriptTransformer.transformFile(args.path, pluginOptions.jit, sideEffects);
+                    const sideEffects = await hasSideEffects(request);
+                    const contents = await javascriptTransformer.transformFile(request, pluginOptions.jit, sideEffects);
                     return {
                         contents,
                         loader: 'js',
+                        watchFiles: request !== args.path ? [request] : undefined,
                     };
                 }, true);
             }));

package/src/tools/sass/rebasing-importer.js

@@ -65,7 +65,7 @@ class UrlRebasingImporter {
                 continue;
             }
             // Sass variable usage either starts with a `$` or contains a namespace and a `.$`
-            const valueNormalized = value[0] === '$' || /^\w+\.\$/.test(value) ? `#{${value}}` : value;
+            const valueNormalized = value[0] === '$' || /^\w[\w_-]*\.\$/.test(value) ? `#{${value}}` : value;
             const rebasedPath = (0, node_path_1.relative)(this.entryDirectory, stylesheetDirectory);
             // Normalize path separators and escape characters
             // https://developer.mozilla.org/en-US/docs/Web/CSS/url#syntax

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 = '19.0.0-rc.1';
+const VERSION = '19.0.0-rc.3';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

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

@@ -15,6 +15,7 @@ export type SerializableRouteTreeNode = ReturnType<Awaited<ReturnType<typeof ɵe
 export type WritableSerializableRouteTreeNode = Writeable<SerializableRouteTreeNode>;
 export interface RoutersExtractorWorkerResult {
     serializedRouteTree: SerializableRouteTreeNode;
+    appShellRoute?: string;
     errors: string[];
 }
 /**

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

@@ -15,8 +15,7 @@ exports.RouteRenderMode = void 0;
  * It maps `RenderMode` enum values to their corresponding numeric identifiers.
  */
 exports.RouteRenderMode = {
-    AppShell: 0,
-    Server: 1,
-    Client: 2,
-    Prerender: 3,
+    Server: 0,
+    Client: 1,
+    Prerender: 2,
 };

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

@@ -51,12 +51,11 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
         assetsReversed[addLeadingSlash(destination.replace(/\\/g, node_path_1.posix.sep))] = source;
     }
     // Get routes to prerender
-    const { errors: extractionErrors, serializedRouteTree: serializableRouteTreeNode } = await getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, assetsReversed, appShellOptions, prerenderOptions, sourcemap, outputMode).catch((err) => {
+    const { errors: extractionErrors, serializedRouteTree: serializableRouteTreeNode, appShellRoute, } = await getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, assetsReversed, appShellOptions, prerenderOptions, sourcemap, outputMode).catch((err) => {
         return {
-            errors: [
-                `An error occurred while extracting routes.\n\n${err.stack ?? err.message ?? err}`,
-            ],
+            errors: [`An error occurred while extracting routes.\n\n${err.stack ?? err.message ?? err}`],
             serializedRouteTree: [],
+            appShellRoute: undefined,
         };
     });
     errors.push(...extractionErrors);
@@ -73,7 +72,6 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
         switch (metadata.renderMode) {
             case undefined: /* Legacy building mode */
             case models_1.RouteRenderMode.Prerender:
-            case models_1.RouteRenderMode.AppShell:
                 serializableRouteTreeNodeForPrerender.push(metadata);
                 break;
             case models_1.RouteRenderMode.Server:
@@ -92,7 +90,7 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
         };
     }
     // Render routes
-    const { errors: renderingErrors, output } = await renderPages(baseHref, sourcemap, serializableRouteTreeNodeForPrerender, maxThreads, workspaceRoot, outputFilesForWorker, assetsReversed, appShellOptions, outputMode);
+    const { errors: renderingErrors, output } = await renderPages(baseHref, sourcemap, serializableRouteTreeNodeForPrerender, maxThreads, workspaceRoot, outputFilesForWorker, assetsReversed, appShellOptions, outputMode, appShellRoute ?? appShellOptions?.route);
     errors.push(...renderingErrors);
     return {
         errors,
@@ -101,7 +99,7 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
         serializableRouteTreeNode,
     };
 }
-async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxThreads, workspaceRoot, outputFilesForWorker, assetFilesForWorker, appShellOptions, outputMode) {
+async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxThreads, workspaceRoot, outputFilesForWorker, assetFilesForWorker, appShellOptions, outputMode, appShellRoute) {
     const output = {};
     const errors = [];
     const workerExecArgv = [utils_1.IMPORT_EXEC_ARGV];
@@ -122,7 +120,7 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
     });
     try {
         const renderingPromises = [];
-        const appShellRoute = appShellOptions && addLeadingSlash(appShellOptions.route);
+        const appShellRouteWithLeadingSlash = appShellRoute && addLeadingSlash(appShellRoute);
         const baseHrefWithLeadingSlash = addLeadingSlash(baseHref);
         for (const { route, redirectTo, renderMode } of serializableRouteTreeNode) {
             // Remove the base href from the file output path.
@@ -134,14 +132,14 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
                 output[outPath] = { content: generateRedirectStaticPage(redirectTo), appShellRoute: false };
                 continue;
             }
-            const isAppShellRoute = renderMode === models_1.RouteRenderMode.AppShell ||
-                // Legacy handling
-                (renderMode === undefined && appShellRoute === routeWithoutBaseHref);
-            const render = renderWorker.run({ url: route, isAppShellRoute });
+            const render = renderWorker.run({ url: route });
             const renderResult = render
                 .then((content) => {
                 if (content !== null) {
-                    output[outPath] = { content, appShellRoute: isAppShellRoute };
+                    output[outPath] = {
+                        content,
+                        appShellRoute: appShellRouteWithLeadingSlash === routeWithoutBaseHref,
+                    };
                 }
             })
                 .catch((err) => {
@@ -163,10 +161,12 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
 async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, assetFilesForWorker, appShellOptions, prerenderOptions, sourcemap, outputMode) {
     const { routesFile, discoverRoutes } = prerenderOptions ?? {};
     const routes = [];
+    let appShellRoute;
     if (appShellOptions) {
+        appShellRoute = (0, url_1.urlJoin)(baseHref, appShellOptions.route);
         routes.push({
-            renderMode: models_1.RouteRenderMode.AppShell,
-            route: (0, url_1.urlJoin)(baseHref, appShellOptions.route),
+            renderMode: models_1.RouteRenderMode.Prerender,
+            route: appShellRoute,
         });
     }
     if (routesFile) {
@@ -179,7 +179,7 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset
         }
     }
     if (!discoverRoutes) {
-        return { errors: [], serializedRouteTree: routes };
+        return { errors: [], appShellRoute, serializedRouteTree: routes };
     }
     const workerExecArgv = [utils_1.IMPORT_EXEC_ARGV];
     if (sourcemap) {
@@ -198,9 +198,9 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset
         execArgv: workerExecArgv,
     });
     try {
-        const { serializedRouteTree, errors } = await renderWorker.run({});
+        const { serializedRouteTree, appShellRoute, errors } = await renderWorker.run({});
         if (!routes.length) {
-            return { errors, serializedRouteTree };
+            return { errors, appShellRoute, serializedRouteTree };
         }
         // Merge the routing trees
         const uniqueRoutes = new Map();

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

@@ -20,9 +20,10 @@ let serverURL = launch_server_1.DEFAULT_URL;
 /** Renders an application based on a provided options. */
 async function extractRoutes() {
     const { ɵextractRoutesAndCreateRouteTree: extractRoutesAndCreateRouteTree } = await (0, load_esm_from_memory_1.loadEsmModuleFromMemory)('./main.server.mjs');
-    const { routeTree, errors } = await extractRoutesAndCreateRouteTree(serverURL, undefined /** manifest */, true /** invokeGetPrerenderParams */, outputMode === schema_1.OutputMode.Server /** includePrerenderFallbackRoutes */);
+    const { routeTree, appShellRoute, errors } = await extractRoutesAndCreateRouteTree(serverURL, undefined /** manifest */, true /** invokeGetPrerenderParams */, outputMode === schema_1.OutputMode.Server /** includePrerenderFallbackRoutes */);
     return {
         errors,
+        appShellRoute,
         serializedRouteTree: routeTree.toObject(),
     };
 }