fix(@angular-devkit/build-angular): non injected styles should not count as initial

alan-agius4 · alan-agius4 · commit 2643fb11a96b · 2021-05-14T13:11:11.000+02:00
Closes angular#20781
diff --git a/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks.ts b/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks.ts
@@ -30,18 +30,14 @@ export function markAsyncChunksNonInitial(
     .flatMap((entryPoint) => entryPoints[entryPoint.bundleName].chunks);
 
   // Find chunks for each ID.
-  const asyncChunks = asyncChunkIds
-    .map((chunkId) => {
-      const chunk = chunks.find((chunk) => chunk.id === chunkId);
-      if (!chunk) {
-        throw new Error(`Failed to find chunk (${chunkId}) in set:\n${JSON.stringify(chunks)}`);
-      }
+  const asyncChunks = asyncChunkIds.map((chunkId) => {
+    const chunk = chunks.find((chunk) => chunk.id === chunkId);
+    if (!chunk) {
+      throw new Error(`Failed to find chunk (${chunkId}) in set:\n${JSON.stringify(chunks)}`);
+    }
 
-      return chunk;
-    })
-    // All Webpack chunks are dependent on `runtime`, which is never an async
-    // entry point, simply ignore this one.
-    .filter((chunk) => !!chunk.names?.includes('runtime'));
+    return chunk;
+  });
 
   // A chunk is considered `initial` only if Webpack already belives it to be initial
   // and the application developer did not mark it async via an extra entry point.
diff --git a/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks_spec.ts b/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks_spec.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/styles-array.ts b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
@@ -3,7 +3,7 @@ import { expectFileToMatch, writeMultipleFiles } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 
-export default async function() {
+export default async function () {
   await writeMultipleFiles({
     'src/string-style.css': '.string-style { color: red }',
     'src/input-style.css': '.input-style { color: red }',
@@ -12,7 +12,7 @@ export default async function() {
     'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
   });
 
-  await updateJsonFile('angular.json', workspaceJson => {
+  await updateJsonFile('angular.json', (workspaceJson) => {
     const appArchitect = workspaceJson.projects['test-project'].architect;
     appArchitect.build.options.styles = [
       { input: 'src/string-style.css' },
@@ -27,7 +27,7 @@ export default async function() {
     ];
   });
 
-  await ng('build', '--extract-css', '--configuration=development');
+  const { stdout } = await ng('build', '--extract-css', '--configuration=development');
 
   await expectFileToMatch('dist/test-project/styles.css', '.string-style');
   await expectFileToMatch('dist/test-project/styles.css', '.input-style');
@@ -41,4 +41,9 @@ export default async function() {
       <link rel="stylesheet" href="renamed-style.css">
     `,
   );
+
+  // Non injected styles should be listed under lazy chunk files
+  if (!/Lazy Chunk Files.*\srenamed-lazy-style\.css/m.test(stdout)) {
+    throw new Error(`Expected "renamed-lazy-style.css" to be listed under "Lazy Chunk Files".`);
+  }
 }
