webpack 5.5.1 → 5.6.0

package/lib/dependencies/HarmonyImportDependency.js

@@ -109,52 +109,18 @@ class HarmonyImportDependency extends ModuleDependency {
 			moduleGraph,
 			parentModule.buildMeta.strictHarmonyModule
 		);
-		switch (exportsType) {
-			case "default-only":
-				// It's has only a default export
-				if (ids.length > 0 && ids[0] !== "default") {
-					// In strict harmony modules we only support the default export
-					return [
-						new HarmonyLinkingError(
-							`Can't import the named export ${ids
-								.map(id => `'${id}'`)
-								.join(
-									"."
-								)} ${additionalMessage} from default-exporting module (only default export is available)`
-						)
-					];
-				}
-				return;
-			case "default-with-named":
-				// It has a default export and named properties redirect
-				// In some cases we still want to warn here
-				if (
-					ids.length > 0 &&
-					ids[0] !== "default" &&
-					importedModule.buildMeta.defaultObject === "redirect-warn"
-				) {
-					// For these modules only the default export is supported
-					return [
-						new HarmonyLinkingError(
-							`Should not import the named export ${ids
-								.map(id => `'${id}'`)
-								.join(
-									"."
-								)} ${additionalMessage} from default-exporting module (only default export is available soon)`
-						)
-					];
-				}
+		if (exportsType === "namespace" || exportsType === "default-with-named") {
+			if (ids.length === 0) {
 				return;
-			case "namespace": {
-				if (ids.length === 0) {
-					return;
-				}
+			}
 
-				if (moduleGraph.isExportProvided(importedModule, ids) !== false) {
-					// It's provided or we are not sure
-					return;
-				}
+			if (
+				(exportsType !== "default-with-named" || ids[0] !== "default") &&
+				moduleGraph.isExportProvided(importedModule, ids) === false
+			) {
+				// We are sure that it's not provided
 
+				// Try to provide detailed info in the error message
 				let pos = 0;
 				let exportsInfo = moduleGraph.getExportsInfo(importedModule);
 				while (pos < ids.length && exportsInfo) {
@@ -180,7 +146,7 @@ class HarmonyImportDependency extends ModuleDependency {
 					exportsInfo = exportInfo.getNestedExportsInfo();
 				}
 
-				// We are sure that it's not provided
+				// General error message
 				return [
 					new HarmonyLinkingError(
 						`export ${ids
@@ -192,6 +158,43 @@ class HarmonyImportDependency extends ModuleDependency {
 				];
 			}
 		}
+		switch (exportsType) {
+			case "default-only":
+				// It's has only a default export
+				if (ids.length > 0 && ids[0] !== "default") {
+					// In strict harmony modules we only support the default export
+					return [
+						new HarmonyLinkingError(
+							`Can't import the named export ${ids
+								.map(id => `'${id}'`)
+								.join(
+									"."
+								)} ${additionalMessage} from default-exporting module (only default export is available)`
+						)
+					];
+				}
+				break;
+			case "default-with-named":
+				// It has a default export and named properties redirect
+				// In some cases we still want to warn here
+				if (
+					ids.length > 0 &&
+					ids[0] !== "default" &&
+					importedModule.buildMeta.defaultObject === "redirect-warn"
+				) {
+					// For these modules only the default export is supported
+					return [
+						new HarmonyLinkingError(
+							`Should not import the named export ${ids
+								.map(id => `'${id}'`)
+								.join(
+									"."
+								)} ${additionalMessage} from default-exporting module (only default export is available soon)`
+						)
+					];
+				}
+				break;
+		}
 	}
 
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.5.1",
+  "version": "5.6.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",