This repository was archived by the owner on Jul 13, 2020. It is now read-only.
Commit a888c8a
committed
ensureInstantiate fix
1 parent d2f1e70 commit a888c8a
1 file changed
Lines changed: 5 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -104,7 +104,7 @@ function createLoadRecord (key, registration) { | |||
| 104 | 104 | ||
| 105 | 105 | execute: undefined, | |
| 106 | 106 | ||
| 107 | - // this lock is necessary just in case a top level execure is called | ||
| 107 | + // this lock is necessary just in case a top level execute is called | ||
| 108 | 108 | // while alreadu executing | |
| 109 | 109 | evaluated: false, | |
| 110 | 110 | ||
@@ -190,7 +190,7 @@ RegisterLoader.prototype[Loader.resolveInstantiate] = function (key, parentKey) | |||
| 190 | 190 | function ensureInstantiate (loader, load) { | |
| 191 | 191 | var link = load.linkRecord; | |
| 192 | 192 | ||
| 193 | - if (!link) | ||
| 193 | + if (!link || link.allInstantiated) | ||
| 194 | 194 | return Promise.resolve(load); | |
| 195 | 195 | ||
| 196 | 196 | if (link.error) | |
@@ -221,10 +221,10 @@ function ensureInstantiateAllDeps (loader, load, seen) { | |||
| 221 | 221 | ||
| 222 | 222 | // skip if already executed / already all instantiated | |
| 223 | 223 | if (!link || link.allInstantiated) | |
| 224 | - return load; | ||
| 224 | + return Promise.resolve(load); | ||
| 225 | 225 | ||
| 226 | 226 | if (seen.indexOf(load) !== -1) | |
| 227 | - return load; | ||
| 227 | + return Promise.resolve(load); | ||
| 228 | 228 | seen.push(load); | |
| 229 | 229 | ||
| 230 | 230 | var instantiateDepsPromises = Array(link.dependencies.length); | |
@@ -456,6 +456,7 @@ function ensureRegister (load) { | |||
| 456 | 456 | throw new TypeError('Module instantiation did not call an anonymous or correctly named System.register.'); | |
| 457 | 457 | ||
| 458 | 458 | link.dependencies = registration[0]; | |
| 459 | + | ||
| 459 | 460 | load.importerSetters = []; | |
| 460 | 461 | ||
| 461 | 462 | // dynamic module | |
0 commit comments