Skip to content

Commit bb4d5a1

Browse files
modularcodermodularcoder
committed
Simplify build paths
MOve dest folders from paths to tasks
1 parent d67f58e commit bb4d5a1

11 files changed

Lines changed: 61 additions & 127 deletions

File tree

‎build/gulpfile.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ gulp.task('connect', function() {
4343
// Rerun the task when a file changes
4444
gulp.task('watch', function() {
4545
// When template changes recompile .html pages
46-
plugins.watch(paths.app.templates.src, function() {
46+
plugins.watch(paths.app.templates, function() {
4747
gulp.start('app-pages');
4848
});
4949

@@ -53,17 +53,17 @@ gulp.task('watch', function() {
5353
});
5454

5555
// When script changes recompile scripts
56-
plugins.watch(paths.app.scripts.src, function() {
56+
plugins.watch(paths.app.scripts, function() {
5757
gulp.start('app-scripts');
5858
});
5959

6060
// When style changes recompile styles
61-
plugins.watch(paths.app.styles.src, function() {
61+
plugins.watch(paths.app.styles, function() {
6262
gulp.start('app-styles');
6363
});
6464

6565
// When theme changes recompile themes
66-
plugins.watch(paths.app.themes.src, function() {
66+
plugins.watch(paths.app.themes, function() {
6767
gulp.start('app-themes');
6868
});
6969
});

‎build/paths/app.js‎

Lines changed: 19 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -20,37 +20,27 @@ var destDir = config.destDir;
2020
Ignore context.js files.
2121
*/
2222

23-
exports.scripts = {
24-
src: [
25-
srcDir + "/config.js",
26-
srcDir + "/**/!(_context|config|main|*-helper)*.js",
27-
srcDir + "/main.js",
28-
"!" + srcDir + "/_vendor/**"
29-
],
30-
dest: destDir + "/js"
31-
};
23+
exports.scripts = [
24+
srcDir + "/config.js",
25+
srcDir + "/**/!(_context|config|main|*-helper)*.js",
26+
srcDir + "/main.js",
27+
"!" + srcDir + "/_vendor/**"
28+
];
3229

3330
/***********************************************
3431
* Application style files
3532
************************************************/
3633

37-
exports.styles = {
38-
src: [
39-
srcDir + "/_main.scss",
40-
srcDir + "/**/!(_main|_variables|*-theme)*.scss",
41-
],
42-
dest: destDir + "/css/"
43-
};
34+
exports.styles = [
35+
srcDir + "/_main.scss",
36+
srcDir + "/**/!(_main|_variables|*-theme)*.scss",
37+
];
4438

4539
/***********************************************
4640
* Application theme files
4741
************************************************/
4842

49-
exports.themes = {
50-
src: srcDir + "/**/*-theme.scss",
51-
dest: destDir + "/css/"
52-
};
53-
43+
exports.themes = srcDir + "/**/*-theme.scss";
5444

5545
/***********************************************
5646
* Application page files
@@ -62,10 +52,7 @@ var destDir = config.destDir;
6252
6353
*/
6454

65-
exports.pages = {
66-
src: srcDir + "/**/*-page.hbs",
67-
dest: destDir + "/"
68-
};
55+
exports.pages = srcDir + "/**/*-page.hbs";
6956

7057

7158
/***********************************************
@@ -78,10 +65,7 @@ var destDir = config.destDir;
7865
in order to use feature like includes or layouts
7966
*/
8067

81-
exports.templates = {
82-
src: srcDir + "/**/*.hbs",
83-
dest: destDir + "/templates"
84-
};
68+
exports.templates = srcDir + "/**/*.hbs";
8569

8670
/***********************************************
8771
* Application handlebars helpers files
@@ -92,13 +76,10 @@ var destDir = config.destDir;
9276
Read more: http://handlebarsjs.com/block_helpers.html
9377
*/
9478

95-
exports.helpers = {
96-
src: [
97-
srcDir + "/**/*-helper.js",
98-
rootDir + '/node_modules/handlebars-layouts/index.js',
99-
],
100-
dest: destDir + "/templates"
101-
};
79+
exports.helpers = [
80+
srcDir + "/**/*-helper.js",
81+
rootDir + '/node_modules/handlebars-layouts/index.js',
82+
];
10283

10384

10485
/***********************************************
@@ -111,16 +92,10 @@ var destDir = config.destDir;
11192
such as <link> and <script> tags.
11293
*/
11394

114-
exports.layouts = {
115-
src: srcDir + "/**/*-layout.hbs",
116-
dest: destDir + "/templates"
117-
};
95+
exports.layouts = srcDir + "/**/*-layout.hbs";
11896

11997
/***********************************************
12098
* Application asset files
12199
************************************************/
122100

123-
exports.assets = {
124-
src: srcDir + "/_assets/**/*",
125-
dest: destDir + "/assets"
126-
};
101+
exports.assets = srcDir + "/_assets/**/*";

‎build/paths/vendor.js‎

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,11 @@ var bowerDir = config.bowerDir;
3131
3232
eg.
3333
34-
export.scripts: {
35-
src: [
36-
bowerDir + "jquery/dist/jquery.js",
37-
bowerDir + "angular/jquery.js",
38-
]
39-
}
34+
export.scripts: [
35+
bowerDir + "jquery/dist/jquery.js",
36+
bowerDir + "angular/jquery.js",
37+
]
4038
41-
4239
********************************************************************************/
4340

4441

@@ -48,36 +45,27 @@ var bowerDir = config.bowerDir;
4845
************************************************/
4946

5047

51-
var vendorSrciptFiles = mainBowerFiles({
48+
exports.scripts = mainBowerFiles({
5249
filter: [
5350
'**/*.js',
5451
'!**/*.min.js'
5552
],
5653
paths: rootDir
5754
});
5855

59-
exports.scripts = {
60-
src: vendorSrciptFiles,
61-
dest: destDir + "/js"
62-
};
6356

6457
/***********************************************
6558
* Vendor style files
6659
************************************************/
6760

68-
var vendorStyleFiles = mainBowerFiles({
61+
exports.styles = mainBowerFiles({
6962
filter: [
7063
'**/*.css',
7164
'!**/*.min.css'
7265
],
7366
paths: rootDir
7467
});
7568

76-
exports.styles = {
77-
src: vendorStyleFiles,
78-
dest: destDir + "/css"
79-
};
80-
8169

8270
/***********************************************
8371
* Vendor assets files
@@ -87,7 +75,7 @@ var bowerDir = config.bowerDir;
8775
All files which are not .js, .css, .less and fonts
8876
*/
8977

90-
var vendorAssetFiles = mainBowerFiles({
78+
exports.assets = mainBowerFiles({
9179
filter: [
9280
'**/*',
9381
'!**/*.js',
@@ -105,17 +93,12 @@ var bowerDir = config.bowerDir;
10593
paths: rootDir
10694
});
10795

108-
exports.assets = {
109-
src: vendorAssetFiles,
110-
dest: destDir + "/assets"
111-
};
112-
11396
/***********************************************
11497
* Vendor font files
11598
************************************************/
11699

117100

118-
var vendorFontFiles = mainBowerFiles({
101+
exports.fonts = mainBowerFiles({
119102
filter: [
120103
'**/*.otf',
121104
'**/*.eot',
@@ -125,10 +108,4 @@ var bowerDir = config.bowerDir;
125108
'**/*.svg'
126109
],
127110
paths: rootDir
128-
});
129-
130-
131-
exports.fonts = {
132-
src: vendorFontFiles,
133-
dest: destDir + "/fonts"
134-
};
111+
});

‎build/tasks/app-assets.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
var config = require('../config');
2+
13
module.exports.task = function(gulp, plugins, paths) {
2-
gulp.src(paths.app.assets.src)
3-
.pipe(gulp.dest(paths.app.assets.dest));
4+
gulp.src(paths.app.assets)
5+
.pipe(gulp.dest(config.destDir + "/assets"));
46
};

‎build/tasks/app-pages.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ var config = require('../config');
77

88
module.exports.task = function(gulp, plugins, paths) {
99

10-
gulp.src(paths.app.pages.src)
10+
gulp.src(paths.app.pages)
1111
// Frontmatter
1212
.pipe(plugins.frontMatter())
1313
// handlebars compilation
1414
.pipe(plugins.hb({
1515
// Register all templates as partials
16-
partials: paths.app.templates.src,
16+
partials: paths.app.templates,
1717
// Partials naming e.g. 'app/app-layout'
1818
parsePartialName: function (file) {
1919
return file.shortPath;
2020
},
2121
// Registering template helpers
22-
helpers: paths.app.helpers.src,
22+
helpers: paths.app.helpers,
2323
// Context data for each page file
2424
dataEach: function (context, file) {
2525

@@ -45,7 +45,7 @@ module.exports.task = function(gulp, plugins, paths) {
4545
.pipe(plugins.flatten())
4646

4747
// Output
48-
.pipe(gulp.dest(paths.app.pages.dest));
48+
.pipe(gulp.dest(config.destDir));
4949
};
5050

5151

‎build/tasks/app-scripts.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
var config = require('../config');
2+
13
module.exports.task = function(gulp, plugins, paths) {
2-
gulp.src(paths.app.scripts.src)
4+
gulp.src(paths.app.scripts)
35
.pipe(plugins.concat('app.js'))
4-
.pipe(gulp.dest(paths.app.scripts.dest));
6+
.pipe(gulp.dest(config.destDir + '/js'));
57
};

‎build/tasks/app-styles.js‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,8 @@ var config = require('../config');
33

44
module.exports.task = function(gulp, plugins, paths) {
55

6-
// gulp.src(paths.app.styles.src)
7-
// .pipe(plugins.concat('app.less'))
8-
// .pipe(plugins.less({
9-
// paths: [
10-
// path.resolve( config.srcDir ),
11-
// path.resolve( config.bowerDir ),
12-
// ]
13-
// }))
14-
// .on('error', plugins.util.log)
15-
// .pipe(plugins.autoprefixer())
16-
// .pipe(gulp.dest(paths.app.styles.dest));
17-
18-
gulp.src(paths.app.styles.src)
6+
gulp.src(paths.app.styles)
197
.pipe(plugins.concat('app.scss'))
20-
// .pipe(gulp.dest(paths.app.styles.dest))
218
.pipe(
229
plugins.sass({
2310
includePaths: [
@@ -29,17 +16,5 @@ module.exports.task = function(gulp, plugins, paths) {
2916
.on('error', plugins.sass.logError)
3017
)
3118
.pipe(plugins.autoprefixer())
32-
.pipe(gulp.dest(paths.app.styles.dest));
33-
34-
35-
// gulp.src(paths.app.themes.src)
36-
// .pipe(plugins.less({
37-
// paths: [
38-
// path.resolve( config.srcDir ),
39-
// path.resolve( config.bowerDir ),
40-
// ]
41-
// }))
42-
// .on('error', plugins.util.log)
43-
// .pipe(plugins.autoprefixer())
44-
// .pipe(gulp.dest(paths.app.themes.dest));
19+
.pipe(gulp.dest(config.destDir + '/css'));
4520
};

‎build/tasks/app-themes.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ var glob = require('glob');
55
module.exports.task = function(gulp, plugins, paths) {
66

77
// For each theme file
8-
glob.sync(paths.app.themes.src).forEach(function(filePath) {
8+
glob.sync(paths.app.themes).forEach(function(filePath) {
99

1010
// Prepend file to styles glob
11-
var src = [].concat(paths.app.styles.src);
11+
var src = [].concat(paths.app.styles);
1212
src.unshift(filePath);
1313

1414
// Theme name
@@ -27,7 +27,7 @@ module.exports.task = function(gulp, plugins, paths) {
2727
.on('error', plugins.sass.logError)
2828
)
2929
.pipe(plugins.autoprefixer())
30-
.pipe(gulp.dest(paths.app.themes.dest));
30+
.pipe(gulp.dest(config.destDir + '/css'));
3131

3232
});
3333

‎build/tasks/vendor-assets.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
var config = require('../config');
2+
13
module.exports.task = function(gulp, plugins, paths) {
2-
gulp.src(paths.vendor.assets.src)
3-
.pipe(gulp.dest(paths.vendor.assets.dest));
4+
gulp.src(paths.vendor.assets)
5+
.pipe(gulp.dest(config.destDir + "/assets"));
46

5-
gulp.src(paths.vendor.fonts.src)
6-
.pipe(gulp.dest(paths.vendor.fonts.dest));
7+
gulp.src(paths.vendor.fonts)
8+
.pipe(gulp.dest(config.destDir + "/fonts"));
79
};

‎build/tasks/vendor-scripts.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
var config = require('../config');
2+
13
module.exports.task = function(gulp, plugins, paths) {
2-
gulp.src(paths.vendor.scripts.src)
4+
gulp.src(paths.vendor.scripts)
35
.pipe(plugins.concat('vendor.js'))
4-
.pipe(gulp.dest(paths.vendor.scripts.dest));
6+
.pipe(gulp.dest(config.destDir + "/js"));
57
};

0 commit comments

Comments
 (0)