Merge pull request #70 from GordonSmith/GH-67-2

GH-67-2 runtime require behaviour
OpenNTF · Oct 23, 2017 · 90d3e94 · 90d3e94
2 parents 8f7521c + 190f77a
commit 90d3e94
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/lib/DojoAMDMainTemplate.runtime.js b/lib/DojoAMDMainTemplate.runtime.js
@@ -86,12 +86,7 @@ module.exports = function() {
 			}
 		}
 		if (!result) {
-			var msg = 'Module not found: ' + mid;
-			if (noInstall) {
-				throw new Error(msg);
-			} else {
-				console.error(msg);
-			}
+			throw new Error('Module not found: ' + mid);
 		}
 		return result;
 	}
@@ -115,10 +110,18 @@ module.exports = function() {
 		}
 		if (type === '[object Array]') {
 			var modules = [], callback = a2;
-			a1.forEach(function(mid) {
-				modules.push(findModule(mid, referenceModule));
+			var foundAll = true;
+			a1.forEach(function (mid) {
+				try {
+					modules.push(findModule(mid, referenceModule));
+				} catch (e) {
+					console.error(e.message);
+					foundAll = false;
+				}
 			});
-			callback.apply(this, modules);
+			if (foundAll) {
+				callback.apply(this, modules);
+			}
 			return req;
 		} else {
 			throw new Error('Unsupported require call');