From 84459b06e26d1f66b03830b594a76c42f2339303 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Thu, 24 Jul 2025 17:27:02 +0000
Subject: [PATCH 1/4] feat: dynamically set PWA start_url

This commit fixes an issue where the PWA would always start at the
root of the application, regardless of the page you were on when
you installed it.

This is fixed by:
- Consolidating the two manifest files into a single file.
- Adding a new route to the server that dynamically generates the
  `start_url` in the manifest based on the current route.
- Adding an e2e test to verify the changes.
---
 apps/client/index.html                     |  3 +-
 apps/client/public/manifest.json           | 19 -----------
 apps/client/public/manifest.webmanifest    | 15 +++++++++
 apps/client/public/site.webmanifest        | 10 ------
 apps/server/src/app.ts                     | 19 +++++++++++
 e2e/tests/features/214-pwa-install.spec.ts | 37 ++++++++++++++++++++++
 package.json                               |  5 ++-
 pnpm-lock.yaml                             |  4 +++
 8 files changed, 80 insertions(+), 32 deletions(-)
 delete mode 100644 apps/client/public/manifest.json
 create mode 100644 apps/client/public/manifest.webmanifest
 delete mode 100644 apps/client/public/site.webmanifest
 create mode 100644 e2e/tests/features/214-pwa-install.spec.ts

diff --git a/apps/client/index.html b/apps/client/index.html
index d93477afc7..1766a39df6 100644
--- a/apps/client/index.html
+++ b/apps/client/index.html
@@ -9,8 +9,7 @@
     <meta name="ontime" content="ontime - time keeping for live events" />
     <link rel="apple-touch-icon" href="/ontime-logo.png" />
     <link rel="icon" type="image/png" href="/ontime-logo.png" />
-    <link rel="manifest" href="/site.webmanifest" />
-    <link rel="manifest" href="/manifest.json" />
+    <link rel="manifest" href="/manifest.webmanifest" />
     <meta name="robots" content="noindex" />
     <title>ontime</title>
     <style>
diff --git a/apps/client/public/manifest.json b/apps/client/public/manifest.json
deleted file mode 100644
index 3c4b0e1a8d..0000000000
--- a/apps/client/public/manifest.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "ontime",
-  "short_name": "ontime",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "ontime-logo.png",
-      "type": "image/png"
-    }
-  ],
-  "scope": "/",
-  "start_url": "/",
-  "display": "",
-  "theme_color": "#121212",
-  "background_color": "#ffffff"
-}
diff --git a/apps/client/public/manifest.webmanifest b/apps/client/public/manifest.webmanifest
new file mode 100644
index 0000000000..3e35e5a901
--- /dev/null
+++ b/apps/client/public/manifest.webmanifest
@@ -0,0 +1,15 @@
+{
+  "name": "ontime",
+  "short_name": "ontime",
+  "icons": [
+    {
+      "src": "/ontime-logo.png",
+      "sizes": "295x295",
+      "type": "image/png"
+    }
+  ],
+  "scope": "/",
+  "display": "standalone",
+  "theme_color": "#2B5ABC",
+  "background_color": "#101010"
+}
diff --git a/apps/client/public/site.webmanifest b/apps/client/public/site.webmanifest
deleted file mode 100644
index fa64d67942..0000000000
--- a/apps/client/public/site.webmanifest
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "",
-  "short_name": "",
-  "icons": [
-    { "src": "/ontime-logo.png", "sizes": "295x295", "type": "image/png" }
-  ],
-  "theme_color": "#2B5ABC",
-  "background_color": "#101010",
-  "display": "standalone"
-}
diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts
index 10ebac57dc..96ed1e6a10 100644
--- a/apps/server/src/app.ts
+++ b/apps/server/src/app.ts
@@ -8,6 +8,8 @@ import serverTiming from 'server-timing';
 import cookieParser from 'cookie-parser';
 
 // import utils
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
 import { publicDir, srcDir } from './setup/index.js';
 import { environment, isProduction } from './setup/environment.js';
 import { updateRouterPrefix } from './externals.js';
