Archived
1
0
Fork 0

Merge branch '36-update-to-gulp-4-0' into 'dev'

Resolve "Update to gulp >= 4.0"

Closes #36

See merge request pnx/httpcb!28
This commit is contained in:
Henrik Hautakoski 2022-07-30 19:08:57 +00:00
commit 2285d0d70a
3 changed files with 6026 additions and 2453 deletions

View file

@ -1,7 +1,6 @@
var { src, dest, watch, series } = require('gulp');
var gulp = require('gulp');
var rename = require('gulp-rename'); var rename = require('gulp-rename');
var sass = require('gulp-sass'); var sass = require('gulp-sass')(require('sass'));
var cssminify = require('gulp-csso'); var cssminify = require('gulp-csso');
var concat = require('gulp-concat'); var concat = require('gulp-concat');
var uglify = require('gulp-uglify'); var uglify = require('gulp-uglify');
@ -39,24 +38,28 @@ var config = {
// Tasks // Tasks
// ---------------------------------- // ----------------------------------
gulp.task('build-css', function () { function build_css() {
return gulp.src(config.sass.src) return src(config.sass.src)
.pipe(sass(config.sass.opt)) .pipe(sass(config.sass.opt))
.pipe(cssminify()) .pipe(cssminify())
.pipe(rename({ basename: config.sass.outputName, suffix: '.min'})) .pipe(rename({ basename: config.sass.outputName, suffix: '.min'}))
.pipe(gulp.dest(config.sass.outputDir)) .pipe(dest(config.sass.outputDir))
}); }
gulp.task('watch-sass', function() { function build_js() {
gulp.watch(config.sass.pattern, ['build-css']); return src(config.js.src)
});
gulp.task('build-js', function () {
return gulp.src(config.js.src)
.pipe(uglify()) .pipe(uglify())
.pipe(concat('application.min.js')) .pipe(concat('application.min.js'))
.pipe(gulp.dest(config.js.outputDir)); .pipe(dest(config.js.outputDir));
}); }
gulp.task('build-assets', ['build-css', 'build-js']); function watch_sass() {
gulp.task('default', ['watch-sass']); return watch(config.sass.pattern, {"usePolling":true}, build_css);
}
exports.build_css = build_css;
exports.build_js = build_js;
exports.build = series(build_css, build_js);
exports.watch_sass = watch_sass;
exports.watch = series(watch_sass);
exports.default = watch;

8379
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -4,19 +4,20 @@
"description": "HTTP Callback Tool", "description": "HTTP Callback Tool",
"devDependencies": { "devDependencies": {
"bootstrap-sass": "^3.3.7", "bootstrap-sass": "^3.3.7",
"gulp": "^3.9.1", "gulp": "^4.0.0",
"gulp-concat": "^2.6.1", "gulp-concat": "^2.6.1",
"gulp-csso": "^3.0.1", "gulp-csso": "^4.0.1",
"gulp-rename": "^1.3.0", "gulp-rename": "^2.0.0",
"gulp-sass": "^4.0.1", "gulp-sass": "^5.1.0",
"gulp-uglify": "^3.0.0", "gulp-uglify": "^3.0.2",
"jquery": "~3.0.0", "jquery": "~3.0.0",
"natives": "^1.1.6" "natives": "^1.1.6",
"sass": "^1.54.0"
}, },
"scripts": { "scripts": {
"phinx": "vendor/bin/phinx", "phinx": "vendor/bin/phinx",
"dbmigrate": "npm run phinx migrate", "dbmigrate": "npm run phinx migrate",
"build": "gulp build-assets", "build": "gulp build",
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"author": "Henrik Hautakoski <henrik.hautakoski@gmail.com>", "author": "Henrik Hautakoski <henrik.hautakoski@gmail.com>",