Support ESM named imports

Closes #776
stealjs · Jul 6, 2017 · ed49d46 · ed49d46
1 parent 0145daa
commit ed49d46
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 11 deletions.
diff --git a/lib/node/slim/make_shim_template.js b/lib/node/slim/make_shim_template.js
@@ -24,7 +24,7 @@ module.exports = function(options) {
 
 			function stealRequire(moduleId) {
 				if (loadedModules[moduleId]) {
-					return stealRequire.esm(loadedModules[moduleId].exports);
+					return loadedModules[moduleId].exports;
 				}
 
 				${options.plugins ? slimPluginsPartial : ""}
@@ -40,14 +40,9 @@ module.exports = function(options) {
 					stealModule
 				);
 
-				return stealRequire.esm(stealModule.exports);
+				return stealModule.exports;
 			}
 
-			stealRequire.esm = function(stealExports) {
-				return stealExports && stealExports.__esModule ?
-					stealExports.default : stealExports;
-			};
-
 			${options.progressive ? progressivePartial : ""}
 
 			// import the main module

diff --git a/test/slim/basics/main-size.snap b/test/slim/basics/main-size.snap
@@ -1 +1 @@
-module.exports = 291;
+module.exports = 252;
diff --git a/test/slim/cache/util.js b/test/slim/cache/util.js
@@ -1,4 +1,4 @@
-export default function(prop) {
+module.exports = function(prop) {
 	var _props = window._props || {};
 	_props[prop] = prop;
 	window._props = _props;

diff --git a/test/slim/esm_named_imports/index.html b/test/slim/esm_named_imports/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+</head>
+<body>
+	<script src="./dist/bundles/main.js"></script>
+</body>
+</html>
diff --git a/test/slim/esm_named_imports/main.js b/test/slim/esm_named_imports/main.js
@@ -0,0 +1,3 @@
+import { sum } from "./sum";
+
+window.result = sum(1, 1);
diff --git a/test/slim/esm_named_imports/stealconfig.js b/test/slim/esm_named_imports/stealconfig.js
@@ -0,0 +1,3 @@
+steal.config({
+	main: "main"
+});
diff --git a/test/slim/esm_named_imports/sum.js b/test/slim/esm_named_imports/sum.js
@@ -0,0 +1,3 @@
+export function sum(a, b) {
+	return a + b;
+}
diff --git a/test/slim/plugins/main-size.snap b/test/slim/plugins/main-size.snap
@@ -1 +1 @@
-module.exports = 337;
+module.exports = 301;
diff --git a/test/slim/progressive/main-size.snap b/test/slim/progressive/main-size.snap
@@ -1 +1 @@
-module.exports = 897;
+module.exports = 864;
diff --git a/test/slim_build_test.js b/test/slim_build_test.js
@@ -408,4 +408,27 @@ describe("slim builds", function() {
 				});
 		});
 	});
+
+	it("ESM named imports work", function() {
+		var base = path.join(__dirname, "slim", "esm_named_imports");
+		var config = { config: path.join(base, "stealconfig.js") };
+
+		// allow `find` to reject before mocha timeout kicks in
+		this.timeout(3000);
+
+		return rmdir(path.join(base, "dist"))
+			.then(function() {
+				return optimize(config, { minify: false, quiet: true });
+			})
+			.then(function() {
+				return open(path.join("test", "slim", "esm_named_imports", "index.html"));
+			})
+			.then(function(args) {
+				return Promise.all([args.close, find(args.browser, "result")]);
+			})
+			.then(function(data) {
+				assert.equal(data[1], 2, "should work");
+				data[0](); // close();
+			});
+	});
 });