snapshot

jrburke · jrburke · commit d26f3ef7ab12 · 2012-05-31T23:39:27.000-07:00
diff --git a/dist/r.js b/dist/r.js
@@ -1,5 +1,5 @@
 /**
- * @license r.js 2.0.0+ Thu, 31 May 2012 01:23:03 GMT Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * @license r.js 2.0.0+ Fri, 01 Jun 2012 06:39:06 GMT Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -20,7 +20,7 @@ var requirejs, require, define;
 
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
         nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode,
-        version = '2.0.0+ Thu, 31 May 2012 01:23:03 GMT',
+        version = '2.0.0+ Fri, 01 Jun 2012 06:39:06 GMT',
         jsSuffixRegExp = /\.js$/,
         commandOption = '',
         useLibLoaded = {},
@@ -15388,7 +15388,7 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
     build = function (args) {
         var stackRegExp = /( {4}at[^\n]+)\n/,
             standardIndent = '  ',
-            buildFile, cmdConfig, errorMsg, stackMatch, errorTree,
+            buildFile, cmdConfig, errorMsg, errorStack, stackMatch, errorTree,
             i, j, errorMod;
 
         try {
@@ -15421,14 +15421,13 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
             stackMatch = stackRegExp.exec(errorMsg);
 
             if (stackMatch) {
-                errorMsg = errorMsg.substring(0, stackMatch.index + stackMatch[0].length + 1);
+                errorMsg += errorMsg.substring(0, stackMatch.index + stackMatch[0].length + 1);
             }
-            logger.error(errorMsg);
 
             //If a module tree that shows what module triggered the error,
             //print it out.
             if (errorTree && errorTree.length > 0) {
-                errorMsg = 'In module tree:\n';
+                errorMsg += '\nIn module tree:\n';
 
                 for (i = errorTree.length - 1; i > -1; i--) {
                     errorMod = errorTree[i];
@@ -15443,21 +15442,26 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
                 logger.error(errorMsg);
             }
 
-            errorMsg = e.stack;
+            errorStack = e.stack;
 
             if (typeof args === 'string' && args.indexOf('stacktrace=true') !== -1) {
-                logger.error(errorMsg);
+                errorMsg += '\n' + errorStack;
             } else {
-                if (!stackMatch && errorMsg) {
+                if (!stackMatch && errorStack) {
                     //Just trim out the first "at" in the stack.
-                    stackMatch = stackRegExp.exec(errorMsg);
+                    stackMatch = stackRegExp.exec(errorStack);
                     if (stackMatch) {
-                        logger.error(stackMatch[0] || '');
+                        errorMsg += '\n' + stackMatch[0] || '';
                     }
                 }
             }
 
-            quit(1);
+            if (logger.level > logger.ERROR) {
+                throw new Error(errorMsg);
+            } else {
+                logger.error(errorMsg);
+                quit(1);
+            }
         }
     };
 
@@ -16143,6 +16147,11 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
                             ' or baseUrl directories optimized.');
         }
 
+        if (config.insertRequire && !lang.isArray(config.insertRequire)) {
+            throw new Error('insertRequire should be a list of module IDs' +
+                            ' to insert in to a require([]) call.');
+        }
+
         if ((config.name || config.include) && !config.modules) {
             //Just need to build one file, but may be part of a whole appDir/
             //baseUrl copy, but specified on the command line, so cannot do
