Merge pull request webpack#7348 from webpack/refactor/nmf_cache

sokra · web-flow · commit 8adaa749e398 · 2018-05-23T21:46:08.000+02:00
Use a WeakMap instead of mutating objects in NMF
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -46,6 +46,8 @@ const identToLoaderRequest = resultString => {
 	}
 };
 
+const dependencyCache = new WeakMap();
+
 class NormalModuleFactory extends Tapable {
 	constructor(context, resolverFactory, options) {
 		super();
@@ -329,7 +331,7 @@ class NormalModuleFactory extends Tapable {
 
 	create(data, callback) {
 		const dependencies = data.dependencies;
-		const cacheEntry = dependencies[0].__NormalModuleFactoryCache;
+		const cacheEntry = dependencyCache.get(dependencies[0]);
 		if (cacheEntry) return callback(null, cacheEntry);
 		const context = data.context || this.context;
 		const resolveOptions = data.resolveOptions || EMPTY_RESOLVE_OPTIONS;
@@ -359,7 +361,7 @@ class NormalModuleFactory extends Tapable {
 
 					if (module && this.cachePredicate(module)) {
 						for (const d of dependencies) {
-							d.__NormalModuleFactoryCache = module;
+							dependencyCache.set(d, module);
 						}
 					}
 
