From 119df07db001c99a402a869c39fad1b7e2b69f10 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 14 Dec 2023 18:00:55 +0000 Subject: [PATCH 01/20] Update dependency cssnano to v6.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 613c2e5..a8f9396 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "autoprefixer": "10.4.16", - "cssnano": "6.0.1", + "cssnano": "6.0.2", "del": "6.1.1", "gulp": "4.0.2", "gulp-concat": "2.6.1", -- 2.43.4 From 33178c735d280e575bfd45b6bfdf58d59d321075 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 27 Dec 2023 21:01:09 +0000 Subject: [PATCH 02/20] Update dependency browser-sync to v3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 613c2e5..b007882 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "url": "https://git.sp-codes.de/samuel-p/sp-magic.de" }, "optionalDependencies": { - "browser-sync": "^2.29.3" + "browser-sync": "^3.0.2" }, "devDependencies": { "autoprefixer": "10.4.16", -- 2.43.4 From 9626cb26676c17802f164238f5403ac6a3fa7479 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 2 Jan 2024 23:01:03 +0000 Subject: [PATCH 03/20] Update dependency sass to ^1.69.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 532cab7..d120d70 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lazypipe": "1.0.2", "node-sass-tilde-importer": "^1.0.2", "postcss": "^8.4.32", - "sass": "^1.69.5" + "sass": "^1.69.7" }, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.4", -- 2.43.4 From 6abba0941c656a88a78565a4dba87c42059b9d7a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 3 Jan 2024 19:01:00 +0000 Subject: [PATCH 04/20] Update dependency cssnano to v6.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 532cab7..1f6f770 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "autoprefixer": "10.4.16", - "cssnano": "6.0.2", + "cssnano": "6.0.3", "del": "6.1.1", "gulp": "4.0.2", "gulp-concat": "2.6.1", -- 2.43.4 From 94ec6efb54c9392a020f0ffd9752f0518baa59da Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 12 Jan 2024 20:01:26 +0000 Subject: [PATCH 05/20] Update dependency gulp-postcss to v9.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 532cab7..702d7a1 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "gulp-flatmap": "1.0.2", "gulp-header": "2.0.9", "gulp-optimize-js": "1.1.0", - "gulp-postcss": "9.0.1", + "gulp-postcss": "9.1.0", "gulp-rename": "2.0.0", "gulp-sass": "5.1.0", "gulp-terser": "2.1.0", -- 2.43.4 From 5b528483c9f27f1d90572b0efe48bf99151403a9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 14 Jan 2024 00:01:36 +0000 Subject: [PATCH 06/20] Update dependency postcss to ^8.4.33 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d7aec39..528f204 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "gulp-terser": "2.1.0", "lazypipe": "1.0.2", "node-sass-tilde-importer": "^1.0.2", - "postcss": "^8.4.32", + "postcss": "^8.4.33", "sass": "^1.69.7" }, "dependencies": { -- 2.43.4 From 6f0e2e8efedec5c31c120dbf675dfe2748cb18df Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 1 Mar 2024 17:00:55 +0000 Subject: [PATCH 07/20] Update dependency autoprefixer to v10.4.18 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 528f204..9ef41c2 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "browser-sync": "^3.0.2" }, "devDependencies": { - "autoprefixer": "10.4.16", + "autoprefixer": "10.4.18", "cssnano": "6.0.3", "del": "6.1.1", "gulp": "4.0.2", -- 2.43.4 From f837736734bc6fbde95d94c3f3f99dc0c67c84e2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 3 Mar 2024 22:01:11 +0000 Subject: [PATCH 08/20] Update actions/checkout action to v4 --- .forgejo/workflows/build-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index 978e7e7..156f8af 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -9,7 +9,7 @@ jobs: container: image: node:lts steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Dependencies run: npm install - name: Build Website -- 2.43.4 From 582425d45e7bc8ecfb76ebfd28be15866d49ae7d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 3 Mar 2024 22:01:12 +0000 Subject: [PATCH 09/20] Update actions/download-artifact action to v4 --- .forgejo/workflows/build-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index 978e7e7..121aee3 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -26,7 +26,7 @@ jobs: needs: [build] if: github.ref == 'refs/heads/develop' steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 - name: Install Dependencies run: which lftp || ( apk --update add lftp ) - name: Deploy Website @@ -43,7 +43,7 @@ jobs: needs: [build] if: github.ref == 'refs/heads/main' steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 - name: Install Dependencies run: which lftp || ( apk --update add lftp ) - name: Deploy Website -- 2.43.4 From 793037cd05ff59484af7966e2c5a91f91d485bab Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 3 Mar 2024 22:01:16 +0000 Subject: [PATCH 10/20] Update dependency gulp-postcss to v10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ef41c2..0c301d7 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "gulp-flatmap": "1.0.2", "gulp-header": "2.0.9", "gulp-optimize-js": "1.1.0", - "gulp-postcss": "9.1.0", + "gulp-postcss": "10.0.0", "gulp-rename": "2.0.0", "gulp-sass": "5.1.0", "gulp-terser": "2.1.0", -- 2.43.4 From 122acf7c9053dc2ff8833988a148c2663c73d4b0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 13 Mar 2024 22:01:06 +0000 Subject: [PATCH 11/20] Update dependency sass to ^1.72.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ef41c2..2fbcfd8 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lazypipe": "1.0.2", "node-sass-tilde-importer": "^1.0.2", "postcss": "^8.4.33", - "sass": "^1.69.7" + "sass": "^1.72.0" }, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.4", -- 2.43.4 From 50db78aeb394da8c9bc24d21ffb854e7294e1eb4 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 21 Mar 2024 00:00:54 +0000 Subject: [PATCH 12/20] Update dependency autoprefixer to v10.4.19 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ef41c2..15a215e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "browser-sync": "^3.0.2" }, "devDependencies": { - "autoprefixer": "10.4.18", + "autoprefixer": "10.4.19", "cssnano": "6.0.3", "del": "6.1.1", "gulp": "4.0.2", -- 2.43.4 From 48820a691034ce0c9fc4912d5a4b8a20c5136f89 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 29 Mar 2024 03:00:55 +0000 Subject: [PATCH 13/20] Update dependency gulp to v5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ef41c2..b6acbd8 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "autoprefixer": "10.4.18", "cssnano": "6.0.3", "del": "6.1.1", - "gulp": "4.0.2", + "gulp": "5.0.0", "gulp-concat": "2.6.1", "gulp-flatmap": "1.0.2", "gulp-header": "2.0.9", -- 2.43.4 From d0d4bb1982599b09cb82579d880f65488b04b2fa Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 29 Mar 2024 18:00:44 +0000 Subject: [PATCH 14/20] Update dependency postcss to ^8.4.38 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b793103..680fb64 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "gulp-terser": "2.1.0", "lazypipe": "1.0.2", "node-sass-tilde-importer": "^1.0.2", - "postcss": "^8.4.33", + "postcss": "^8.4.38", "sass": "^1.72.0" }, "dependencies": { -- 2.43.4 From 5a84417dda8f3fbb9f66b1ae5a585fc4ef67e8f9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 29 Mar 2024 18:00:49 +0000 Subject: [PATCH 15/20] Update dependency cssnano to v6.1.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b793103..fff6693 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "autoprefixer": "10.4.19", - "cssnano": "6.0.3", + "cssnano": "6.1.2", "del": "6.1.1", "gulp": "5.0.0", "gulp-concat": "2.6.1", -- 2.43.4 From d04a3cfcc61353b8e29e53769180ea7f02ff8055 Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Fri, 29 Mar 2024 18:02:32 +0000 Subject: [PATCH 16/20] revert b77624c754d3b87702903a1eca9f0970482e43b7 revert Merge pull request 'Update actions/download-artifact action to v4' (#98) from renovate/actions-download-artifact-4.x into develop Reviewed-on: https://git.sp-codes.de/samuel-p/sp-magic.de/pulls/98 --- .forgejo/workflows/build-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index 3b3ebe7..156f8af 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -26,7 +26,7 @@ jobs: needs: [build] if: github.ref == 'refs/heads/develop' steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 - name: Install Dependencies run: which lftp || ( apk --update add lftp ) - name: Deploy Website @@ -43,7 +43,7 @@ jobs: needs: [build] if: github.ref == 'refs/heads/main' steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 - name: Install Dependencies run: which lftp || ( apk --update add lftp ) - name: Deploy Website -- 2.43.4 From 96539f73afd8cae716d87d3c9e5a1f720adacae8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 4 Apr 2024 02:00:49 +0000 Subject: [PATCH 17/20] Update dependency sass to ^1.74.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 17e92ac..630dbc3 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lazypipe": "1.0.2", "node-sass-tilde-importer": "^1.0.2", "postcss": "^8.4.38", - "sass": "^1.72.0" + "sass": "^1.74.1" }, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.4", -- 2.43.4 From d832a309b114176f8e7cebb20da0dc96919fc904 Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 10 Apr 2024 01:17:40 +0200 Subject: [PATCH 18/20] updated deploy to delete old files --- .forgejo/workflows/build-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index 156f8af..468d224 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -30,7 +30,7 @@ jobs: - name: Install Dependencies run: which lftp || ( apk --update add lftp ) - name: Deploy Website - run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./build/ dev.sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R -e ./build/ dev.sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST env: FTP_HOST: ${{ secrets.FTP_HOST }} FTP_USERNAME: ${{ secrets.FTP_USERNAME }} @@ -47,7 +47,7 @@ jobs: - name: Install Dependencies run: which lftp || ( apk --update add lftp ) - name: Deploy Website - run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./build/ sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R -e ./build/ sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST env: FTP_HOST: ${{ secrets.FTP_HOST }} FTP_USERNAME: ${{ secrets.FTP_USERNAME }} -- 2.43.4 From 1b4a4134fe701a31f314a7fbb78d29d9c32101b2 Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 10 Apr 2024 01:26:43 +0200 Subject: [PATCH 19/20] fixed build --- gulpfile.js | 69 ---------------------------------------------------- package.json | 7 +----- 2 files changed, 1 insertion(+), 75 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 91399bf..35182ab 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -4,7 +4,6 @@ */ var settings = { clean: true, - scripts: true, styles: true, copy: true, reload: true @@ -17,10 +16,6 @@ var settings = { var paths = { input: 'src/', output: 'dist/', - scripts: { - input: 'src/js/*.js', - output: 'dist/js/' - }, styles: { input: 'src/scss/*.scss', output: 'dist/css/' @@ -59,17 +54,10 @@ var banner = { // General var {src, dest, watch, series, parallel} = require('gulp'); var del = require('del'); -var flatmap = require('gulp-flatmap'); -var lazypipe = require('lazypipe'); var rename = require('gulp-rename'); var header = require('gulp-header'); var package = require('./package.json'); -// Scripts -var concat = require('gulp-concat'); -var uglify = require('gulp-terser'); -var optimizejs = require('gulp-optimize-js'); - // Styles var sass = require('gulp-sass')(require('sass')); var postcss = require('gulp-postcss'); @@ -100,62 +88,6 @@ var cleanDist = function (done) { }; -// Repeated JavaScript tasks -var jsTasks = lazypipe() - .pipe(header, banner.main, {package: package}) - .pipe(optimizejs) - .pipe(dest, paths.scripts.output) - .pipe(rename, {suffix: '.min'}) - .pipe(uglify) - .pipe(optimizejs) - .pipe(header, banner.main, {package: package}) - .pipe(dest, paths.scripts.output); - -// minify, and concatenate scripts -var buildScripts = function (done) { - // Make sure this feature is activated before running - if (!settings.scripts) return done(); - - // Run tasks on script files - return src(paths.scripts.input) - .pipe(flatmap(function(stream, file) { - - // If the file is a directory - if (file.isDirectory()) { - - // Setup a suffix variable - var suffix = ''; - - // If separate polyfill files enabled - if (settings.polyfills) { - - // Update the suffix - suffix = '.polyfills'; - - // Grab files that aren't polyfills, concatenate them, and process them - src([file.path + '/*.js', '!' + file.path + '/*' + paths.scripts.polyfills]) - .pipe(concat(file.relative + '.js')) - .pipe(jsTasks()); - - } - - // Grab all files and concatenate them - // If separate polyfills enabled, this will have .polyfills in the filename - src(file.path + '/*.js') - .pipe(concat(file.relative + suffix + '.js')) - .pipe(jsTasks()); - - return stream; - - } - - // Otherwise, process the file - return stream.pipe(jsTasks()); - - })); - -}; - // Process, and minify Sass files var buildStyles = function (done) { // Make sure this feature is activated before running @@ -239,7 +171,6 @@ var watchSource = function (done) { exports.default = series( cleanDist, parallel( - buildScripts, buildStyles, copyFiles ) diff --git a/package.json b/package.json index 630dbc3..343096e 100644 --- a/package.json +++ b/package.json @@ -17,17 +17,12 @@ "devDependencies": { "autoprefixer": "10.4.19", "cssnano": "6.1.2", - "del": "6.1.1", + "del": "7.1.0", "gulp": "5.0.0", - "gulp-concat": "2.6.1", - "gulp-flatmap": "1.0.2", "gulp-header": "2.0.9", - "gulp-optimize-js": "1.1.0", "gulp-postcss": "10.0.0", "gulp-rename": "2.0.0", "gulp-sass": "5.1.0", - "gulp-terser": "2.1.0", - "lazypipe": "1.0.2", "node-sass-tilde-importer": "^1.0.2", "postcss": "^8.4.38", "sass": "^1.74.1" -- 2.43.4 From c3df49f1cec104f6837fe7867551aff8a214547e Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 10 Apr 2024 01:28:55 +0200 Subject: [PATCH 20/20] fixed build --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 343096e..a2f660d 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "devDependencies": { "autoprefixer": "10.4.19", "cssnano": "6.1.2", - "del": "7.1.0", + "del": "6.1.1", "gulp": "5.0.0", "gulp-header": "2.0.9", "gulp-postcss": "10.0.0", -- 2.43.4