componentjs
diff --git a/‎lib/resolver.js
Copy file name to clipboardExpand all lines: lib/resolver.js
+1Lines changed: 1 addition & 0 deletions b/‎lib/resolver.js
Copy file name to clipboardExpand all lines: lib/resolver.js
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎test/fixtures/locals/app.js
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎test/fixtures/locals/app.js
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎test/fixtures/locals/component.json
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎test/fixtures/locals/component.json
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎test/fixtures/locals/lib/a/component.json
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎test/fixtures/locals/lib/a/component.json
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎test/fixtures/locals/lib/a/index.js
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎test/fixtures/locals/lib/a/index.js
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎test/fixtures/locals/lib/boot/component.json
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎test/fixtures/locals/lib/boot/component.json
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎test/fixtures/locals/lib/boot/index.js
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎test/fixtures/locals/lib/boot/index.js
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎test/resolver.js
Copy file name to clipboardExpand all lines: test/resolver.js
+8Lines changed: 8 additions & 0 deletions b/‎test/resolver.js
Copy file name to clipboardExpand all lines: test/resolver.js
+8Lines changed: 8 additions & 0 deletions
@@ -240,6 +240,7 @@ Resolver.prototype.pull = function(type){
  */
 
 Resolver.prototype.resolve = function(dep, fn){
+  this.locals = this.locals.concat(this.parent.locals);
   var paths = this.paths.concat(this.locals);
   var dep = dep.replace('/', '-');
   var name = this.conf.name;
 
@@ -0,0 +1,2 @@
+
+module.exports = require('boot');
@@ -0,0 +1,7 @@
+{
+  "name": "app",
+  "main": "app.js",
+  "paths": ["lib"],
+  "scripts": ["app.js"],
+  "local": ["boot"]
+}
@@ -0,0 +1,5 @@
+{
+  "name": "a",
+  "main": "index.js",
+  "scripts": ["index.js"]
+}
@@ -0,0 +1,2 @@
+
+module.exports = 'a';
@@ -0,0 +1,6 @@
+{
+  "name": "boot",
+  "main": "index.js",
+  "scripts": ["index.js"],
+  "local": ["a"]
+}
@@ -0,0 +1,2 @@
+
+module.exports = require('a');
@@ -41,6 +41,14 @@ describe('Resolver', function(){
     })
   })
 
+
+  describe('locals', function(){
+    it('should work', function(done){
+      var resolver = Resolver('test/fixtures/locals');
+      resolver.end(done);
+    })
+  })
+
   describe('collision', function(){
     it('should work', function(done){
       var collision = Resolver('test/fixtures/collision');
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+`
	`2`	`+module.exports = require('boot');`