Only create one RequestShortener per Compiler

sokra · sokra · commit 7d87f3426971 · 2017-12-04T12:23:42.000+01:00
move Compiler.context assignment into Compiler
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -170,6 +170,7 @@ class Compilation extends Tapable {
 		this.compiler = compiler;
 		this.resolverFactory = compiler.resolverFactory;
 		this.inputFileSystem = compiler.inputFileSystem;
+		this.requestShortener = compiler.requestShortener;
 
 		const options = this.options = compiler.options;
 		this.outputOptions = options && options.output;
@@ -181,8 +182,8 @@ class Compilation extends Tapable {
 		this.chunkTemplate = new ChunkTemplate(this.outputOptions);
 		this.hotUpdateChunkTemplate = new HotUpdateChunkTemplate(this.outputOptions);
 		this.moduleTemplates = {
-			javascript: new ModuleTemplate(this.outputOptions),
-			webassembly: new ModuleTemplate(this.outputOptions)
+			javascript: new ModuleTemplate(this.outputOptions, this.requestShortener),
+			webassembly: new ModuleTemplate(this.outputOptions, this.requestShortener)
 		};
 
 		this.semaphore = new Semaphore(options.parallelism || 100);
diff --git a/lib/Compiler.js b/lib/Compiler.js
@@ -18,6 +18,7 @@ const NormalModuleFactory = require("./NormalModuleFactory");
 const ContextModuleFactory = require("./ContextModuleFactory");
 const ResolverFactory = require("./ResolverFactory");
 
+const RequestShortener = require("./RequestShortener");
 const makePathsRelative = require("./util/identifier").makePathsRelative;
 
 class Watching {
@@ -174,7 +175,7 @@ class Watching {
 }
 
 class Compiler extends Tapable {
-	constructor() {
+	constructor(context) {
 		super();
 		this.hooks = {
 			shouldEmit: new SyncBailHook(["compilation"]),
@@ -321,6 +322,10 @@ class Compiler extends Tapable {
 		};
 
 		this.options = {};
+
+		this.context = context;
+
+		this.requestShortener = new RequestShortener(context);
 	}
 
 	watch(watchOptions, handler) {
@@ -515,7 +520,7 @@ class Compiler extends Tapable {
 	}
 
 	createChildCompiler(compilation, compilerName, compilerIndex, outputOptions, plugins) {
-		const childCompiler = new Compiler();
+		const childCompiler = new Compiler(this.context);
 		if(Array.isArray(plugins)) {
 			plugins.forEach(plugin => childCompiler.apply(plugin));
 		}
diff --git a/lib/FunctionModulePlugin.js b/lib/FunctionModulePlugin.js
@@ -5,17 +5,14 @@
 "use strict";
 
 const FunctionModuleTemplatePlugin = require("./FunctionModuleTemplatePlugin");
-const RequestShortener = require("./RequestShortener");
 
 class FunctionModulePlugin {
-	constructor(options, requestShortener) {
+	constructor(options) {
 		this.options = options;
-		this.requestShortener = requestShortener;
 	}
 
 	apply(compiler) {
 		compiler.plugin("compilation", (compilation) => {
-			compilation.moduleTemplates.javascript.requestShortener = this.requestShortener || new RequestShortener(compiler.context);
 			compilation.moduleTemplates.javascript.apply(new FunctionModuleTemplatePlugin());
 		});
 	}
diff --git a/lib/ModuleTemplate.js b/lib/ModuleTemplate.js
@@ -9,8 +9,9 @@ const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
 const SyncHook = require("tapable").SyncHook;
 
 module.exports = class ModuleTemplate extends Template {
-	constructor(outputOptions) {
+	constructor(outputOptions, requestShortener) {
 		super(outputOptions);
+		this.requestShortener = requestShortener;
 		this.hooks = {
 			content: new SyncWaterfallHook(["source", "module", "options", "dependencyTemplates"]),
 			module: new SyncWaterfallHook(["source", "module", "options", "dependencyTemplates"]),
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -5,7 +5,6 @@
 "use strict";
 
 const path = require("path");
-const RequestShortener = require("./RequestShortener");
 const ConcatSource = require("webpack-sources").ConcatSource;
 const RawSource = require("webpack-sources").RawSource;
 const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
@@ -74,7 +73,7 @@ class SourceMapDevToolPlugin {
 		const moduleFilenameTemplate = this.moduleFilenameTemplate;
 		const namespace = this.namespace;
 		const fallbackModuleFilenameTemplate = this.fallbackModuleFilenameTemplate;
-		const requestShortener = new RequestShortener(compiler.context);
+		const requestShortener = compiler.requestShortener;
 		const options = this.options;
 		options.test = options.test || /\.(js|css)($|\?)/i;
 
diff --git a/lib/Stats.js b/lib/Stats.js
@@ -96,8 +96,8 @@ class Stats {
 		};
 
 		const compilation = this.compilation;
-		const context = optionsOrFallback(options.context, process.cwd());
-		const requestShortener = new RequestShortener(context);
+		const context = optionsOrFallback(options.context, compilation.compiler.context);
+		const requestShortener = compilation.compiler.context === context ? compilation.requestShortener : new RequestShortener(context);
 		const showPerformance = optionOrLocalFallback(options.performance, true);
 		const showHash = optionOrLocalFallback(options.hash, true);
 		const showEnv = optionOrLocalFallback(options.env, false);
diff --git a/lib/webpack.js b/lib/webpack.js
@@ -24,8 +24,7 @@ const webpack = (options, callback) => {
 	} else if(typeof options === "object") {
 		options = new WebpackOptionsDefaulter().process(options);
 
-		compiler = new Compiler();
-		compiler.context = options.context;
+		compiler = new Compiler(options.context);
 		compiler.options = options;
 		new NodeEnvironmentPlugin().apply(compiler);
 		if(options.plugins && Array.isArray(options.plugins)) {
diff --git a/test/Stats.unittest.js b/test/Stats.unittest.js
@@ -11,14 +11,20 @@ describe("Stats", () => {
 			it("hasErrors", () => {
 				const mockStats = new Stats({
 					errors: ["firstError"],
-					hash: "1234"
+					hash: "1234",
+					compiler: {
+						context: ""
+					}
 				});
 				mockStats.hasErrors().should.be.ok();
 			});
 			it("hasWarnings", () => {
 				const mockStats = new Stats({
 					warnings: ["firstError"],
-					hash: "1234"
+					hash: "1234",
+					compiler: {
+						context: ""
+					}
 				});
 				mockStats.hasWarnings().should.be.ok();
 			});
@@ -27,14 +33,20 @@ describe("Stats", () => {
 			it("hasErrors", () => {
 				const mockStats = new Stats({
 					errors: [],
-					hash: "1234"
+					hash: "1234",
+					compiler: {
+						context: ""
+					}
 				});
 				mockStats.hasErrors().should.not.be.ok();
 			});
 			it("hasWarnings", () => {
 				const mockStats = new Stats({
 					warnings: [],
-					hash: "1234"
+					hash: "1234",
+					compiler: {
+						context: ""
+					}
 				});
 				mockStats.hasWarnings().should.not.be.ok();
 			});
@@ -51,6 +63,9 @@ describe("Stats", () => {
 				hash: "1234",
 				mainTemplate: {
 					getPublicPath: () => "path"
+				},
+				compiler: {
+					context: ""
 				}
 			});
 			const obj = mockStats.toJson();
