diff options
author | Florian Dold <florian.dold@gmail.com> | 2016-11-03 01:33:53 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2016-11-03 01:33:53 +0100 |
commit | d1291f67551c58168af43698a359cb5ddfd266b0 (patch) | |
tree | 55a13ed29fe1915e3f42f1b1b7038dafa2e975a7 /node_modules/systemjs/dist/system.src.js | |
parent | d0a0695fb5d34996850723f7d4b1b59c3df909c2 (diff) |
node_modules
Diffstat (limited to 'node_modules/systemjs/dist/system.src.js')
-rw-r--r-- | node_modules/systemjs/dist/system.src.js | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/node_modules/systemjs/dist/system.src.js b/node_modules/systemjs/dist/system.src.js index 3734388df..4cac0d0fc 100644 --- a/node_modules/systemjs/dist/system.src.js +++ b/node_modules/systemjs/dist/system.src.js @@ -1,5 +1,5 @@ /* - * SystemJS v0.19.39 + * SystemJS v0.19.40 */ (function() { function bootstrap() {// from https://gist.github.com/Yaffle/1088850 @@ -1499,7 +1499,7 @@ var __exec; return (wrap ? '(function(System, SystemJS) {' : '') + load.source + (wrap ? '\n})(System, System);' : '') // adds the sourceURL comment if not already present - + (load.source.substr(lastLineIndex, 15) != '\n//# sourceURL=' + + (load.source.substr(lastLineIndex, 15) != '\n//# sourceURL=' ? '\n//# sourceURL=' + load.address + (sourceMap ? '!transpiled' : '') : '') // add sourceMappingURL if load.metadata.sourceMap is set + (sourceMap && inlineSourceMap(sourceMap) || ''); @@ -1526,7 +1526,7 @@ var __exec; curLoad = load; if (callCounter++ == 0) curSystem = __global.System; - __global.System = __global.SystemJS = loader; + __global.System = __global.SystemJS = loader; } function postExec() { if (--callCounter == 0) @@ -1556,16 +1556,13 @@ var __exec; postExec(); } catch(e) { - postExec(); + postExec(); throw addToError(e, 'Evaluating ' + load.address); } }; var supportsScriptExec = false; if (isBrowser && typeof document != 'undefined' && document.getElementsByTagName) { - var scripts = document.getElementsByTagName('script'); - $__curScript = scripts[scripts.length - 1]; - if (!(window.chrome && window.chrome.extension || navigator.userAgent.match(/^Node\.js/))) supportsScriptExec = true; } @@ -3576,7 +3573,14 @@ function createEntry() { // do transpilation return (loader._loader.transpilerPromise || ( loader._loader.transpilerPromise = Promise.resolve( - __global[loader.transpiler == 'typescript' ? 'ts' : loader.transpiler] || (loader.pluginLoader || loader)['import'](loader.transpiler) + __global[loader.transpiler == 'typescript' ? 'ts' : loader.transpiler] || (loader.pluginLoader || loader).normalize(loader.transpiler) + .then(function(normalized) { + loader._loader.transpilerNormalized = normalized; + return (loader.pluginLoader || loader).load(normalized) + .then(function() { + return (loader.pluginLoader || loader).get(normalized); + }); + }) ))).then(function(transpiler) { loader._loader.loadedTranspilerRuntime = true; @@ -3585,6 +3589,8 @@ function createEntry() { // if transpiler is the same as the plugin loader, then don't run twice if (transpiler == load.metadata.loaderModule) return load.source; + load.metadata.loaderModule = transpiler; + load.metadata.loader = loader._loader.transpilerNormalized; // convert the source map into an object for transpilation chaining if (typeof load.metadata.sourceMap == 'string') @@ -3596,7 +3602,7 @@ function createEntry() { var sourceMap = load.metadata.sourceMap; if (sourceMap && typeof sourceMap == 'object') { var originalName = load.address.split('!')[0]; - + // force set the filename of the original file if (!sourceMap.file || sourceMap.file == load.address) sourceMap.file = originalName + '!transpiled'; @@ -3615,14 +3621,14 @@ function createEntry() { // legacy builder support if (loader.builder) load.metadata.originalSource = load.source; - + // defined in es6-module-loader/src/transpile.js return transpile.call(loader, load) .then(function(source) { // clear sourceMap as transpiler embeds it load.metadata.sourceMap = undefined; return source; - }); + }); }, function(err) { throw addToError(err, 'Unable to load transpiler to transpile ' + load.name); }); @@ -5100,7 +5106,7 @@ hookConstructor(function(constructor) { System = new SystemJSLoader(); __global.SystemJS = System; -System.version = '0.19.39 Standard'; +System.version = '0.19.40 Standard'; if (typeof module == 'object' && module.exports && typeof exports == 'object') module.exports = System; @@ -5117,6 +5123,8 @@ if (typeof document !== 'undefined') { $__curScript = scripts[scripts.length - 1]; if (document.currentScript && ($__curScript.defer || $__curScript.async)) $__curScript = document.currentScript; + if (!$__curScript.src) + $__curScript = undefined; if (doPolyfill) { var curPath = $__curScript.src; var basePath = curPath.substr(0, curPath.lastIndexOf('/') + 1); @@ -5150,4 +5158,4 @@ else { } -})();
\ No newline at end of file +})(); |