webpack 2.4.1 → 2.6.1

package/README.md

@@ -4,6 +4,7 @@
 [![tests][tests]][tests-url]
 [![builds][builds]][builds-url]
 [![coverage][cover]][cover-url]
+[![licenses][licenses]][licenses-url]
 
 <div align="center">
   <a href="https://github.com/webpack/webpack">
@@ -255,6 +256,10 @@ You are also welcome to correct any spelling mistakes or any language issues.
 
 If you want to discuss something or just need help, [here is our Gitter room](https://gitter.im/webpack/webpack).
 
+### License
+
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fwebpack%2Fwebpack.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fwebpack%2Fwebpack?ref=badge_large)
+
 <h2 align="center">Core Team</h2>
 
 <table>
@@ -333,7 +338,7 @@ This is how we use the donations:
 
 <h2 align="center">Other Backers and Sponsors</h2>
 
-We had other sources of donations before starting to use OpenCollective (or people that can't donate via OpenCollective). We want to acknowledge these sponsors and backers, but donations were not public and we are not sure of donors want to stay anonymous. So if you want to be in this list, just send a PR.
+Before we started using OpenCollective, donations were made anonymously. Now that we have made the switch, we would like to acknowledge these sponsors (and the ones who continue to donate using OpenCollective). If we've missed someone, please send us a PR, and we'll add you to this list.
 
 [Google Angular Team](https://angular.io/), [Architects.io](http://architects.io/),
 <a href="https://moonmail.io" target="_blank" title="Email Marketing Software"><img 
@@ -511,5 +516,8 @@ src="https://static.monei.net/monei-logo.svg" height="30" alt="MONEI"></a>
 [builds-url]: https://ci.appveyor.com/project/sokra/webpack/branch/master
 [builds]: https://ci.appveyor.com/api/projects/status/github/webpack/webpack?svg=true
 
+[licenses-url]: https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fwebpack%2Fwebpack?ref=badge_shield
+[licenses]: https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fwebpack%2Fwebpack.svg?type=shield
+
 [cover]: https://img.shields.io/coveralls/webpack/webpack.svg
 [cover-url]: https://coveralls.io/r/webpack/webpack/

package/lib/BannerPlugin.js

@@ -8,10 +8,10 @@
 const ConcatSource = require("webpack-sources").ConcatSource;
 const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 
-function wrapComment(str) {
+const wrapComment = (str) => {
 	if(!str.includes("\n")) return `/*! ${str} */`;
 	return `/*!\n * ${str.split("\n").join("\n * ")}\n */`;
-}
+};
 
 class BannerPlugin {
 	constructor(options) {
@@ -33,14 +33,36 @@ class BannerPlugin {
 			compilation.plugin("optimize-chunk-assets", (chunks, callback) => {
 				chunks.forEach((chunk) => {
 					if(options.entryOnly && !chunk.isInitial()) return;
-
 					chunk.files
 						.filter(ModuleFilenameHelpers.matchObject.bind(undefined, options))
-						.forEach((file) =>
-							compilation.assets[file] = new ConcatSource(
-								banner, "\n", compilation.assets[file]
-							)
-						);
+						.forEach((file) => {
+							let basename;
+							let query = "";
+							let filename = file;
+							const hash = compilation.hash;
+							const querySplit = filename.indexOf("?");
+
+							if(querySplit >= 0) {
+								query = filename.substr(querySplit);
+								filename = filename.substr(0, querySplit);
+							}
+
+							if(filename.indexOf("/") < 0) {
+								basename = filename;
+							} else {
+								basename = filename.substr(filename.lastIndexOf("/") + 1);
+							}
+
+							const comment = compilation.getPath(banner, {
+								hash,
+								chunk,
+								filename,
+								basename,
+								query,
+							});
+
+							return compilation.assets[file] = new ConcatSource(comment, "\n", compilation.assets[file]);
+						});
 				});
 				callback();
 			});

package/lib/Compilation.js

@@ -14,7 +14,6 @@ const ModuleDependencyError = require("./ModuleDependencyError");
 const Module = require("./Module");
 const Chunk = require("./Chunk");
 const Entrypoint = require("./Entrypoint");
-const Stats = require("./Stats");
 const MainTemplate = require("./MainTemplate");
 const ChunkTemplate = require("./ChunkTemplate");
 const HotUpdateChunkTemplate = require("./HotUpdateChunkTemplate");
@@ -22,6 +21,7 @@ const ModuleTemplate = require("./ModuleTemplate");
 const Dependency = require("./Dependency");
 const ChunkRenderError = require("./ChunkRenderError");
 const CachedSource = require("webpack-sources").CachedSource;
+const Stats = require("./Stats");
 
 function byId(a, b) {
 	if(a.id < b.id) return -1;
@@ -82,6 +82,10 @@ class Compilation extends Tapable {
 		this.dependencyTemplates = new Map();
 	}
 
+	getStats() {
+		return new Stats(this);
+	}
+
 	templatesPlugin(name, fn) {
 		this.mainTemplate.plugin(name, fn);
 		this.chunkTemplate.plugin(name, fn);
@@ -197,7 +201,7 @@ class Compilation extends Tapable {
 
 	addModuleDependencies(module, dependencies, bail, cacheGroup, recursive, callback) {
 		let _this = this;
-		const start = _this.profile && +new Date();
+		const start = _this.profile && Date.now();
 
 		const factories = [];
 		for(let i = 0; i < dependencies.length; i++) {
@@ -266,7 +270,7 @@ class Compilation extends Tapable {
 					if(!dependentModule.profile) {
 						dependentModule.profile = {};
 					}
-					afterFactory = +new Date();
+					afterFactory = Date.now();
 					dependentModule.profile.factory = afterFactory - start;
 				}
 
@@ -286,7 +290,7 @@ class Compilation extends Tapable {
 						if(!module.profile) {
 							module.profile = {};
 						}
-						const time = +new Date() - start;
+						const time = Date.now() - start;
 						if(!module.profile.dependencies || time > module.profile.dependencies) {
 							module.profile.dependencies = time;
 						}
@@ -307,7 +311,7 @@ class Compilation extends Tapable {
 					iterationDependencies(dependencies);
 
 					if(_this.profile) {
-						const afterBuilding = +new Date();
+						const afterBuilding = Date.now();
 						module.profile.building = afterBuilding - afterFactory;
 					}
 
@@ -328,7 +332,7 @@ class Compilation extends Tapable {
 					}
 
 					if(_this.profile) {
-						const afterBuilding = +new Date();
+						const afterBuilding = Date.now();
 						dependentModule.profile.building = afterBuilding - afterFactory;
 					}
 
@@ -356,7 +360,7 @@ class Compilation extends Tapable {
 	}
 
 	_addModuleChain(context, dependency, onModule, callback) {
-		const start = this.profile && +new Date();
+		const start = this.profile && Date.now();
 
 		const errorAndCallback = this.bail ? function errorAndCallback(err) {
 			callback(err);
@@ -393,7 +397,7 @@ class Compilation extends Tapable {
 				if(!module.profile) {
 					module.profile = {};
 				}
-				afterFactory = +new Date();
+				afterFactory = Date.now();
 				module.profile.factory = afterFactory - start;
 			}
 
@@ -404,7 +408,7 @@ class Compilation extends Tapable {
 				onModule(module);
 
 				if(this.profile) {
-					const afterBuilding = +new Date();
+					const afterBuilding = Date.now();
 					module.profile.building = afterBuilding - afterFactory;
 				}
 
@@ -432,7 +436,7 @@ class Compilation extends Tapable {
 				}
 
 				if(this.profile) {
-					const afterBuilding = +new Date();
+					const afterBuilding = Date.now();
 					module.profile.building = afterBuilding - afterFactory;
 				}
 
@@ -1214,10 +1218,6 @@ class Compilation extends Tapable {
 		return this.mainTemplate.applyPluginsWaterfall("asset-path", filename, data);
 	}
 
-	getStats() {
-		return new Stats(this);
-	}
-
 	createChildCompiler(name, outputOptions) {
 		return this.compiler.createChildCompiler(this, name, outputOptions);
 	}

package/lib/Compiler.js

@@ -6,15 +6,13 @@ var path = require("path");
 var Tapable = require("tapable");
 
 var Compilation = require("./Compilation");
-
+var Stats = require("./Stats");
 var NormalModuleFactory = require("./NormalModuleFactory");
 var ContextModuleFactory = require("./ContextModuleFactory");
 
 function Watching(compiler, watchOptions, handler) {
 	this.startTime = null;
 	this.invalid = false;
-	this.error = null;
-	this.stats = null;
 	this.handler = handler;
 	this.closed = false;
 	if(typeof watchOptions === "number") {
@@ -38,7 +36,7 @@ function Watching(compiler, watchOptions, handler) {
 
 Watching.prototype._go = function() {
 	var self = this;
-	self.startTime = new Date().getTime();
+	self.startTime = Date.now();
 	self.running = true;
 	self.invalid = false;
 	self.compiler.applyPluginsAsync("watch-run", self, function(err) {
@@ -61,9 +59,9 @@ Watching.prototype._go = function() {
 					if(compilation.applyPluginsBailResult("need-additional-pass")) {
 						compilation.needAdditionalPass = true;
 
-						var stats = compilation.getStats();
+						var stats = new Stats(compilation);
 						stats.startTime = self.startTime;
-						stats.endTime = new Date().getTime();
+						stats.endTime = Date.now();
 						self.compiler.applyPlugins("done", stats);
 
 						self.compiler.applyPluginsAsync("additional-pass", function(err) {
@@ -79,22 +77,29 @@ Watching.prototype._go = function() {
 	});
 };
 
+Watching.prototype._getStats = function(compilation) {
+	var stats = new Stats(compilation);
+	stats.startTime = this.startTime;
+	stats.endTime = Date.now();
+	return stats;
+};
+
 Watching.prototype._done = function(err, compilation) {
 	this.running = false;
 	if(this.invalid) return this._go();
-	this.error = err || null;
-	this.stats = compilation ? compilation.getStats() : null;
-	if(this.stats) {
-		this.stats.startTime = this.startTime;
-		this.stats.endTime = new Date().getTime();
+
+	var stats = compilation ? this._getStats(compilation) : null;
+	if(err) {
+		this.compiler.applyPlugins("failed", err);
+		this.handler(err, stats);
+		return;
 	}
-	if(this.stats)
-		this.compiler.applyPlugins("done", this.stats);
-	else
-		this.compiler.applyPlugins("failed", this.error);
-	this.handler(this.error, this.stats);
-	if(!this.error && !this.closed)
+
+	this.compiler.applyPlugins("done", stats);
+	this.handler(null, stats);
+	if(!this.closed) {
 		this.watch(compilation.fileDependencies, compilation.contextDependencies, compilation.missingDependencies);
+	}
 };
 
 Watching.prototype.watch = function(files, dirs, missing) {
@@ -217,7 +222,7 @@ Compiler.prototype.watch = function(watchOptions, handler) {
 
 Compiler.prototype.run = function(callback) {
 	var self = this;
-	var startTime = new Date().getTime();
+	var startTime = Date.now();
 
 	self.applyPluginsAsync("before-run", self, function(err) {
 		if(err) return callback(err);
@@ -232,9 +237,9 @@ Compiler.prototype.run = function(callback) {
 					if(err) return callback(err);
 
 					if(self.applyPluginsBailResult("should-emit", compilation) === false) {
-						var stats = compilation.getStats();
+						var stats = new Stats(compilation);
 						stats.startTime = startTime;
-						stats.endTime = new Date().getTime();
+						stats.endTime = Date.now();
 						self.applyPlugins("done", stats);
 						return callback(null, stats);
 					}
@@ -245,9 +250,9 @@ Compiler.prototype.run = function(callback) {
 						if(compilation.applyPluginsBailResult("need-additional-pass")) {
 							compilation.needAdditionalPass = true;
 
-							var stats = compilation.getStats();
+							var stats = new Stats(compilation);
 							stats.startTime = startTime;
-							stats.endTime = new Date().getTime();
+							stats.endTime = Date.now();
 							self.applyPlugins("done", stats);
 
 							self.applyPluginsAsync("additional-pass", function(err) {
@@ -260,9 +265,9 @@ Compiler.prototype.run = function(callback) {
 						self.emitRecords(function(err) {
 							if(err) return callback(err);
 
-							var stats = compilation.getStats();
+							var stats = new Stats(compilation);
 							stats.startTime = startTime;
-							stats.endTime = new Date().getTime();
+							stats.endTime = Date.now();
 							self.applyPlugins("done", stats);
 							return callback(null, stats);
 						});

package/lib/ContextModule.js

@@ -8,16 +8,18 @@ const Module = require("./Module");
 const OriginalSource = require("webpack-sources").OriginalSource;
 const RawSource = require("webpack-sources").RawSource;
 const AsyncDependenciesBlock = require("./AsyncDependenciesBlock");
+const DepBlockHelpers = require("./dependencies/DepBlockHelpers");
+const Template = require("./Template");
 
 class ContextModule extends Module {
-	constructor(resolveDependencies, context, recursive, regExp, addon, isAsync, chunkName) {
+	constructor(resolveDependencies, context, recursive, regExp, addon, asyncMode, chunkName) {
 		super();
 		this.resolveDependencies = resolveDependencies;
 		this.context = context;
 		this.recursive = recursive;
 		this.regExp = regExp;
 		this.addon = addon;
-		this.async = !!isAsync;
+		this.async = asyncMode;
 		this.cacheable = true;
 		this.contextDependencies = [context];
 		this.built = false;
@@ -44,7 +46,7 @@ class ContextModule extends Module {
 	identifier() {
 		let identifier = this.context;
 		if(this.async)
-			identifier += " async";
+			identifier += ` ${this.async}`;
 		if(!this.recursive)
 			identifier += " nonrecursive";
 		if(this.addon)
@@ -58,7 +60,7 @@ class ContextModule extends Module {
 	readableIdentifier(requestShortener) {
 		let identifier = requestShortener.shorten(this.context);
 		if(this.async)
-			identifier += " async";
+			identifier += ` ${this.async}`;
 		if(!this.recursive)
 			identifier += " nonrecursive";
 		if(this.addon)
@@ -72,7 +74,7 @@ class ContextModule extends Module {
 	libIdent(options) {
 		let identifier = this.contextify(options.context, this.context);
 		if(this.async)
-			identifier += " async";
+			identifier += ` ${this.async}`;
 		if(this.recursive)
 			identifier += " recursive";
 		if(this.addon)
@@ -99,46 +101,71 @@ class ContextModule extends Module {
 
 	build(options, compilation, resolver, fs, callback) {
 		this.built = true;
-		this.builtTime = new Date().getTime();
+		this.builtTime = Date.now();
 		this.resolveDependencies(fs, this.context, this.recursive, this.regExp, (err, dependencies) => {
 			if(err) return callback(err);
 
+			// Reset children
+			this.dependencies = [];
+			this.blocks = [];
+
+			// abort if something failed
+			// this will create an empty context
 			if(!dependencies) {
-				this.dependencies = [];
 				callback();
 				return;
 			}
 
-			// enhance dependencies
+			// enhance dependencies with meta info
 			dependencies.forEach(dep => {
 				dep.loc = dep.userRequest;
 				dep.request = this.addon + dep.request;
 			});
 
-			// if these we are not a async context
-			// add dependencies and continue
-			if(!this.async) {
+			if(!this.async || this.async === "eager") {
+
+				// if we have an sync or eager context
+				// just add all dependencies and continue
 				this.dependencies = dependencies;
-				callback();
-				return;
-			}
 
-			// if we are async however create a new async dependency block
-			// and add that block to this context
-			dependencies.forEach(dep => {
-				const block = new AsyncDependenciesBlock(this.chunkName, dep.module, dep.loc);
-				block.addDependency(dep);
-				this.addBlock(block);
-			});
+			} else if(this.async === "lazy-once") {
+
+				// for the lazy-once mode create a new async dependency block
+				// and add that block to this context
+				if(dependencies.length > 0) {
+					const block = new AsyncDependenciesBlock(this.chunkName, this);
+					dependencies.forEach(dep => {
+						block.addDependency(dep);
+					});
+					this.addBlock(block);
+				}
+
+			} else {
+
+				// if we are lazy create a new async dependency block per dependency
+				// and add all blocks to this context
+				dependencies.forEach((dep, idx) => {
+					let chunkName = this.chunkName;
+					if(chunkName) {
+						if(!/\[(index|request)\]/.test(chunkName))
+							chunkName += "[index]";
+						chunkName = chunkName.replace(/\[index\]/g, idx);
+						chunkName = chunkName.replace(/\[request\]/g, Template.toPath(dep.userRequest));
+					}
+					const block = new AsyncDependenciesBlock(chunkName, dep.module, dep.loc);
+					block.addDependency(dep);
+					this.addBlock(block);
+				});
+			}
 			callback();
 		});
 	}
 
-	getSourceWithDependencies(dependencies, id) {
+	getUserRequestMap(dependencies) {
 		// if we filter first we get a new array
 		// therefor we dont need to create a clone of dependencies explicitly
 		// therefore the order of this is !important!
-		const map = dependencies
+		return dependencies
 			.filter(dependency => dependency.module)
 			.sort((a, b) => {
 				if(a.userRequest === b.userRequest) {
@@ -149,6 +176,10 @@ class ContextModule extends Module {
 				map[dep.userRequest] = dep.module.id;
 				return map;
 			}, Object.create(null));
+	}
+
+	getSyncSource(dependencies, id) {
+		const map = this.getUserRequestMap(dependencies);
 		return `var map = ${JSON.stringify(map, null, "\t")};
 function webpackContext(req) {
 	return __webpack_require__(webpackContextResolve(req));
@@ -167,7 +198,53 @@ module.exports = webpackContext;
 webpackContext.id = ${JSON.stringify(id)};`;
 	}
 
-	getSourceWithBlocks(blocks, id) {
+	getEagerSource(dependencies, id) {
+		const map = this.getUserRequestMap(dependencies);
+		return `var map = ${JSON.stringify(map, null, "\t")};
+function webpackAsyncContext(req) {
+	return webpackAsyncContextResolve(req).then(__webpack_require__);
+};
+function webpackAsyncContextResolve(req) {
+	return new Promise(function(resolve, reject) {
+		var id = map[req];
+		if(!(id + 1)) // check for number or string
+			reject(new Error("Cannot find module '" + req + "'."));
+		else
+			resolve(id);
+	});
+};
+webpackAsyncContext.keys = function webpackAsyncContextKeys() {
+	return Object.keys(map);
+};
+webpackAsyncContext.resolve = webpackAsyncContextResolve;
+module.exports = webpackAsyncContext;
+webpackAsyncContext.id = ${JSON.stringify(id)};`;
+	}
+
+	getLazyOnceSource(block, dependencies, id, outputOptions, requestShortener) {
+		const promise = DepBlockHelpers.getDepBlockPromise(block, outputOptions, requestShortener, "lazy-once context");
+		const map = this.getUserRequestMap(dependencies);
+		return `var map = ${JSON.stringify(map, null, "\t")};
+function webpackAsyncContext(req) {
+	return webpackAsyncContextResolve(req).then(__webpack_require__);
+};
+function webpackAsyncContextResolve(req) {
+	return ${promise}.then(function() {
+		var id = map[req];
+		if(!(id + 1)) // check for number or string
+			throw new Error("Cannot find module '" + req + "'.");
+		return id;
+	});
+};
+webpackAsyncContext.keys = function webpackAsyncContextKeys() {
+	return Object.keys(map);
+};
+webpackAsyncContext.resolve = webpackAsyncContextResolve;
+module.exports = webpackAsyncContext;
+webpackAsyncContext.id = ${JSON.stringify(id)};`;
+	}
+
+	getLazySource(blocks, id) {
 		let hasMultipleOrNoChunks = false;
 		const map = blocks
 			.filter(block => block.dependencies[0].module)
@@ -219,15 +296,38 @@ module.exports = webpackEmptyContext;
 webpackEmptyContext.id = ${JSON.stringify(id)};`;
 	}
 
-	getSourceString() {
-		if(this.dependencies && this.dependencies.length > 0) {
-			return this.getSourceWithDependencies(this.dependencies, this.id);
-		}
+	getSourceForEmptyAsyncContext(id) {
+		return `function webpackEmptyAsyncContext(req) {
+	return new Promise(function(resolve, reject) { reject(new Error("Cannot find module '" + req + "'.")); });
+}
+webpackEmptyAsyncContext.keys = function() { return []; };
+webpackEmptyAsyncContext.resolve = webpackEmptyAsyncContext;
+module.exports = webpackEmptyAsyncContext;
+webpackEmptyAsyncContext.id = ${JSON.stringify(id)};`;
+	}
 
-		if(this.blocks && this.blocks.length > 0) {
-			return this.getSourceWithBlocks(this.blocks, this.id);
+	getSourceString(asyncMode, outputOptions, requestShortener) {
+		if(asyncMode === "lazy") {
+			if(this.blocks && this.blocks.length > 0) {
+				return this.getLazySource(this.blocks, this.id);
+			}
+			return this.getSourceForEmptyAsyncContext(this.id);
+		}
+		if(asyncMode === "eager") {
+			if(this.dependencies && this.dependencies.length > 0) {
+				return this.getEagerSource(this.dependencies, this.id);
+			}
+			return this.getSourceForEmptyAsyncContext(this.id);
+		} else if(asyncMode === "lazy-once") {
+			const block = this.blocks[0];
+			if(block) {
+				return this.getLazyOnceSource(block, block.dependencies, this.id, outputOptions, requestShortener);
+			}
+			return this.getSourceForEmptyAsyncContext(this.id);
+		}
+		if(this.dependencies && this.dependencies.length > 0) {
+			return this.getSyncSource(this.dependencies, this.id);
 		}
-
 		return this.getSourceForEmptyContext(this.id);
 	}
 
@@ -238,9 +338,9 @@ webpackEmptyContext.id = ${JSON.stringify(id)};`;
 		return new RawSource(sourceString);
 	}
 
-	source() {
+	source(dependencyTemplates, outputOptions, requestShortener) {
 		return this.getSource(
-			this.getSourceString()
+			this.getSourceString(this.async, outputOptions, requestShortener)
 		);
 	}
 

package/lib/DelegatedModule.js

@@ -37,7 +37,7 @@ class DelegatedModule extends Module {
 
 	build(options, compilation, resolver, fs, callback) {
 		this.built = true;
-		this.builtTime = new Date().getTime();
+		this.builtTime = Date.now();
 		this.usedExports = true;
 		this.providedExports = this.delegateData.exports || true;
 		this.dependencies.length = 0;
@@ -67,6 +67,8 @@ class DelegatedModule extends Module {
 					str += `[${JSON.stringify(this.request)}]`;
 					break;
 			}
+
+			str += ";";
 		}
 
 		if(this.useSourceMap) {

package/lib/ExternalModule.js

@@ -35,7 +35,7 @@ class ExternalModule extends Module {
 	}
 
 	build(options, compilation, resolver, fs, callback) {
-		this.builtTime = new Date().getTime();
+		this.builtTime = Date.now();
 		callback();
 	}
 

package/lib/FunctionModuleTemplatePlugin.js

@@ -28,7 +28,7 @@ class FunctionModuleTemplatePlugin {
 				if(Array.isArray(module.providedExports))
 					source.add("/* exports provided: " + module.providedExports.join(", ") + " */\n");
 				else if(module.providedExports)
-					source.add("/* unknown exports provided */\n");
+					source.add("/* no static exports found */\n");
 				if(Array.isArray(module.usedExports))
 					source.add("/* exports used: " + module.usedExports.join(", ") + " */\n");
 				else if(module.usedExports)

package/lib/HotModuleReplacement.runtime.js

@@ -578,6 +578,8 @@ module.exports = function() {
 		}
 
 		hotSetStatus("idle");
-		return Promise.resolve(outdatedModules);
+		return new Promise(function(resolve) {
+			resolve(outdatedModules);
+		});
 	}
 };

package/lib/IgnorePlugin.js

@@ -16,7 +16,7 @@ class IgnorePlugin {
 	 * Only returns true if a "resourceRegExp" exists
 	 * and the resource given matches the regexp.
 	 */
-	checkResouce(resource) {
+	checkResource(resource) {
 		if(!this.resourceRegExp) {
 			return false;
 		}
@@ -45,7 +45,7 @@ class IgnorePlugin {
 		if(!result) {
 			return true;
 		}
-		return this.checkResouce(result.request) && this.checkContext(result.context);
+		return this.checkResource(result.request) && this.checkContext(result.context);
 	}
 
 	checkIgnore(result, callback) {