Add strictExportPresence option

Timer · Timer · commit fa47a391078f · 2017-02-22T21:06:43.000-05:00
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -27,6 +27,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("module.wrappedContextRegExp", /.*/);
 		this.set("module.wrappedContextRecursive", true);
 		this.set("module.wrappedContextCritical", false);
+		this.set("module.strictExportPresence", false);
 
 		this.set("module.unsafeCache", true);
 
diff --git a/lib/dependencies/HarmonyImportDependencyParserPlugin.js b/lib/dependencies/HarmonyImportDependencyParserPlugin.js
@@ -11,6 +11,10 @@ const HarmonyAcceptDependency = require("./HarmonyAcceptDependency");
 const HarmonyModulesHelpers = require("./HarmonyModulesHelpers");
 
 module.exports = class HarmonyImportDependencyParserPlugin {
+	constructor(moduleOptions) {
+		this.strictExportPresence = moduleOptions.strictExportPresence;
+	}
+
 	apply(parser) {
 		parser.plugin("import", (statement, source) => {
 			const dep = new HarmonyImportDependency(source, HarmonyModulesHelpers.getNewModuleVar(parser.state, source), statement.range);
@@ -29,7 +33,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 		parser.plugin("expression imported var", (expr) => {
 			const name = expr.name;
 			const settings = parser.state.harmonySpecifier[`$${name}`];
-			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], settings[2], name, expr.range);
+			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], settings[2], name, expr.range, this.strictExportPresence);
 			dep.shorthand = parser.scope.inShorthand;
 			dep.directImport = true;
 			dep.loc = expr.loc;
@@ -41,7 +45,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			const settings = parser.state.harmonySpecifier[`$${name}`];
 			if(settings[2] !== null)
 				return false;
-			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], expr.property.name || expr.property.value, name, expr.range);
+			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], expr.property.name || expr.property.value, name, expr.range, this.strictExportPresence);
 			dep.shorthand = parser.scope.inShorthand;
 			dep.directImport = false;
 			dep.loc = expr.loc;
@@ -54,7 +58,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			expr = expr.callee;
 			const name = expr.name;
 			const settings = parser.state.harmonySpecifier[`$${name}`];
-			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], settings[2], name, expr.range);
+			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], settings[2], name, expr.range, this.strictExportPresence);
 			dep.directImport = true;
 			dep.callArgs = args;
 			dep.call = fullExpr;
diff --git a/lib/dependencies/HarmonyImportSpecifierDependency.js b/lib/dependencies/HarmonyImportSpecifierDependency.js
@@ -6,13 +6,14 @@
 const NullDependency = require("./NullDependency");
 
 class HarmonyImportSpecifierDependency extends NullDependency {
-	constructor(importDependency, importedVar, id, name, range) {
+	constructor(importDependency, importedVar, id, name, range, strictExportPresence) {
 		super();
 		this.importDependency = importDependency;
 		this.importedVar = importedVar;
 		this.id = id;
 		this.name = name;
 		this.range = range;
+		this.strictExportPresence = strictExportPresence;
 	}
 
 	get type() {
@@ -28,6 +29,20 @@ class HarmonyImportSpecifierDependency extends NullDependency {
 	}
 
 	getWarnings() {
+		if(this.strictExportPresence) {
+			return [];
+		}
+		return this._getErrors();
+	}
+
+	getErrors() {
+		if(this.strictExportPresence) {
+			return this._getErrors();
+		}
+		return [];
+	}
+
+	_getErrors() {
 		const importedModule = this.importDependency.module;
 		if(!importedModule || !importedModule.meta || !importedModule.meta.harmonyModule) {
 			return;
diff --git a/lib/dependencies/HarmonyModulesPlugin.js b/lib/dependencies/HarmonyModulesPlugin.js
@@ -20,6 +20,9 @@ const HarmonyImportDependencyParserPlugin = require("./HarmonyImportDependencyPa
 const HarmonyExportDependencyParserPlugin = require("./HarmonyExportDependencyParserPlugin");
 
 class HarmonyModulesPlugin {
+	constructor(options) {
+		this.options = options;
+	}
 
 	apply(compiler) {
 		compiler.plugin("compilation", (compilation, params) => {
@@ -59,7 +62,7 @@ class HarmonyModulesPlugin {
 
 				parser.apply(
 					new HarmonyDetectionParserPlugin(),
-					new HarmonyImportDependencyParserPlugin(),
+					new HarmonyImportDependencyParserPlugin(this.options),
 					new HarmonyExportDependencyParserPlugin()
 				);
 			});
diff --git a/schemas/webpackOptionsSchema.json b/schemas/webpackOptionsSchema.json
@@ -218,6 +218,9 @@
         },
         "wrappedContextRegExp": {
           "instanceof": "RegExp"
+        },
+        "strictExportPresence": {
+          "type": "boolean"
         }
       },
       "type": "object"
