Promote changes in main → next

.github/workflows/codeql-analysis.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
     branches: [main]
   schedule:
-    - cron: '37 7 * * 1'
+    - cron: "37 7 * * 1"
 
 jobs:
   analyze:

.github/workflows/on-pull-request.yml

@@ -29,9 +29,9 @@ jobs:
       - name: Upload website
         uses: FirebaseExtended/action-hosting-deploy@v0
         with:
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
           firebaseServiceAccount:
-            '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}'
+            "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}"
           expires: 30d
           target: dev
           projectId: bjerk-io
@@ -62,4 +62,4 @@ jobs:
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Apply formatting changes
-          branch: ${{ github.head_ref }}
+          branch: ${{ github.head_ref }}

.github/workflows/on-push-to-next.yml

@@ -13,7 +13,7 @@ permissions:
   id-token: write
 
 concurrency:
-  group: 'next-pages'
+  group: "next-pages"
   cancel-in-progress: true
 
 jobs:
@@ -71,9 +71,9 @@ jobs:
         if: ${{ steps.branch-names.outputs.current_branch == env.NEXT_BRANCH }}
         uses: FirebaseExtended/action-hosting-deploy@v0
         with:
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
           firebaseServiceAccount:
-            '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}'
+            "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}"
           projectId: bjerk-io
           channelId: live
           target: next
@@ -82,10 +82,10 @@ jobs:
         if: ${{ steps.branch-names.outputs.current_branch != env.NEXT_BRANCH }}
         uses: FirebaseExtended/action-hosting-deploy@v0
         with:
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
           firebaseServiceAccount:
-            '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}'
+            "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}"
           projectId: bjerk-io
           expires: 30d
-          channelID: ${{ steps.branch-names.outputs.current_branch }} 
-          target: next
+          channelID: ${{ steps.branch-names.outputs.current_branch }}
+          target: next

.github/workflows/on-push.yml

@@ -3,7 +3,7 @@ name: On Push
 on:
   schedule:
     # Schedule for every day at 12:00 CEST
-    - cron: '0 10 * * *'
+    - cron: "0 10 * * *"
   workflow_dispatch:
   push:
     branches:
@@ -15,7 +15,7 @@ permissions:
   id-token: write
 
 concurrency:
-  group: 'pages'
+  group: "pages"
   cancel-in-progress: true
 
 jobs:
@@ -40,7 +40,7 @@ jobs:
 
       - name: Lint 🔨
         run: pnpm lint
- 
+
   update-next:
     name: Update next
     runs-on: ubuntu-latest
@@ -63,7 +63,7 @@ jobs:
         uses: peter-evans/create-pull-request@v6
         with:
           branch: promote/main-to-next
-          title: 'Promote changes in main → next'
+          title: "Promote changes in main → next"
           body: |
             This PR promotes changes from the main branch to the next branch.
 
@@ -96,9 +96,9 @@ jobs:
       - name: Upload website
         uses: FirebaseExtended/action-hosting-deploy@v0
         with:
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
           firebaseServiceAccount:
-            '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}'
+            "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}"
           channelId: live
           target: prod
           projectId: bjerk-io

.prettierrc.mjs

@@ -0,0 +1,16 @@
+/** @type {import("prettier").Config} */
+export default {
+  plugins: ["prettier-plugin-astro"],
+  trailingComma: "all",
+  htmlWhitespaceSensitivity: "ignore",
+  proseWrap: "always",
+  arrowParens: "avoid",
+  overrides: [
+    {
+      files: "*.astro",
+      options: {
+        parser: "astro",
+      },
+    },
+  ],
+};

README.md

@@ -38,11 +38,12 @@ Next branches are development channels for this website. There is a permanent
 next website available at https://next.bjerk.io/. This website is deployed when
 pushing to the [`next`](https://github.com/bjerkio/website/tree/next) branch.
 
-You can also deploy a temporary next website by pushing to a branch named `next-<name>`.
-The URL for that branch will be available in the GitHub Actions logs.
+You can also deploy a temporary next website by pushing to a branch named
+`next-<name>`. The URL for that branch will be available in the GitHub Actions
+logs.
 
-The `next` branch is kept update to date with `main` branches with an auto update
-workflow.
+The `next` branch is kept update to date with `main` branches with an auto
+update workflow.
 
 ## Legacy
 
@@ -58,4 +59,4 @@ start with a new issue first. Another good way to start is [searching in our
 codebase for TODOs][todos].
 
 [todos]:
-  https://github.com/search?q=repo%3Abjerkio%2Fwebsite%20TODO%3A&type=code
+  https://github.com/search?q=repo%3Abjerkio%2Fwebsite%20TODO%3A&type=code

astro.config.mjs

@@ -1,9 +1,10 @@
 import { defineConfig } from "astro/config";
 import remarkGfm from "remark-gfm";
 import Icons from "unplugin-icons/vite";
-
 import sitemap from "@astrojs/sitemap";
 
+import alpinejs from "@astrojs/alpinejs";
+
 // https://astro.build/config
 export default defineConfig({
   site: "https://bjerk.io",
@@ -17,5 +18,5 @@ export default defineConfig({
   markdown: {
     remarkPlugins: [remarkGfm],
   },
-  integrations: [sitemap()],
+  integrations: [sitemap(), alpinejs()],
 });

firebase.json

@@ -70,7 +70,7 @@
           "headers": [
             {
               "key": "Content-Security-Policy",
-              "value": "script-src 'self' https://gc.zgo.at; connect-src https://bjerk.goatcounter.com/count"
+              "value": "script-src 'self' https://gc.zgo.at https://cdnjs.cloudflare.com 'unsafe-eval'; connect-src https://bjerk.goatcounter.com/count"
             },
             {
               "key": "X-Frame-Options",

package.json

@@ -2,21 +2,23 @@
   "name": "astro",
   "type": "module",
   "version": "0.0.3",
-  "packageManager": "[email protected]",
-  "prettier": "@simenandre/prettier",
+  "packageManager": "[email protected]",
   "scripts": {
-    "format": "biome format ./ --write && prettier --write src/content",
+    "format": "prettier --write .",
     "lint": "biome lint --apply ./",
-    "release": "commit-and-tag-version",
     "dev": "astro dev",
     "start": "astro dev",
     "build": "astro build",
     "preview": "astro preview",
     "astro": "astro"
   },
   "dependencies": {
+    "@astrojs/alpinejs": "^0.4.0",
     "@astrojs/sitemap": "^3.0.3",
     "@fontsource-variable/sora": "^5.0.15",
+    "@fontsource/ibm-plex-sans": "^5.1.0",
+    "@types/alpinejs": "^3.0.0",
+    "alpinejs": "^3.0.0",
     "astro": "^4.0.0",
     "date-fns": "^2.30.0",
     "date-fns-tz": "^2.0.0",
@@ -28,7 +30,7 @@
     "@biomejs/biome": "^1.4.0",
     "@iconify-json/ph": "^1.1.6",
     "@iconify-json/tabler": "^1.1.103",
-    "@simenandre/prettier": "^5.0.0",
+    "prettier-plugin-astro": "^0.14.1",
     "commit-and-tag-version": "^12.4.2",
     "prettier": "^3.0.3",
     "schema-dts": "^1.1.2",