6.4.2

systemjs · Aug 5, 2020 · 48901ea · 48901ea
1 parent 3bf22cb
commit 48901ea
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+SystemJS 6.4.2
+* Fix and simplify auto import domready resets (https://github.com/systemjs/systemjs/pull/2225)
+
 SystemJS 6.4.1
 * Fix auto import handling of dynamic import races during loading phase (https://github.com/systemjs/systemjs/pull/2223)
 * Fix crossOrigin script attribute loading in Safari (https://github.com/systemjs/systemjs/pull/2222)

diff --git a/dist/s.js b/dist/s.js
@@ -1,5 +1,5 @@
 /*
-* SJS 6.4.1
+* SJS 6.4.2
 * Minimal SystemJS Build
 */
 (function () {
@@ -527,7 +527,6 @@
   var lastAutoImportUrl, lastAutoImportDeps;
   var autoImportCandidates = {};
   var systemRegister = systemJSPrototype.register;
-  var timeoutCnt = 0;
   systemJSPrototype.register = function (deps, declare) {
     if (hasDocument && document.readyState === 'loading' && typeof deps !== 'string') {
       var scripts = document.getElementsByTagName('script');
@@ -537,17 +536,9 @@
         lastAutoImportUrl = url;
         lastAutoImportDeps = deps;
         autoImportCandidates[url] = [deps, declare];
-        var loader = this;
-        // This timeout ensures that if this is a dynamic script injection by SystemJS
-        // that the auto import will be cleared after the timeout and hence will not
-        // be auto imported
-        timeoutCnt++;
-        setTimeout(function () {
-          if (autoImportCandidates[url])
-            loader.import(url);
-          if (--timeoutCnt === 0 && document.readyState !== 'loading')
-            autoImportCandidates = {};
-        });
+        // if this is already a System load, then the instantiate has already begun
+        // so this re-import has no consequence
+        this.import(url);
       }
     }
     else {

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.js b/dist/system.js
@@ -1,5 +1,5 @@
 /*
-* SystemJS 6.4.1
+* SystemJS 6.4.2
 */
 (function () {
   function errMsg(errCode, msg) {
@@ -535,7 +535,6 @@
   var lastAutoImportUrl, lastAutoImportDeps;
   var autoImportCandidates = {};
   var systemRegister = systemJSPrototype.register;
-  var timeoutCnt = 0;
   systemJSPrototype.register = function (deps, declare) {
     if (hasDocument && document.readyState === 'loading' && typeof deps !== 'string') {
       var scripts = document.getElementsByTagName('script');
@@ -545,17 +544,9 @@
         lastAutoImportUrl = url;
         lastAutoImportDeps = deps;
         autoImportCandidates[url] = [deps, declare];
-        var loader = this;
-        // This timeout ensures that if this is a dynamic script injection by SystemJS
-        // that the auto import will be cleared after the timeout and hence will not
-        // be auto imported
-        timeoutCnt++;
-        setTimeout(function () {
-          if (autoImportCandidates[url])
-            loader.import(url);
-          if (--timeoutCnt === 0 && document.readyState !== 'loading')
-            autoImportCandidates = {};
-        });
+        // if this is already a System load, then the instantiate has already begun
+        // so this re-import has no consequence
+        this.import(url);
       }
     }
     else {