Merge pull request #932 from stealjs/autorender

Allow plugins to force inclusion of the slim dynamic loader

lib/graph/slim_graph.js

@@ -57,7 +57,10 @@ module.exports = function(options) {
 					target: options.target,
 					slimConfig: options.slimConfig,
 					plugins: !!nonJsBundles.length,
-					mainModuleId: getMainModuleId(options.graph, options.mains[0])
+					mainModuleId: getMainModuleId(
+						options.graph,
+						options.mains[0]
+					)
 				})
 			])
 		);
@@ -102,7 +105,9 @@ module.exports = function(options) {
 					sharedBundles: sharedBundles,
 					plugins: !!nonJsBundles.length,
 					slimConfig: options.slimConfig,
-					progressive: !!secondaryBundles.length,
+					progressive:
+						needsDynamicLoader(options.slimConfig) ||
+						!!secondaryBundles.length,
 					mainModuleId: getMainModuleId(options.graph, mainName)
 				})
 			];
@@ -122,6 +127,15 @@ module.exports = function(options) {
 	return slimmedBundles;
 };
 
+/**
+ * Whether the slim loader should support dynamic loading
+ * @param {Object} config
+ * @return {boolean}
+ */
+function needsDynamicLoader(config) {
+	return config.needsDynamicLoader === true;
+}
+
 /**
  * Whether there are multiple mains to be built
  * @param {Array} mains

test/slim/dynamic/foo.plug

@@ -0,0 +1 @@
+"foo"

test/slim/dynamic/main.js

@@ -0,0 +1 @@
+require("foo.plug!plug");

test/slim/dynamic/plug.js

@@ -0,0 +1,15 @@
+"format cjs";
+var loader = require("@loader");
+var local = loader.localLoader || loader;
+
+if (local.slimConfig) {
+	local.slimConfig.needsDynamicLoader = true;
+}
+
+exports.translate = function plug(load) {
+	return `
+		define(function() {
+			return ${load.source};
+		});
+	`;
+};

test/slim/dynamic/stealconfig.js

@@ -0,0 +1,3 @@
+steal.config({
+	main: "main"
+});

test/slim_build_test.js

@@ -785,4 +785,23 @@ describe("slim builds", function() {
 				close();
 			});
 	});
+
+	it("adds dynamic loading if config flag set", function() {
+		var base = path.join(__dirname, "slim", "dynamic");
+		var config = { config: path.join(base, "stealconfig.js") };
+
+		return rmdir(path.join(base, "dist"))
+			.then(function() {
+				return optimize(config, { quiet: true, minify: false });
+			})
+			.then(function() {
+				return readFile(path.join(base, "dist", "bundles", "main.js"));
+			})
+			.then(function(buffer) {
+				assert.ok(
+					/stealRequire\.dynamic = function/.test(buffer.toString()),
+					"slim loader should support dynamic imports"
+				);
+			});
+	});
 });