Skip to content

feat(@ngtools/webpack): adjust changed file extensions based on usage #9409

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
filipesilva merged 1 commit into from
Jan 29, 2018
Merged

feat(@ngtools/webpack): adjust changed file extensions based on usage #9409

Show file tree
Hide file tree
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
28 changes: 23 additions & 5 deletions packages/@ngtools/webpack/src/angular_compiler_plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ export class AngularCompilerPlugin implements Tapable {
private _platform: PLATFORM;
private _JitMode = false;
private _emitSkipped = true;
private _changedFileExtensions = new Set(['ts', 'html', 'css']);

// Webpack plugin.
private _firstRun = true;
Expand Down Expand Up @@ -292,9 +293,22 @@ export class AngularCompilerPlugin implements Tapable {
.filter(k => this._compilerHost.fileExists(k));
}

updateChangedFileExtensions(extension: string) {
if (extension) {
this._changedFileExtensions.add(extension);
}
}

private _getChangedCompilationFiles() {
return this._compilerHost.getChangedFilePaths()
.filter(k => /\.(?:ts|html|css|scss|sass|less|styl)$/.test(k));
.filter(k => {
for (const ext of this._changedFileExtensions) {
if (k.endsWith(ext)) {
return true;
}
}
return false;
});
}

private _createOrUpdateProgram() {
Expand Down Expand Up @@ -877,12 +891,16 @@ export class AngularCompilerPlugin implements Tapable {
const resourceImports = findResources(sourceFile)
.map((resourceReplacement) => resourceReplacement.resourcePaths)
.reduce((prev, curr) => prev.concat(curr), [])
.map((resourcePath) => path.resolve(path.dirname(resolvedFileName), resourcePath))
.reduce((prev, curr) =>
prev.concat(...this.getResourceDependencies(curr)), []);
.map((resourcePath) => path.resolve(path.dirname(resolvedFileName), resourcePath));

// These paths are meant to be used by the loader so we must denormalize them.
return [...esImports, ...resourceImports].map((p) => this._compilerHost.denormalizePath(p));
const uniqueDependencies = new Set([
...esImports,
...resourceImports,
...this.getResourceDependencies(resolvedFileName)
].map((p) => this._compilerHost.denormalizePath(p)));

return [...uniqueDependencies];
}

getResourceDependencies(fileName: string): string[] {
Expand Down
5 changes: 4 additions & 1 deletion packages/@ngtools/webpack/src/loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,10 @@ export function ngcLoader(this: LoaderContext & { _compilation: any }, source: s
if (sourceFileName.endsWith('.ts')) {
result.errorDependencies.forEach(dep => this.addDependency(dep));
const dependencies = plugin.getDependencies(sourceFileName);
dependencies.forEach(dep => this.addDependency(dep));
dependencies.forEach(dep => {
plugin.updateChangedFileExtensions(path.extname(dep));
this.addDependency(dep);
});
}

// NgFactory files depend on the component template, but we can't know what that file
Expand Down