fix for local modules

Janpot · Janpot · commit dccd8624ed7f · 2018-04-06T08:30:26.000+02:00
diff --git a/lib/dependencies/CommonJsRequireDependencyParserPlugin.js b/lib/dependencies/CommonJsRequireDependencyParserPlugin.js
@@ -74,7 +74,7 @@ class CommonJsRequireDependencyParserPlugin {
 				return true;
 			});
 
-		const handler = expr => {
+		const createHandler = ({ callNew = false }) => expr => {
 			if (expr.arguments.length !== 1) return;
 			let localModule;
 			const param = parser.evaluateExpression(expr.arguments[0]);
@@ -103,7 +103,7 @@ class CommonJsRequireDependencyParserPlugin {
 					param.string
 				))
 			) {
-				const dep = new LocalModuleDependency(localModule, expr.range);
+				const dep = new LocalModuleDependency(localModule, expr.range, callNew);
 				dep.loc = expr.loc;
 				parser.state.current.addDependency(dep);
 				return true;
@@ -121,10 +121,10 @@ class CommonJsRequireDependencyParserPlugin {
 		};
 		parser.hooks.call
 			.for("require")
-			.tap("CommonJsRequireDependencyParserPlugin", handler);
+			.tap("CommonJsRequireDependencyParserPlugin", createHandler({ callNew: false }));
 		parser.hooks.new
 			.for("require")
-			.tap("CommonJsRequireDependencyParserPlugin", handler);
+			.tap("CommonJsRequireDependencyParserPlugin", createHandler({ callNew: false }));
 	}
 }
 module.exports = CommonJsRequireDependencyParserPlugin;
diff --git a/lib/dependencies/LocalModuleDependency.js b/lib/dependencies/LocalModuleDependency.js
@@ -6,22 +6,31 @@
 const NullDependency = require("./NullDependency");
 
 class LocalModuleDependency extends NullDependency {
-	constructor(localModule, range) {
+	constructor(localModule, range, callNew) {
 		super();
 		localModule.flagUsed();
 		this.localModule = localModule;
 		this.range = range;
+		this.callNew = callNew;
 	}
 }
 
 LocalModuleDependency.Template = class LocalModuleDependencyTemplate {
 	apply(dep, source) {
 		if (!dep.range) return;
-		source.replace(
-			dep.range[0],
-			dep.range[1] - 1,
-			dep.localModule.variableName()
-		);
+		if (dep.callNew) {
+			source.replace(
+				dep.range[0],
+				dep.range[1] - 1,
+				`new (function () { return ${dep.localModule.variableName()}; })()`
+			);
+		} else {
+			source.replace(
+				dep.range[0],
+				dep.range[1] - 1,
+				dep.localModule.variableName()
+			);
+		}
 	}
 };
 
diff --git a/test/cases/parsing/issue-4940/index.js b/test/cases/parsing/issue-4940/index.js
@@ -37,8 +37,10 @@ it("should create dependency with 'new' on a local dependency (object export)",
 
 it("shouldn't fail with a local dependency (non-object export)", function() {
 	const sideEffect = require("local-side-effect");
-	new require("local-module-non-object");
+	const result = new require("local-module-non-object");
+	result.should.not.equal(1);
 	sideEffect.foo.should.equal("bar");
+	result.should.not.equal(require("local-module-non-object"));
 });
 
 it("should work with 'require' in parentheses", function () {
