snapshot

jrburke · jrburke · commit c968d1179b59 · 2012-11-17T15:32:11.000-08:00
diff --git a/dist/r.js b/dist/r.js
@@ -1,5 +1,5 @@
 /**
- * @license r.js 2.1.1+ Sat, 17 Nov 2012 02:00:39 GMT Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * @license r.js 2.1.1+ Sat, 17 Nov 2012 23:32:03 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
  */
@@ -21,7 +21,7 @@ var requirejs, require, define;
 
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
         nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode,
-        version = '2.1.1+ Sat, 17 Nov 2012 02:00:39 GMT',
+        version = '2.1.1+ Sat, 17 Nov 2012 23:32:03 GMT',
         jsSuffixRegExp = /\.js$/,
         commandOption = '',
         useLibLoaded = {},
@@ -15080,43 +15080,53 @@ define('build', function (require) {
                     //Get rid of the extension
                     moduleName = moduleName.substring(0, moduleName.length - 3);
 
-                    //Convert the file to transport format, but without a name
-                    //inserted (by passing null for moduleName) since the files are
-                    //standalone, one module per file.
-                    fileContents = file.readFile(fileName);
-
-                    //For builds, if wanting cjs translation, do it now, so that
-                    //the individual modules can be loaded cross domain via
-                    //plain script tags.
-                    if (config.cjsTranslate) {
-                        fileContents = commonJs.convert(fileName, fileContents);
-                    }
-
                     //If there is an override for a specific layer build module,
                     //and this file is that module, mix in the override for use
                     //by optimize.jsFile.
                     moduleIndex = getOwn(config._buildPathToModuleIndex, fileName);
                     //Normalize, since getOwn could have returned undefined
                     moduleIndex = moduleIndex === 0 || moduleIndex > 0 ? moduleIndex : -1;
 
-                    //Only do transport normalization if this is not a build layer
-                    //and if normalizeDefines indicated all should be done.
-                    if (moduleIndex === -1 && config.normalizeDefines === "all") {
-                        fileContents = build.toTransport(config.namespace,
-                                                     null,
-                                                     fileName,
-                                                     fileContents);
-                    }
+                    //Try to avoid extra work if the other files do not need to
+                    //be read. Build layers should be processed at the very
+                    //least for optimization.
+                    if (moduleIndex > -1 || !config.skipDirOptimize ||
+                            config.normalizeDirDefines === "all" ||
+                            config.cjsTranslate) {
+                        //Convert the file to transport format, but without a name
+                        //inserted (by passing null for moduleName) since the files are
+                        //standalone, one module per file.
+                        fileContents = file.readFile(fileName);
 
-                    override = moduleIndex > -1 ?
-                               config.modules[moduleIndex].override : null;
-                    if (override) {
-                        cfg = build.createOverrideConfig(config, override);
-                    } else {
-                        cfg = config;
-                    }
+                        //For builds, if wanting cjs translation, do it now, so that
+                        //the individual modules can be loaded cross domain via
+                        //plain script tags.
+                        if (config.cjsTranslate) {
+                            fileContents = commonJs.convert(fileName, fileContents);
+                        }
+
+                        //Only do transport normalization if this is not a build
+                        //layer (since it was already normalized) and if
+                        //normalizeDirDefines indicated all should be done.
+                        if (moduleIndex === -1 && config.normalizeDirDefines === "all") {
+                            fileContents = build.toTransport(config.namespace,
+                                                         null,
+                                                         fileName,
+                                                         fileContents);
+                        }
+
+                        override = moduleIndex > -1 ?
+                                   config.modules[moduleIndex].override : null;
+                        if (override) {
+                            cfg = build.createOverrideConfig(config, override);
+                        } else {
+                            cfg = config;
+                        }
 
-                    optimize.jsFile(fileName, fileContents, fileName, cfg, pluginCollector);
+                        if (moduleIndex > -1 || !config.skipDirOptimize) {
+                            optimize.jsFile(fileName, fileContents, fileName, cfg, pluginCollector);
+                        }
+                    }
                 });
 
                 //Normalize all the plugin resources.
@@ -15649,13 +15659,13 @@ define('build', function (require) {
                             ' pages.');
         }
 
-        //Set up normalizeDefines. If not explicitly set, if optimize "none",
+        //Set up normalizeDirDefines. If not explicitly set, if optimize "none",
         //set to "skip" otherwise set to "all".
-        if (!hasProp(config, 'normalizeDefines')) {
-            if (config.optimize === 'none') {
-                config.normalizeDefines = 'skip';
+        if (!hasProp(config, 'normalizeDirDefines')) {
+            if (config.optimize === 'none' || config.skipDirOptimize) {
+                config.normalizeDirDefines = 'skip';
             } else {
-                config.normalizeDefines = 'all';
+                config.normalizeDirDefines = 'all';
             }
         }
 
