Skip to content

Commit

Permalink
Merge branch 'release/3.3.2'
Browse files Browse the repository at this point in the history
* release/3.3.2:
  Changelog for 3.3.2
  Switch to gulp 4
  • Loading branch information
joshangell committed Feb 21, 2019
2 parents 281cf2c + c384d39 commit a960ce9
Show file tree
Hide file tree
Showing 4 changed files with 1,293 additions and 486 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
## Unreleased


## 3.3.2 - 2019-02-21

### Changed
- Upgraded gulp


## 3.3.1 - 2019-02-21

### Added
Expand Down
22 changes: 10 additions & 12 deletions src/assetbundles/gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
'use strict';

var gulp = require('gulp'),
const gulp = require('gulp'),
rename = require('gulp-rename'),
uglify = require('gulp-uglify'),
sass = require('gulp-sass');

gulp.task('js', function() {
function jsTask() {
return gulp.src('src/**/*.js')
.pipe(uglify())
.pipe(rename({ extname: '.min.js' }))
.pipe(gulp.dest('dist/js/'));
});
}

gulp.task('sass', function() {
function sassTask() {
return gulp.src('src/**/*.scss')
.pipe(sass({ outputStyle: 'compressed' }))
.pipe(rename({ extname: '.min.css' }))
.pipe(gulp.dest('dist/css/'));
});
}

gulp.task('watch', function(){
gulp.watch('src/**/*.js', ['js']);
gulp.watch('src/**/*.scss', ['sass']);
});
function watch() {
gulp.watch('src/**/*.js', ['jsTask']);
gulp.watch('src/**/*.scss', ['sassTask']);
}

gulp.task('default', ['js','sass']);
exports.default = gulp.series(jsTask, sassTask);
Loading

0 comments on commit a960ce9

Please sign in to comment.