Merge pull request 'Mergin dev - new header, updated servants' (#29) from dev into main

Reviewed-on: #29

.forgejo/workflows/build_preview.yml

@@ -40,28 +40,31 @@ jobs:
     runs-on: docker
     steps:
       - name: Release New Version
-        uses: actions/forgejo-release@v1
+        uses: https://code.forgejo.org/actions/forgejo-release@v1
         with:
           direction: upload
           url: https://forgejo.neshweb.net
           release-dir: release
           token: ${{ secrets.FORGEJO_TOKEN }}
           tag: ${{  github.ref_name }}
+          prerelease: true
 
-  unlighthouse:
-    needs: [publish]
-    if: success()
-    runs-on: docker
-    services:
-      website:
-        image: forgejo.neshweb.net/firq/firq-dev-website:preview
-    steps:
-      - name: Install Dependencies
-        run: npm install -g @unlighthouse/cli puppeteer
-      - name: Run unlighthouse
-        run: unlighthouse-ci --site website:8081
-      - name: Upload reports
-        uses: actions/upload-artifact@v3
-        with:
-          name: unlighthouse-reports
-          path: unlighthouse-reports/
+  # doesn't work atm
+  # unlighthouse:
+  #   needs: [publish]
+  #   if: success()
+  #   runs-on: docker
+  #   container: registry.gitlab.com/gitlab-ci-utils/lighthouse:latest
+  #   services:
+  #     website:
+  #       image: forgejo.neshweb.net/firq/firq-dev-website:preview
+  #   steps:
+  #     - name: Install Dependencies
+  #       run: npm install @unlighthouse/cli puppeteer
+  #     - name: Run unlighthouse
+  #       run: node_modules/.bin/unlighthouse-ci
+  #     - name: Upload reports
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: unlighthouse-reports
+  #         path: unlighthouse-reports/

.forgejo/workflows/build_release.yml

@@ -2,9 +2,6 @@ on:
   push:
     tags:
       - '[0-9]+\.[0-9]+\.[0-9]+'
-      - '[0-9]+\.[0-9]+\.[0-9]+a[0-9]+'
-      - '[0-9]+\.[0-9]+\.[0-9]+b[0-9]+'
-      - '[0-9]+\.[0-9]+\.[0-9]+rc[0-9]+'
 
 jobs:
   checking:
@@ -17,7 +14,6 @@ jobs:
         run: npm install
       - name: Run astro check (linting +  static analysis)
         run: npm run astro check
-        run: npm run astro check
 
   build-site:
     needs: [checking]
@@ -44,7 +40,7 @@ jobs:
     runs-on: docker
     steps:
       - name: Release New Version
-        uses: actions/forgejo-release@v1
+        uses: https://code.forgejo.org/actions/forgejo-release@v1
         with:
           direction: upload
           url: https://forgejo.neshweb.net

.forgejo/workflows/unlighthouse.yml

@@ -0,0 +1,98 @@
+on:
+  push:
+    tags:
+      - '[0-9]+\.[0-9]+\.[0-9]+unlighthouse[0-9]+'
+      - '[0-9]+\.[0-9]+\.[0-9]+ulh[0-9]+'
+
+jobs:
+  unlighthouse:
+    runs-on: docker
+    container: forgejo.neshweb.net/ci-docker-images/unlighthouse:latest
+    steps:
+      - name: Checkout repository
+        uses: https://code.forgejo.org/actions/checkout@v3 
+      - name: Run unlighthouse
+        run: unlighthouse-ci --site "https://preview.firq.dev/"
+      - name: Prepare artifacts
+        run: cp serve.json unlighthouse-reports
+      - name: Upload reports
+        uses: actions/upload-artifact@v3
+        with:
+          name: unlighthouse-reports
+          path: unlighthouse-reports/
+
+  deploy-unlighthouse-files:
+    needs: [ unlighthouse ]
+    if: success()
+    runs-on: docker
+    env: 
+      DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+      DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+    steps:
+      - name: Install and update ssh + rsync
+        run: |
+            which rsync || ( apt update -y && apt install rsync -y)
+            which ssh-agent || ( apt update -y && apt install openssh-client -y)            
+      - name: Downloading static site artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: unlighthouse-reports
+          path: public
+      - name: Install SSH Key
+        uses: https://github.com/shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          known_hosts: unnecessary
+      - name: Adding Known Hosts
+        run: ssh-keyscan -H ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts
+      - name: Stop screen session, delete old files
+        uses: https://github.com/appleboy/ssh-action@master
+        with:
+          host: ${{ env.DEPLOY_HOST }}
+          username: ${{ env.DEPLOY_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            screen -X -S firq_dev-unlighthouse kill
+            rm -r -f firq_dev/unlighthouse/*            
+      - name: Copy files using rsync
+        run: rsync -az --stats public/* ${{ env.DEPLOY_USER }}@${{ env.DEPLOY_HOST }}:~/firq_dev/unlighthouse
+      - name: Check files on deploy target
+        uses: https://github.com/appleboy/ssh-action@master
+        with:
+          host: ${{ env.DEPLOY_HOST }}
+          username: ${{ env.DEPLOY_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            cd firq_dev
+            find unlighthouse -maxdepth 1 -printf "%p\n"            
+
+  deploy-unlighthouse-site:
+    needs: [ deploy-unlighthouse-files ]
+    if: success()
+    runs-on: docker
+    env: 
+      DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+      DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+    steps:
+      - name: Install and update ssh + rsync
+        run: |
+            which rsync || ( apt update -y && apt install rsync -y)
+            which ssh-agent || ( apt update -y && apt install openssh-client -y)            
+      - name: Install SSH Key
+        uses: https://github.com/shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          known_hosts: unnecessary
+      - name: Adding Known Hosts
+        run: ssh-keyscan -H ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts
+      - name: Start new screen session
+        uses: https://github.com/appleboy/ssh-action@master
+        with:
+          host: ${{ env.DEPLOY_HOST }}
+          username: ${{ env.DEPLOY_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            PATH="$HOME/.local/bin:$PATH"
+            screen -ls | grep 'firq_dev-unlighthouse' | awk '{print $1}' | xargs -I % -t screen -X -S % quit
+            cd firq_dev
+            screen -S firq_dev-unlighthouse -dm serve unlighthouse/ -p ${{ secrets.UNLIGHTHOUSE_DEPLOY_PORT }}   

.vscode/settings.json

@@ -0,0 +1,12 @@
+{
+    "files.exclude": {
+        "**/.git": true,
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/CVS": true,
+        "**/.DS_Store": true,
+        "**/Thumbs.db": true,
+        "**/__pycache__": true
+    },
+    "hide-files.files": []
+}

Dockerfile

@@ -4,12 +4,11 @@ COPY . .
 RUN npm i
 RUN npm run build
 
-FROM node:lts AS runtime
-RUN npm install --global "@warren-bank/serve"
+FROM forgejo.neshweb.net/ci-docker-images/website-serve:latest AS runtime
 
 COPY --from=build /app/dist /public
 COPY --from=build /app/serve.json /public/serve.json
-RUN rm -r /public/assets/data/
+RUN rm -r /public/data/
 
 ENV PORT 8081
 EXPOSE 8081

astro.config.mjs

@@ -1,7 +1,7 @@
 import { defineConfig } from 'astro/config';
 
-// https://astro.build/config
 import sitemap from "@astrojs/sitemap";
+import mdx from "@astrojs/mdx";
 
 // https://astro.build/config
 export default defineConfig({
@@ -10,5 +10,5 @@ export default defineConfig({
   outDir: 'dist',
   publicDir: 'static',
   site: 'https://firq.dev/',
-  integrations: [sitemap()]
+  integrations: [sitemap(), mdx()]
 });

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@firq/fgosite",
 	"type": "module",
-	"version": "0.1.7",
+	"version": "0.1.27",
 	"private": true,
 	"scripts": {
 		"dev": "astro dev",
@@ -11,10 +11,18 @@
 		"astro": "astro"
 	},
 	"dependencies": {
+		"@astro-community/astro-embed-youtube": "^0.4.3",
 		"@astrojs/check": "^0.3.3",
+		"@astrojs/mdx": "^2.0.3",
 		"@astrojs/sitemap": "^3.0.3",
-		"astro": "^4.0.7",
-		"iconoir": "^6.1.0",
+		"astro": "^4.2.1",
+		"autoprefixer": "^10.4.16",
+		"iconoir": "^7.2.0",
+		"postcss-preset-env": "^9.3.0",
 		"typescript": "^5.3.3"
-	}
+	},
+	"browserslist": [
+		"last 2 versions",
+		">0.5% and not dead"
+	]
 }

postcss.config.cjs

@@ -0,0 +1,13 @@
+module.exports = {
+  plugins: {
+    "postcss-preset-env": {
+      autoprefixer: { flexbox: "no-2009" },
+      stage: 2,
+      features: {
+        "custom-properties": false,
+        "custom-media-queries": true,
+        "nesting-rules": true
+      }
+    }
+  }
+};

serve.json

@@ -14,14 +14,14 @@
       "source" : "**/*.css",
       "headers" : [{
         "key" : "Cache-Control",
-        "value" : "max-age=86400"
+        "value" : "max-age=31536000"
       }]
     },
     {
       "source" : "**/*.@(jpg|jpeg|gif|png|webp|svg)",
       "headers" : [{
         "key" : "Cache-Control",
-        "value" : "max-age=86400"
+        "value" : "max-age=31536000"
       }]
     }
   ]