From 7395c125123da2adce5d55d3b26a5f8812fdac2c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 8 Oct 2020 18:49:27 +0300 Subject: run default gulp tasks on startup --- gulpfile.js | 12 +++++++----- index.php | 38 +++++++++++++++++++------------------- worker.js | 4 ++-- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 84016b0..0db8a13 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -60,11 +60,11 @@ gulp.task('minifyCSS', function(cb) { gulp .src(['css/reader_iframe.less']) - .pipe(less()) - .pipe(minifyCSS()) - .pipe(rename("reader_iframe.min.css")) - .on('error', swallowError) - .pipe(gulp.dest('dist/')); + .pipe(less()) + .pipe(minifyCSS()) + .pipe(rename("reader_iframe.min.css")) + .on('error', swallowError) + .pipe(gulp.dest('dist/')); cb(); }); @@ -72,6 +72,8 @@ gulp.task('minifyCSS', function(cb) { gulp.task( 'default', function(cb) { + gulp.series(['minifyCSS', 'minifyJS', 'minifyLibsJS'])(); + gulp.watch(['lib/**/*.js', 'lib/*.js'], gulp.series('minifyLibsJS')); gulp.watch(['js/*.js'], gulp.series('minifyJS')); gulp.watch(['css/*.less'], gulp.series('minifyCSS')); diff --git a/index.php b/index.php index 07d023f..9da75cd 100644 --- a/index.php +++ b/index.php @@ -40,25 +40,25 @@ // TODO: this should be unified with the service worker cache list $check_files_mtime = [ - 'manifest.json', - 'worker.js', - 'img/ic_launcher_web.png', - 'img/favicon.png', - 'read.html', - 'dist/app.min.js', - 'dist/reader_iframe.min.js', - 'dist/app.min.css', - 'dist/app-libs.min.js', - 'offline.html', - 'dist/reader_iframe.min.css', - 'lib/bootstrap/v3/css/bootstrap-theme.min.css', - 'lib/bootstrap/v3/css/bootstrap.min.css', - 'lib/bootstrap/v3/css/theme-dark.min.css', - 'lib/bootstrap/v3/fonts/glyphicons-halflings-regular.woff2', - 'lib/fonts/pmn-caecilia-55.ttf', - 'lib/fonts/pmn-caecilia-56.ttf', - 'lib/fonts/pmn-caecilia-75.ttf' - ]; + 'manifest.json', + 'worker.js', + 'img/ic_launcher_web.png', + 'img/favicon.png', + 'read.html', + 'dist/app.min.js', + 'dist/app.min.css', + 'dist/app-libs.min.js', + 'dist/reader_iframe.min.js', + 'dist/reader_iframe.min.css', + 'offline.html', + 'lib/bootstrap/v3/css/bootstrap-theme.min.css', + 'lib/bootstrap/v3/css/bootstrap.min.css', + 'lib/bootstrap/v3/css/theme-dark.min.css', + 'lib/bootstrap/v3/fonts/glyphicons-halflings-regular.woff2', + 'lib/fonts/pmn-caecilia-55.ttf', + 'lib/fonts/pmn-caecilia-56.ttf', + 'lib/fonts/pmn-caecilia-75.ttf' + ]; $last_mtime = array_reduce( array_map("filemtime", $check_files_mtime), diff --git a/worker.js b/worker.js index 1020a94..059d196 100644 --- a/worker.js +++ b/worker.js @@ -9,11 +9,11 @@ const CACHE_URLS = [ 'img/favicon.png', 'read.html', 'dist/app.min.js', - 'dist/reader_iframe.min.js', 'dist/app.min.css', 'dist/app-libs.min.js', - 'offline.html', + 'dist/reader_iframe.min.js', 'dist/reader_iframe.min.css', + 'offline.html', 'lib/bootstrap/v3/css/bootstrap-theme.min.css', 'lib/bootstrap/v3/css/bootstrap.min.css', 'lib/bootstrap/v3/css/theme-dark.min.css', -- cgit v1.2.3