Merge pull request webpack#6183 from ooflorent/resolver_deprecations

sokra · web-flow · commit 48a9af1fee3d · 2017-12-23T08:16:41.000+01:00
Do not use deprecated features of enhanced-resolve
diff --git a/lib/ContextModuleFactory.js b/lib/ContextModuleFactory.js
@@ -77,14 +77,14 @@ module.exports = class ContextModuleFactory extends Tapable {
 
 			asyncLib.parallel([
 				callback => {
-					contextResolver.resolve({}, context, resource, (err, result) => {
+					contextResolver.resolve({}, context, resource, {}, (err, result) => {
 						if(err) return callback(err);
 						callback(null, result);
 					});
 				},
 				callback => {
 					asyncLib.map(loaders, (loader, callback) => {
-						loaderResolver.resolve({}, context, loader, (err, result) => {
+						loaderResolver.resolve({}, context, loader, {}, (err, result) => {
 							if(err) return callback(err);
 							callback(null, result);
 						});
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -160,7 +160,7 @@ class NormalModuleFactory extends Tapable {
 						});
 					}
 
-					normalResolver.resolve(contextInfo, context, resource, (err, resource, resourceResolveData) => {
+					normalResolver.resolve(contextInfo, context, resource, {}, (err, resource, resourceResolveData) => {
 						if(err) return callback(err);
 						callback(null, {
 							resourceResolveData,
@@ -302,9 +302,9 @@ class NormalModuleFactory extends Tapable {
 	resolveRequestArray(contextInfo, context, array, resolver, callback) {
 		if(array.length === 0) return callback(null, []);
 		asyncLib.map(array, (item, callback) => {
-			resolver.resolve(contextInfo, context, item.loader, (err, result) => {
+			resolver.resolve(contextInfo, context, item.loader, {}, (err, result) => {
 				if(err && /^[^/]*$/.test(item.loader) && !/-loader$/.test(item.loader)) {
-					return resolver.resolve(contextInfo, context, item.loader + "-loader", err2 => {
+					return resolver.resolve(contextInfo, context, item.loader + "-loader", {}, err2 => {
 						if(!err2) {
 							err.message = err.message + "\n" +
 								"BREAKING CHANGE: It's no longer allowed to omit the '-loader' suffix when using loaders.\n" +
diff --git a/test/statsCases/resolve-plugin-context/ResolvePackageFromRootPlugin.js b/test/statsCases/resolve-plugin-context/ResolvePackageFromRootPlugin.js
@@ -25,22 +25,22 @@ module.exports = class ResolvePackageFromRootPlugin {
 				return callback(null, originalResolved)
 			}
 
-			resolver.doResolve("resolve", {
+			resolver.doResolve(resolver.hooks.resolve, {
 				context: {},
 				path: originalResolved.context.issuer,
 				request: originalResolved.context.issuer
-			}, `resolve issuer of ${originalResolved.path}`, (err, issuer) => {
+			}, `resolve issuer of ${originalResolved.path}`, {}, (err, issuer) => {
 				if (err) {
 					return callback(null, originalResolved);
 				}
 
 				const moduleRequestPath = originalResolved.path.replace(replaceNodeModuleRegex, "");
 
-				resolver.doResolve("resolve", {
+				resolver.doResolve(resolver.hooks.resolve, {
 					context: {},
 					path: this.rootPath,
 					request: moduleRequestPath
-				}, `resolve ${moduleRequestPath} in ${this.rootPath}`, (err, resolvedInParentContext) => {
+				}, `resolve ${moduleRequestPath} in ${this.rootPath}`, {}, (err, resolvedInParentContext) => {
 					if (err) {
 						return callback(null, originalResolved);
 					}