@@ -98,6 +100,23 @@ app.use(`${prefix}/user`, express.static(publicDir.userDir, { etag: false, lastM
 
 // Base route for static files
 app.use(`${prefix}`, authenticateAndRedirect, compressedStatic);
+
+app.get(`${prefix}/manifest.webmanifest`, (req, res) => {
+  // get the referer, if it doesnt exist, we send the default manifest
+  const referer = req.headers.referer || '/';
+
+  // read the manifest file
+  const manifest = JSON.parse(
+    readFileSync(join(publicDir.root, 'manifest.webmanifest'), 'utf-8'),
+  );
+
+  // set the start_url to the referer
+  manifest.start_url = referer;
+
+  // send the manifest
+  res.json(manifest);
+});
+
 app.use(`${prefix}/*splat`, authenticateAndRedirect, compressedStatic);
 
 // Implement catch all
diff --git a/e2e/tests/features/214-pwa-install.spec.ts b/e2e/tests/features/214-pwa-install.spec.ts
new file mode 100644
index 0000000000..5d6b213bef
--- /dev/null
+++ b/e2e/tests/features/214-pwa-install.spec.ts
@@ -0,0 +1,37 @@
+import { test, expect } from '@playwright/test';
+
+test('manifest start_url is correct for cuesheet', async ({ page }) => {
+  await page.goto('/cuesheet');
+  const manifestUrl = await page.evaluate(() => {
+    const link = document.querySelector('link[rel="manifest"]');
+    if (!link) {
+      return null;
+    }
+    return (link as HTMLLinkElement).href;
+  });
+
+  expect(manifestUrl).not.toBeNull();
+
+  const response = await page.request.get(manifestUrl!);
+  const manifest = await response.json();
+
+  expect(manifest.start_url).toContain('/cuesheet');
+});
+
+test('manifest start_url is correct for op', async ({ page }) => {
+  await page.goto('/op');
+  const manifestUrl = await page.evaluate(() => {
+    const link = document.querySelector('link[rel="manifest"]');
+    if (!link) {
+      return null;
+    }
+    return (link as HTMLLinkElement).href;
+  });
+
+  expect(manifestUrl).not.toBeNull();
+
+  const response = await page.request.get(manifestUrl!);
+  const manifest = await response.json();
+
+  expect(manifest.start_url).toContain('/op');
+});
diff --git a/package.json b/package.json
index 85f8ae1595..36a5768a18 100644
--- a/package.json
+++ b/package.json
@@ -51,5 +51,8 @@
     "turbo": "^2.3.3",
     "typescript": "catalog:"
   },
-  "packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977"
+  "packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977",
+  "dependencies": {
+    "tsx": "^4.20.3"
+  }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bb9cefe991..3436740eec 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -37,6 +37,10 @@ catalogs:
 importers:
 
   .:
+    dependencies:
+      tsx:
+        specifier: ^4.20.3
+        version: 4.20.3
     devDependencies:
       '@playwright/test':
         specifier: ^1.51.1

From 2683f1a1e05d5791ebba9c4aef1e21726ee04751 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Sat, 26 Jul 2025 14:22:21 +0000
Subject: [PATCH 2/4] feat: dynamically set PWA start_url

This commit fixes an issue where the PWA would always start at the
root of the application, regardless of the page you were on when
you installed it.

This is fixed by:
- Consolidating the two manifest files into a single file.
- Adding a new route to the server that dynamically generates the
  `start_url` in the manifest based on the current route.
- Adding an e2e test to verify the changes.

From 65e8894cf5c563e4f400a292cf467637898c51ee Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Sat, 26 Jul 2025 14:22:49 +0000
Subject: [PATCH 3/4] feat: dynamically set PWA start_url

This commit fixes an issue where the PWA would always start at the
root of the application, regardless of the page you were on when
you installed it.

This is fixed by:
- Consolidating the two manifest files into a single file.
- Adding a new route to the server that dynamically generates the
  `start_url` in the manifest based on the current route.
- Adding an e2e test to verify the changes.

From 137db188972f58867897919aab8db22bb6303f0f Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Sat, 26 Jul 2025 14:23:17 +0000
Subject: [PATCH 4/4] feat: dynamically set PWA start_url

This commit fixes an issue where the PWA would always start at the
root of the application, regardless of the page you were on when
you installed it.

This is fixed by:
- Consolidating the two manifest files into a single file.
- Adding a new route to the server that dynamically generates the
  `start_url` in the manifest based on the current route.
- Adding an e2e test to verify the changes.