mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-19 04:23:55 +00:00
Merge branch 'dillon/122-1688-po-automation-project' into vapor/development
This commit is contained in:
Vendored
+14
-36
@@ -9,9 +9,6 @@ const plugins = require('gulp-load-plugins')({
|
||||
uglifyEs: (plugin) => plugin.default
|
||||
}
|
||||
});
|
||||
const path = require('path');
|
||||
const merge = require('merge-stream');
|
||||
const gulpIf = require('gulp-if');
|
||||
|
||||
const onError = (error) => {
|
||||
fancyLog(error);
|
||||
@@ -88,44 +85,24 @@ gulp.task('sourceCss', gulp.series('sourceImages', () => {
|
||||
.pipe(gulp.dest(pkg.paths.build.css));
|
||||
}));
|
||||
|
||||
// gulp.task('sourceJs', () => {
|
||||
// fancyLog('Compiling source JS dependencies');
|
||||
// return gulp.src(pkg.globs.sourceJs)
|
||||
// .pipe(plugins.plumber({errorHandler: onError}))
|
||||
// .pipe(plugins.print())
|
||||
// .pipe(plugins.concat('site.js'))
|
||||
// .pipe(plugins.uglifyEs())
|
||||
// .pipe(gulp.dest(pkg.paths.build.js));
|
||||
// });
|
||||
|
||||
gulp.task('sourceJs', () => {
|
||||
fancyLog('Compiling source JS dependencies');
|
||||
|
||||
const allFiles = gulp.src(pkg.globs.sourceJs)
|
||||
.pipe(plugins.plumber({ errorHandler: onError }))
|
||||
.pipe(plugins.print());
|
||||
|
||||
// Stream for files that need to be concatenated
|
||||
const concatStream = allFiles
|
||||
.pipe(gulpIf(
|
||||
file => !pkg.globs.sourceJsKeepNames.includes(path.basename(file.path)),
|
||||
plugins.concat('site.js')
|
||||
))
|
||||
return gulp.src(pkg.globs.sourceJs)
|
||||
.pipe(plugins.plumber({errorHandler: onError}))
|
||||
.pipe(plugins.print())
|
||||
.pipe(plugins.concat('site.js'))
|
||||
.pipe(plugins.uglifyEs())
|
||||
.pipe(gulp.dest(pkg.paths.build.js));
|
||||
});
|
||||
|
||||
// Stream for files that should keep their own names
|
||||
const keepNamesStream = allFiles
|
||||
.pipe(gulpIf(
|
||||
file => pkg.globs.sourceJsKeepNames.includes(path.basename(file.path)),
|
||||
plugins.uglifyEs()
|
||||
))
|
||||
.pipe(gulpIf(
|
||||
file => pkg.globs.sourceJsKeepNames.includes(path.basename(file.path)),
|
||||
gulp.dest(pkg.paths.build.js)
|
||||
));
|
||||
gulp.task('sourceJsKeepNames', () => {
|
||||
fancyLog('Compiling source JS Keep Original Names dependencies');
|
||||
|
||||
return merge(concatStream, keepNamesStream);
|
||||
return gulp.src(pkg.globs.sourceJsKeepNames)
|
||||
.pipe(plugins.plumber({ errorHandler: onError }))
|
||||
.pipe(plugins.print())
|
||||
.pipe(plugins.uglifyEs())
|
||||
.pipe(gulp.dest(pkg.paths.build.js));
|
||||
});
|
||||
|
||||
gulp.task('sourceFonts', () => {
|
||||
@@ -141,7 +118,7 @@ gulp.task('clean', () => {
|
||||
});
|
||||
|
||||
gulp.task('vendor', gulp.series('vendorJs', 'vendorCss', 'vendorFonts', 'vendorFlags', 'vendorImages'));
|
||||
gulp.task('source', gulp.series('sourceCss', 'sourceImages', 'sourceJs', 'sourceFonts'));
|
||||
gulp.task('source', gulp.series('sourceCss', 'sourceImages', 'sourceJs', 'sourceJsKeepNames', 'sourceFonts'));
|
||||
gulp.task('build', gulp.series('clean', 'vendor', 'source'));
|
||||
|
||||
gulp.task('watch', (done) => {
|
||||
@@ -149,5 +126,6 @@ gulp.task('watch', (done) => {
|
||||
gulp.watch(pkg.globs.sourceImages, gulp.series('sourceImages'));
|
||||
gulp.watch(pkg.globs.sourceJs, gulp.series('sourceJs'));
|
||||
gulp.watch(pkg.globs.sourceJs, gulp.series('sourceFonts'));
|
||||
gulp.watch(pkg.globs.sourceJsKeepNames, gulp.series('sourceJsKeepNames'));
|
||||
done();
|
||||
});
|
||||
|
||||
@@ -48,7 +48,6 @@
|
||||
"gulp-concat": "^2.6.1",
|
||||
"gulp-concat-css": "^3.1.0",
|
||||
"gulp-copy": "^4.0.1",
|
||||
"gulp-if": "^3.0.0",
|
||||
"gulp-livereload": "^4.0.2",
|
||||
"gulp-load-plugins": "^2.0.6",
|
||||
"gulp-newer": "^1.3.0",
|
||||
@@ -62,7 +61,6 @@
|
||||
"gulp-uglify-es": "^2.0.0",
|
||||
"laravel-mix": "^6.0.49",
|
||||
"lodash": "^4.17.13",
|
||||
"merge-stream": "^2.0.0",
|
||||
"resolve-url-loader": "^3.1.5",
|
||||
"vue-loader": "^15.11.1 ",
|
||||
"vue-template-compiler": "^2.7.14"
|
||||
|
||||
Reference in New Issue
Block a user