Skip to content

perf(@ngtools/webpack): use precalculated dependencies in unused file check #20250

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.

Sign up for GitHub

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
alan-agius4 merged 1 commit into from
Mar 12, 2021
Merged

perf(@ngtools/webpack): use precalculated dependencies in unused file check #20250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 23 additions & 8 deletions packages/ngtools/webpack/src/ivy/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export class AngularWebpackPlugin {
// Example: module -> module__ivy_ngcc
resolverFactoryHooks.resolveOptions
.for('normal')
.tap(PLUGIN_NAME, (resolveOptions: { mainFields: string[], plugins: unknown[] }) => {
.tap(PLUGIN_NAME, (resolveOptions: { mainFields: string[]; plugins: unknown[] }) => {
const originalMainFields = resolveOptions.mainFields;
const ivyMainFields = originalMainFields.map((f) => `${f}_ivy_ngcc`);

Expand Down Expand Up @@ -273,15 +273,12 @@ export class AngularWebpackPlugin {
const currentUnused = new Set(
allProgramFiles
.filter((sourceFile) => !sourceFile.isDeclarationFile)
.map((sourceFile) => sourceFile.fileName),
.map((sourceFile) => normalizePath(sourceFile.fileName)),
);
Array.from(modules).forEach(({ resource }: compilation.Module & { resource?: string }) => {
const sourceFile = resource && builder.getSourceFile(resource);
if (!sourceFile) {
return;
if (resource) {
this.markResourceUsed(normalizePath(resource), currentUnused);
}

builder.getAllDependencies(sourceFile).forEach((dep) => currentUnused.delete(dep));
});
for (const unused of currentUnused) {
if (previousUnused && previousUnused.has(unused)) {
Expand All @@ -301,6 +298,24 @@ export class AngularWebpackPlugin {
});
}

private markResourceUsed(
normalizedResourcePath: string,
currentUnused: Set<string>,
): void {
if (!currentUnused.has(normalizedResourcePath)) {
return;
}

currentUnused.delete(normalizedResourcePath);
const dependencies = this.fileDependencies.get(normalizedResourcePath);
if (!dependencies) {
return;
}
for (const dependency of dependencies) {
this.markResourceUsed(normalizePath(dependency), currentUnused);
}
}

private async rebuildRequiredFiles(
modules: Iterable<compilation.Module>,
compilation: WebpackCompilation,
Expand Down Expand Up @@ -599,7 +614,7 @@ export class AngularWebpackPlugin {
}

const dependencies = [
...this.fileDependencies.get(filePath) || [],
...(this.fileDependencies.get(filePath) || []),
...getExtraDependencies(sourceFile),
].map(externalizePath);

Expand Down