* update for gulp 4.0.0

* added gulp 4.0.0
This commit is contained in:
Pawel Raszewski 2018-12-05 03:35:52 -05:00 committed by Jos de Jong
parent 9ac82e24d2
commit 404fa036f9
3 changed files with 1893 additions and 374 deletions

View File

@ -42,9 +42,7 @@ var compiler = webpack({
}, },
plugins: [bannerPlugin], plugins: [bannerPlugin],
module: { module: {
loaders: [ loaders: [{ test: /\.json$/, loader: 'json' }]
{ test: /\.json$/, loader: "json" }
]
}, },
cache: true cache: true
}); });
@ -77,7 +75,7 @@ function minify(name) {
}); });
if (result.error) { if (result.error) {
throw result.error throw result.error;
} }
var fileMin = DIST + '/' + name + '.min.js'; var fileMin = DIST + '/' + name + '.min.js';
@ -91,13 +89,16 @@ function minify(name) {
} }
// make dist folder structure // make dist folder structure
gulp.task('mkdir', function () { gulp.task('mkdir', function(done) {
mkdirp.sync(DIST); mkdirp.sync(DIST);
mkdirp.sync(DIST + '/img'); mkdirp.sync(DIST + '/img');
done();
}); });
// bundle javascript // bundle javascript
gulp.task('bundle', ['mkdir'], function (done) { gulp.task(
'bundle',
gulp.series(gulp.parallel('mkdir'), function(done) {
// update the banner contents (has a date in it which should stay up to date) // update the banner contents (has a date in it which should stay up to date)
bannerPlugin.banner = createBanner(); bannerPlugin.banner = createBanner();
@ -110,10 +111,13 @@ gulp.task('bundle', ['mkdir'], function (done) {
done(); done();
}); });
}); })
);
// bundle minimalist version of javascript // bundle minimalist version of javascript
gulp.task('bundle-minimalist', ['mkdir'], function (done) { gulp.task(
'bundle-minimalist',
gulp.series(gulp.parallel('mkdir'), function(done) {
// update the banner contents (has a date in it which should stay up to date) // update the banner contents (has a date in it which should stay up to date)
bannerPlugin.banner = createBanner(); bannerPlugin.banner = createBanner();
@ -126,11 +130,15 @@ gulp.task('bundle-minimalist', ['mkdir'], function (done) {
done(); done();
}); });
}); })
);
// bundle css // bundle css
gulp.task('bundle-css', ['mkdir'], function () { gulp.task(
gulp.src([ 'bundle-css',
gulp.series(gulp.parallel('mkdir'), function(done) {
gulp
.src([
'src/css/reset.css', 'src/css/reset.css',
'src/css/jsoneditor.css', 'src/css/jsoneditor.css',
'src/css/contextmenu.css', 'src/css/contextmenu.css',
@ -150,45 +158,73 @@ gulp.task('bundle-css', ['mkdir'], function () {
gutil.log('bundled ' + DIST + '/' + NAME + '.css'); gutil.log('bundled ' + DIST + '/' + NAME + '.css');
gutil.log('bundled ' + DIST + '/' + NAME + '.min.css'); gutil.log('bundled ' + DIST + '/' + NAME + '.min.css');
}); done();
})
);
// create a folder img and copy the icons // create a folder img and copy the icons
gulp.task('copy-img', ['mkdir'], function () { gulp.task(
gulp.src(IMAGE) 'copy-img',
.pipe(gulp.dest(DIST + '/img')); gulp.series(gulp.parallel('mkdir'), function(done) {
gulp.src(IMAGE).pipe(gulp.dest(DIST + '/img'));
gutil.log('Copied images'); gutil.log('Copied images');
}); done();
})
);
// create a folder img and copy the icons // create a folder img and copy the icons
gulp.task('copy-docs', ['mkdir'], function () { gulp.task(
gulp.src(DOCS) 'copy-docs',
.pipe(gulp.dest(DIST)); gulp.series(gulp.parallel('mkdir'), function(done) {
gulp.src(DOCS).pipe(gulp.dest(DIST));
gutil.log('Copied doc'); gutil.log('Copied doc');
}); done();
})
);
gulp.task('minify', ['bundle'], function () { gulp.task(
minify(NAME) 'minify',
}); gulp.series(gulp.parallel('bundle'), function(done) {
minify(NAME);
done();
})
);
gulp.task('minify-minimalist', ['bundle-minimalist'], function () { gulp.task(
minify(NAME_MINIMALIST) 'minify-minimalist',
}); gulp.series(gulp.parallel('bundle-minimalist'), function(done) {
minify(NAME_MINIMALIST);
done();
})
);
// TODO: zip file using archiver // TODO: zip file using archiver
var pkg = 'jsoneditor-' + require('./package.json').version + '.zip'; var pkg = 'jsoneditor-' + require('./package.json').version + '.zip';
gulp.task('zip', shell.task([ gulp.task(
'zip ' + pkg + ' ' + 'README.md NOTICE LICENSE HISTORY.md index.html src dist docs examples -r ' 'zip',
])); shell.task([
'zip ' +
pkg +
' ' +
'README.md NOTICE LICENSE HISTORY.md index.html src dist docs examples -r '
])
);
// The watch task (to automatically rebuild when the source code changes) // The watch task (to automatically rebuild when the source code changes)
// Does only generate jsoneditor.js and jsoneditor.css, and copy the image // Does only generate jsoneditor.js and jsoneditor.css, and copy the image
// Does NOT minify the code and does NOT generate the minimalist version // Does NOT minify the code and does NOT generate the minimalist version
gulp.task('watch', ['bundle', 'bundle-css', 'copy-img'], function () { gulp.task(
gulp.watch(['src/**/*'], ['bundle', 'bundle-css', 'copy-img']); 'watch',
}); gulp.series(gulp.parallel('bundle', 'bundle-css', 'copy-img'), function() {
gulp.watch(['src/**/*'], gulp.series('bundle', 'bundle-css', 'copy-img'));
})
);
// The default task (called when you run `gulp`) // The default task (called when you run `gulp`)
gulp.task('default', [ gulp.task(
'default',
gulp.series(
gulp.parallel(
'bundle', 'bundle',
'bundle-minimalist', 'bundle-minimalist',
'bundle-css', 'bundle-css',
@ -196,4 +232,6 @@ gulp.task('default', [
'copy-docs', 'copy-docs',
'minify', 'minify',
'minify-minimalist' 'minify-minimalist'
]); )
)
);

2041
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -33,7 +33,7 @@
"vanilla-picker": "2.4.2" "vanilla-picker": "2.4.2"
}, },
"devDependencies": { "devDependencies": {
"gulp": "3.9.1", "gulp": "4.0.0",
"gulp-clean-css": "3.4.2", "gulp-clean-css": "3.4.2",
"gulp-concat-css": "2.3.0", "gulp-concat-css": "2.3.0",
"gulp-shell": "0.6.3", "gulp-shell": "0.6.3",