fix depLoad already linked in dynamic require sfx case

systemjs · Mar 16, 2017 · cd19b07 · cd19b07
1 parent db73dd3
commit cd19b07
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/templates/sfx-core.js b/templates/sfx-core.js
@@ -183,11 +183,17 @@
       for (var i = 0; i < deps.length; i++)
         if (deps[i] === name) {
           var depLoad = depLoads[i];
+          var depLink = depLoad.linkRecord;
           var module;
-          if (seen.indexOf(depLoad) === -1)
-            module = doEvaluate(depLoad, depLoad.linkRecord, seen);
-          else
-            module = depLoad.linkRecord.moduleObj;
+          if (depLink) {
+            if (seen.indexOf(depLoad) === -1)
+              module = doEvaluate(depLoad, depLink, seen);
+            else
+              module = depLink.moduleObj;
+          }
+          else {
+            module = depLoad.module;
+          }
           return module.__useDefault ? module.default : module;
         }
     };

diff --git a/templates/sfx-core.min.js b/templates/sfx-core.min.js