archive-gh-me/systemjs
1
0
Fork 0
mirror of https://github.com/systemjs/systemjs.git synced 2026-01-18 14:53:14 +00:00
Code Issues Projects Releases Wiki Activity

correct System.register regex (#1071)

Browse Source
This commit is contained in:
guybedford 2016-02-03 15:04:01 +02:00
parent 7ea9734098
commit e472ecce1a
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/register.js
View File

@ -51,7 +51,7 @@
*
*/
var leadingCommentAndMetaRegEx = /^\s*(\/\*[^\*]*(\*(?!\/)[^\*]*)*\*\/|\s*\/\/[^\n]*|\s*"[^"]+"\s*;?|\s*'[^']+'\s*;?)*\s*/;
var leadingCommentAndMetaRegEx = /^(\s*\/\*[^\*]*(\*(?!\/)[^\*]*)*\*\/|\s*\/\/[^\n]*|\s*"[^"]+"\s*;?|\s*'[^']+'\s*;?)*\s*/;
function detectRegisterFormat(source) {
var leadingCommentAndMeta = source.match(leadingCommentAndMetaRegEx);
return leadingCommentAndMeta && source.substr(leadingCommentAndMeta[0].length, 15) == 'System.register';

7
test/test.js
View File

@ -514,6 +514,13 @@ asyncTest('System.register regex test', function() {
}, err);
});
asyncTest('System.register regex test 2', function() {
System['import']('tests/register-regex-2.js').then(function(m) {
ok(m);
start();
}, err);
});
asyncTest('System.register module name arg', function() {
System['import']('tests/module-name.js').then(function(m) {
ok(m.name == System.baseURL + 'tests/module-name.js');

15
test/tests/register-regex-2.js Normal file
View File

@ -0,0 +1,15 @@
/**
* @file file comment
* ...
*/
/**
* module comment
* ...
*/
System.register([], function() {
return {
setters: [],
execute: function() {}
};
});