use module.unsafeCache only for node_modules

remove unsafe resolve cache remainings

Author: sokra

lib/NormalModuleFactory.js

@@ -78,10 +78,11 @@ class NormalModuleFactory {
 		});
 		this.resolverFactory = resolverFactory;
 		this.ruleSet = new RuleSet(options.defaultRules.concat(options.rules));
+		this.unsafeCache = !!options.unsafeCache;
 		this.cachePredicate =
 			typeof options.unsafeCache === "function"
 				? options.unsafeCache
-				: Boolean.bind(null, options.unsafeCache);
+				: () => true;
 		this.context = context || "";
 		this.parserCache = Object.create(null);
 		this.generatorCache = Object.create(null);
@@ -333,8 +334,10 @@ class NormalModuleFactory {
 
 	create(data, callback) {
 		const dependencies = data.dependencies;
-		const cacheEntry = dependencyCache.get(dependencies[0]);
-		if (cacheEntry) return callback(null, cacheEntry);
+		if (this.unsafeCache) {
+			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;
 		const request = dependencies[0].request;
@@ -361,7 +364,7 @@ class NormalModuleFactory {
 				factory(result, (err, module) => {
 					if (err) return callback(err);
 
-					if (module && this.cachePredicate(module)) {
+					if (this.unsafeCache && module && this.cachePredicate(module)) {
 						for (const d of dependencies) {
 							dependencyCache.set(d, module);
 						}

lib/WebpackOptionsDefaulter.js

@@ -6,10 +6,11 @@
 "use strict";
 
 const path = require("path");
-
 const OptionsDefaulter = require("./OptionsDefaulter");
 const Template = require("./Template");
 
+const NODE_MODULES_REGEXP = /[\\/]node_modules[\\/]/i;
+
 const isProductionLikeMode = options => {
 	return options.mode === "production" || !options.mode;
 };
@@ -78,7 +79,14 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("module.wrappedContextCritical", false);
 		this.set("module.strictExportPresence", false);
 		this.set("module.strictThisContextOnImports", false);
-		this.set("module.unsafeCache", "make", options => !!options.cache);
+		this.set("module.unsafeCache", "make", options => {
+			if (options.cache) {
+				return module => {
+					const name = module.nameForCondition();
+					return name && NODE_MODULES_REGEXP.test(name);
+				};
+			}
+		});
 		this.set("module.rules", []);
 		this.set("module.defaultRules", "make", options => [
 			{
@@ -273,7 +281,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		});
 		this.set("optimization.splitChunks.cacheGroups.defaultVendors", {
 			automaticNamePrefix: "vendors",
-			test: /[\\/]node_modules[\\/]/,
+			test: NODE_MODULES_REGEXP,
 			priority: -10
 		});
 		this.set("optimization.runtimeChunk", "call", value => {
@@ -360,24 +368,11 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 				return ["module", "main"];
 			}
 		});
-		this.set("resolve.cacheWithContext", "make", options => {
-			return (
-				Array.isArray(options.resolve.plugins) &&
-				options.resolve.plugins.length > 0
-			);
-		});
 
 		this.set("resolveLoader", "call", value => Object.assign({}, value));
-		this.set("resolveLoader.unsafeCache", true);
 		this.set("resolveLoader.mainFields", ["loader", "main"]);
 		this.set("resolveLoader.extensions", [".js", ".json"]);
 		this.set("resolveLoader.mainFiles", ["index"]);
-		this.set("resolveLoader.cacheWithContext", "make", options => {
-			return (
-				Array.isArray(options.resolveLoader.plugins) &&
-				options.resolveLoader.plugins.length > 0
-			);
-		});
 	}
 }