Merge pull request #1511 from stealjs/comment-es

ES module detection, remove strings before removing comments

main.js

@@ -3454,6 +3454,7 @@ function es6(loader) {
 
   // good enough ES6 detection regex - format detections not designed to be accurate, but to handle the 99% use case
   var es6RegEx = /(^\s*|[}\);\n]\s*)(import\s+(['"]|(\*\s+as\s+)?[^"'\(\)\n;]+\s+from\s+['"]|\{)|export\s+\*\s+from\s+["']|export\s+(\{|default|function|class|var|const|let|async\s+function))/;
+  var strictStringRegEx = /["'].*["']/g;
   var strictCommentRegEx = /\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/gm;
 
   var traceurRuntimeRegEx = /\$traceurRuntime\s*\./;
@@ -3493,7 +3494,8 @@ function es6(loader) {
   };
 
   function looksLikeES6(source) {
-	  var sourceWithComments = source.replace(strictCommentRegEx, '$1');
+	  var sourceWithComments = source.replace(strictStringRegEx, '""')
+		  .replace(strictCommentRegEx, '$1');
 	  return sourceWithComments.match(es6RegEx);
   }
 

src/base/base.js

@@ -1009,6 +1009,7 @@ function es6(loader) {
 
   // good enough ES6 detection regex - format detections not designed to be accurate, but to handle the 99% use case
   var es6RegEx = /(^\s*|[}\);\n]\s*)(import\s+(['"]|(\*\s+as\s+)?[^"'\(\)\n;]+\s+from\s+['"]|\{)|export\s+\*\s+from\s+["']|export\s+(\{|default|function|class|var|const|let|async\s+function))/;
+  var strictStringRegEx = /["'].*["']/g;
   var strictCommentRegEx = /\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/gm;
 
   var traceurRuntimeRegEx = /\$traceurRuntime\s*\./;
@@ -1048,7 +1049,8 @@ function es6(loader) {
   };
 
   function looksLikeES6(source) {
-	  var sourceWithComments = source.replace(strictCommentRegEx, '$1');
+	  var sourceWithComments = source.replace(strictStringRegEx, '""')
+		  .replace(strictCommentRegEx, '$1');
 	  return sourceWithComments.match(es6RegEx);
   }
 

src/base/lib/extension-es6.js

@@ -6,6 +6,7 @@ function es6(loader) {
 
   // good enough ES6 detection regex - format detections not designed to be accurate, but to handle the 99% use case
   var es6RegEx = /(^\s*|[}\);\n]\s*)(import\s+(['"]|(\*\s+as\s+)?[^"'\(\)\n;]+\s+from\s+['"]|\{)|export\s+\*\s+from\s+["']|export\s+(\{|default|function|class|var|const|let|async\s+function))/;
+  var strictStringRegEx = /["'].*["']/g;
   var strictCommentRegEx = /\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/gm;
 
   var traceurRuntimeRegEx = /\$traceurRuntime\s*\./;
@@ -45,7 +46,8 @@ function es6(loader) {
   };
 
   function looksLikeES6(source) {
-	  var sourceWithComments = source.replace(strictCommentRegEx, '$1');
+	  var sourceWithComments = source.replace(strictStringRegEx, '""')
+		  .replace(strictCommentRegEx, '$1');
 	  return sourceWithComments.match(es6RegEx);
   }
 

steal-with-promises.js

@@ -4602,6 +4602,7 @@ function es6(loader) {
 
   // good enough ES6 detection regex - format detections not designed to be accurate, but to handle the 99% use case
   var es6RegEx = /(^\s*|[}\);\n]\s*)(import\s+(['"]|(\*\s+as\s+)?[^"'\(\)\n;]+\s+from\s+['"]|\{)|export\s+\*\s+from\s+["']|export\s+(\{|default|function|class|var|const|let|async\s+function))/;
+  var strictStringRegEx = /["'].*["']/g;
   var strictCommentRegEx = /\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/gm;
 
   var traceurRuntimeRegEx = /\$traceurRuntime\s*\./;
@@ -4641,7 +4642,8 @@ function es6(loader) {
   };
 
   function looksLikeES6(source) {
-	  var sourceWithComments = source.replace(strictCommentRegEx, '$1');
+	  var sourceWithComments = source.replace(strictStringRegEx, '""')
+		  .replace(strictCommentRegEx, '$1');
 	  return sourceWithComments.match(es6RegEx);
   }
 

steal.js

@@ -3332,6 +3332,7 @@ function es6(loader) {
 
   // good enough ES6 detection regex - format detections not designed to be accurate, but to handle the 99% use case
   var es6RegEx = /(^\s*|[}\);\n]\s*)(import\s+(['"]|(\*\s+as\s+)?[^"'\(\)\n;]+\s+from\s+['"]|\{)|export\s+\*\s+from\s+["']|export\s+(\{|default|function|class|var|const|let|async\s+function))/;
+  var strictStringRegEx = /["'].*["']/g;
   var strictCommentRegEx = /\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/gm;
 
   var traceurRuntimeRegEx = /\$traceurRuntime\s*\./;
@@ -3371,7 +3372,8 @@ function es6(loader) {
   };
 
   function looksLikeES6(source) {
-	  var sourceWithComments = source.replace(strictCommentRegEx, '$1');
+	  var sourceWithComments = source.replace(strictStringRegEx, '""')
+		  .replace(strictCommentRegEx, '$1');
 	  return sourceWithComments.match(es6RegEx);
   }
 

test/bad_json/dev.html

@@ -22,7 +22,7 @@
 			window.WARN(msg);
 		};
 	</script>
-	<script src="../../../steal-with-promises.js"
+	<script src="../../steal-with-promises.js"
 		data-base-url="."
 		data-config="package.json!npm"
 		data-main="@empty"></script>

test/cjs_export_default/dev.html

@@ -13,18 +13,28 @@
 <script>
 	steal.import("~/index")
 	.then(function(index){
-
 		if(window.assert) {
 			window.assert.equal(index.foo, "bar", "loaded correctly");
-			window.done();
 		} else {
 			console.log("index module:", index);
 		}
+
+		return steal.import("~/es");
+	})
+	.then(function(es) {
+		if(window.assert) {
+			window.assert.equal(es.default.default, "//", "comment in a string");
+			window.done();
+		} else {
+			console.log("es module", es);
+		}
 	})
 	.catch(function(err) {
 		if(window.assert) {
 			window.assert.ok(false, err);
 			window.done();
+		} else {
+			console.error("Oops", err);
 		}
 	});
 </script>

test/cjs_export_default/es.js

@@ -0,0 +1 @@
+var french={default:"//"};export default french;

test/dev_bundle_err/dev.html

@@ -9,7 +9,7 @@
 		window.assert = window.parent.assert;
 		window.done = window.parent.done;
 	</script>
-	<script src="../../../steal-with-promises.js"
+	<script src="../../steal-with-promises.js"
 		data-base-url="."
 		data-config="package.json!npm"
 		data-dev-bundle></script>

test/http_spec/dev.html

@@ -39,7 +39,7 @@
 		return _send.apply(this, arguments);
 	};
 </script>
-<script src="../../../steal-with-promises.js"
+<script src="../../steal-with-promises.js"
 	data-base-url="."
 	data-config="package.json!npm"></script>
 <script>

test/init_error/dev.html

@@ -12,7 +12,7 @@
 </script>
 <script
 	main="~/main"
-	src="../../../steal-with-promises.js"
+	src="../../steal-with-promises.js"
 	data-base-url="."
 	data-config="package.json!npm"></script>
 <script>

test/json_syntax_err/dev.html

@@ -31,7 +31,7 @@
 	</script>
 	<script
 		main="~/main"
-		src="../../../steal-with-promises.js"
+		src="../../steal-with-promises.js"
 		data-base-url="."
 		data-config="package.json!npm"></script>
 	<script>

test/load_after_fail/dev.html

@@ -9,7 +9,7 @@
 		window.assert = window.parent.assert;
 		window.done = window.parent.done;
 	</script>
-	<script src="../../../steal-with-promises.js" data-base-url="."
+	<script src="../../steal-with-promises.js" data-base-url="."
 		data-config="package.json!npm" data-main="~/oops"></script>
 	<script>
 		steal.done().then(null, function(err){

test/load_module_twice/dev.html

@@ -27,7 +27,7 @@
 		main="~/main"
 		base-url="."
 		config="package.json!npm"
-		src="../../../steal-with-promises.js"
+		src="../../steal-with-promises.js"
 	>
 	</script>
 </body>

test/load_module_twice_clone/dev.html

@@ -26,7 +26,7 @@
 		main="~/main"
 		base-url="."
 		config="package.json!npm"
-		src="../../../steal-with-promises.js"
+		src="../../steal-with-promises.js"
 	>
 	</script>
 	<script>

test/load_module_twice_false_positive/dev.html

@@ -27,7 +27,7 @@
 		main="main"
 		base-url="."
 		config="package.json!npm"
-		src="../../../steal-with-promises.js"
+		src="../../steal-with-promises.js"
 	></script>
 	<script>
 		steal.done().then(function(){

test/load_module_twice_false_positive/on-error.html

@@ -23,7 +23,7 @@
 			window.done();
 		};
 	</script>
-	<script src="../../../steal-with-promises.js" data-base-url="."
+	<script src="../../steal-with-promises.js" data-base-url="."
 		data-config="package.json!npm" data-main="~/oops"></script>
 	<script>
 		function importAModuleThatImportsInvalidPackage() {

test/meta_deps/dev.html

@@ -9,7 +9,7 @@
 		window.assert = window.parent.assert;
 		window.done = window.parent.done;
 	</script>
-	<script main src="../../../steal-with-promises.js" base-url="." config="package.json!npm">
+	<script main src="../../steal-with-promises.js" base-url="." config="package.json!npm">
 	</script>
 </body>
 </html>

test/mjs/dev.html

@@ -10,7 +10,7 @@
 		window.done = window.parent.done;
 	</script>
 	<script
-		src="../../../steal-with-promises.js"
+		src="../../steal-with-promises.js"
 		data-main
 		data-base-url="."
 		data-config="package.json!npm"></script>

test/parse_errors/dev.html

@@ -9,7 +9,7 @@
 	window.assert = window.parent.assert;
 	window.done = window.parent.done;
 </script>
-<script src="../../../steal-with-promises.js"
+<script src="../../steal-with-promises.js"
 	data-base-url="."
 	data-config="package.json!npm"
 	data-main="@empty"></script>

test/steal-with-promises.js

@@ -4602,6 +4602,7 @@ function es6(loader) {
 
   // good enough ES6 detection regex - format detections not designed to be accurate, but to handle the 99% use case
   var es6RegEx = /(^\s*|[}\);\n]\s*)(import\s+(['"]|(\*\s+as\s+)?[^"'\(\)\n;]+\s+from\s+['"]|\{)|export\s+\*\s+from\s+["']|export\s+(\{|default|function|class|var|const|let|async\s+function))/;
+  var strictStringRegEx = /["'].*["']/g;
   var strictCommentRegEx = /\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/gm;
 
   var traceurRuntimeRegEx = /\$traceurRuntime\s*\./;
@@ -4641,7 +4642,8 @@ function es6(loader) {
   };
 
   function looksLikeES6(source) {
-	  var sourceWithComments = source.replace(strictCommentRegEx, '$1');
+	  var sourceWithComments = source.replace(strictStringRegEx, '""')
+		  .replace(strictCommentRegEx, '$1');
 	  return sourceWithComments.match(es6RegEx);
   }
 

test/syntax_errs/build.html

@@ -9,7 +9,7 @@
 		window.assert = window.parent.assert;
 		window.done = window.parent.done;
 	</script>
-	<script src="../../../steal-with-promises.js"
+	<script src="../../steal-with-promises.js"
 		data-base-url="."
 		data-config="package.json!npm"
 		data-main="@empty"></script>

test/syntax_errs/dev.html

@@ -9,7 +9,7 @@
 		window.assert = window.parent.assert;
 		window.done = window.parent.done;
 	</script>
-	<script src="../../../steal-with-promises.js"
+	<script src="../../steal-with-promises.js"
 		data-base-url="."
 		data-config="package.json!npm"
 		data-main="~/importer"></script>