Skip to content

Commit 8d57932

Browse files
committed
upgrade gulp v4
1 parent 07480ab commit 8d57932

File tree

4 files changed

+3763
-35
lines changed

4 files changed

+3763
-35
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ cd redmine/public/theme
3434
git clone git://github.com/makotokw/redmine-theme-gitmike.git gitmike
3535
cd gitmike
3636
gem install compass
37-
npm install -g gulp
38-
npm install
37+
npm install -g gulp-cli
38+
yarn
3939
gulp debug
4040
```
4141

gulpfile.js

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
/*jshint node: true */
21
'use strict';
32

43
var gulp = require('gulp');
5-
var plugins = require('gulp-load-plugins')();
6-
var browserSync = require('browser-sync');
7-
var reload = browserSync.reload;
4+
var gulpCompass = require('gulp-compass');
5+
var gulpAutoPrefixer = require('gulp-autoprefixer');
6+
var browserSync = require('browser-sync').create();
87

98
function compass(env) {
10-
gulp.src('./sass/*.scss')
11-
.pipe(plugins.compass({
9+
return gulp.src('./sass/*.scss')
10+
.pipe(gulpCompass({
1211
config_file: 'sass/config.rb',
1312
environment: env,
1413
comments: env === 'development',
@@ -17,39 +16,35 @@ function compass(env) {
1716
sass: 'sass',
1817
force: env !== 'development'
1918
}))
20-
.on('error', function(err) {
19+
.on('error', function (err) {
2120
console.log(err);
2221
})
23-
.pipe(plugins.autoprefixer({
22+
.pipe(gulpAutoPrefixer({
2423
cascade: false
2524
}))
2625
.pipe(gulp.dest('stylesheets'))
27-
.pipe(reload({stream: true, once: true}));
26+
.pipe(browserSync.stream())
27+
;
2828
}
2929

30-
gulp.task('compass', function () {
31-
compass('production');
30+
gulp.task('compass:prod', function () {
31+
return compass('production');
3232
});
3333

3434
gulp.task('compass:dev', function () {
35-
compass('development');
35+
return compass('development');
3636
});
3737

38-
gulp.task('browser-sync', function () {
39-
browserSync({
38+
gulp.task('browser-sync', function (done) {
39+
browserSync.init({
4040
port: 3001,
41-
proxy: "127.0.0.1:3000"
41+
proxy: '127.0.0.1:3000'
4242
});
43+
done();
4344
});
4445

45-
gulp.task('browser-sync:reload', function () {
46-
browserSync.reload();
47-
});
48-
49-
gulp.task('debug', ['compass:dev', 'browser-sync'],
50-
function () {
51-
gulp.watch('sass/**/*.scss', ['compass:dev']);
52-
}
53-
);
46+
gulp.task('debug', gulp.series('compass:dev', 'browser-sync', function () {
47+
gulp.watch('sass/**/*.scss', gulp.task('compass:dev'));
48+
}));
5449

55-
gulp.task('default', ['compass']);
50+
gulp.task('default', gulp.series('compass:prod'));

package.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@
1313
},
1414
"homepage": "https://github.com/makotokw/redmine-theme-gitmike",
1515
"devDependencies": {
16-
"browser-sync": "^2.8.0",
17-
"github-markdown-css": "^2.3.0",
18-
"gulp": "^3.9.0",
19-
"gulp-autoprefixer": "^2.3.1",
16+
"browser-sync": "^2.26.7",
17+
"github-markdown-css": "^3.0.1",
18+
"gulp": "^4.0.2",
19+
"gulp-autoprefixer": "^7.0.0",
2020
"gulp-compass": "^2.1.0",
21-
"gulp-load-plugins": "^0.10.0",
22-
"gulp-plumber": "^1.0.1",
23-
"gulp-ruby-sass": "^1.0.5",
24-
"gulp-util": "^3.0.6"
21+
"gulp-util": "^3.0.8"
2522
}
2623
}

0 commit comments

Comments
 (0)