Merge pull request #9425 from webpack/bugfix/no-resolve-options

fix #9424
webpack · Jul 17, 2019 · 4cac066 · 4cac066
2 parents 95d21bb + 1f966eb
commit 4cac066
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/ResolverFactory.js b/lib/ResolverFactory.js
@@ -10,6 +10,8 @@ const { cachedCleverMerge } = require("./util/cleverMerge");
 
 /** @typedef {import("enhanced-resolve").Resolver} Resolver */
 
+const EMTPY_RESOLVE_OPTIONS = {};
+
 module.exports = class ResolverFactory extends Tapable {
 	constructor() {
 		super();
@@ -40,13 +42,11 @@ module.exports = class ResolverFactory extends Tapable {
 				return true;
 			}
 		});
-		this.cache1 = new WeakMap();
 		this.cache2 = new Map();
 	}
 
 	get(type, resolveOptions) {
-		const cachedResolver = this.cache1.get(resolveOptions);
-		if (cachedResolver) return cachedResolver();
+		resolveOptions = resolveOptions || EMTPY_RESOLVE_OPTIONS;
 		const ident = `${type}|${JSON.stringify(resolveOptions)}`;
 		const resolver = this.cache2.get(ident);
 		if (resolver) return resolver;