Merge pull request 'develop' (#92 ) from develop into main

Reviewed-on: #92
Merge remote-tracking branch 'origin/renovate/minify-8.x' into develop
2021-10-01 22:27:54 +00:00 · 2021-10-02 00:21:29 +02:00 · 2021-10-01 22:17:45 +00:00 · 2021-10-01 19:01:39 +00:00 · 2021-10-01 19:01:31 +00:00 · 2021-10-01 19:41:58 +02:00
3 changed files with 37 additions and 2 deletions
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -0,0 +1,34 @@
 pipeline:
  build:
    image: node:lts
    commands:
      - npm install
      - npm run build
  deploy-dev:
    image: alpine
    secrets:
      - FTP_HOST
      - FTP_USERNAME
      - FTP_PASSWORD
    commands:
      - which lftp || ( apk --update add lftp )
      - lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ dev.sp-codes.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST
    when:
      branch:
        - develop
      event:
        - push
  deploy:
    image: alpine
    secrets:
      - FTP_HOST
      - FTP_USERNAME
      - FTP_PASSWORD
    commands:
      - which lftp || ( apk --update add lftp )
      - lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ sp-codes.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST
    when:
      branch:
        - main
      event:
        - push
--- a/package.json
+++ b/package.json
@ -26,8 +26,8 @@
    "@node-minify/crass": "^6.2.0",
    "@node-minify/html-minifier": "^6.2.0",
    "cpx": "^1.5.0",
-    "glob": "^7.1.7",
+    "glob": "^7.2.0",
-    "minify": "^7.1.0",
+    "minify": "^8.0.0",
    "node-sass": "^6.0.1",
    "node-sass-tilde-importer": "^1.0.2",
    "npm-run-all": "^4.1.5",
--- a/src/_includes/layouts/base.njk
+++ b/src/_includes/layouts/base.njk
@ -35,6 +35,7 @@ title: sp-codes
    <link rel="icon" type="image/png" href="favicon.png">
    <link rel="stylesheet" href="/css/main.css">
    <script async defer data-domain="sp-codes.de" src="https://plausible.sp-codes.de/js/plausible.outbound-links.js"></script>
    <script async defer data-website-id="47b8022b-0537-4bb2-baa5-455a87a36ff5" src="https://umami.sp-codes.de/umami.js"></script>
 </head>
 <body>
 <nav class="nav menu border-bottom">
Author	SHA1	Message	Date
Samuel Philipp	ffd7e88e26	Merge pull request 'develop' (#92 ) from develop into main All checks were successful continuous-integration/drone the build was successful Details Reviewed-on: #92	2021-10-01 22:27:54 +00:00
samuel-p	a2832b93b5	Merge remote-tracking branch 'origin/renovate/minify-8.x' into develop # Conflicts: # package.json	2021-10-02 00:21:29 +02:00
Samuel Philipp	ca3e93d9b9	Merge pull request 'Update dependency minify to ^7.2.2' (#90 ) from renovate/minify-7.x into develop Reviewed-on: #90	2021-10-01 22:17:45 +00:00
Renovate Bot	c07c77a9c0	Update dependency minify to v8 All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details continuous-integration/drone the build was successful Details	2021-10-01 19:01:39 +00:00
Renovate Bot	40dc330061	Update dependency minify to ^7.2.2 All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details continuous-integration/drone the build was successful Details	2021-10-01 19:01:31 +00:00
samuel-p	0bac80613c	updated .woodpecker.yml All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone the build was successful Details	2021-10-01 19:41:58 +02:00
samuel-p	d3b77bd8b4	added umami.js All checks were successful continuous-integration/drone/push Build is passing Details added .woodpecker.yml	2021-10-01 19:19:31 +02:00
Samuel Philipp	2659c6f20b	Merge pull request 'Update dependency minify to ^7.2.1' (#89 ) from renovate/minify-7.x into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #89	2021-09-30 17:59:54 +00:00
Renovate Bot	09dbe34126	Update dependency minify to ^7.2.1 All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2021-09-28 16:01:27 +00:00
Samuel Philipp	9937715c18	Merge pull request 'Update dependency glob to ^7.2.0' (#88 ) from renovate/glob-7.x into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #88	2021-09-23 17:27:41 +00:00
Renovate Bot	468dd9d9ce	Update dependency glob to ^7.2.0 All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2021-09-23 04:01:28 +00:00