Skip to content

Commit c2e1275

Browse files
add ribbon
1 parent 9c3aa1e commit c2e1275

File tree

13 files changed

+880
-272
lines changed

13 files changed

+880
-272
lines changed

gulpfile.js

Lines changed: 50 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,66 +13,90 @@ var usemin = require('gulp-usemin');
1313
var rjs = require('gulp-requirejs');
1414
var uglify = require('gulp-uglify');
1515
var rev = require('gulp-rev');
16+
var clean = require('gulp-clean');
1617

1718
var rjsConfig = require('./public/scripts/requirejsConfig');
18-
19+
var es = require('event-stream');
1920

2021
var server = lr();
2122
// gulp.task('default', function(){
2223
// // place code for your default task here
2324
// });
2425

2526

27+
// https://github.com/gulpjs/gulp/blob/master/docs/recipes/running-tasks-in-series.md#running-tasks-in-series
2628

2729
var concatJs = function() {
30+
console.log(rjsConfig);
2831
rjsConfig.baseUrl = "public/scripts";
2932
rjsConfig.out = 'concat.js';
3033
rjsConfig.name = "main";
3134

32-
rjs(rjsConfig).pipe(uglify({
35+
return rjs(rjsConfig).pipe(uglify({
3336
outSourceMap: true,
34-
output:{
35-
ascii_only:false
37+
output: {
38+
ascii_only: false
3639
}
3740
}))
3841
.pipe(gulp.dest('dist/scripts/')); // pipe it to the output DIR
42+
3943
};
40-
console.log(rjsConfig);
4144

42-
gulp.task('build', function() {
43-
gulp.src('less/*.less')
45+
gulp.task('build2', ['build'], function(cb) {
46+
//smell of bad design but works
47+
//trick let this two overwite the concated js file
48+
//simple overwrite wont do as it just stream to same files ignoring existing content length
49+
50+
es.concat(
51+
gulp.src('pre-dist/index.html')
52+
.pipe(gulp.dest('dist/')),
53+
gulp.src(['public/scripts/require.min.js'])
54+
.pipe(gulp.dest('dist/scripts/')),
55+
concatJs()
56+
).on('end', cb);
57+
58+
});
59+
60+
gulp.task('pre-dist-clean', ['build', 'build2'], function() {
61+
// //ok remove folder not scripts
62+
// console.log('clean');
63+
gulp.src('pre-dist/', {
64+
read: true
65+
}).pipe(clean({
66+
force: true
67+
}));
68+
});
69+
70+
71+
72+
gulp.task('dist', ['build', 'build2', 'pre-dist-clean']);
73+
74+
75+
76+
gulp.task('build', function(cb) {
77+
78+
var lessStream = gulp.src('less/*.less')
4479
.pipe(less())
4580
.pipe(gulp.dest('dist/css/'));
4681

47-
gulp.src(['public/scripts/require.min.js'])
48-
.pipe(gulp.dest('dist/scripts/'));
49-
50-
gulp.src(['public/templates/**.html'])
82+
var templatesStream = gulp.src(['public/templates/**.html'])
5183
.pipe(gulp.dest('dist/templates/'));
5284

5385

54-
55-
gulp.src('public/index.html')
86+
var htmlMinStream = gulp.src('public/index.html')
5687
.pipe(usemin({
5788
// css: [minifyCss(), 'concat'],
5889
// html: [minifyHtml({empty: true})],
5990
js: []
6091
}))
61-
//discard it as concat may run before above
62-
// .pipe(gulp.dest('dist/'));
63-
64-
//force overdie
65-
66-
//trick let this overwite the file
67-
console.log('concat js');
68-
concatJs();
92+
.pipe(gulp.dest('pre-dist/'));
93+
//discard it as concat may run before above
94+
es.concat(
95+
lessStream, templatesStream, htmlMinStream
96+
).on('end', cb);
6997

7098
});
7199

72-
// fa-coffee
73-
//fa-cutlery
74-
// fa-bar M
75-
76100
gulp.task('default', ['listen'], function() {
77101

78102
bower()
@@ -97,4 +121,4 @@ gulp.task('listen', function(next) {
97121
if (err) return console.error(err);
98122
next();
99123
});
100-
});
124+
});

0 commit comments

Comments
 (0)