test strict mode

sokra · sokra · commit e83e9b8c233e · 2016-05-06T10:44:31.000+02:00
enable strict mode if import/export is used
diff --git a/lib/FunctionModuleTemplatePlugin.js b/lib/FunctionModuleTemplatePlugin.js
@@ -16,7 +16,7 @@ FunctionModuleTemplatePlugin.prototype.apply = function(moduleTemplate) {
 			defaultArguments.push("__webpack_require__");
 		}
 		source.add("/***/ function(" + defaultArguments.concat(module.arguments || []).join(", ") + ") {\n\n");
-		if(module.strict) source.add("\"use strict\";\n");
+		if(module.strict) source.add(this.outputOptions.sourcePrefix + "\"use strict\";\n");
 		source.add(new PrefixSource(this.outputOptions.sourcePrefix, moduleSource));
 		source.add("\n\n/***/ }");
 		return source;
diff --git a/lib/dependencies/HarmonyExportDependencyParserPlugin.js b/lib/dependencies/HarmonyExportDependencyParserPlugin.js
@@ -16,6 +16,7 @@ module.exports = AbstractPlugin.create({
 		dep.loc = statement.loc;
 		this.state.current.addDependency(dep);
 		this.state.module.meta.harmonyModule = true;
+		this.state.module.strict = true;
 		return true;
 	},
 	"export import": function(statement, source) {
@@ -24,12 +25,14 @@ module.exports = AbstractPlugin.create({
 		this.state.current.addDependency(dep);
 		this.state.lastHarmoryImport = dep;
 		this.state.module.meta.harmonyModule = true;
+		this.state.module.strict = true;
 		return true;
 	},
 	"export expression": function(statement, expr) {
 		var dep = new HarmonyExportExpressionDependency(this.state.module, expr.range, statement.range);
 		dep.loc = statement.loc;
 		this.state.current.addDependency(dep);
+		this.state.module.strict = true;
 		return true;
 	},
 	"export declaration": function() {},
diff --git a/lib/dependencies/HarmonyImportDependencyParserPlugin.js b/lib/dependencies/HarmonyImportDependencyParserPlugin.js
@@ -15,6 +15,7 @@ module.exports = AbstractPlugin.create({
 		dep.loc = statement.loc;
 		this.state.current.addDependency(dep);
 		this.state.lastHarmonyImport = dep;
+		this.state.module.strict = true;
 		return true;
 	},
 	"import specifier": function(statement, source, id, name) {
diff --git a/test/cases/parsing/strict-mode/abc.js b/test/cases/parsing/strict-mode/abc.js
@@ -0,0 +1,3 @@
+export default function() {
+	return typeof this;
+};
diff --git a/test/cases/parsing/strict-mode/index.js b/test/cases/parsing/strict-mode/index.js
@@ -0,0 +1,19 @@
+"use strict";
+define(["./abc"], function(abc) {
+	// AMD is used here, because it adds stuff to the top of the code
+	// we make sure to keep strict mode
+
+	var a = abc.default;
+
+	it("should keep strict mode", function() {
+		var x = (function() {
+			return this;
+		})();
+		(typeof x).should.be.eql("undefined");
+	});
+
+	it("should import modules in strict mode", function() {
+		a().should.be.eql("undefined");
+	});
+
+});

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ FunctionModuleTemplatePlugin.prototype.apply = function(moduleTemplate) {`
`16`	`16`	`defaultArguments.push("__webpack_require__");`
`17`	`17`	`}`
`18`	`18`	`source.add("/***/ function(" + defaultArguments.concat(module.arguments \|\| []).join(", ") + ") {\n\n");`
`19`		`- if(module.strict) source.add("\"use strict\";\n");`
	`19`	`+ if(module.strict) source.add(this.outputOptions.sourcePrefix + "\"use strict\";\n");`
`20`	`20`	`source.add(new PrefixSource(this.outputOptions.sourcePrefix, moduleSource));`
`21`	`21`	`source.add("\n\n/***/ }");`
`22`	`22`	`return source;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export default function() {`
	`2`	`+ return typeof this;`
	`3`	`+};`