Merge pull request #9260 from webpack/fix-9044

fix(mjs): remove harmony unused build errors
webpack · Jun 12, 2019 · 55f18f9 · 55f18f9
2 parents acf2c2d + 8d5ad83
commit 55f18f9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/lib/dependencies/HarmonyExportImportedSpecifierDependency.js b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
@@ -355,15 +355,13 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 			// It's not an harmony module
 			if (
 				this.originModule.buildMeta.strictHarmonyModule &&
+				this._id &&
 				this._id !== "default"
 			) {
 				// In strict harmony modules we only support the default export
-				const exportName = this._id
-					? `the named export '${this._id}'`
-					: "the namespace object";
 				return [
 					new HarmonyLinkingError(
-						`Can't reexport ${exportName} from non EcmaScript module (only default export is available)`
+						`Can't reexport the named export '${this._id}' from non EcmaScript module (only default export is available)`
 					)
 				];
 			}

diff --git a/lib/dependencies/HarmonyImportSpecifierDependency.js b/lib/dependencies/HarmonyImportSpecifierDependency.js
@@ -80,15 +80,13 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 			// It's not an harmony module
 			if (
 				this.originModule.buildMeta.strictHarmonyModule &&
+				this._id &&
 				this._id !== "default"
 			) {
 				// In strict harmony modules we only support the default export
-				const exportName = this._id
-					? `the named export '${this._id}'`
-					: "the namespace object";
 				return [
 					new HarmonyLinkingError(
-						`Can't import ${exportName} from non EcmaScript module (only default export is available)`
+						`Can't import the named export '${this._id}' from non EcmaScript module (only default export is available)`
 					)
 				];
 			}

diff --git a/test/cases/mjs/cjs-import-default/errors.js b/test/cases/mjs/cjs-import-default/errors.js
@@ -1,19 +1,10 @@
 module.exports = [
-	[
-		/Can't import the namespace object from non EcmaScript module \(only default export is available\)/
-	],
-	[
-		/Can't import the namespace object from non EcmaScript module \(only default export is available\)/
-	],
 	[
 		/Can't import the named export 'data' from non EcmaScript module \(only default export is available\)/
 	],
 	[
 		/Can't import the named export 'data' from non EcmaScript module \(only default export is available\)/
 	],
-	[
-		/Can't reexport the namespace object from non EcmaScript module \(only default export is available\)/
-	],
 	[
 		/Can't reexport the named export 'data' from non EcmaScript module \(only default export is available\)/
 	]