From 2286ab913ff1f6e5ca79f9901a3c3de57c54e2c8 Mon Sep 17 00:00:00 2001 From: Felix Schulze Date: Fri, 8 Nov 2019 12:58:28 +0100 Subject: [PATCH] maker versioning non paralell --- gulpfile.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 4622956..4cdd20d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -35,7 +35,7 @@ var paths = { output: 'dist/svg/' }, copy: { - input: 'src/copy/**/*', + input: ['src/**/*', '!src/js/**', '!src/css/**'], output: 'dist/' }, reload: './dist/' @@ -240,11 +240,18 @@ var copyFiles = function (done) { // updates version in all assets var updateAssetVersion = function (done) { - return src('src/**/*.{php,html,css}') - .pipe(hashsrc({build_dir:paths.input,src_path:"/",hash_len:"6",query_name:"v"})) - .pipe(hashsrc({build_dir:paths.input,src_path:"/",hash_len:"6",query_name:"v",exts:[".json"]})) + return src('src/**/*.{php,html}') + .pipe(hashsrc({build_dir:paths.output,src_path:"src",hash_len:"6",query_name:"v"})) + .pipe(hashsrc({build_dir:paths.output,src_path:"src",hash_len:"6",query_name:"v",exts:[".json"]})) .pipe(dest(paths.output)); }; + +// updates version in all assets +var updateCssVersion = function (done) { + return src(paths.styles.input) + .pipe(hashsrc({build_dir:paths.output,src_path:'src',hash_len:"6",query_name:"v"})) + .pipe(dest(paths.styles.output)); +}; // Watch for changes to the src directory var startServer = function (done) { @@ -286,13 +293,14 @@ var watchSource = function (done) { exports.default = series( cleanDist, parallel( + copyFiles, buildScripts, lintScripts, buildStyles, - buildSVGs, - copyFiles, - updateAssetVersion - ) + buildSVGs + ), + updateAssetVersion, + updateCssVersion, ); // Watch and reload