Skip to content

fix(@ngtools/webpack): use rendered instead of hash in resource loader #7988

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
hansl merged 1 commit into from
Oct 10, 2017
Merged

fix(@ngtools/webpack): use rendered instead of hash in resource loader #7988

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
48 changes: 23 additions & 25 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 @@ -5,21 +5,24 @@ const NodeTemplatePlugin = require('webpack/lib/node/NodeTemplatePlugin');
const NodeTargetPlugin = require('webpack/lib/node/NodeTargetPlugin');
const LoaderTargetPlugin = require('webpack/lib/LoaderTargetPlugin');
const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin');
const loaderUtils = require('loader-utils');


interface CompilationOutput {
hash: string;
rendered: boolean;
outputName: string;
source: string;
newSource?: string;
}

interface CachedCompilation {
outputName: string;
evaluatedSource?: string;
}

export class WebpackResourceLoader {
private _parentCompilation: any;
private _context: string;
private _uniqueId = 0;
private _cache = new Map<string, CompilationOutput>();
private _cache = new Map<string, CachedCompilation>();

constructor() {}

Expand Down Expand Up @@ -95,15 +98,13 @@ export class WebpackResourceLoader {
}
});

const source = childCompilation.assets[outputName].source();

resolve({
// Hash of the source.
hash: loaderUtils.getHashDigest(source),
// Boolean showing if this entry was changed since the last compilation.
rendered: entries[0].rendered,
// Output name.
outputName,
// Compiled code.
source
source: childCompilation.assets[outputName].source()
});
}
});
Expand All @@ -116,12 +117,12 @@ export class WebpackResourceLoader {
const vmScript = new vm.Script(output.source, { filename: output.outputName });

// Evaluate code and cast to string
let newSource: string;
newSource = vmScript.runInContext(vmContext);
let evaluatedSource: string;
evaluatedSource = vmScript.runInContext(vmContext);

if (typeof newSource == 'string') {
this._cache.set(output.outputName, { ...output, newSource });
return Promise.resolve(newSource);
if (typeof evaluatedSource == 'string') {
this._cache.set(output.outputName, { outputName: output.outputName, evaluatedSource });
return Promise.resolve(evaluatedSource);
}

return Promise.reject('The loader "' + output.outputName + '" didn\'t return a string.');
Expand All @@ -132,17 +133,14 @@ export class WebpackResourceLoader {

get(filePath: string): Promise<string> {
return this._compile(filePath)
.then((result: any) => {
// Check cache.
const outputName = result.outputName;
const output = this._cache.get(outputName);
if (output) {
if (output.hash === result.hash && output.newSource) {
// Return cached newSource.
return Promise.resolve(output.newSource);
} else {
// Delete cache entry.
this._cache.delete(outputName);
.then((result: CompilationOutput) => {
if (!result.rendered) {
// Check cache.
const outputName = result.outputName;
const cachedOutput = this._cache.get(outputName);
if (cachedOutput) {
// Return cached evaluatedSource.
return Promise.resolve(cachedOutput.evaluatedSource);
}
}

Expand Down