Skip to content

Commit d975f51

Browse files
Ben RubinBen Rubin
authored andcommitted
change theme gulp process to inject file into pipeline
1 parent ae23bad commit d975f51

File tree

4 files changed

+15
-51
lines changed

4 files changed

+15
-51
lines changed

gulp/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ exports.paths = {
1212
appPartials: docsSrcPath+'**/*.html',
1313
scripts: [srcPath+'**/*.js'],
1414
css: [srcPath+'*.scss', srcPath+'*.css', '!'+srcPath+'*spec.css', '!'+srcPath+'*-theme.scss'],
15-
theme: srcPath+'*-theme.scss'
15+
theme: srcPath+'style-theme.scss'
1616
};

gulp/jsBuild.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ var rename = require("gulp-rename");
1010
var gutil = require('gulp-util');
1111
var ngAnnotate = require('gulp-ng-annotate');
1212

13+
var theme = require('./theme.js');
14+
1315

1416

1517
exports.dev = function () {
1618
return gulp.src(paths.scripts)
19+
.pipe(theme())
1720
.pipe(wrap('(function(){"use strict";<%= contents %>}());'))
1821
.pipe(jshint())
1922
.pipe(jshint.reporter('default'))
@@ -25,6 +28,7 @@ exports.dev = function () {
2528

2629
exports.release = function () {
2730
return gulp.src(paths.scripts)
31+
.pipe(theme())
2832
.pipe(wrap('(function(){"use strict";<%= contents %>}());'))
2933
.pipe(ngAnnotate())
3034
.pipe(jshint())

gulp/theme.js

Lines changed: 8 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,49 +10,15 @@ var concat = require('gulp-concat');
1010
var wrap = require('gulp-wrap');
1111
var ngConstant = require('gulp-ng-constant');
1212
var uglify = require('gulp-uglify');
13+
var gulpFile = require('gulp-file');
1314

1415

15-
exports.dev = function () {
16-
return gulp.src(paths.theme)
17-
.pipe(sass())
18-
.pipe(through2.obj(function (file, enc, cb) {
19-
var config = {
20-
name: 'angular-material-tree',
21-
deps: false,
22-
constants: {
23-
TREE_THEME: file.contents.toString()
24-
}
25-
};
26-
file.contents = new Buffer(JSON.stringify(config), 'utf-8');
27-
this.push(file);
28-
cb();
29-
}))
30-
.pipe(ngConstant({wrap: false}))
31-
.pipe(wrap('(function(){"use strict";<%= contents %>}());'))
32-
.pipe(rename('_theme.js'))
33-
.pipe(gulp.dest(paths.docs))
34-
};
35-
3616

37-
exports.release = function () {
38-
return gulp.src(paths.theme)
39-
.pipe(sass())
40-
.pipe(cssnano())
41-
.pipe(through2.obj(function (file, enc, cb) {
42-
var config = {
43-
name: 'angular-material-tree',
44-
deps: false,
45-
constants: {
46-
TREE_THEME: file.contents.toString()
47-
}
48-
};
49-
file.contents = new Buffer(JSON.stringify(config), 'utf-8');
50-
this.push(file);
51-
cb();
52-
}))
53-
.pipe(ngConstant({wrap: false}))
54-
.pipe(wrap('(function(){"use strict";<%= contents %>}());'))
55-
.pipe(uglify())
56-
.pipe(rename('_theme.js'))
57-
.pipe(gulp.dest(paths.dist));
17+
module.exports = function injectFile() {
18+
require('require-sass')();
19+
return gulpFile('theme.js', wrapper(require('../'+paths.theme)));
5820
};
21+
22+
function wrapper(contents) {
23+
return 'angular.module("angular-material-tree").constant("TREE_THEME",'+JSON.stringify(contents)+');';
24+
}

gulpfile.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ var cssBuild = require('./gulp/cssBuild');
1414
gulp.task('cssDev', cssBuild.dev);
1515
gulp.task('cssRelease', cssBuild.release);
1616

17-
var themeBuild = require('./gulp/theme');
18-
gulp.task('themeDev', themeBuild.dev);
19-
gulp.task('themeRelease', themeBuild.release);
20-
2117
var docs = require('./gulp/docs');
2218
gulp.task('docsBuild', docs.build);
2319
gulp.task('docsInject', docs.inject);
@@ -32,8 +28,7 @@ gulp.task('buildLocal', gulpSequence(
3228
[
3329
'jsDev',
3430
'cssDev',
35-
'docsBuild',
36-
'themeDev'
31+
'docsBuild'
3732
],
3833
'docsInject'
3934
));
@@ -42,8 +37,7 @@ gulp.task('release', gulpSequence(
4237
'cleanDist',
4338
[
4439
'jsRelease',
45-
'cssRelease',
46-
'themeRelease'
40+
'cssRelease'
4741
]
4842
));
4943

0 commit comments

Comments
 (0)