fix(@ngtools/webpack): re-emit component stylesheet assets

alan-agius4 · clydin · commit 5855374eb540 · 2021-05-21T20:04:32.000-04:00
With this change we re-emit assets referenced in component stylesheets which where uneffected by the change that re-triggered a re-compilation. Since we cache the the result of processed component CSS, during a re-compilation `postcss-cli-resources` plugin will not run which causes assets to be to emit. With this change we now cache the asset and re-emit them on every change. Closes angular#20882
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/postcss-cli-resources.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/postcss-cli-resources.ts
@@ -125,7 +125,7 @@ export default function (options?: PostcssCliResourcesOptions): Plugin {
 
         loader.addDependency(result);
         if (emitFile) {
-          loader.emitFile(outputPath, content, undefined);
+          loader.emitFile(outputPath, content, undefined, { sourceFilename: result });
         }
 
         let outputUrl = outputPath.replace(/\\/g, '/');
diff --git a/packages/ngtools/webpack/src/resource_loader.ts b/packages/ngtools/webpack/src/resource_loader.ts
@@ -9,7 +9,7 @@
 import { createHash } from 'crypto';
 import * as path from 'path';
 import * as vm from 'vm';
-import { Compilation, EntryPlugin, NormalModule, library, node, sources } from 'webpack';
+import { Asset, Compilation, EntryPlugin, NormalModule, library, node, sources } from 'webpack';
 import { normalizePath } from './ivy/paths';
 
 interface CompilationOutput {
@@ -25,13 +25,16 @@ export class WebpackResourceLoader {
 
   private fileCache?: Map<string, CompilationOutput>;
   private inlineCache?: Map<string, CompilationOutput>;
+  private assetCache?: Map<string, Asset>;
+
   private modifiedResources = new Set<string>();
   private outputPathCounter = 1;
 
   constructor(shouldCache: boolean) {
     if (shouldCache) {
       this.fileCache = new Map();
       this.inlineCache = new Map();
+      this.assetCache = new Map();
     }
   }
 
@@ -40,15 +43,34 @@ export class WebpackResourceLoader {
 
     // Update resource cache and modified resources
     this.modifiedResources.clear();
+
     if (changedFiles) {
       for (const changedFile of changedFiles) {
+        const changedFileNormalized = normalizePath(changedFile);
+        this.assetCache?.delete(changedFileNormalized);
+
         for (const affectedResource of this.getAffectedResources(changedFile)) {
-          this.fileCache?.delete(normalizePath(affectedResource));
+          const affectedResourceNormalized = normalizePath(affectedResource);
+          this.fileCache?.delete(affectedResourceNormalized);
           this.modifiedResources.add(affectedResource);
+
+          for (const effectedDependencies of this.getResourceDependencies(
+            affectedResourceNormalized,
+          )) {
+            this.assetCache?.delete(normalizePath(effectedDependencies));
+          }
         }
       }
     } else {
       this.fileCache?.clear();
+      this.assetCache?.clear();
+    }
+
+    // Re-emit all assets for un-effected files
+    if (this.assetCache) {
+      for (const [, { name, source, info }] of this.assetCache) {
+        this._parentCompilation.emitAsset(name, source, info);
+      }
     }
   }
 
@@ -200,6 +222,13 @@ export class WebpackResourceLoader {
 
           parent.warnings.push(...childCompilation.warnings);
           parent.errors.push(...childCompilation.errors);
+          for (const { info, name, source } of childCompilation.getAssets()) {
+            if (info.sourceFilename === undefined) {
+              throw new Error(`'${name}' asset info 'sourceFilename' is 'undefined'.`);
+            }
+
+            this.assetCache?.set(info.sourceFilename, { info, name, source });
+          }
         }
 
         // Save the dependencies for this resource.

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ export default function (options?: PostcssCliResourcesOptions): Plugin {`
`125`	`125`
`126`	`126`	`loader.addDependency(result);`
`127`	`127`	`if (emitFile) {`
`128`		`- loader.emitFile(outputPath, content, undefined);`
	`128`	`+ loader.emitFile(outputPath, content, undefined, { sourceFilename: result });`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`let outputUrl = outputPath.replace(/\\/g, '/');`