Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into expiration-summary-email

This commit is contained in:
Jasmine Schladen 2020-12-10 08:43:10 -08:00 committed by GitHub
parent d921f53d08 2ffa691fe4
commit 8ba32aa1e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gulp/build.js
View File

@ -188,7 +188,7 @@ gulp.task('build:inject', gulp.series(['dev:styles', 'dev:scripts', 'build:ngvie
return injectHtml(false); return injectHtml(false);
})); }));
gulp.task('build:html', gulp.series(['dev:styles', 'dev:scripts', 'build:ngviews', 'build:inject'], function () { gulp.task('build:html', gulp.series('build:inject', function () {
var jsFilter = filter(['**/*.js'], {'restore': true}); var jsFilter = filter(['**/*.js'], {'restore': true});
var cssFilter = filter(['**/*.css'], {'restore': true}); var cssFilter = filter(['**/*.css'], {'restore': true});
@ -238,8 +238,8 @@ gulp.task('addUrlContextPath:revision', async function(){
}); });
gulp.task('addUrlContextPath:revreplace', gulp.series('addUrlContextPath:revision', function(){ gulp.task('addUrlContextPath:revreplace', gulp.series('addUrlContextPath:revision', function(){
// var manifest = gulp.src("lemur/static/dist/rev-manifest.json"); var manifest = gulp.src("lemur/static/dist/rev-manifest.json", { allowEmpty: true });
// var urlContextPathExists = argv.urlContextPath ? true : false; var urlContextPathExists = argv.urlContextPath ? true : false;
return gulp.src( "lemur/static/dist/index.html") return gulp.src( "lemur/static/dist/index.html")
.pipe(gulp.dest('lemur/static/dist')); .pipe(gulp.dest('lemur/static/dist'));
})); }));
@ -259,5 +259,5 @@ gulp.task('addUrlContextPath', gulp.series('addUrlContextPath:revreplace', async
})); }));
gulp.task('build', gulp.series(['build:ngviews', 'build:inject', 'build:images', 'build:fonts', 'build:html', 'build:extras'])); gulp.task('build', gulp.series(['build:images', 'build:fonts', 'build:html', 'build:extras']));
gulp.task('package', gulp.series(['addUrlContextPath', 'package:strip'])); gulp.task('package', gulp.series(['addUrlContextPath', 'package:strip']));

2
gulp/server.js
View File

@ -38,7 +38,7 @@ function browserSyncInit(baseDir, files, browser) {
} }
gulp.task('watch', gulp.series(['dev:styles', 'dev:scripts', 'dev:inject', 'dev:fonts'], function (done) { gulp.task('watch', gulp.series(['dev:inject', 'dev:fonts'], function (done) {
gulp.watch('app/styles/**/*.less', gulp.parallel('dev:styles')); gulp.watch('app/styles/**/*.less', gulp.parallel('dev:styles'));
gulp.watch('app/styles/**/*.css', gulp.parallel('dev:styles')); gulp.watch('app/styles/**/*.css', gulp.parallel('dev:styles'));
gulp.watch('app/**/*.js', gulp.parallel('dev:scripts')); gulp.watch('app/**/*.js', gulp.parallel('dev:scripts'));