componentjs
diff --git a/‎lib/builder.js
Copy file name to clipboardExpand all lines: lib/builder.js
+22-9Lines changed: 22 additions & 9 deletions b/‎lib/builder.js
Copy file name to clipboardExpand all lines: lib/builder.js
+22-9Lines changed: 22 additions & 9 deletions
diff --git a/‎package.json
Copy file name to clipboardExpand all lines: package.json
+1-1Lines changed: 1 addition & 1 deletion b/‎package.json
Copy file name to clipboardExpand all lines: package.json
+1-1Lines changed: 1 addition & 1 deletion
@@ -818,44 +818,57 @@ function noop(builder, file, str){
 
 function register(builder, file, js){
   var main = builder.config.main;
+  var isMain = main == file;
   var orig = file;
 
   // strip ./
   if ('./' == file.slice(0, 2)) file = file.slice(2);
 
-  // rewrite main to index.js
-  // so that require() still grabs
-  // the correct file without aliases
-  if (file == main) file = 'index.js';
-
   // determine prefix
   // TODO: should always be name / version combo
   var prefix = builder.root
     ? builder.config.name
     : builder.basename;
 
-
   // prefix
   file = prefix + '/' + file;
 
+  // rewrite requires for dependencies,
+  // and fix relative requires when .main
+  // is not index.js
   js = requires(js, function(require){
     var deps = builder.config.dependencies || {};
     var path = require.path;
     var name = canonicalized(path, deps) || path;
     return 'require("' + name + '")';
   });
 
+  // register the module
   if (builder.sourceUrls) {
-    js = JSON.stringify(js + '//@ sourceURL=' + prefix + '/' + orig);
+    js = JSON.stringify(js + '//@ sourceURL=' + file);
     js = js.replace(/\\n/g, '\\n\\\n');
-    return 'require.register("' + file + '", Function("exports, require, module",\n'
+    js = 'require.register("' + file + '", Function("exports, require, module",\n'
       + js
       + '\n));';
   } else {
-    return 'require.register("' + file + '", function(exports, require, module){\n'
+    js = 'require.register("' + file + '", function(exports, require, module){\n'
       + js
       + '\n});';
   }
+
+  // main support
+  // TODO: dear god, this is nasty, doesnt belong
+  // in here but doing a separate tree walk is lame
+  // so screw it, works for now, need to rewrite this thing
+
+  // once we produce a dep tree first then we can completely
+  // remove all of this junk, as we'll know what all the mains
+  // are and can simply rewrite
+  if (isMain && 'index.js' != orig) {
+    js += '\nrequire.main("' + prefix + '", "' + orig + '")';
+  }
+
+  return js;
 }
 
 /**
 
@@ -8,7 +8,7 @@
   ],
   "author": "TJ Holowaychuk <tj@vision-media.caa>",
   "dependencies": {
-    "component-require": "1.0.0",
+    "component-require": "1.0.1",
     "batch": "0.2.1",
     "mkdirp": "0.3.4",
     "debug": "*",