Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit b0075f3

Browse filesBrowse files
committed
fix mains with ./
1 parent 98e8c4a commit b0075f3
Copy full SHA for b0075f3

File tree

Expand file treeCollapse file tree

2 files changed

+27
-28
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+27
-28
lines changed

‎lib/builder.js

Copy file name to clipboardExpand all lines: lib/builder.js
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -817,13 +817,13 @@ function noop(builder, file, str){
817817
*/
818818

819819
function register(builder, file, js){
820+
// strip ./
821+
if ('./' == file.slice(0, 2)) file = file.slice(2);
822+
820823
var main = builder.config.main;
821824
var isMain = main == file;
822825
var orig = file;
823826

824-
// strip ./
825-
if ('./' == file.slice(0, 2)) file = file.slice(2);
826-
827827
// determine prefix
828828
// TODO: should always be name / version combo
829829
var prefix = builder.root

‎test/builder.js

Copy file name to clipboardExpand all lines: test/builder.js
+24-25Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -415,33 +415,32 @@ describe('Builder', function(){
415415
builder.addLookup('test/fixtures');
416416
builder.build(function(err, res){
417417
if (err) return done(err);
418-
res.js.should.include('require.register("main/index.js"');
419-
res.js.should.include('require.register("boot/index.js"');
418+
res.js.should.include('require.main("boot", "boot.js"');
419+
res.js.should.include('require.main("main", "foo.js"');
420420
done();
421421
})
422422
})
423423

424-
// it('should support root-level "main"', function(done){
425-
// var builder = new Builder('test/fixtures/main-boot');
426-
// builder.addLookup('test/fixtures');
427-
// builder.build(function(err, res){
428-
// if (err) return done(err);
429-
// res.js.should.include('require.alias("boot/boot.js", "boot/index.js")');
430-
// res.js.should.include('require.alias("main/foo.js", "boot/deps/main/index.js")');
431-
// res.js.should.include('require.alias("main/foo.js", "main/index.js")');
432-
// done();
433-
// })
434-
// })
435-
436-
// it('should expose name aliases for root dependencies', function(done){
437-
// var builder = new Builder('test/fixtures/root-aliases');
438-
// builder.addLookup('test/fixtures/components');
439-
// builder.build(function(err, res){
440-
// if (err) return done(err);
441-
// var js = res.require + res.js;
442-
// var ret = vm.runInNewContext(js + '\nrequire("jquery")');
443-
// ret.should.equal('jquery');
444-
// done();
445-
// })
446-
// })
424+
it('should support root-level "main"', function(done){
425+
var builder = new Builder('test/fixtures/main-boot');
426+
builder.addLookup('test/fixtures');
427+
builder.build(function(err, res){
428+
if (err) return done(err);
429+
res.js.should.include('require.main("boot", "boot.js")');
430+
res.js.should.include('require.main("main", "foo.js"');
431+
done();
432+
})
433+
})
434+
435+
it('should expose name aliases for root dependencies', function(done){
436+
var builder = new Builder('test/fixtures/root-aliases');
437+
builder.addLookup('test/fixtures/components');
438+
builder.build(function(err, res){
439+
if (err) return done(err);
440+
var js = res.require + res.js;
441+
var ret = vm.runInNewContext(js + '\nrequire("jquery")');
442+
ret.should.equal('jquery');
443+
done();
444+
})
445+
})
447446
})

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.