0485128 fix(@angular-devkit/build-angular): app-shell generation incorrect content when using the application builder

Author: Angular Builds

package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "17.0.5+sha-e7d7309",
+  "version": "17.0.5+sha-0485128",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.1",
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#e7d7309",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#e7d7309",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#e7d7309",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#0485128",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#0485128",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#0485128",
     "@babel/core": "7.23.2",
     "@babel/generator": "7.23.0",
     "@babel/helper-annotate-as-pure": "7.22.5",
@@ -20,7 +20,7 @@
     "@babel/preset-env": "7.23.2",
     "@babel/runtime": "7.23.2",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#e7d7309",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#0485128",
     "@vitejs/plugin-basic-ssl": "1.0.1",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.16",

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

@@ -39,9 +39,11 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
      * NOTE: we don't perform critical CSS inlining as this will be done during server rendering.
      */
     let indexContentOutputNoCssInlining;
+    // When using prerender/app-shell the index HTML file can be regenerated.
+    // Thus, we use a Map so that we do not generate 2 files with the same filename.
+    const additionalHtmlOutputFiles = new Map();
     // Generate index HTML file
     // If localization is enabled, index generation is handled in the inlining process.
-    // NOTE: Localization with SSR is not currently supported.
     if (indexHtmlOptions) {
         const { content, contentWithoutCriticalCssInlined, errors, warnings } = await (0, index_html_generator_1.generateIndexHtml)(initialFiles, outputFiles, {
             ...options,
@@ -50,9 +52,10 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
         indexContentOutputNoCssInlining = contentWithoutCriticalCssInlined;
         allErrors.push(...errors);
         allWarnings.push(...warnings);
-        additionalOutputFiles.push((0, utils_1.createOutputFileFromText)(indexHtmlOptions.output, content, bundler_context_1.BuildOutputFileType.Browser));
+        additionalHtmlOutputFiles.set(indexHtmlOptions.output, (0, utils_1.createOutputFileFromText)(indexHtmlOptions.output, content, bundler_context_1.BuildOutputFileType.Browser));
         if (ssrOptions) {
-            additionalOutputFiles.push((0, utils_1.createOutputFileFromText)('index.server.html', contentWithoutCriticalCssInlined, bundler_context_1.BuildOutputFileType.Server));
+            const serverIndexHtmlFilename = 'index.server.html';
+            additionalHtmlOutputFiles.set(serverIndexHtmlFilename, (0, utils_1.createOutputFileFromText)(serverIndexHtmlFilename, contentWithoutCriticalCssInlined, bundler_context_1.BuildOutputFileType.Server));
         }
     }
     // Pre-render (SSG) and App-shell
@@ -64,9 +67,10 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
         allWarnings.push(...warnings);
         prerenderedRoutes.push(...Array.from(generatedRoutes));
         for (const [path, content] of Object.entries(output)) {
-            additionalOutputFiles.push((0, utils_1.createOutputFileFromText)(path, content, bundler_context_1.BuildOutputFileType.Browser));
+            additionalHtmlOutputFiles.set(path, (0, utils_1.createOutputFileFromText)(path, content, bundler_context_1.BuildOutputFileType.Browser));
         }
     }
+    additionalOutputFiles.push(...additionalHtmlOutputFiles.values());
     // Augment the application with service worker support
     // If localization is enabled, service worker is handled in the inlining process.
     if (serviceWorker) {

uniqueId

@@ -1 +1 @@
-Wed Dec 06 2023 06:47:17 GMT+0000 (Coordinated Universal Time)
+Wed Dec 06 2023 15:23:20 GMT+0000 (Coordinated Universal Time)