Skip to content

Commit 6de7a22

Browse files
bguizbguiz
committed
=BG= reindent post merge conflict resolution
- move any instances of `cliArgs` parsing out of main gulp tasks
1 parent 83073dc commit 6de7a22

File tree

10 files changed

+243
-247
lines changed

10 files changed

+243
-247
lines changed

‎tasks/build.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ function setUpTaskBuild(tyRun) {
88
checks: [],
99
options: [],
1010
onInit: function onBuildTask(yargsInstance) {
11-
var cliArgs = yargsInstance
12-
.strict()
13-
.wrap(80)
14-
.argv;
11+
var gulp = require('gulp'),
12+
wordwrap = require('wordwrap'),
13+
runSequence = require('run-sequence');
1514

16-
var gulp = require('gulp'),
17-
wordwrap = require('wordwrap'),
18-
runSequence = require('run-sequence');
15+
var taskYargs = require('../lib/util/task-yargs'),
16+
hr = require('../lib/util/hr');
1917

20-
var taskYargs = require('../lib/util/task-yargs'),
21-
hr = require('../lib/util/hr');
18+
var cliArgs = yargsInstance
19+
.strict()
20+
.wrap(80)
21+
.argv;
2222

23-
gulp.task('build', function (done) {
24-
console.log(hr('-', 80, 'build'));
25-
runSequence('javascript', 'css', 'html', done);
26-
});
23+
gulp.task('build', function (done) {
24+
console.log(hr('-', 80, 'build'));
25+
runSequence('javascript', 'css', 'html', done);
26+
});
2727
},
2828
onRun: function onBuildTask(yargsInstance) {
2929
var runSequence = require('run-sequence');

‎tasks/css.js‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,43 @@ function setUpTaskCss(tyRun) {
88
checks: [],
99
options: [],
1010
onInit: function onInitCssTask(yargsInstance) {
11-
var cliArgs = yargsInstance
12-
.strict()
13-
.wrap(80)
14-
.argv;
11+
var gulp = require('gulp'),
12+
rimraf = require('gulp-rimraf'),
13+
runSequence = require('run-sequence'),
14+
wordwrap = require('wordwrap'),
15+
path = require('path');
1516

16-
var gulp = require('gulp'),
17-
rimraf = require('gulp-rimraf'),
18-
runSequence = require('run-sequence'),
19-
wordwrap = require('wordwrap'),
20-
path = require('path');
17+
var nodeSass = require('../lib/build/node-sass'),
18+
taskYargs = require('../lib/util/task-yargs'),
19+
hr = require('../lib/util/hr'),
20+
streams = require('../lib/config/streams');
2121

22-
var nodeSass = require('../lib/build/node-sass'),
23-
taskYargs = require('../lib/util/task-yargs'),
24-
hr = require('../lib/util/hr'),
25-
streams = require('../lib/config/streams');
22+
var cliArgs = yargsInstance
23+
.strict()
24+
.wrap(80)
25+
.argv;
2626

27-
gulp.task('css', function (done) {
28-
console.log(hr('-', 80, 'css'));
29-
runSequence(
30-
'css:clean',
31-
'css:build',
32-
done
33-
);
34-
});
27+
gulp.task('css', function (done) {
28+
console.log(hr('-', 80, 'css'));
29+
runSequence(
30+
'css:clean',
31+
'css:build',
32+
done
33+
);
34+
});
3535

36-
// clean the css build directory
37-
gulp.task('css:clean', function () {
38-
return gulp.src(streams.BUILD + '/**/*.css*', {read: false})
39-
.pipe(rimraf());
40-
});
36+
// clean the css build directory
37+
gulp.task('css:clean', function () {
38+
return gulp.src(streams.BUILD + '/**/*.css*', {read: false})
39+
.pipe(rimraf());
40+
});
4141

42-
// compile sass with the previously discovered lib paths
43-
gulp.task('css:build', function () {
44-
return streams.scssApp()
45-
.pipe(nodeSass(80, [streams.BOWER, streams.NODE]))
46-
.pipe(gulp.dest(streams.BUILD));
47-
});
42+
// compile sass with the previously discovered lib paths
43+
gulp.task('css:build', function () {
44+
return streams.scssApp()
45+
.pipe(nodeSass(80, [streams.BOWER, streams.NODE]))
46+
.pipe(gulp.dest(streams.BUILD));
47+
});
4848
},
4949
onRun: function onRunCssTask(yargsInstance) {
5050
var runSequence = require('run-sequence');

‎tasks/html.js‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -9,61 +9,61 @@ function setUpTaskHtml(tyRun) {
99
checks: [],
1010
options: [],
1111
onInit: function onInitHtmlTask(yargsInstance) {
12-
var cliArgs = yargsInstance
13-
.strict()
14-
.wrap(80)
15-
.argv;
12+
var gulp = require('gulp'),
13+
concat = require('gulp-concat'),
14+
inject = require('gulp-inject'),
15+
plumber = require('gulp-plumber'),
16+
rimraf = require('gulp-rimraf'),
17+
runSequence = require('run-sequence'),
18+
wordwrap = require('wordwrap');
1619

17-
var gulp = require('gulp'),
18-
concat = require('gulp-concat'),
19-
inject = require('gulp-inject'),
20-
plumber = require('gulp-plumber'),
21-
rimraf = require('gulp-rimraf'),
22-
runSequence = require('run-sequence'),
23-
wordwrap = require('wordwrap');
20+
var injectAdjacent = require('../lib/inject/adjacent-files'),
21+
bowerFiles = require('../lib/inject/bower-files'),
22+
taskYargs = require('../lib/util/task-yargs'),
23+
hr = require('../lib/util/hr'),
24+
streams = require('../lib/config/streams');
2425

25-
var injectAdjacent = require('../lib/inject/adjacent-files'),
26-
bowerFiles = require('../lib/inject/bower-files'),
27-
taskYargs = require('../lib/util/task-yargs'),
28-
hr = require('../lib/util/hr'),
29-
streams = require('../lib/config/streams');
26+
var cliArgs = yargsInstance
27+
.strict()
28+
.wrap(80)
29+
.argv;
3030

31-
// `cliArgs` are available within gulp tasks by means of closure,
32-
// as they are only called after `onRun` has been invoked, and they have been passeds
33-
gulp.task('html', function (done) {
34-
console.log(hr('-', 80, 'html'));
35-
runSequence(
36-
'html:clean',
37-
['html:inject', 'html:assets'],
38-
done
39-
);
40-
});
31+
// `cliArgs` are available within gulp tasks by means of closure,
32+
// as they are only called after `onRun` has been invoked, and they have been passeds
33+
gulp.task('html', function (done) {
34+
console.log(hr('-', 80, 'html'));
35+
runSequence(
36+
'html:clean',
37+
['html:inject', 'html:assets'],
38+
done
39+
);
40+
});
4141

42-
// clean the html build directory
43-
gulp.task('html:clean', function () {
44-
return gulp.src([streams.BUILD + '/**/*.html*', streams.BUILD + '/**/assets/**'], {read: false})
45-
.pipe(rimraf());
46-
});
42+
// clean the html build directory
43+
gulp.task('html:clean', function () {
44+
return gulp.src([streams.BUILD + '/**/*.html*', streams.BUILD + '/**/assets/**'], {read: false})
45+
.pipe(rimraf());
46+
});
4747

48-
// inject dependencies into html and output to build directory
49-
gulp.task('html:inject', function () {
50-
return streams.htmlApp()
51-
.pipe(plumber())
52-
.pipe(gulp.dest(streams.BUILD)) // put html in final directory first to get correct inject paths
53-
.pipe(injectAdjacent('js|css', {
54-
name: 'inject'
55-
}))
56-
.pipe(inject(bowerFiles().src('js|css', {read: false}), {
57-
name: 'bower'
58-
}))
59-
.pipe(gulp.dest(streams.BUILD));
60-
});
48+
// inject dependencies into html and output to build directory
49+
gulp.task('html:inject', function () {
50+
return streams.htmlApp()
51+
.pipe(plumber())
52+
.pipe(gulp.dest(streams.BUILD)) // put html in final directory first to get correct inject paths
53+
.pipe(injectAdjacent('js|css', {
54+
name: 'inject'
55+
}))
56+
.pipe(inject(bowerFiles().src('js|css', {read: false}), {
57+
name: 'bower'
58+
}))
59+
.pipe(gulp.dest(streams.BUILD));
60+
});
6161

62-
// copy assets to build directory
63-
gulp.task('html:assets', function () {
64-
return gulp.src(streams.APP + '/**/assets/**')
65-
.pipe(gulp.dest(streams.BUILD));
66-
});
62+
// copy assets to build directory
63+
gulp.task('html:assets', function () {
64+
return gulp.src(streams.APP + '/**/assets/**')
65+
.pipe(gulp.dest(streams.BUILD));
66+
});
6767
},
6868
onRun: function onRunHtmlTask(yargsInstance) {
6969
var runSequence = require('run-sequence');

‎tasks/init.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -221,14 +221,14 @@ function setUpInitTask(tyRun) {
221221
var cliArgs;
222222
var templateParams;
223223

224+
yargsInstance
225+
.strict()
226+
.wrap(80);
227+
cliArgs = yargsInstance.argv;
228+
224229
gulp.task('init', function (done) {
225230
console.log(hr('-', 80, 'init'));
226231

227-
yargsInstance
228-
.strict()
229-
.wrap(80);
230-
cliArgs = yargsInstance.argv;
231-
232232
// augment or adjust yargs parameters
233233
var port = (cliArgs.port === 'random') ? Math.floor(Math.random() * (65536 - 49152) + 49152) : cliArgs.port;
234234
var tags = []

‎tasks/javascript.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
'use strict';
22

33
function setUpTaskJavascript(tyRun) {
4-
var cliArgs;
5-
var transforms;
6-
74
var jshintReporter = require('../lib/util/jshint-reporter');
85
var karma = require('../lib/test/karma');
96

@@ -122,6 +119,7 @@ function setUpTaskJavascript(tyRun) {
122119
streams = require('../lib/config/streams'),
123120
jshintReporter = require('../lib/util/jshint-reporter');
124121

122+
var cliArgs;
125123
cliArgs = yargsInstance
126124
.strict()
127125
.wrap(80)

0 commit comments

Comments
 (0)