6.12.0

CHANGELOG.md

@@ -1,3 +1,6 @@
+SystemJS 6.12.0
+* Call fetch hook when retrieving external import maps. Resolves #2374. (https://github.com/systemjs/systemjs/pull/2376)
+
 SystemJS 6.11.0
 * Add the possibility to use an async createScript hook (https://github.com/systemjs/systemjs/pull/2362 @legarsjules)
 * Use Promise.resolve in named-register. Resolves #2359. (https://github.com/systemjs/systemjs/pull/2363)

dist/extras/amd.js

@@ -5,7 +5,7 @@
  */
 (function (global) {
   function unsupportedRequire () {
-    throw Error( errMsg(5, 'AMD require not supported.'));
+    throw Error(errMsg(5, 'AMD require not supported.'));
   }
 
   var requireExportsModule = ['require', 'exports', 'module'];
@@ -86,7 +86,7 @@
       deps = requireExportsModule;
       exec = depArg;
     } else {
-      throw Error( errMsg(9, 'Invalid call to AMD define()'));
+      throw Error(errMsg(9, 'Invalid call to AMD define()'));
     }
 
     var amdRegister = createAMDRegister(deps, exec);
@@ -96,11 +96,11 @@
         System.registerRegistry[name] = amdRegister;
         System.register(name, amdRegister[0], amdRegister[1]);
       } else
-        console.warn( errMsg('W6', 'Include named-register.js for full named define support'));
+        console.warn(errMsg('W6', 'Include named-register.js for full named define support'));
         // TODO: create new warning number and documentation for using named define without named-register extra
         System.register(amdRegister[0], amdRegister[1]);
     } else
       System.register(amdRegister[0], amdRegister[1]);
   };
   global.define.amd = {};
-})(typeof self !== 'undefined' ? self : global);}());
+})(typeof self !== 'undefined' ? self : global);})();

dist/extras/dynamic-import-maps.js

@@ -13,4 +13,4 @@ new MutationObserver(function (mutations) {
       }
     }
   }
-}).observe(document, { childList: true, subtree: true });}());
+}).observe(document, { childList: true, subtree: true });})();

dist/extras/global.js

@@ -93,4 +93,4 @@
       || !isNaN(p) && p < global.length
       || isIE11 && global[p] && typeof window !== 'undefined' && global[p].parent === window;
   }
-})(typeof self !== 'undefined' ? self : global);}());
+})(typeof self !== 'undefined' ? self : global);})();

dist/extras/module-types.js

@@ -178,4 +178,4 @@ function resolveUrl (relUrl, parentUrl) {
       return res;
     });
   };
-})(typeof self !== 'undefined' ? self : global);}());
+})(typeof self !== 'undefined' ? self : global);})();

dist/extras/named-exports.js

@@ -60,4 +60,4 @@
     };
     return register;
   };
-})(typeof self !== 'undefined' ? self : global);}());
+})(typeof self !== 'undefined' ? self : global);})();

dist/extras/named-register.js

@@ -78,4 +78,4 @@
     firstName = null;
     return result;
   };
-})(typeof self !== 'undefined' ? self : global);}());
+})(typeof self !== 'undefined' ? self : global);})();

dist/extras/transform.js

@@ -17,7 +17,7 @@
     return fetch(url, { credentials: 'same-origin' })
     .then(function (res) {
       if (!res.ok)
-        throw Error(errMsg(7,  'Fetch error: ' + res.status + ' ' + res.statusText + (parent ? ' loading from ' + parent : '')));
+        throw Error(errMsg(7, 'Fetch error: ' + res.status + ' ' + res.statusText + (parent ? ' loading from ' + parent : '')));
       return res.text();
     })
     .then(function (source) {
@@ -33,4 +33,4 @@
   systemJSPrototype.transform = function (_id, source) {
     return source;
   };
-})(typeof self !== 'undefined' ? self : global);}());
+})(typeof self !== 'undefined' ? self : global);})();

dist/extras/use-default.js

@@ -13,4 +13,4 @@
       return ns.__useDefault ? ns.default : ns;
     });
   };
-})(typeof self !== 'undefined' ? self : global);}());
+})(typeof self !== 'undefined' ? self : global);})();

dist/s.js

