Use a stricter RegExp to detect System.register modules

Fixes #1500
stealjs · Jul 31, 2019 · 607f49f · 607f49f
1 parent fcb4dcc
commit 607f49f
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 10 deletions.
diff --git a/main.js b/main.js
@@ -3298,7 +3298,7 @@ function register(loader) {
 
   var Module = loader.newModule({}).constructor;
 
-  var registerRegEx = /System\.register/;
+  var registerRegEx = /\bSystem\.register\b/;
 
   var loaderFetch = loader.fetch;
   loader.fetch = function(load) {

diff --git a/src/base/base.js b/src/base/base.js
@@ -854,7 +854,7 @@ function register(loader) {
 
   var Module = loader.newModule({}).constructor;
 
-  var registerRegEx = /System\.register/;
+  var registerRegEx = /\bSystem\.register\b/;
 
   var loaderFetch = loader.fetch;
   loader.fetch = function(load) {

diff --git a/src/base/lib/extension-register.js b/src/base/lib/extension-register.js
@@ -450,7 +450,7 @@ function register(loader) {
 
   var Module = loader.newModule({}).constructor;
 
-  var registerRegEx = /System\.register/;
+  var registerRegEx = /\bSystem\.register\b/;
 
   var loaderFetch = loader.fetch;
   loader.fetch = function(load) {

diff --git a/steal-with-promises.js b/steal-with-promises.js
@@ -4447,7 +4447,7 @@ function register(loader) {
 
   var Module = loader.newModule({}).constructor;
 
-  var registerRegEx = /System\.register/;
+  var registerRegEx = /\bSystem\.register\b/;
 
   var loaderFetch = loader.fetch;
   loader.fetch = function(load) {

diff --git a/steal-with-promises.production.js b/steal-with-promises.production.js
diff --git a/steal.js b/steal.js
@@ -3177,7 +3177,7 @@ function register(loader) {
 
   var Module = loader.newModule({}).constructor;
 
-  var registerRegEx = /System\.register/;
+  var registerRegEx = /\bSystem\.register\b/;
 
   var loaderFetch = loader.fetch;
   loader.fetch = function(load) {

diff --git a/steal.production.js b/steal.production.js
diff --git a/test/cjs_system_register/dev.html b/test/cjs_system_register/dev.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<title></title>
+	</head>
+	<body>
+		<script>
+			window.done = window.parent.done;
+			window.assert = window.parent.assert;
+		</script>
+		<script
+			src="../../steal.js"
+			data-base-url="."
+			data-config="package.json!npm"
+			data-main="~/index"
+		></script>
+		<script>
+			steal.import("~/index").then(
+				function(main) {
+					if (window.assert) {
+						window.assert.ok(false, "~/index should not load");
+						window.done();
+					} else {
+						console.error("~/index should not load");
+					}
+				},
+				function(err) {
+					if (window.assert) {
+						window.assert.notOk(
+							/require is not defined/i.test(err.message),
+							"should NOT error due to incorrect module detection"
+						);
+						window.assert.ok(
+							/Could not load 'fs'/i.test(err.message),
+							"should error because module was not found"
+						);
+						window.done();
+					} else {
+						console.error(err);
+					}
+				}
+			);
+		</script>
+	</body>
+</html>
diff --git a/test/cjs_system_register/index.js b/test/cjs_system_register/index.js
@@ -0,0 +1,3 @@
+require("fs.js");
+FileSystem.registerFileSystem();
+System.registerFileSystem();
diff --git a/test/cjs_system_register/package.json b/test/cjs_system_register/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "cjs-system-register",
+  "main": "index.js",
+  "version": "1.0.0"
+}
diff --git a/test/steal-with-promises.js b/test/steal-with-promises.js
@@ -4447,7 +4447,7 @@ function register(loader) {
 
   var Module = loader.newModule({}).constructor;
 
-  var registerRegEx = /System\.register/;
+  var registerRegEx = /\bSystem\.register\b/;
 
   var loaderFetch = loader.fetch;
   loader.fetch = function(load) {

diff --git a/test/steal-with-promises.production.js b/test/steal-with-promises.production.js
diff --git a/test/test.js b/test/test.js
@@ -1,3 +1,4 @@
+"format cjs";
 var QUnit = require("steal-qunit");
 
 QUnit.config.testTimeout = 30000;
@@ -272,7 +273,11 @@ QUnit.test("can load a bundle with an amd module depending on a global", functio
 
 QUnit.test("AMD CommonJS detection works with lodash", function(assert) {
 	makeIframe("amd_require/dev.html", assert);
-})
+});
+
+QUnit.test("Does not detect CJS as System.register #1500", function(assert) {
+	makeIframe("cjs_system_register/dev.html", assert);
+});
 
 QUnit.test("envs config works", function(assert) {
 	makeIframe("envs/envs.html", assert);