Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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, '/');
Expand Down
33 changes: 31 additions & 2 deletions packages/ngtools/webpack/src/resource_loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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();
}
}

Expand All @@ -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);
}
}
}

Expand Down Expand Up @@ -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.
Expand Down