fix(@angular/build): Fixing the missing browser initial stats file that was in my main branch off of @angular/angular-cli repository

This addresses an issue of including the (browser|server)-initial-stats.json file that was in my original repository. It also fixes unit tests that were also addressed in the original repo.

Author: tsteuwer-accesso

packages/angular/build/src/builders/application/execute-build.ts

@@ -308,13 +308,31 @@ export async function executeBuild(
   if (options.stats) {
     executionResult.addOutputFile(
       'browser-stats.json',
-      JSON.stringify(buildMetafileForType(metafile, 'browser', outputFiles), null, 2),
+      JSON.stringify(buildMetafileForType(metafile, 'browser', false, outputFiles), null, 2),
+      BuildOutputFileType.Root,
+    );
+    executionResult.addOutputFile(
+      'browser-initial-stats.json',
+      JSON.stringify(
+        buildMetafileForType(metafile, 'browser', true, outputFiles, initialFiles),
+        null,
+        2,
+      ),
       BuildOutputFileType.Root,
     );
     if (ssrOutputEnabled) {
       executionResult.addOutputFile(
         'server-stats.json',
-        JSON.stringify(buildMetafileForType(metafile, 'server', outputFiles), null, 2),
+        JSON.stringify(buildMetafileForType(metafile, 'server', false, outputFiles), null, 2),
+        BuildOutputFileType.Root,
+      );
+      executionResult.addOutputFile(
+        'server-initial-stats.json',
+        JSON.stringify(
+          buildMetafileForType(metafile, 'server', true, outputFiles, initialFiles),
+          null,
+          2,
+        ),
         BuildOutputFileType.Root,
       );
     }

packages/angular/build/src/tools/esbuild/utils.ts

@@ -32,25 +32,33 @@ import {
 export function buildMetafileForType(
   metafile: Metafile,
   type: 'browser' | 'server',
+  initial: boolean,
   outputFiles: BuildOutputFile[],
+  initialFiles?: Map<string, InitialFileRecord>,
 ): Metafile {
+  const isServer = type === 'server';
+
   const outputPathsForType = new Set(
     outputFiles
       .filter(({ type: fileType }) => {
         const isServerFile =
           fileType === BuildOutputFileType.ServerApplication ||
           fileType === BuildOutputFileType.ServerRoot;
 
-        return type === 'server' ? isServerFile : !isServerFile;
+        return isServer ? isServerFile : !isServerFile;
       })
       .map(({ path }) => path),
   );
 
   const filteredOutputs: Metafile['outputs'] = {};
   for (const [outputPath, output] of Object.entries(metafile.outputs)) {
-    if (outputPathsForType.has(outputPath)) {
-      filteredOutputs[outputPath] = output;
+    if (!outputPathsForType.has(outputPath)) {
+      continue;
+    }
+    if (initial && !initialFiles?.has(outputPath)) {
+      continue;
     }
+    filteredOutputs[outputPath] = output;
   }
 
   const referencedInputs = new Set<string>();

packages/angular_devkit/build_angular/src/builders/browser/tests/options/stats-json_spec.ts

@@ -26,12 +26,18 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
       expect(result?.success).toBe(true);
 
-      if (harness.expectFile('dist/stats.json').toExist()) {
-        const content = harness.readFile('dist/stats.json');
+      if (harness.expectFile('dist/browser-stats.json').toExist()) {
+        const content = harness.readFile('dist/browser-stats.json');
         expect(() => JSON.parse(content))
           .withContext('Expected Webpack Stats file to be valid JSON.')
           .not.toThrow();
       }
+      if (harness.expectFile('dist/browser-initial-stats.json').toExist()) {
+        const initialContent = harness.readFile('dist/browser-initial-stats.json');
+        expect(() => JSON.parse(initialContent))
+          .withContext('Expected Webpack Stats file to be valid JSON.')
+          .not.toThrow();
+      }
     });
 
     // TODO: Investigate why this profiling object is no longer present in Webpack 5.90.3+ and if this should even be tested
@@ -45,8 +51,8 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
       expect(result?.success).toBe(true);
 
-      if (harness.expectFile('dist/stats.json').toExist()) {
-        const stats = JSON.parse(harness.readFile('dist/stats.json'));
+      if (harness.expectFile('dist/browser-stats.json').toExist()) {
+        const stats = JSON.parse(harness.readFile('dist/browser-stats.json'));
         expect(stats?.chunks?.[0]?.modules?.[0]?.profile?.building).toBeDefined();
       }
     });
@@ -61,7 +67,8 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
       expect(result?.success).toBe(true);
 
-      harness.expectFile('dist/stats.json').toNotExist();
+      harness.expectFile('dist/browser-stats.json').toNotExist();
+      harness.expectFile('dist/browser-initial-stats.json').toNotExist();
     });
 
     it('does not generate a Webpack Stats file in output when not present', async () => {
@@ -73,7 +80,8 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
       expect(result?.success).toBe(true);
 
-      harness.expectFile('dist/stats.json').toNotExist();
+      harness.expectFile('dist/browser-stats.json').toNotExist();
+      harness.expectFile('dist/browser-initial-stats.json').toNotExist();
     });
   });
 });

packages/angular_devkit/build_angular/src/tools/webpack/configs/common.ts

@@ -245,6 +245,9 @@ export async function getCommonConfig(wco: WebpackConfigOptions): Promise<Config
   if (buildOptions.statsJson) {
     extraPlugins.push(
       new JsonStatsPlugin(path.resolve(root, buildOptions.outputPath, 'browser-stats.json')),
+      new JsonStatsPlugin(
+        path.resolve(root, buildOptions.outputPath, 'browser-initial-stats.json'),
+      ),
     );
   }