@@ -180,7 +180,7 @@
   }
 
   function targetWarning (code, match, target, msg) {
-    console.warn(errMsg(code,  [target, match].join(', ') ));
+    console.warn(errMsg(code, [target, match].join(', ') ));
   }
 
   function resolveImportMap (importMap, resolvedOrPlain, parentUrl) {
@@ -282,7 +282,7 @@
     })
     .then(function (registration) {
       if (!registration)
-        throw Error(errMsg(2,  id ));
+        throw Error(errMsg(2, id ));
       function _export (name, value) {
         // note if we have hoisted exports (including reexports)
         load.h = true;
@@ -538,10 +538,10 @@
         script.sp = true;
         var fetchPromise = script.src ? fetch(script.src, { integrity: script.integrity }).then(function (res) {
           if (!res.ok)
-            throw Error( res.status );
+            throw Error(res.status );
           return res.text();
         }).catch(function (err) {
-          err.message = errMsg('W4',  script.src ) + '\n' + err.message;
+          err.message = errMsg('W4', script.src ) + '\n' + err.message;
           console.warn(err);
           if (typeof script.onerror === 'function') {
               script.onerror();
@@ -562,7 +562,7 @@
     try {
       newMap = JSON.parse(newMapText);
     } catch (err) {
-      console.warn(Error(( errMsg('W5')  )));
+      console.warn(Error((errMsg('W5')  )));
     }
     resolveAndComposeImportMap(newMap, newMapUrl, importMap);
   }
@@ -595,15 +595,14 @@
   };
 
   // Auto imports -> script tags can be inlined directly for load phase
-  var lastAutoImportUrl, lastAutoImportDeps, lastAutoImportTimeout;
+  var lastAutoImportDeps, lastAutoImportTimeout;
   var autoImportCandidates = {};
   var systemRegister = systemJSPrototype.register;
   systemJSPrototype.register = function (deps, declare) {
     if (hasDocument && document.readyState === 'loading' && typeof deps !== 'string') {
       var scripts = document.querySelectorAll('script[src]');
       var lastScript = scripts[scripts.length - 1];
       if (lastScript) {
-        lastAutoImportUrl = lastScript.src;
         lastAutoImportDeps = deps;
         // if this is already a System load, then the instantiate has already begun
         // so this re-import has no consequence
@@ -631,7 +630,7 @@
     return Promise.resolve(systemJSPrototype.createScript(url)).then(function (script) {
       return new Promise(function (resolve, reject) {
         script.addEventListener('error', function () {
-          reject(Error(errMsg(3,  [url, firstParentUrl].join(', ') )));
+          reject(Error(errMsg(3, [url, firstParentUrl].join(', ') )));
         });
         script.addEventListener('load', function () {
           document.head.removeChild(script);
@@ -674,10 +673,10 @@
     })
     .then(function (res) {
       if (!res.ok)
-        throw Error(errMsg(7,  [res.status, res.statusText, url, parent].join(', ') ));
+        throw Error(errMsg(7, [res.status, res.statusText, url, parent].join(', ') ));
       var contentType = res.headers.get('content-type');
       if (!contentType || !jsContentTypeRegEx.test(contentType))
-        throw Error(errMsg(4,  contentType ));
+        throw Error(errMsg(4, contentType ));
       return res.text().then(function (source) {
         if (source.indexOf('//# sourceURL=') < 0)
           source += '\n//# sourceURL=' + url;
@@ -689,16 +688,16 @@
 
   systemJSPrototype.resolve = function (id, parentUrl) {
     parentUrl = parentUrl || !true  || baseUrl;
-    return resolveImportMap(( importMap), resolveIfNotPlainOrUrl(id, parentUrl) || id, parentUrl) || throwUnresolved(id, parentUrl);
+    return resolveImportMap((importMap), resolveIfNotPlainOrUrl(id, parentUrl) || id, parentUrl) || throwUnresolved(id, parentUrl);
   };
 
   function throwUnresolved (id, parentUrl) {
-    throw Error(errMsg(8,  [id, parentUrl].join(', ') ));
+    throw Error(errMsg(8, [id, parentUrl].join(', ') ));
   }
 
   var systemInstantiate = systemJSPrototype.instantiate;
   systemJSPrototype.instantiate = function (url, firstParentUrl) {
-    var preloads = ( importMap).depcache[url];
+    var preloads = (importMap).depcache[url];
     if (preloads) {
       for (var i = 0; i < preloads.length; i++)
         getOrCreateLoad(this, this.resolve(preloads[i], url), url);
@@ -719,4 +718,4 @@
       });
     };
 
-}());
+})();