6.5.1

systemjs · Sep 2, 2020 · 5145217 · 5145217
1 parent 3270005
commit 5145217
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+SystemJS 6.5.1
+* Fix depcache hook (https://github.com/systemjs/systemjs/pull/2242)
+
 SystemJS 6.5.0
 * import.meta.resolve implementation (https://github.com/systemjs/systemjs/pull/2230)
 * Import maps integrity feature (https://github.com/systemjs/systemjs/pull/2229)

diff --git a/dist/s.js b/dist/s.js
@@ -1,5 +1,5 @@
 /*
-* SJS 6.5.0
+* SJS 6.5.1
 * Minimal SystemJS Build
 */
 (function () {
@@ -513,16 +513,6 @@
     window.addEventListener('DOMContentLoaded', processScripts);
   }
 
-  var systemInstantiate = systemJSPrototype.instantiate;
-  systemJSPrototype.instantiate = function (url, firstParentUrl) {
-    var preloads = ( importMap).depcache[url];
-    if (preloads) {
-      for (var i = 0; i < preloads.length; i++)
-        getOrCreateLoad(this, this.resolve(preloads[i], url), url);
-    }
-    return systemInstantiate.call(this, url, firstParentUrl);
-  };
-
   function processScripts () {
     [].forEach.call(document.querySelectorAll('script'), function (script) {
       if (script.sp) // sp marker = systemjs processed
@@ -650,6 +640,16 @@
     throw Error(errMsg(8,  [id, parentUrl].join(', ') ));
   }
 
+  var systemInstantiate = systemJSPrototype.instantiate;
+  systemJSPrototype.instantiate = function (url, firstParentUrl) {
+    var preloads = ( importMap).depcache[url];
+    if (preloads) {
+      for (var i = 0; i < preloads.length; i++)
+        getOrCreateLoad(this, this.resolve(preloads[i], url), url);
+    }
+    return systemInstantiate.call(this, url, firstParentUrl);
+  };
+
   /*
    * Supports loading System.register in workers
    */

diff --git a/dist/s.min.js b/dist/s.min.js
diff --git a/dist/s.min.js.map b/dist/s.min.js.map
diff --git a/dist/system-node.cjs b/dist/system-node.cjs
@@ -2638,16 +2638,6 @@ if (hasDocument) {
   window.addEventListener('DOMContentLoaded', processScripts);
 }
 
-var systemInstantiate = system_core_systemJSPrototype.instantiate;
-system_core_systemJSPrototype.instantiate = function (url, firstParentUrl) {
-  var preloads = (!process.env.SYSTEM_BROWSER && this[IMPORT_MAP] || import_maps_importMap).depcache[url];
-  if (preloads) {
-    for (var i = 0; i < preloads.length; i++)
-      getOrCreateLoad(this, this.resolve(preloads[i], url), url);
-  }
-  return systemInstantiate.call(this, url, firstParentUrl);
-};
-
 function processScripts () {
   [].forEach.call(document.querySelectorAll('script'), function (script) {
     if (script.sp) // sp marker = systemjs processed

diff --git a/dist/system.js b/dist/system.js
@@ -1,5 +1,5 @@
 /*
-* SystemJS 6.5.0
+* SystemJS 6.5.1
 */
 (function () {
   function errMsg(errCode, msg) {
@@ -521,16 +521,6 @@
     window.addEventListener('DOMContentLoaded', processScripts);
   }
 
-  var systemInstantiate = systemJSPrototype.instantiate;
-  systemJSPrototype.instantiate = function (url, firstParentUrl) {
-    var preloads = ( importMap).depcache[url];
-    if (preloads) {
-      for (var i = 0; i < preloads.length; i++)
-        getOrCreateLoad(this, this.resolve(preloads[i], url), url);
-    }
-    return systemInstantiate.call(this, url, firstParentUrl);
-  };
-
   function processScripts () {
     [].forEach.call(document.querySelectorAll('script'), function (script) {
       if (script.sp) // sp marker = systemjs processed
@@ -658,6 +648,16 @@
     throw Error(errMsg(8,  "Unable to resolve bare specifier '" + id + (parentUrl ? "' from " + parentUrl : "'")));
   }
 
+  var systemInstantiate = systemJSPrototype.instantiate;
+  systemJSPrototype.instantiate = function (url, firstParentUrl) {
+    var preloads = ( importMap).depcache[url];
+    if (preloads) {
+      for (var i = 0; i < preloads.length; i++)
+        getOrCreateLoad(this, this.resolve(preloads[i], url), url);
+    }
+    return systemInstantiate.call(this, url, firstParentUrl);
+  };
+
   /*
    * Supports loading System.register in workers
    */