Skip to content

Commit c33bd1a

Browse files
author
benholloway
committed
fix composition order
1 parent 46747ff commit c33bd1a

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

lib/list-compositions.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,28 @@ var glob = require('glob');
1212
function compositions(appDir) {
1313
var files = glob.sync(appDir + '/**/index.html') || [];
1414
return files
15-
.sort()
16-
.reduce(reduceFilesToItems, []);
15+
.map(fileToItem)
16+
.sort(sortByDirectory);
1717

18-
function reduceFilesToItems(array, file) {
18+
function fileToItem(file) {
1919
var posix = path.dirname(file).replace(/[\\\/]/g, '/'),
2020
relative = path.relative(path.resolve(appDir), path.resolve(file)),
21-
directory = path.dirname(relative),
21+
directory = path.dirname(relative)
22+
.replace(/^\.$/, ''),
2223
namespace = directory
23-
.replace(/^\.$/, '').split(/[\\\/]/)
24+
.split(/[\\\/]/)
2425
.filter(Boolean);
2526

26-
return array.concat({
27+
return {
2728
directory : directory,
2829
namespace : namespace,
2930
htmlFiles : file,
3031
indexFiles: glob.sync(posix + '/index.{js,css,scss}')
31-
});
32+
};
33+
}
34+
35+
function sortByDirectory(a, b) {
36+
return (a.directory > b.directory);
3237
}
3338
}
3439

0 commit comments

Comments
 (0)