Store relative path cache on compilation to avoid leaking memory.

asolove · asolove · commit 3f1b7e624c41 · 2017-07-17T23:06:59.000-06:00
diff --git a/lib/optimize/AggressiveSplittingPlugin.js b/lib/optimize/AggressiveSplittingPlugin.js
@@ -56,7 +56,7 @@ class AggressiveSplittingPlugin {
 
 						const nameToModuleMap = new Map();
 						chunk.forEachModule(m => {
-							const name = identifierUtils.makePathsRelative(compiler.context, m.identifier());
+							const name = identifierUtils.makePathsRelative(compiler.context, m.identifier(), compilation.cache);
 							nameToModuleMap.set(name, m);
 						});
 
@@ -127,7 +127,7 @@ class AggressiveSplittingPlugin {
 							newChunk.origins = chunk.origins.map(copyWithReason);
 							chunk.origins = chunk.origins.map(copyWithReason);
 							compilation._aggressiveSplittingSplits = (compilation._aggressiveSplittingSplits || []).concat({
-								modules: newChunk.mapModules(m => identifierUtils.makePathsRelative(compiler.context, m.identifier()))
+								modules: newChunk.mapModules(m => identifierUtils.makePathsRelative(compiler.context, m.identifier(), compilation.cache))
 							});
 							return true;
 						} else {
@@ -144,7 +144,7 @@ class AggressiveSplittingPlugin {
 					if(chunk.hasEntryModule()) return;
 					const size = chunk.size(this.options);
 					const incorrectSize = size < minSize;
-					const modules = chunk.mapModules(m => identifierUtils.makePathsRelative(compiler.context, m.identifier()));
+					const modules = chunk.mapModules(m => identifierUtils.makePathsRelative(compiler.context, m.identifier(), compilation.cache));
 					if(typeof chunk._fromAggressiveSplittingIndex === "undefined") {
 						if(incorrectSize) return;
 						chunk.recorded = true;
diff --git a/lib/util/identifier.js b/lib/util/identifier.js
@@ -7,10 +7,18 @@ const looksLikeAbsolutePath = (maybeAbsolutePath) => {
 
 const normalizePathSeparator = (p) => p.replace(/\\/g, "/");
 
-/* A map from context dir strings to maps from identifier names to relative paths */
-const relativePaths = new Map();
+const _makePathsRelative = (context, identifier) => {
+	return identifier
+		.split(/([|! ])/)
+		.map(str => looksLikeAbsolutePath(str) ?
+			normalizePathSeparator(path.relative(context, str)) : str)
+		.join("");
+}
 
-exports.makePathsRelative = (context, identifier) => {
+exports.makePathsRelative = (context, identifier, cache) => {
+	if(!cache) return _makePathsRelative(context, identifier);
+
+	const relativePaths = cache.relativePaths || (cache.relativePaths = new Map());
 	if(!relativePaths.has(context)) {
 		relativePaths.set(context, new Map());
 	}
@@ -20,11 +28,7 @@ exports.makePathsRelative = (context, identifier) => {
 	if(contextCache.has(identifier)) {
 		return contextCache.get(identifier);
 	} else {
-		var relativePath = identifier
-			.split(/([|! ])/)
-			.map(str => looksLikeAbsolutePath(str) ?
-				normalizePathSeparator(path.relative(context, str)) : str)
-			.join("");
+		let relativePath = _makePathsRelative(context, identifier);
 		contextCache.set(identifier, relativePath);
 		return relativePath;
 	}
