Merge pull request #1775 from zenorbi/master

fix register format detection to include SystemJS.register
systemjs · Mar 12, 2018 · 5157088 · 5157088
2 parents cbd878d + 5443f12
commit 5157088
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/instantiate.js b/src/instantiate.js
@@ -420,7 +420,10 @@ export var esmRegEx = /(^\s*|[}\);\n]\s*)(import\s*(['"]|(\*\s+as\s+)?(?!type)([
 var leadingCommentAndMetaRegEx = /^(\s*\/\*[^\*]*(\*(?!\/)[^\*]*)*\*\/|\s*\/\/[^\n]*|\s*"[^"]+"\s*;?|\s*'[^']+'\s*;?)*\s*/;
 export function detectRegisterFormat(source) {
   var leadingCommentAndMeta = source.match(leadingCommentAndMetaRegEx);
-  return leadingCommentAndMeta && source.substr(leadingCommentAndMeta[0].length, 15) === 'System.register';
+  if (!leadingCommentAndMeta)
+    return false;
+  var codeStart = leadingCommentAndMeta[0].length;
+  return source.startsWith('System.register', codeStart) || source.startsWith('SystemJS.register', codeStart);
 }
 
 // AMD Module Format Detection RegEx