6.8.0

systemjs · Nov 26, 2020 · d762870 · d762870
1 parent 48351aa
commit d762870
Show file tree

Hide file tree

Showing 12 changed files with 5,556 additions and 5,473 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+SystemJS 6.8.0
+* System.firstGlobalProp for global loading extra (https://github.com/systemjs/systemjs/commit/48351aa83c48fdd22b63000d417dedc2329f2340, @joeldenning)
+* Graceful import map loading errors (https://github.com/systemjs/systemjs/commit/9edebd1969842dcc95a12d4137677c6bc9fe2bae, @naltatis)
+* Sourcemap normalization for fetch loader (https://github.com/systemjs/systemjs/commit/97621d724cc7c892d9dee2cff6b27553326c8169)
+* Dispatch script loading errors for `<script type="systemjs-module">` (https://github.com/systemjs/systemjs/commit/f0fe5a473414b995082688c30a876c602e32d901, @dmail)
+
 SystemJS 6.7.1
 * Fix auto import race condition (https://github.com/systemjs/systemjs/pull/2266)
 

diff --git a/dist/extras/global.js b/dist/extras/global.js
@@ -10,18 +10,23 @@
   var firstGlobalProp, secondGlobalProp, lastGlobalProp;
   function getGlobalProp () {
     var cnt = 0;
-    var lastProp;
+    var foundLastProp, result;
     for (var p in global) {
       // do not check frames cause it could be removed during import
       if (shouldSkipProperty(p))
         continue;
       if (cnt === 0 && p !== firstGlobalProp || cnt === 1 && p !== secondGlobalProp)
         return p;
+      if (foundLastProp) {
+        lastGlobalProp = p;
+        result = systemJSPrototype.firstGlobalProp && result || p;
+      }
+      else {
+        foundLastProp = p === lastGlobalProp;
+      }
       cnt++;
-      lastProp = p;
     }
-    if (lastProp !== lastGlobalProp)
-      return lastProp;
+    return result;
   }
 
   function noteGlobalProps () {

diff --git a/dist/extras/global.min.js b/dist/extras/global.min.js
diff --git a/dist/extras/global.min.js.map b/dist/extras/global.min.js.map
diff --git a/dist/s.js b/dist/s.js
@@ -1,8 +1,9 @@
 /*
-* SJS 6.7.1
+* SJS 6.8.0
 * Minimal SystemJS Build
 */
 (function () {
+
   function errMsg(errCode, msg) {
     return (msg || "") + " (SystemJS https://git.io/JvFET#" + errCode + ")";
   }
@@ -464,18 +465,18 @@
             execPromise = execPromise.then(function () {
               load.C = load.n;
               load.E = null; // indicates completion
-              if (!true) triggerOnload(loader, load, null, true);
+              if (!true) ;
             }, function (err) {
               load.er = err;
               load.E = null;
-              if (!true) triggerOnload(loader, load, err, true);
+              if (!true) ;
               else throw err;
             });
           return load.E = load.E || execPromise;
         }
         // (should be a promise, but a minify optimization to leave out Promise.resolve)
         load.C = load.n;
-        if (!true) triggerOnload(loader, load, null, true);
+        if (!true) ;
       }
       catch (err) {
         load.er = err;
@@ -522,12 +523,27 @@
         script.sp = true;
         if (!script.src)
           return;
-        System.import(script.src.slice(0, 7) === 'import:' ? script.src.slice(7) : resolveUrl(script.src, baseUrl));
+        System.import(script.src.slice(0, 7) === 'import:' ? script.src.slice(7) : resolveUrl(script.src, baseUrl)).catch(function (e) {
+          // if there is a script load error, dispatch an "error" event
+          // on the script tag.
+          if (e.message.indexOf('https://git.io/JvFET#3') > -1) {
+            var event = document.createEvent('Event');
+            event.initEvent('error', false, false);
+            script.dispatchEvent(event);
+          }
+          return Promise.reject(e);
+        });
       }
       else if (script.type === 'systemjs-importmap') {
         script.sp = true;
         var fetchPromise = script.src ? fetch(script.src, { integrity: script.integrity }).then(function (res) {
+          if (!res.ok)
+            throw Error( res.status );
           return res.text();
+        }).catch(function (err) {
+          err.message = errMsg('W4',  script.src ) + '\n' + err.message;
+          console.warn(err);
+          return '{}';
         }) : script.innerHTML;
         importMapPromise = importMapPromise.then(function () {
           return fetchPromise;
@@ -539,10 +555,11 @@
   }
 
   function extendImportMap (importMap, newMapText, newMapUrl) {
+    var newMap = {};
     try {
-      var newMap = JSON.parse(newMapText);
+      newMap = JSON.parse(newMapText);
     } catch (err) {
-      throw Error( errMsg(1) );
+      console.warn(Error(( errMsg('W5')  )));
     }
     resolveAndComposeImportMap(newMap, newMapUrl, importMap);
   }
@@ -658,6 +675,8 @@
       if (!contentType || !jsContentTypeRegEx.test(contentType))
         throw Error(errMsg(4,  contentType ));
       return res.text().then(function (source) {
+        if (source.indexOf('//# sourceURL=') < 0)
+          source += '\n//# sourceURL=' + url;
         (0, eval)(source);
         return loader.getRegister();
       });