switched to ESM as default format

moonglum · FND · commit 510de0f6e3ce · 2023-01-16T10:35:58.000+01:00
NB: this constitutes a breaking change
diff --git a/lib/bundle/config.js b/lib/bundle/config.js
@@ -26,8 +26,8 @@ module.exports = generateConfig;
 // * `externals` determines which modules/packages to exclude from the bundle
 //   (e.g. `{ jquery: "jQuery" }` - the key refers to the respective
 //   module/package name, the value refers to a corresponding global variable)
-// * `format` determines the bundle format: ES, UMD, AMD, CommonJS or IIFE
-//    (case-insensitive, defaults to IIFE)
+// * `format` determines the bundle format: ESM, UMD, AMD, CommonJS or IIFE
+//    (case-insensitive, defaults to ESM)
 // * `exports` determines the bundle's API, as per the entry point's exported
 //   value (if any)
 // * `esnext`, if truthy, activates ESNext transpilation
@@ -137,7 +137,7 @@ function generateConfig({ extensions = [], // eslint-disable-next-line indent
 	});
 }
 
-function determineModuleFormat(format = "iife") {
+function determineModuleFormat(format = "esm") {
 	format = format.toLowerCase();
 	let _format = MODULE_FORMATS[format];
 	switch(_format) {
diff --git a/test/cli/test_basic/faucet.config.js b/test/cli/test_basic/faucet.config.js
@@ -5,8 +5,7 @@ let path = require("path");
 module.exports = {
 	js: [{
 		source: "./src/index.js",
-		target: "./dist/bundle.js",
-		format: "esm"
+		target: "./dist/bundle.js"
 	}],
 	plugins: [path.resolve(__dirname, "../../..")]
 };
diff --git a/test/cli/test_browserslist/faucet.config.js b/test/cli/test_browserslist/faucet.config.js
@@ -6,19 +6,16 @@ module.exports = {
 	js: [{
 		source: "./src/index.js",
 		target: "./dist/bundle.js",
-		format: "esm",
 		esnext: true
 	}, {
 		source: "./src/index.js",
 		target: "./dist/bundle_alt.js",
-		format: "esm",
 		esnext: {
 			browserslist: false
 		}
 	}, {
 		source: "./src/index.js",
 		target: "./dist/bundle_legacy.js",
-		format: "esm",
 		esnext: {
 			browserslist: "legacy"
 		}
diff --git a/test/cli/test_bundle_customization/faucet.config.js b/test/cli/test_bundle_customization/faucet.config.js
@@ -11,6 +11,7 @@ module.exports = {
 	}, {
 		source: "./src/index.js",
 		target: "./dist/bundle_iife.js",
+		format: "iife",
 		exports: "MYLIB"
 	}, {
 		source: "./src/index.js",
diff --git a/test/cli/test_compact/faucet.config.js b/test/cli/test_compact/faucet.config.js
@@ -5,8 +5,7 @@ let path = require("path");
 module.exports = {
 	js: [{
 		source: "./src/index.js",
-		target: "./dist/bundle.js",
-		format: "esm"
+		target: "./dist/bundle.js"
 	}],
 	plugins: [path.resolve(__dirname, "../../..")]
 };
diff --git a/test/cli/test_custom_config/assets.js b/test/cli/test_custom_config/assets.js
@@ -5,8 +5,7 @@ let path = require("path");
 module.exports = {
 	js: [{
 		source: "./index.js",
-		target: "./dist/bundle.js",
-		format: "esm"
+		target: "./dist/bundle.js"
 	}],
 	plugins: [path.resolve(__dirname, "../../..")]
 };
diff --git a/test/cli/test_fingerprinting/faucet.config.js b/test/cli/test_fingerprinting/faucet.config.js
@@ -5,12 +5,10 @@ let path = require("path");
 module.exports = {
 	js: [{
 		source: "./src/index.js",
-		target: "./dist/bundle.js",
-		format: "esm"
+		target: "./dist/bundle.js"
 	}, {
 		source: "./src/index.js",
 		target: "./dist/bundle_alt.js",
-		format: "esm",
 		fingerprint: false
 	}],
 	plugins: [path.resolve(__dirname, "../../..")]
diff --git a/test/cli/test_jsx/faucet.config.js b/test/cli/test_jsx/faucet.config.js
@@ -6,7 +6,6 @@ module.exports = {
 	js: [{
 		source: "./src/index.jsx",
 		target: "./dist/bundle.js",
-		format: "esm",
 		esnext: true,
 		jsx: {
 			pragma: "createElement",
diff --git a/test/cli/test_mangle/faucet.config.js b/test/cli/test_mangle/faucet.config.js
@@ -6,7 +6,6 @@ module.exports = {
 	js: [{
 		source: "./src/index.js",
 		target: "./dist/bundle.js",
-		format: "esm",
 		compact: "mangle"
 	}],
 	plugins: [path.resolve(__dirname, "../../..")]
diff --git a/test/cli/test_manifest/expected.json b/test/cli/test_manifest/expected.json
@@ -1 +1 @@
-{"dist/bundle.js":"/assets/dist/bundle-7a1db6adc4ef815c9557d95c82779a74.js"}
+{"dist/bundle.js":"/assets/dist/bundle-68b329da9893e34099c7d8ad5cb9c940.js"}
diff --git a/test/cli/test_manifest_uris/expected.json b/test/cli/test_manifest_uris/expected.json
@@ -1,4 +1,4 @@
 {
-	"dist/foo.js":"/assets/foo-71338920f697ae7208a107c326809bc1.js",
-	"dist/bar.js":"/assets/bar-0ddcb0327775137fe4fe372149de7e88.js"
+	"dist/foo.js":"/assets/foo-68ae39f9849df247bf6a66d6c48e0657.js",
+	"dist/bar.js":"/assets/bar-f5b24f8d7d02d59132cf968924b602a0.js"
 }
diff --git a/test/cli/test_minify/faucet.config.js b/test/cli/test_minify/faucet.config.js
@@ -6,7 +6,6 @@ module.exports = {
 	js: [{
 		source: "./src/index.js",
 		target: "./dist/bundle.js",
-		format: "esm",
 		compact: "minify"
 	}],
 	plugins: [path.resolve(__dirname, "../../..")]
diff --git a/test/cli/test_multi/faucet.config.js b/test/cli/test_multi/faucet.config.js
@@ -5,12 +5,10 @@ let path = require("path");
 module.exports = {
 	js: [{
 		source: "./src/foo.js",
-		target: "./dist/foo.js",
-		format: "esm"
+		target: "./dist/foo.js"
 	}, {
 		source: "./src/bar.js",
 		target: "./dist/bar.js",
-		format: "esm",
 		esnext: true
 	}],
 	manifest: {
diff --git a/test/cli/test_sourcemap/faucet.config.js b/test/cli/test_sourcemap/faucet.config.js
@@ -5,8 +5,7 @@ let path = require("path");
 module.exports = {
 	js: [{
 		source: "./src/index.js",
-		target: "./dist/bundle.js",
-		format: "esm"
+		target: "./dist/bundle.js"
 	}],
 	plugins: [path.resolve(__dirname, "../../..")]
 };
diff --git a/test/cli/test_transpilation/faucet.config.js b/test/cli/test_transpilation/faucet.config.js
@@ -6,7 +6,6 @@ module.exports = {
 	js: [{
 		source: "./src/index.js",
 		target: "./dist/bundle.js",
-		format: "esm",
 		esnext: true
 	}],
 	plugins: [path.resolve(__dirname, "../../..")]
diff --git a/test/cli/test_typescript/expected.js b/test/cli/test_typescript/expected.js
@@ -1,6 +1,3 @@
-(function () {
-'use strict';
-
 var LogLevel;
 (function (LogLevel) {
     LogLevel[LogLevel["Debug"] = 0] = "Debug";
@@ -31,5 +28,3 @@ generateArticle({
     },
     authors: ["foo", "bar"]
 });
-
-})();
diff --git a/test/unit/test_bundling.js b/test/unit/test_bundling.js
@@ -46,7 +46,7 @@ describe("bundling", _ => {
 var util = "UTIL";
 
 console.log(\`[…] $\{util}\`); // eslint-disable-line no-console
-					`.trim())
+					`)
 				}]);
 			});
 	});
@@ -67,7 +67,7 @@ console.log(\`[…] $\{util}\`); // eslint-disable-line no-console
 var util = "UTIL";
 
 console.log("[\\u2026] ".concat(util)); // eslint-disable-line no-console
-					`.trim())
+					`)
 				}]);
 			});
 	});
@@ -112,7 +112,7 @@ var MYLIB = "MY-LIB";
 var MYLIB = dist.exports;
 
 console.log("[\\u2026] ".concat(MYLIB)); // eslint-disable-line no-console
-					`.trim())
+					`)
 					/* eslint-enable max-len */
 				}]);
 			});
@@ -134,7 +134,7 @@ console.log("[\\u2026] ".concat(MYLIB)); // eslint-disable-line no-console
 var helper = { foo: "lorem", bar: "ipsum" };
 
 console.log(\`[…] $\{helper}\`); // eslint-disable-line no-console
-					`.trim())
+					`)
 				}]);
 			});
 	});
@@ -151,15 +151,15 @@ console.log(\`[…] $\{helper}\`); // eslint-disable-line no-console
 			then(_ => {
 				assetManager.assertWrites([{
 					filepath: path.resolve(FIXTURES_DIR, "./dist/bundle.js"),
-					content: "var MYLIB = " + makeBundle(`
+					content: makeBundle(`
 var util = "UTIL";
 
 var lib = msg => {
 	console.log(\`[…] $\{util} $\{msg}\`); // eslint-disable-line no-console
 };
 
-return lib;
-					`.trim())
+export { lib as default };
+					`)
 				}]);
 			});
 	});
@@ -176,7 +176,7 @@ return lib;
 			then(_ => {
 				assetManager.assertWrites([{
 					filepath: path.resolve(FIXTURES_DIR, "./dist/bundle.js"),
-					content: `
+					content: makeBundle(`
 define((function () { 'use strict';
 
 var util = "UTIL";
@@ -188,7 +188,7 @@ var lib = msg => {
 return lib;
 
 }));
-					`.trim() + "\n"
+					`)
 				}]);
 			});
 	});
@@ -208,7 +208,7 @@ return lib;
 var MYLIB = "MY-LIB";
 
 console.log(\`[…] $\{MYLIB}\`); // eslint-disable-line no-console
-					`.trim())
+					`)
 				}]);
 			});
 	});
@@ -225,18 +225,11 @@ console.log(\`[…] $\{MYLIB}\`); // eslint-disable-line no-console
 			then(_ => {
 				assetManager.assertWrites([{
 					filepath: path.resolve(FIXTURES_DIR, "./dist/bundle.js"),
-					content: `
-(function (MYLIB) {
-'use strict';
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var MYLIB__default = /*#__PURE__*/_interopDefaultLegacy(MYLIB);
-
-console.log(\`[…] $\{MYLIB__default["default"]}\`); // eslint-disable-line no-console
+					content: makeBundle(`
+import MYLIB from 'my-lib';
 
-})(MYLIB);
-					`.trim() + "\n"
+console.log(\`[…] $\{MYLIB}\`); // eslint-disable-line no-console
+					`)
 				}]);
 			});
 	});
@@ -258,7 +251,7 @@ console.log(\`[…] $\{MYLIB__default["default"]}\`); // eslint-disable-line no-
 var util = "UTIL";
 
 console.log(\`[…] $\{util}\`); // eslint-disable-line no-console
-					`.trim())
+					`)
 				}]);
 			});
 	});
@@ -282,7 +275,7 @@ console.log(\`[…] $\{util}\`); // eslint-disable-line no-console
 var util = "UTIL";
 
 console.log("[\\u2026] ".concat(util)); // eslint-disable-line no-console
-					`.trim())
+					`)
 				}]);
 			});
 	});
@@ -309,7 +302,7 @@ console.log("[\\u2026] ".concat(util)); // eslint-disable-line no-console
 var util = "UTIL";
 
 console.log(\`[…] $\{util}\`); // eslint-disable-line no-console
-					`.trim())
+					`)
 				}]);
 			});
 	});
@@ -330,7 +323,7 @@ console.log(\`[…] $\{util}\`); // eslint-disable-line no-console
 
 bar\`;
 console.log(\`[…] $\{txt}\`);
-					`.trim(), { compact: true })
+					`, { compact: true })
 				}]);
 
 				config[0].esnext = true;
@@ -343,7 +336,7 @@ console.log(\`[…] $\{txt}\`);
 					content: makeBundle(`
 var txt = "foo\\n\\nbar";
 console.log("[\\u2026] ".concat(txt));
-					`.trim(), { compact: true })
+					`, { compact: true })
 				}]);
 
 				config[0].compact = false; // overrides global option
@@ -356,7 +349,7 @@ console.log("[\\u2026] ".concat(txt));
 					content: makeBundle(`
 var txt = "foo\\n\\nbar";
 console.log("[\\u2026] ".concat(txt)); // eslint-disable-line no-console
-					`.trim())
+					`)
 				}]);
 			});
 	});
@@ -394,7 +387,7 @@ console.log("[\\u2026] ".concat(txt)); // eslint-disable-line no-console
 var util = "DUMMY-UTIL";
 
 console.log(\`[DUMMY] $\{util}\`); // eslint-disable-line no-console
-					`.trim())
+					`)
 				}]);
 
 				let fn = _ => compile("dummy/src/does_not_exist.js", target);
diff --git a/test/unit/util.js b/test/unit/util.js
@@ -36,22 +36,9 @@ exports.MockAssetManager = class MockAssetManager extends AssetManager {
 	}
 };
 
-// wraps given code in boilerplate
+// adjust the whitespace around the given code
 exports.makeBundle = function makeBundle(code, { compact } = {}) {
-	if(compact) {
-		return `
-(function(){'use strict';${code}})();
-		`.trim();
-	}
-
-	return `
-(function () {
-'use strict';
-
-${code}
-
-})();
-	`.trim() + "\n";
+	return compact ? code.trim() : `${code.trim()}\n`;
 };
 
 // returns a function that invokes `callback` only after having itself been

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"dist/bundle.js":"/assets/dist/bundle-7a1db6adc4ef815c9557d95c82779a74.js"}`
	`1`	`+{"dist/bundle.js":"/assets/dist/bundle-68b329da9893e34099c7d8ad5cb9c940.js"}`