From 1d5013961e395927368f13b3b8fff4ab07c7eb9c Mon Sep 17 00:00:00 2001 From: IanDelMar <42134098+IanDelMar@users.noreply.github.com> Date: Tue, 28 Apr 2020 14:58:29 +0200 Subject: [PATCH 1/4] Update task dist Fixes #1066 --- gulpconfig.json | 4 ++-- gulpfile.js | 15 ++++----------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/gulpconfig.json b/gulpconfig.json index 47fa403..2a3a205 100644 --- a/gulpconfig.json +++ b/gulpconfig.json @@ -10,8 +10,8 @@ "img": "./img", "imgsrc": "./src/img", "sass": "./sass", - "node": "./node_modules/", - "bower": "./bower_components/", + "node": "./node_modules", + "composer": "./vendor", "dev": "./src", "dist": "./dist", "distprod": "./dist-product", diff --git a/gulpfile.js b/gulpfile.js index 5c4c28c..16360a8 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -242,8 +242,6 @@ gulp.task( .src( [ '**/*', - `!${paths.bower}`, - `!${paths.bower}/**`, `!${paths.node}`, `!${paths.node}/**`, `!${paths.dev}`, @@ -254,17 +252,12 @@ gulp.task( `!${paths.distprod}/**`, `!${paths.sass}`, `!${paths.sass}/**`, + `!${paths.composer}`, + `!${paths.composer}/**`, '!readme.txt', - '!readme.md', - '!package.json', - '!package-lock.json', - '!gulpfile.js', - '!gulpconfig.json', + '!README.md', + '!*.+(json|js|lock|xml)', '!CHANGELOG.md', - '!.travis.yml', - '!jshintignore', - '!codesniffer.ruleset.xml', - '*' ], { buffer: true } ) From 7ea00a95c9087a9a6b965d427fceb0270e8802d7 Mon Sep 17 00:00:00 2001 From: IanDelMar <42134098+IanDelMar@users.noreply.github.com> Date: Tue, 28 Apr 2020 15:03:27 +0200 Subject: [PATCH 2/4] Remove Bower Bower has been dropped a while ago --- gulpfile.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 16360a8..3ceb664 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -171,7 +171,7 @@ gulp.task('watch-bs', gulp.parallel('browser-sync', 'watch')); // Run: // gulp copy-assets. -// Copy all needed dependency assets files from bower_component assets to themes /js, /scss and /fonts folder. Run this task after bower install or bower update +// Copy all needed dependency assets files from node_modules to theme's /js, /scss and /fonts folder. Run this task after npm install or npm update ////////////////// All Bootstrap SASS Assets ///////////////////////// gulp.task('copy-assets', function (done) { @@ -299,8 +299,6 @@ gulp.task( return gulp .src([ '**/*', - `!${paths.bower}`, - `!${paths.bower}/**`, `!${paths.node}`, `!${paths.node}/**`, `!${paths.dist}`, From 27572a2117dfec87ad82d5f4c3cb8b93792b94c8 Mon Sep 17 00:00:00 2001 From: IanDelMar <42134098+IanDelMar@users.noreply.github.com> Date: Tue, 28 Apr 2020 15:07:49 +0200 Subject: [PATCH 3/4] Update task dist-prod --- gulpfile.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 3ceb664..0f7c72c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -301,11 +301,12 @@ gulp.task( '**/*', `!${paths.node}`, `!${paths.node}/**`, + `!${paths.composer}`, + `!${paths.composer}/**`, `!${paths.dist}`, `!${paths.dist}/**`, `!${paths.distprod}`, `!${paths.distprod}/**`, - '*' ]) .pipe(gulp.dest(paths.distprod)) .pipe(touch()); From e7dcb5bbb78dbcc7cc3e4638fa705bcf2a178a43 Mon Sep 17 00:00:00 2001 From: IanDelMar <42134098+IanDelMar@users.noreply.github.com> Date: Tue, 28 Apr 2020 15:11:25 +0200 Subject: [PATCH 4/4] Fix description Taks copy-assets is called on postinstall (see package.json). --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 0f7c72c..f66cb57 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -171,7 +171,7 @@ gulp.task('watch-bs', gulp.parallel('browser-sync', 'watch')); // Run: // gulp copy-assets. -// Copy all needed dependency assets files from node_modules to theme's /js, /scss and /fonts folder. Run this task after npm install or npm update +// Copy all needed dependency assets files from node_modules to theme's /js, /scss and /fonts folder. Run this task after npm update ////////////////// All Bootstrap SASS Assets ///////////////////////// gulp.task('copy-assets', function (done) {