Combine tar and isolate, so that everything is done in one definition.

node/utils/Minify.js

@@ -278,37 +278,41 @@ function requireDefinition() {
 }
 
 function tarCode(jsFiles, write, callback) {
-  async.forEach(jsFiles, function (item, callback){
+  write('require.define({');
-    if (item == 'ace.js') {
+  var initialEntry = true;
+  async.forEach(jsFiles, function (filename, callback){
+    if (filename == 'ace.js') {
       getAceFile(handleFile);
     } else {
-      fs.readFile(JS_DIR + item, "utf8", handleFile);
+      fs.readFile(JS_DIR + filename, "utf8", handleFile);
     }
 
     function handleFile(err, data) {
       if(ERR(err, callback)) return;
-      data = ("\n\n\n/*** File: static/js/" + item + " ***/\n\n\n") + data;
-      if (settings.minify) {
-        write(compressJS([isolateJS(data, item)]) + ';\n');
-      } else {
-        write(isolateJS(data, item));
-      }
-      callback();
-    }
-  }, callback);
-}
-
-// Wrap the following code in a self executing function and assign exports to
-// global. This is a first step towards removing symbols from the global scope.
-// exports is global and require is a function that returns global.
-function isolateJS(code, filename) {
       var srcPath = JSON.stringify('/' + filename);
       var srcPathAbbv = JSON.stringify('/' + filename.replace(/\.js$/, ''));
-  return 'require.define({'
+      if (!initialEntry) {
-    + srcPath + ': '
+        write('\n,');
-      + 'function (require, exports, module) {' + code + '}'
+      } else {
-    + (srcPath != srcPathAbbv ? '\n,' + srcPathAbbv + ': null' : '')
+        initialEntry = false;
-    + '});\n';
+      }
+      write(srcPath + ': ')
+      data = '(function (require, exports, module) {' + data + '})';
+      if (settings.minify) {
+        write(compressJS([data]));
+      } else {
+        write(data);
+      }
+      if (srcPath != srcPathAbbv) {
+        write('\n,' + srcPathAbbv + ': null');
+      }
+
+      callback();
+    }
+  }, function () {
+    write('});\n');
+    callback();
+  });
 }
 
 function compressJS(values)