fix bug where UMD modules with further dependencies did not resolve c…

…orrectly
dlueth · Oct 4, 2020 · 0c4cbb1 · 0c4cbb1
1 parent cdcd82f
commit 0c4cbb1
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 20 deletions.
diff --git a/dist/cache/dispose.js b/dist/cache/dispose.js
diff --git a/dist/cache/states.js b/dist/cache/states.js
diff --git a/dist/demand.js b/dist/demand.js
diff --git a/dist/demand.js.map b/dist/demand.js.map
diff --git a/dist/handler/css.js b/dist/handler/css.js
diff --git a/dist/handler/html.js b/dist/handler/html.js
diff --git a/dist/handler/json.js b/dist/handler/json.js
diff --git a/dist/handler/legacy.js b/dist/handler/legacy.js
diff --git a/dist/handler/text.js b/dist/handler/text.js
diff --git a/dist/plugin/cookie.js b/dist/plugin/cookie.js
diff --git a/dist/plugin/lzstring.js b/dist/plugin/lzstring.js
diff --git a/dist/plugin/sri.js b/dist/plugin/sri.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "qoopido.demand",
   "title": "Qoopido.demand",
   "description": "Promise like module loader using XHR requests and localStorage caching to dynamically load JavaScript and CSS + dynamic dependency resolution + support for custom handlers",
-  "version": "7.1.4",
+  "version": "7.1.5",
   "homepage": "https://github.com/dlueth/qoopido.demand",
   "author": {
     "name": "Dirk Lueth",

diff --git a/src/class/dependency.js b/src/class/dependency.js
@@ -148,10 +148,7 @@ var ClassDependency = (function() {
 
 						break;
 					case EXPORTS_ID:
-						value = {};
-
-						dependency.dfd.pledge
-							.then(this.get(context).dfd.resolve);
+						value = this.get(context).value = {};
 
 						break;
 				}

diff --git a/src/function/provide.js b/src/function/provide.js
@@ -46,14 +46,15 @@ provide = function provide() {
 							try {
 								value = definition.apply(NULL, arguments);
 
-								if(validatorIsThenable(value)) {
+								// module.value is already set when when module used exports (e.g. UMD)
+								if(!module.value && validatorIsThenable(value)) {
 									value
 										.then(
 											module.dfd.resolve,
 											function() { module.dfd.reject(new ClassFailure(ERROR_PROVIDE, module.id, arguments)); }
 										);
 								} else {
-									module.dfd.resolve(value);
+									module.dfd.resolve(module.value || value);
 								}
 							} catch(error) {
 								module.dfd.reject(new ClassFailure(ERROR_PROVIDE, module.id, arguments));