Merge System.define correction

Author: guybedford

src/loader.js

@@ -345,6 +345,12 @@ function logloads(loads) {
       for (var i = 0, l = loader.loads.length; i < l; i++) {
         if (loader.loads[i].name == name) {
           existingLoad = loader.loads[i];
+
+          if(step == 'translate' && !existingLoad.source) {
+            existingLoad.address = stepState.moduleAddress;
+            proceedToTranslate(loader, existingLoad, Promise.resolve(stepState.moduleSource));
+          }
+
           return existingLoad.linkSets[0].done.then(function() {
             resolve(existingLoad);
           });

test/loader/master.js

@@ -0,0 +1 @@
+import 'slave';

test/system.spec.js

@@ -375,6 +375,36 @@ describe('System', function () {
     });
 
   });
+  
+  describe('#System.define', function () {
+
+    it('should load System.define', function(done) {
+      var oldLocate = System.locate;
+      var slaveLocatePromise = new Promise(function(resolve, reject) {
+
+        System.locate = function(load) {
+          if(load.name === 'slave') {
+            setTimeout(function() {
+              System.define('slave', 'var double = [1,2,3].map(i => i * 2);');
+              resolve('slave.js');
+            }, 1);
+            return slaveLocatePromise;
+          }
+          return oldLocate.apply(this, arguments);
+        };
+
+      });
+
+      System.import('test/loader/master').then(function(m) {
+        done()
+      }, done).then(reset, reset);
+
+      function reset() {
+        System.locate = oldLocate;
+      }
+    });
+
+  });
 
   describeIf(
     typeof window != 'undefined' && window.Worker,

test/test.js

@@ -441,6 +441,34 @@ function runTests() {
     });
   });
 
+  test('should load System.define', function(assert) {
+    var oldLocate = System.locate;
+    var slaveLocatePromise = new Promise(function(resolve, reject) {
+
+      System.locate = function(load) {
+        if(load.name === 'slave') {
+          setTimeout(function() {
+            System.define('slave', 'var double = [1,2,3].map(i => i * 2);');
+            resolve('slave.js');
+          }, 1);
+          return slaveLocatePromise;
+        }
+        return oldLocate.apply(this, arguments);
+      };
+
+    });
+
+    System.import('loader/master').then(function() {
+      assert(true, true, 'Able to load');
+    }, function(err) {
+      assert('Did not resolve');
+    }).then(reset, reset);
+
+    function reset() {
+      System.locate = oldLocate;
+    }
+  });
+
   var customModules = {};
   var customFactories = {};