Skip to content

Commit 20f9373

Browse files
committed
Update build dependencies and Gulpfile
1 parent 5e8d640 commit 20f9373

File tree

6 files changed

+1307
-1491
lines changed

6 files changed

+1307
-1491
lines changed

Gulpfile.js

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,42 @@
11
var gulp = require( 'gulp' );
2-
var sass = require( 'gulp-sass' );
2+
var gulpSass = require( 'gulp-sass' )(require('sass'));
33
var rename = require( 'gulp-rename' );
44
var cssmin = require( 'gulp-cssmin' );
55
var uglify = require( 'gulp-uglify' );
66
var livereload = require( 'gulp-livereload' );
77

8-
gulp.task( 'sass', function() {
8+
function sass() {
99
return gulp.src( 'assets/scss/**/*.scss' )
10-
.pipe( sass().on( 'error', sass.logError ) )
10+
.pipe( gulpSass.sync().on( 'error', gulpSass.logError ) )
1111
.pipe( gulp.dest( 'assets/css' ) )
1212
.pipe( livereload() );
13-
} );
13+
};
1414

15-
gulp.task( 'css', [ 'sass' ], function() {
15+
function css () {
1616
return gulp.src( [ 'assets/css/**/*.css', '!assets/css/**/*.min.css' ] )
1717
.pipe( rename( { suffix: '.min' } ) )
1818
.pipe( cssmin() )
1919
.pipe( gulp.dest( 'assets/css' ) )
20-
} );
20+
};
2121

22-
gulp.task( 'js', function() {
22+
function js () {
2323
return gulp.src( [ 'assets/js/**/*.js', '!assets/js/**/*.min.js' ] )
2424
.pipe( uglify( {
2525
mangle: false
2626
} ) )
2727
.pipe( rename( { suffix: '.min' } ) )
2828
.pipe( gulp.dest( 'assets/js' ) )
2929
.pipe( livereload() );
30-
} );
30+
};
3131

32-
gulp.task( 'default', [ 'css', 'js' ] );
32+
exports.sass = sass;
33+
exports.css = css;
34+
exports.js = js;
3335

34-
gulp.task( 'watch', [ 'css', 'js' ], function() {
35-
livereload.listen();
36-
gulp.watch( [ 'assets/scss/**/*.scss' ], [ 'css' ] );
37-
gulp.watch( [ 'assets/js/**/*.js' ], [ 'js' ] );
38-
} );
36+
exports.build = gulp.series( sass, css, js );
37+
38+
exports.watch = gulp.series( sass, css, js, () => {
39+
livereload.listen();
40+
gulp.watch( [ 'assets/scss/**/*.scss' ], gulp.series( sass, css ) );
41+
gulp.watch( [ 'assets/js/**/*.js' ], gulp.series( js ) );
42+
} );

assets/css/article-promo-email.css

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#article-promo-email input[type=text] {
2-
width: 100%; }
3-
2+
width: 100%;
3+
}
44
#article-promo-email textarea {
55
margin: 10px 0 0 0;
6-
font-family: 'Helvetica', 'Arial', sans-serif;
6+
font-family: "Helvetica", "Arial", sans-serif;
77
font-size: 14px;
88
line-height: 1.4;
99
background-color: transparent;
1010
box-shadow: none;
1111
border: 0;
1212
padding: 0;
13-
width: 100%; }
13+
width: 100%;
14+
}

assets/css/social.css

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
.don-king-share {
2-
width: 100%; }
3-
.don-king-share .share-url {
4-
width: 100%; }
5-
.don-king-share .share-url input {
6-
width: 100%; }
2+
width: 100%;
3+
}
4+
.don-king-share .share-url {
5+
width: 100%;
6+
}
7+
.don-king-share .share-url input {
8+
width: 100%;
9+
}
710

811
.change-campaign {
9-
padding: 10px 0 20px 0; }
12+
padding: 10px 0 20px 0;
13+
}

assets/js/social.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
"name": "wp-promoter",
33
"private": true,
44
"devDependencies": {
5-
"gulp": "^3.9.1",
6-
"gulp-rename": "^1.2.2",
7-
"gulp-cssmin": "^0.2.0",
5+
"gulp": "^4.0.2",
86
"gulp-concat": "^2.6.1",
9-
"gulp-livereload": "^4.0.1",
10-
"gulp-sass": "^4.0.2",
11-
"gulp-uglify": "^3.0.1"
7+
"gulp-cssmin": "^0.2.0",
8+
"gulp-livereload": "^4.0.2",
9+
"gulp-rename": "^2.0.0",
10+
"gulp-sass": "^5.1.0",
11+
"gulp-uglify": "^3.0.2",
12+
"sass": "^1.54.3"
1213
}
1314
}

0 commit comments

Comments
 (0)