Update site layout

.docker/php/Dockerfile

@@ -12,6 +12,7 @@ ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/do
 RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
     && install-php-extensions \
     gd \
+    intl \
     xdebug \
     zip \
     @composer \
@@ -43,6 +44,7 @@ fi
 EOF
 
 WORKDIR /var/www/html
+ENV HISTFILE=/dev/null
 USER www-data
 
 COPY entrypoint.sh /var/www/scripts/

.docker/php/entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euo pipefail
+
 if [[ ! -d "vendor" ]]; then
     composer i
 fi
@@ -8,20 +10,22 @@ if [[ ! -d "node_modules" ]]; then
     npm ci
 fi
 
-php-fpm &
-
 MODE="${SERVER_MODE:-watch}"
 MODE="$(echo "$MODE" | tr '[:upper:]' '[:lower:]' | xargs)"
 
 echo "Starting php container with SERVER_MODE=$MODE"
 
 if [[ "$MODE" == 'watch' ]]; then
-    npm run watch
+    php-fpm -D
+    exec npm run watch
 else
-    if [[ ! -f "source/assets/build/mix-manifest.json" ]]; then
-        echo "Mix manifest missing. Running one-time asset build (npm run dev)..."
-        npm run dev
-    fi
+    # Remove the Vite hot file so Jigsaw uses the compiled manifest
+    # instead of pointing HTML to the dev server.
+    rm -f "source/hot"
 
-    php ./vendor/bin/jigsaw serve --host 0.0.0.0 --port 3000
+    # Build Vite assets and the local static site in one step.
+    # NODE_ENV=local causes the plugin to run `jigsaw build local`,
+    # so build_local is ready for nginx with no leftover build_staging.
+    npm run build-assets
+    exec php-fpm -F
 fi

.github/workflows/deploy.yml

@@ -1,48 +1,30 @@
-# This is a basic workflow to help you get started with Actions
-
 name: Deploy
 
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push events but only for the main branch
   push:
     branches: [ main ]
   workflow_dispatch:
   repository_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
-      - name: Setup Node
-        uses: actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 20
-      - name: Set up php 8.3
-        uses: shivammathur/setup-php@v2
+      - uses: shivammathur/setup-php@v2
         with:
           php-version: 8.3
-      - name: Set up PHP dependencie
-        run: composer i
-      - name: Run composer command
-        run: composer prod
-      - name: Build production site
-        run: ./vendor/bin/jigsaw build production
-      - name: Deploy to GitHub Pages
+      - run: composer i
+      - run: composer prod
+      - run: ./vendor/bin/jigsaw build production
+      - uses: crazy-max/ghaction-github-pages@v4
         if: success()
-        uses: crazy-max/ghaction-github-pages@v4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          # Build directory to deploy
           build_dir: build_production
-          # Write the given domain name to the CNAME file
           fqdn: libresign.coop
-          # Allow Jekyll to build your site
           jekyll: false

.github/workflows/preview.yml

@@ -23,6 +23,7 @@ jobs:
         run: |
           sed -i "s|libresign.coop|libresign.github.io|g" CNAME
           sed -i "s|baseUrl' => '/'|baseUrl' => 'https://LibreSign.github.io/site-preview/pr-preview/pr-${{ github.event.pull_request.number }}/'|g" config.php
+          sed -i "s|base: '/assets/build/'|base: 'https://libresign.github.io/site-preview/pr-preview/pr-${{ github.event.pull_request.number }}/assets/build/'|g" vite.config.js
           cat config.php|grep "'baseUrl' => "
           sed -i "/'matomo_container'/d" config.production.php
           # Disable HTTP calls during preview build to avoid SSL issues

.gitignore

@@ -11,9 +11,12 @@ npm-debug.log
 /source/_posts/_translated_tmp/
 /source/_redirect/
 /source/_team/
-# Optional ignores
-# /build_staging/
+/build_staging/
 /build_production/
+/source/assets/compiled/
 /source/assets/build/
+/source/hot
 
 .env
+docker-compose.override.yml
+.bash_history

README.md

@@ -1,5 +1,41 @@
 # LibreSign Website
 
+## Local development
+
+### Starting the stack
+
+```bash
+docker compose up
+```
+
+The `php` container builds the static site on startup and keeps `php-fpm` running so you can exec into it at any time:
+
+```bash
+docker compose exec php bash
+```
+
+The site is then served by nginx at <http://localhost/>.
+
+### Asset and build commands
+
+| Goal | Command | Exits? |
+|---|---|---|
+| Dev server with hot-reload (HMR) | `npm run dev` | No — stays alive waiting for changes |
+| Watch mode (rebuild on save, no HMR) | `npm run watch` | No — stays alive |
+| **Build assets + local site** (for local nginx) | `npm run build-assets` | Yes |
+| Staging build | `npm run staging` | Yes |
+| Production build | `npm run prod` | Yes |
+
+> **Note:** `npm run dev` starts the Vite development server on port `3000` (mapped to the host via `HTTP_PORT_BROWSERSYNC`, default `3000`). It runs an initial Jigsaw build, prints "Initial Jigsaw build completed." and then waits for file changes with HMR. It is not supposed to exit — press Ctrl+C to stop it.
+
+### Force a full local rebuild
+
+Use this when you want to regenerate `build_local` manually and return to the prompt:
+
+```bash
+docker compose exec php bash -lc "npm run build-assets"
+```
+
 ## Translations
 Help to translate the project on Weblate platform: https://hosted.weblate.org/projects/libresign-coop-site/site/