Skip to content

fix(@ngtools/webpack): remove redundant inline style cache #20974

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
May 31, 2021
Merged

fix(@ngtools/webpack): remove redundant inline style cache #20974

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
32 changes: 10 additions & 22 deletions packages/ngtools/webpack/src/resource_loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export class WebpackResourceLoader {
private _reverseDependencies = new Map<string, Set<string>>();

private fileCache?: Map<string, CompilationOutput>;
private inlineCache?: Map<string, CompilationOutput>;
private assetCache?: Map<string, Asset>;

private modifiedResources = new Set<string>();
Expand All @@ -39,7 +38,6 @@ export class WebpackResourceLoader {
constructor(shouldCache: boolean) {
if (shouldCache) {
this.fileCache = new Map();
this.inlineCache = new Map();
this.assetCache = new Map();
}
}
Expand Down Expand Up @@ -106,7 +104,6 @@ export class WebpackResourceLoader {
mimeType?: string,
fileExtension?: string,
resourceType?: 'style' | 'template',
hash?: string,
containingFile?: string,
): Promise<CompilationOutput> {
if (!this._parentCompilation) {
Expand All @@ -118,7 +115,8 @@ export class WebpackResourceLoader {
filePath ||
(resourceType
? `${containingFile}-${this.outputPathCounter}.${fileExtension}!=!${this.inlineDataLoaderPath}!${containingFile}`
: `angular-resource:${resourceType},${hash}`);
: // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
`angular-resource:${resourceType},${createHash('md5').update(data!).digest('hex')}`);

if (!entry) {
throw new Error(`"filePath" or "data" must be specified.`);
Expand Down Expand Up @@ -337,24 +335,14 @@ export class WebpackResourceLoader {
return '';
}

const cacheKey = createHash('md5').update(data).digest('hex');
let compilationResult = this.inlineCache?.get(cacheKey);

if (compilationResult === undefined) {
compilationResult = await this._compile(
undefined,
data,
mimeType,
fileExtension,
resourceType,
cacheKey,
containingFile,
);

if (this.inlineCache && compilationResult.success) {
this.inlineCache.set(cacheKey, compilationResult);
}
}
const compilationResult = await this._compile(
undefined,
data,
mimeType,
fileExtension,
resourceType,
containingFile,
);

return compilationResult.content;
}
Expand Down