chore: update web dependencies

This reverts commit 280957ca22.

.gitea/workflows/ci.yaml

@@ -0,0 +1,28 @@
+name: Build container
+on:
+  push:
+
+jobs:
+  build:
+    runs-on: citadel-container-builder
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install qemu dependency
+        run: |
+          sudo dnf install -y qemu-user-static-aarch64
+      - name: Build
+        uses: redhat-actions/buildah-build@v2
+        with:
+          image: ${{ github.repository_owner }}/${{ github.event.repository.name }}
+          tags: latest
+          archs: arm64
+          containerfiles: |
+            ./Containerfile
+      - name: Push
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          image: ${{ github.repository_owner }}/${{ github.event.repository.name }}
+          tags: latest
+          registry: git.plabble.org
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_TOKEN }}

Containerfile

@@ -1,11 +1,11 @@
-FROM node:21-alpine3.19 AS frontend-builder
+FROM node:22-alpine3.20 AS frontend-builder
 WORKDIR /build
 
 RUN corepack enable
 COPY pastabble-frontend/ .
 RUN pnpm i && pnpm build
 
-FROM rust:alpine3.19 AS builder
+FROM rust:alpine3.20 AS builder
 WORKDIR /build
 
 RUN apk add --no-cache musl-dev
@@ -18,7 +18,7 @@ RUN case "$(apk --print-arch)" in \
 	       mv ./target/aarch64-unknown-linux-musl /release ;; \
 	esac
 
-FROM alpine:3.19
+FROM alpine:3.20
 WORKDIR /app
 
 RUN mkdir wwwroot data && \

pastabble-frontend/package.json

@@ -10,20 +10,20 @@
     "check": "svelte-check --tsconfig ./tsconfig.json"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^3.0.1",
-    "@tsconfig/svelte": "^5.0.2",
-    "autoprefixer": "^10.4.17",
-    "daisyui": "^4.6.1",
-    "postcss": "^8.4.33",
-    "svelte": "^4.2.8",
-    "svelte-check": "^3.6.2",
-    "tailwindcss": "^3.4.1",
-    "tslib": "^2.6.2",
-    "typescript": "^5.2.2",
-    "vite": "^5.0.8"
+    "@sveltejs/vite-plugin-svelte": "^5.1.0",
+    "@tsconfig/svelte": "^5.0.4",
+    "autoprefixer": "^10.4.21",
+    "daisyui": "^4.12.24",
+    "postcss": "^8.5.4",
+    "svelte": "^5.33.14",
+    "svelte-check": "^4.2.1",
+    "tailwindcss": "^3.4.17",
+    "tslib": "^2.8.1",
+    "typescript": "^5.8.3",
+    "vite": "^6.3.5"
   },
   "dependencies": {
-    "highlight.js": "^11.9.0",
+    "highlight.js": "^11.11.1",
     "svelte-spa-router": "^4.0.1"
   }
 }

pastabble-frontend/src/lib/components/CodeBlock.svelte

@@ -6,23 +6,22 @@
     export let language: string | undefined;
 
     let displayCode: string | undefined;
+    let displayLanguage: string | undefined;
     let showAlert = false;
-    let initial = true;
 
     $: if(code) {
         highlight();
-        initial = false;
     }
 
-    $: if(language) {
-        if(initial || !code) {
-            highlight();
-        }
+    $: if(language !== displayLanguage) {
+        highlight();
     }
 
     function highlight() {
         if(language) {
-            const res = hljs.highlight(language!, code!);
+            const res = hljs.highlight(code!, {
+                language
+            });
             if(!res.errorRaised) {
                 displayCode = res.value;
             }
@@ -33,6 +32,7 @@
                 language = res.language;
             }
         }
+        displayLanguage = language;
     }
 
     async function copy() {

pastabble-frontend/src/lib/pages/Home.svelte

@@ -45,7 +45,10 @@
         });
 
         if(res.ok) {
-            const id = await res.text();
+            let id = await res.text();
+            if(id.includes('/')) {
+                id = id.substring(id.lastIndexOf('/') + 1);
+            }
             push(`/${id}`);
         }
     }
@@ -75,7 +78,10 @@
         });
         
         if(res.status === 200) {
-            const id = await res.text();
+            let id = await res.text();
+            if(id.includes('/')) {
+                id = id.substring(id.lastIndexOf('/') + 1);
+            }
             createdUrl = `${location.origin}/to/${id}`;
             enteredUrl = '';
             showAlert = true;

pastabble-frontend/src/main.ts

@@ -1,9 +1,8 @@
 import './app.css'
 import 'highlight.js/styles/github-dark.min.css';
+import { mount } from 'svelte';
 import App from './App.svelte'
 
-const app = new App({
-  target: document.getElementById('app'),
-})
+const app = mount(App, { target: document.getElementById("app") });
 
 export default app