feat: allow default condition to be anywhere

webpack · Jun 4, 2024 · 5994a0f · 5994a0f
2 parents e389708 + 1213f32
commit 5994a0f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/lib/util/entrypoints.js b/lib/util/entrypoints.js
@@ -464,17 +464,11 @@ function conditionalMapping(conditionalMapping_, conditionNames) {
 
 	loop: while (lookup.length > 0) {
 		const [mapping, conditions, j] = lookup[lookup.length - 1];
-		const last = conditions.length - 1;
 
 		for (let i = j; i < conditions.length; i++) {
 			const condition = conditions[i];
 
-			// assert default. Could be last only
-			if (i !== last) {
-				if (condition === "default") {
-					throw new Error("Default condition should be last one");
-				}
-			} else if (condition === "default") {
+			if (condition === "default") {
 				const innerMapping = mapping[condition];
 				// is nested
 				if (isConditionalMapping(innerMapping)) {

diff --git a/test/exportsField.test.js b/test/exportsField.test.js
@@ -543,7 +543,7 @@ describe("Process exports field", function exportsField() {
 		},
 		{
 			name: "Direct mapping #7",
-			expect: new Error(), // Default is first one
+			expect: ["./src/index.js"], // Default is first one
 			suite: [
 				{
 					".": {

diff --git a/test/importsField.test.js b/test/importsField.test.js
@@ -451,7 +451,7 @@ describe("Process imports field", function exportsField() {
 		},
 		{
 			name: "Direct mapping #7",
-			expect: new Error(), // Default is first one
+			expect: ["./src/index.js"], // Default is first one
 			suite: [
 				{
 					"#a": {
@@ -1309,7 +1309,6 @@ describe("ImportsFieldPlugin", () => {
 				fs.rmdirSync(dir);
 				if (err) return done(err);
 				if (!result) return done(new Error("No result"));
-				console.log(result);
 				expect(result).toEqual(file);
 				done();
 			});