Merge pull request #1453 from stealjs/no-main2

Prevent the "no main loaded" warning with inline scripts
stealjs · Jul 27, 2018 · 10da38b · 10da38b
2 parents 468352e + 6b1a534
commit 10da38b
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 5 deletions.
diff --git a/src/extension-no-main.js b/src/extension-no-main.js
@@ -30,4 +30,12 @@ addStealExtension(function (loader) {
 
 		return loaderImport.apply(this, arguments);
 	};
+
+	var loaderModule = loader.module;
+	loader.module = function() {
+		var p = loaderModule.apply(this, arguments);
+		this.module = loaderModule;
+		clearTimeout(this._noMainTimeoutId);
+		return p;
+	};
 });
diff --git a/steal-with-promises.js b/steal-with-promises.js
@@ -6789,6 +6789,14 @@ addStealExtension(function (loader) {
 
 		return loaderImport.apply(this, arguments);
 	};
+
+	var loaderModule = loader.module;
+	loader.module = function() {
+		var p = loaderModule.apply(this, arguments);
+		this.module = loaderModule;
+		clearTimeout(this._noMainTimeoutId);
+		return p;
+	};
 });
 
 addStealExtension(function(loader) {

diff --git a/steal-with-promises.production.js b/steal-with-promises.production.js
diff --git a/steal.js b/steal.js
@@ -5519,6 +5519,14 @@ addStealExtension(function (loader) {
 
 		return loaderImport.apply(this, arguments);
 	};
+
+	var loaderModule = loader.module;
+	loader.module = function() {
+		var p = loaderModule.apply(this, arguments);
+		this.module = loaderModule;
+		clearTimeout(this._noMainTimeoutId);
+		return p;
+	};
 });
 
 addStealExtension(function(loader) {

diff --git a/steal.production.js b/steal.production.js
diff --git a/test/main-warn/script-inner.html b/test/main-warn/script-inner.html
@@ -10,7 +10,7 @@
 	data-base-url="."
 	data-config="package.json!npm">
 
-	import "~/main";
+	require("~/main");
 </script>
 <script>
 	steal._mainWarnMs = 10;

diff --git a/test/main-warn/steal-module.html b/test/main-warn/steal-module.html
@@ -10,7 +10,7 @@
 	data-base-url="."
 	data-config="package.json!npm"></script>
 <script type="steal-module">
-	import "~/main";
+	require("~/main");
 </script>
 <script>
 	steal._mainWarnMs = 10;

diff --git a/test/steal-with-promises.js b/test/steal-with-promises.js
@@ -6789,6 +6789,14 @@ addStealExtension(function (loader) {
 
 		return loaderImport.apply(this, arguments);
 	};
+
+	var loaderModule = loader.module;
+	loader.module = function() {
+		var p = loaderModule.apply(this, arguments);
+		this.module = loaderModule;
+		clearTimeout(this._noMainTimeoutId);
+		return p;
+	};
 });
 
 addStealExtension(function(loader) {

diff --git a/test/steal-with-promises.production.js b/test/steal-with-promises.production.js