Merge branch 'develop' into 'main'

Merging develop into main

See merge request !78

src/Handler.php

@@ -203,6 +203,7 @@ class Handler extends BaseHandler {
       ],
       'unlighthouse' => [
         'enable' => $this->env->receiveGlobal('UNLIGHTHOUSE', 'Unlighthouse', '0'),
+        'urlprefix' => '',
       ],
     ];
   }

templates/docker-compose.yml.twig

@@ -593,7 +593,7 @@ services:
       traefik.enable: 'true'
       traefik.docker.network: traefik-public
       traefik.http.services.{{ projectname }}_unlighthouse.loadbalancer.server.port: 5678
-      traefik.http.routers.unlighthouse-{{ projectname }}.rule: Host(`{{ projectdomain }}`)
+      traefik.http.routers.unlighthouse-{{ projectname }}.rule: Host(`unlighthouse-{{ projectdomain }}`)
 {% if drupal.live|default(0) or traefik.usessl %}
       traefik.http.routers.unlighthouse-{{ projectname }}.tls: 'true'
       traefik.http.routers.unlighthouse-{{ projectname }}.tls.certresolver: lakedrops

templates/tests/unlighthouse.config.ts

-export default {
-    puppeteerOptions: {
-        args: ["--no-sandbox"],
-    },
-    server: {
-        open: false,
-    },
-    site: "{{ projectprotocol }}://{{ projectdomain }}",
-    serverUrl: "{{ projectprotocol }}:/unlighthouse-{{ projectdomain }}/",
-    clientUrl: "{{ projectprotocol }}://unlighthouse-{{ projectdomain }}/",
-    apiUrl: "{{ projectprotocol }}://unlighthouse-{{ projectdomain }}/api",
-    websocketUrl: "{{ socketprotocol }}://unlighthouse-{{ projectdomain }}/api/ws",
-}

templates/tests/unlighthouse.config.ts.twig

+export default {
+  puppeteerOptions: {
+    args: ["--no-sandbox"],
+  },
+  server: {
+    open: false,
+  },
+  site: "{{ projectprotocol }}://{{ projectdomain }}{{ unlighthouse.urlprefix|default('') }}",
+{% if basicauth.enable %}
+  auth: {
+    username: "{{ basicauth.user }}",
+    password: "{{ basicauth.pass }}",
+  },
+{% endif %}
+  serverUrl: "{{ projectprotocol }}://unlighthouse-{{ projectdomain }}/",
+  clientUrl: "{{ projectprotocol }}://unlighthouse-{{ projectdomain }}/",
+  apiUrl: "{{ projectprotocol }}://unlighthouse-{{ projectdomain }}/api",
+  websocketUrl: "{{ socketprotocol }}://unlighthouse-{{ projectdomain }}/api/ws",
+}