Skip to content
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

fix(@ngtools/webpack): don't delete virtual files for resources still on disk #15702

Merged
merged 2 commits into from
Sep 27, 2019
Merged

fix(@ngtools/webpack): don't delete virtual files for resources still on disk #15702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef4de2a
fix(@ngtools/webpack): don't delete virtual files for resources still…
filipesilva Sep 27, 2019
252e1b6
fix(@angular-devkit/build-angular): don't double process factory files
filipesilva Sep 27, 2019
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
2 changes: 2 additions & 0 deletions packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,8 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
},
{
test: /\.js$/,
// Factory files are processed by BO in the rules added in typescript.ts.
exclude: /(ngfactory|ngstyle)\.js$/,
...buildOptimizerUseRule,
},
{
Expand Down
14 changes: 10 additions & 4 deletions packages/ngtools/webpack/src/compiler_host.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,16 @@ export class WebpackCompilerHost implements ts.CompilerHost {
return;
}

for (const ext of this._virtualStyleFileExtensions) {
const virtualFile = (fullPath + ext) as Path;
if (this._memoryHost.exists(virtualFile)) {
this._memoryHost.delete(virtualFile);
if (!exists) {
// At this point we're only looking at resource files (html/css/scss/etc).
// If the original was deleted, we should delete the virtual files too.
// If the original wasn't deleted we should leave them to be overwritten, because webpack
// might begin the loading process before our plugin has re-emitted them.
for (const ext of this._virtualStyleFileExtensions) {
const virtualFile = (fullPath + ext) as Path;
if (this._memoryHost.exists(virtualFile)) {
this._memoryHost.delete(virtualFile);
}
}
}
}
Expand Down