Fix jest tests

.dockerignore

@@ -1,2 +1 @@
 data/
-data-test/

.env.ci

@@ -1,6 +0,0 @@
-DATABASE="postgres"
-POSTGRES_PASSWORD="testpassword"
-POSTGRES_HOST="database"
-POSTGRES_PORT=5432
-VAPID_PRIVATE_KEY="privatekey"
-BASE_URL="http://localhost:5173"

.env.default

@@ -1,4 +1 @@
-DATABASE="postgres"
+POSTGRES_PASSWORD="The password for the postgres database"
-POSTGRES_PASSWORD="password"
-VAPID_PRIVATE_KEY=""
-BASE_URL="http://localhost:5173"

.env.test

@@ -1,6 +0,0 @@
-DATABASE="postgres"
-POSTGRES_PASSWORD="testpassword"
-POSTGRES_HOST="localhost"
-POSTGRES_PORT=5434
-VAPID_PRIVATE_KEY="privatekey"
-BASE_URL="http://localhost:5173"

.gitea/workflows/test.yaml

@@ -5,27 +5,6 @@ on: [push]
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: mcr.microsoft.com/playwright:v1.48.1-jammy
-    services:
-      database:
-        image: postgres:16
-        env:
-          POSTGRES_PASSWORD: testpassword
-          POSTGRES_USER: postgres
-          POSTGRES_DB: test
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5434:5432
     steps:
       - uses: actions/checkout@v4
-      - name: Run Tests
+      - run: npm install && npm run test
-        env: NODE_OPTIONS=--max-old-space-size=8192
-        run: |
-          npm install
-          npm run ci
-          npm ci
-          npx playwright test

.gitignore

@@ -1,6 +1,5 @@
 .env
-/data/
+data/
-/data-test/
 node_modules/
 build/
 /public/entry.worker.js
@@ -8,4 +7,3 @@ build/
 /playwright-report/
 /blob-report/
 /playwright/.cache/
-send-it.js

.prettierrc

@@ -13,7 +13,7 @@
                 "*.spec.js"
             ],
             "options": {
-                "maxLineLength": 9999
+                "maxLineLength": 9999999
             }
         }
     ]

Dockerfile

@@ -3,4 +3,4 @@ WORKDIR /tack-up-now
 COPY . .
 RUN npm install
 RUN npx -y remix vite:build
-CMD /bin/sh ./start.sh
+CMD npx tsx server.ts

api/app.ts

@@ -1,14 +0,0 @@
-import express from "express"
-import { postSubscription } from "./subscriptionEndpoints/postSubscription"
-import { putSubscription } from "./subscriptionEndpoints/putSubscription"
-import migrateToLatest from "./data/migrate"
-
-const app = express()
-app.use(express.json())
-
-app.get("/api", (req, res) => res.send("HI"))
-
-app.post("/api/subscription", postSubscription)
-app.put("/api/subscription/:id/", putSubscription)
-
-export default app

api/data/database.ts

@@ -1,28 +0,0 @@
-import { SubscriptionTable } from "./subscription"
-import pg from "pg"
-const { Pool } = pg
-
-export interface Database {
-  subscription: SubscriptionTable
-}
-
-import { Kysely, PostgresDialect } from "kysely"
-import settings from "./settings"
-
-const dialect = new PostgresDialect({
-  pool: new Pool({
-    ...settings,
-    max: 10,
-  }),
-})
-
-export let db = new Kysely<Database>({
-  dialect,
-})
-
-export async function resetDbInstance() {
-  await db.destroy()
-  db = new Kysely<Database>({
-    dialect,
-  })
-}

api/data/migrate.ts

@@ -1,46 +0,0 @@
-import { promises as fs } from "fs"
-import { FileMigrationProvider, Migrator } from "kysely"
-import * as path from "path"
-import { db } from "./database"
-import { fileURLToPath } from "url"
-
-let dirname
-
-try {
-  dirname = __dirname
-} catch {
-  const filename = fileURLToPath(import.meta.url)
-  dirname = path.dirname(filename)
-}
-
-const migrator = new Migrator({
-  db,
-  provider: new FileMigrationProvider({
-    fs,
-    path,
-    migrationFolder: path.join(dirname, "migrations"),
-  }),
-})
-
-async function migrateToLatest() {
-  const { error, results } = await migrator.migrateToLatest()
-
-  results?.forEach((it) => {
-    if (it.status === "Success") {
-      console.log(`migration "${it.migrationName}" was executed successfully`)
-    } else if (it.status === "Error") {
-      console.error(`failed to execute migration "${it.migrationName}"`)
-    }
-  })
-
-  if (error) {
-    console.error("failed to migrate")
-    console.error(error)
-  }
-}
-
-export async function resetAll() {
-  while ((await migrator.migrateDown()).error !== undefined) {}
-}
-
-export default migrateToLatest

api/data/migrations/1.addSubscriptions.ts

@@ -1,13 +0,0 @@
-import { Kysely } from "kysely"
-
-export async function up(db: Kysely<any>) {
-  await db.schema
-    .createTable("subscription")
-    .addColumn("id", "serial", (col) => col.primaryKey())
-    .addColumn("subscription", "json")
-    .execute()
-}
-
-export async function down(db: Kysely<any>) {
-  await db.schema.dropTable("subscription").execute()
-}

api/data/settings.ts

@@ -1,7 +0,0 @@
-export default {
-  database: process.env.DATABASE ?? "postgres",
-  host: process.env.POSTGRES_HOST ?? "database",
-  user: "postgres",
-  password: process.env.POSTGRES_PASSWORD,
-  port: process.env.POSTGRES_PORT ?? 5432,
-}

api/data/subscription.test.ts

@@ -1,103 +0,0 @@
-import { db, resetDbInstance } from "./database"
-import migrateToLatest, { resetAll } from "./migrate"
-import {
-  createSubscription,
-  getSubscription,
-  Subscription,
-  updateSubscription,
-} from "./subscription"
-
-const pushSubscription1 = {
-  endpoint: "https://updates.push.services.mozilla.com/wpush/v2/aaaaaaa",
-  expirationTime: null,
-  keys: {
-    auth: "adfsadfasdf",
-    p256dh: "aaaaaaaaaaaa",
-  },
-}
-
-const pushSubscription2 = {
-  endpoint: "https://updates.push.services.mozilla.com/wpush/v2/bbbbbbbb",
-  expirationTime: null,
-  keys: {
-    auth: "whoahauth",
-    p256dh: "bbbbbbbb",
-  },
-}
-
-jest.mock("./settings", () => ({
-  port: process.env.POSTGRES_PORT,
-  user: "postgres",
-  password: process.env.POSTGRES_PASSWORD,
-  database: "test",
-  host: process.env.POSTGRES_HOST,
-}))
-
-describe("subscriptions", () => {
-  beforeAll(async () => {
-    await resetDbInstance()
-  })
-
-  beforeEach(async () => {
-    await migrateToLatest()
-  })
-
-  afterEach(async () => {
-    await resetAll()
-  })
-
-  afterAll(async () => {
-    await db.destroy()
-  })
-
-  test("createSubscription", async () => {
-    const { id } = await createSubscription(pushSubscription1)
-
-    const subscription = (await db
-      .selectFrom("subscription")
-      .selectAll()
-      .where("id", "=", id)
-      .executeTakeFirst()) as Subscription
-
-    expect(subscription).toEqual({
-      id,
-      subscription: pushSubscription1,
-    })
-  })
-
-  test("updateSubscription", async () => {
-    const { id } = (await db
-      .insertInto("subscription")
-      .values({ subscription: JSON.stringify(pushSubscription1), id: 50 })
-      .returning("id")
-      .executeTakeFirst())!
-
-    await updateSubscription(pushSubscription2, id)
-
-    const updated = (await db
-      .selectFrom("subscription")
-      .selectAll()
-      .where("id", "=", id)
-      .executeTakeFirst()) as Subscription
-
-    expect(updated).toEqual({
-      id,
-      subscription: pushSubscription2,
-    })
-  })
-
-  test("getSubscription", async () => {
-    const { id } = (await db
-      .insertInto("subscription")
-      .values({ subscription: JSON.stringify(pushSubscription1), id: 5000 })
-      .returning("id")
-      .executeTakeFirst())!
-
-    const got = await getSubscription(id)
-
-    expect(got).toEqual({
-      subscription: pushSubscription1,
-      id: 5000,
-    })
-  })
-})

api/data/subscription.ts

@@ -1,48 +0,0 @@
-import {
-  Generated,
-  Insertable,
-  JSONColumnType,
-  Selectable,
-  Updateable,
-} from "kysely"
-import { db } from "./database"
-
-export async function createSubscription(
-  subscription: PushSubscriptionJSON
-): Promise<Subscription> {
-  const inserted = await db
-    .insertInto("subscription")
-    .values({ subscription: JSON.stringify(subscription) })
-    .returningAll()
-    .executeTakeFirst()
-
-  return inserted!
-}
-
-export async function updateSubscription(
-  subscription: PushSubscriptionJSON,
-  id: number
-): Promise<void> {
-  await db
-    .updateTable("subscription")
-    .set({ subscription: JSON.stringify(subscription) })
-    .where("id", "=", id)
-    .executeTakeFirst()
-}
-
-export async function getSubscription(id: number) {
-  return await db
-    .selectFrom("subscription")
-    .selectAll()
-    .where("id", "=", id)
-    .executeTakeFirst()
-}
-
-export interface SubscriptionTable {
-  id: Generated<number>
-  subscription: JSONColumnType<PushSubscriptionJSON>
-}
-
-export type Subscription = Selectable<SubscriptionTable>
-export type NewSubscription = Insertable<SubscriptionTable>
-export type SubscriptionUpdate = Updateable<SubscriptionTable>

api/data/upgrade.ts

@@ -1,3 +0,0 @@
-import migrateToLatest from "./migrate"
-
-migrateToLatest()

api/subscribe.ts

@@ -0,0 +1,5 @@
+import type { Response, Request } from "express"
+
+export function subscribe(req: Request, res: Response) {
+  res.status(200).send()
+}

api/subscriptionEndpoints.test.ts

@@ -1,47 +0,0 @@
-import request from "supertest"
-import app from "./app"
-import { createSubscription, updateSubscription } from "./data/subscription"
-
-const pushSubscription = {
-  endpoint: "https://updates.push.services.mozilla.com/wpush/v2/aaaaaaa",
-  expirationTime: null,
-  keys: {
-    auth: "adfsadfasdf",
-    p256dh: "aaaaaaaaaaaa",
-  },
-}
-
-jest.mock("./data/subscription")
-
-const mockedCreateSubscription = jest.mocked(createSubscription)
-const mockedUpdateSubscription = jest.mocked(updateSubscription)
-
-describe("/api/subscription", () => {
-  beforeEach(() => {
-    mockedCreateSubscription.mockImplementation((subscription) =>
-      Promise.resolve({ id: 40, subscription })
-    )
-
-    mockedUpdateSubscription.mockImplementation((subscription, id) =>
-      Promise.resolve({ id, subscription })
-    )
-  })
-
-  test("POST", async () => {
-    const response = await request(app)
-      .post("/api/subscription/")
-      .send(pushSubscription)
-
-    expect(JSON.parse(response.text)).toEqual({
-      subscriptionId: 40,
-    })
-
-    expect(mockedCreateSubscription).toHaveBeenCalledWith(pushSubscription)
-  })
-
-  test("PUT", async () => {
-    await request(app).put("/api/subscription/10/").send(pushSubscription)
-
-    expect(mockedUpdateSubscription).toHaveBeenCalledWith(pushSubscription, 10)
-  })
-})

api/subscriptionEndpoints/postSubscription.ts

@@ -1,11 +0,0 @@
-import type { Response, Request } from "express"
-
-import { createSubscription } from "../data/subscription"
-
-export async function postSubscription(req: Request, res: Response) {
-  const subscriptionBody = req.body
-
-  const { id: subscriptionId } = await createSubscription(subscriptionBody)
-
-  res.status(200).send({ subscriptionId })
-}

api/subscriptionEndpoints/putSubscription.ts

@@ -1,10 +0,0 @@
-import type { Response, Request } from "express"
-import { updateSubscription } from "../data/subscription"
-
-export async function putSubscription(req: Request, res: Response) {
-  const subscriptionBody = req.body
-
-  await updateSubscription(subscriptionBody, Number.parseInt(req.params.id))
-
-  res.status(200).send()
-}

app/entry.worker.ts

@@ -4,6 +4,14 @@ export {}
 
 declare let self: ServiceWorkerGlobalScope
 
-import initWorker from "./worker"
+self.addEventListener("install", (event) => {
+  console.log("Service worker installed")
 
-initWorker(self)
+  event.waitUntil(self.skipWaiting())
+})
+
+self.addEventListener("activate", (event) => {
+  console.log("Service worker activated")
+
+  event.waitUntil(self.clients.claim())
+})

app/install/EnableNotifications.tsx

@@ -1,8 +1,6 @@
 import React from "react"
 import { useEffect } from "react"
 import { usePush } from "../usePush"
-import pushPublicKey from "../../pushPublicKey"
-import urlB64ToUint8Array from "../../b64ToUInt8"
 
 export default function EnableNotifications({
   onSubscribe,
@@ -32,13 +30,11 @@ function EnableButton({ onSubscribe }: { onSubscribe: () => void }) {
     if (!canSendPush) return
 
     subscribeToPush(
-      urlB64ToUint8Array(pushPublicKey) as any,
+      urlB64ToUint8Array(applicationServerPublicKey) as any,
-      async (subscription) => {
+      (subscription) => {
-        await navigator.serviceWorker.ready.then((registration) => {
+        fetch("/api/subscribe", {
-          registration.active?.postMessage({
+          method: "POST",
-            type: "subscribed",
+          body: JSON.stringify(subscription),
-            subscription: subscription.toJSON(),
-          })
         })
         onSubscribe()
       }
@@ -47,3 +43,19 @@ function EnableButton({ onSubscribe }: { onSubscribe: () => void }) {
 
   return <button onClick={subscribe}>Enable Notifications</button>
 }
+
+const applicationServerPublicKey =
+  "BDTbzdtzJxwV0sscdsXla-GKvlcxqQr7edEfkX8-papwvvV1UVc3IMyRacl1BbgTi31nWPji2wKCZkjf1l5iX7Y"
+
+function urlB64ToUint8Array(base64String: string) {
+  const padding = "=".repeat((4 - (base64String.length % 4)) % 4)
+  const base64 = (base64String + padding).replace(/\-/g, "+").replace(/_/g, "/")
+
+  const rawData = window.atob(base64)
+  const outputArray = new Uint8Array(rawData.length)
+
+  for (let i = 0; i < rawData.length; ++i) {
+    outputArray[i] = rawData.charCodeAt(i)
+  }
+  return outputArray
+}

app/install/InstallPrompts.tsx

@@ -4,12 +4,10 @@ import EnableNotifications from "./EnableNotifications"
 import OpenSafari from "./OpenSafari"
 import InstallPWA from "./InstallPWA"
 import Unsupported from "./Unsupported"
-import PermissionDenied from "./PermissionDenied"
 
 interface InstallPromptsProps {
   isMobileSafari: boolean
   isSupported: boolean
-  isIOS: boolean
   notificationsEnabled: boolean
   onInstallComplete: () => void
 }
@@ -17,10 +15,9 @@ interface InstallPromptsProps {
 export default function InstallPrompts({
   isSupported,
   isMobileSafari,
-  isIOS,
   onInstallComplete,
 }: InstallPromptsProps) {
-  const { step } = useInstallState({ isSupported, isMobileSafari, isIOS })
+  const { step } = useInstallState({ isSupported, isMobileSafari })
 
   const steps = {
     "open safari": <OpenSafari />,
@@ -29,7 +26,6 @@ export default function InstallPrompts({
       <EnableNotifications onSubscribe={onInstallComplete} />
     ),
     unsupported: <Unsupported />,
-    "permission denied": <PermissionDenied />,
   }
 
   return steps[step as keyof typeof steps] ?? null

app/install/PermissionDenied.tsx

@@ -1,18 +0,0 @@
-import React from "react"
-
-export default function PermissionDenied() {
-  return (
-    <div>
-      <h1>Enable Notifications</h1>
-      <div>
-        <span className="bold">Tack Up Now</span> requires notifications
-        permissions to work
-      </div>
-      <br />
-      <div>
-        You have denied permission to send notifications, please grant
-        notifications permissions to use Tack Up Now
-      </div>
-    </div>
-  )
-}

app/routes/_index.test.tsx

@@ -0,0 +1,51 @@
+import { act, render, screen, waitFor } from "@testing-library/react"
+import MatchMediaMock from "jest-matchmedia-mock"
+
+import { createRemixStub, RemixStubProps } from "@remix-run/testing"
+import App from "../root"
+import React from "react"
+import Index from "./_index"
+let RemixStub: (props: RemixStubProps) => React.JSX.Element
+
+describe("root", () => {
+  beforeEach(() => {
+    RemixStub = createRemixStub([
+      {
+        path: "/",
+        meta: () => [],
+        links: () => [],
+        loader: () => ({ isSupported: true, isMobileSafari: true }),
+        Component: Index,
+      },
+    ])
+  })
+
+  let matchMedia: MatchMediaMock
+
+  beforeAll(() => {
+    matchMedia = new MatchMediaMock()
+  })
+
+  afterEach(() => {
+    matchMedia.clear()
+  })
+
+  describe("when user is on iOS", () => {
+    describe("version 16.4 or higher", () => {
+      describe("and tack up now is not already installed on their device", () => {
+        test("they are instructed to install tack up now", async () => {
+          render(<RemixStub />)
+
+          await waitFor(
+            () => screen.findByText<HTMLElement>(/Install Tack Up Now!/),
+            {
+              timeout: 2000,
+            }
+          )
+
+          expect(true).toBe(true)
+        })
+      })
+    })
+  })
+})

app/routes/_index.tsx

@@ -4,13 +4,13 @@ import {
   type MetaFunction,
 } from "@remix-run/node"
 import { useLoaderData } from "@remix-run/react"
-import React, { useEffect, useRef, useState } from "react"
+import React, { Suspense, useEffect, useState } from "react"
 import coerceSemver from "semver/functions/coerce"
 import versionAtLeast from "semver/functions/gte"
 import UAParser from "ua-parser-js"
-import ClientOnly from "../ClientOnly"
 import InstallPrompts from "../install/InstallPrompts"
 import useInstallState from "../useInstallState"
+import ClientOnly from "../ClientOnly"
 
 export const meta: MetaFunction = () => {
   return [
@@ -28,68 +28,40 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
     os.name !== "iOS" ||
     versionAtLeast(coerceSemver(os.version) ?? "0.0.0", "16.4.0")
 
-  const isIOS = os.name === "iOS"
+  return json({
-
+    isSupported,
-  const cookies = parseCookies(request.headers.get("Cookie"))
+    isMobileSafari,
-  const userIdCookie = cookies?.find(({ key }) => key === "userId")
+    name: os.name,
-
+    version: os.version,
-  const newUserId =
+  })
-    userIdCookie === undefined ? Math.floor(Math.random()) * 5 : null
-
-  return json(
-    {
-      isSupported,
-      isMobileSafari,
-      isIOS,
-    },
-    {
-      headers:
-        newUserId !== null && isSupported && isIOS && isMobileSafari
-          ? {
-              "Set-Cookie": `userId=${newUserId}`,
-            }
-          : {},
-    }
-  )
 }
 
 export default function Index() {
-  const { isSupported, isMobileSafari, isIOS } = useLoaderData<typeof loader>()
+  const { isSupported, isMobileSafari, name, version } =
+    useLoaderData<typeof loader>()
+
+  console.log(name, version)
 
   return (
     <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.8" }}>
-      <TackUpNow
+      <Suspense>
-        isSupported={isSupported}
+        <LandingMessage
-        isMobileSafari={isMobileSafari}
+          isSupported={isSupported}
-        isIOS={isIOS}
+          isMobileSafari={isMobileSafari}
-      />
+        />
+      </Suspense>
     </div>
   )
 }
 
-function parseCookies(cookieString: string | null | undefined) {
+function LandingMessage({
-  if (cookieString === null || cookieString === undefined) return
-
-  const allCookieStrings = cookieString.split(";")
-  const cookies = allCookieStrings.map((string) => {
-    const [key, value] = string.trim().split("=")
-
-    return { key, value }
-  })
-
-  return cookies
-}
-
-function TackUpNow({
   isSupported,
   isMobileSafari,
-  isIOS,
 }: {
   isSupported: boolean
   isMobileSafari: boolean
-  isIOS: boolean
 }) {
-  const { installed } = useInstallState({ isSupported, isMobileSafari, isIOS })
+  const { installed } = useInstallState({ isSupported, isMobileSafari })
 
   const [isInstalled, setIsInstalled] = useState(installed)
 
@@ -102,7 +74,6 @@ function TackUpNow({
           <InstallPrompts
             isMobileSafari={isMobileSafari}
             isSupported={isSupported}
-            isIOS={isIOS}
             notificationsEnabled={false}
             onInstallComplete={() => setIsInstalled(true)}
           />

app/useInstallState.ts

@@ -6,16 +6,13 @@ type IOSInstallStep =
   | "open safari"
   | "enable notifications"
   | "unsupported"
-  | "permission denied"
 
 export default function useInstallState({
   isSupported,
   isMobileSafari,
-  isIOS,
 }: {
   isSupported: boolean
   isMobileSafari: boolean
-  isIOS: boolean
 }) {
   const isClient = typeof window !== "undefined"
 
@@ -32,32 +29,20 @@ export default function useInstallState({
       window.Notification.permission === "granted") ||
     canSendPush
 
-  const permissionDenied =
-    "Notification" in window && window.Notification.permission === "denied"
-
   const isRunningPWA =
     ("standalone" in navigator && (navigator.standalone as boolean)) ||
     matchMedia("(dislay-mode: standalone)").matches
 
-  const iOSStates = [
-    state(!isMobileSafari, "open safari"),
-    state(!isRunningPWA, "install"),
-  ]
-
-  const states = [
-    state(!isSupported, "unsupported"),
-    ...(isIOS ? iOSStates : []),
-    state(permissionDenied, "permission denied"),
-    state(!notificationsEnabled, "enable notifications"),
-  ]
-
   return {
-    step: states.find(({ active }) => active)?.result ?? null,
+    step: !isSupported
+      ? "unsupported"
+      : !isMobileSafari
+        ? "open safari"
+        : !isRunningPWA && isMobileSafari
+          ? "install"
+          : !notificationsEnabled
+            ? "enable notifications"
+            : (null as IOSInstallStep | null),
     installed: notificationsEnabled,
   }
 }
-
-const state = (active: boolean, result: IOSInstallStep) => ({
-  active,
-  result,
-})

app/usePush.ts

@@ -131,6 +131,8 @@ export const usePush = (): PushObject => {
         } catch (err) {
           console.error("Error getting service worker registration:", err)
         }
+      } else {
+        console.warn("Service Workers are not supported in this browser.")
       }
     }
 

app/worker.test.ts

@@ -1,436 +0,0 @@
-import "fake-indexeddb/auto"
-import "core-js/stable/structured-clone"
-import initWorker from "./worker"
-import Dexie, { EntityTable } from "dexie"
-
-function createSubscription(testToken = "HI") {
-  return {
-    toJSON: () => ({
-      subscription: testToken,
-    }),
-  }
-}
-
-const createSelf = () =>
-  ({
-    addEventListener: jest.fn(),
-    skipWaiting: jest.fn(() => Promise.resolve()),
-    registration: {
-      pushManager: {
-        subscribe: jest.fn(() => Promise.resolve(createSubscription())),
-        getSubscription: jest.fn(() => Promise.resolve(createSubscription())),
-      },
-      showNotification: jest.fn(),
-    },
-    clients: {
-      claim: jest.fn(() => Promise.resolve()),
-      openWindow: jest.fn(() => Promise.resolve()),
-      matchAll: jest.fn(() => Promise.resolve([])),
-    },
-  }) as unknown as ServiceWorkerGlobalScope
-
-let originalWindow: Window & typeof globalThis
-
-describe("service worker", () => {
-  let self: ServiceWorkerGlobalScope
-  let controlledClients: Client[]
-  let uncontrolledClients: Client[]
-
-  beforeEach(() => {
-    originalWindow = global.window
-    global.window = undefined as any
-    indexedDB = new IDBFactory()
-    self = createSelf()
-    controlledClients = []
-    uncontrolledClients = []
-
-    fetchMock.mockResponse((req) => {
-      if (
-        req.url.replace(/https?:\/\/[a-zA-Z0-9\.]*/, "") ===
-          "/api/subscription/" &&
-        req.method === "POST"
-      ) {
-        return Promise.resolve({
-          body: JSON.stringify({ subscriptionId: 123 }),
-        })
-      } else if (
-        req.url
-          .replace(/https?:\/\/[a-zA-Z0-9\.]*/, "")
-          .startsWith("/api/subscription/") &&
-        req.method === "PUT"
-      ) {
-        return Promise.resolve({ init: { status: 200 } })
-      }
-
-      return Promise.resolve({ init: { status: 500 } })
-    })
-  })
-
-  afterEach(() => {
-    jest.clearAllMocks()
-    global.window = originalWindow
-  })
-
-  test("displays push notifications", async () => {
-    initWorker(self)
-
-    const pushHandler = getHandler("push")
-
-    const pushEvent = createPushEvent(
-      JSON.stringify({
-        title: "Test title",
-        body: "Test text",
-        icon: "Test icon",
-        badge: "Test badge",
-        destination: "tackupnow.com/hi",
-      })
-    )
-    pushHandler(pushEvent)
-    await waitUntilCalls(pushEvent)
-
-    expect(self.registration.showNotification).toHaveBeenCalledWith(
-      "Test title",
-      {
-        body: "Test text",
-        icon: "Test icon",
-        badge: "Test badge",
-        data: { destination: "tackupnow.com/hi" },
-      }
-    )
-  })
-
-  describe("on notification click", () => {
-    test("the notification is closed", async () => {
-      initWorker(self)
-
-      const notificationHandler = getHandler("notificationclick")
-
-      const event = createNotificationEvent("tackupnow.com")
-      notificationHandler(event)
-      await waitUntilCalls(event)
-
-      expect(event.notification.close).toHaveBeenCalled()
-    })
-
-    test("opens tack up now if no clients match the destination", async () => {
-      initWorker(self)
-
-      const notificationHandler = getHandler("notificationclick")
-
-      const event = createNotificationEvent("tackupnow.com")
-      notificationHandler(event)
-      await waitUntilCalls(event)
-
-      expect(self.clients.openWindow).toHaveBeenCalledWith("tackupnow.com")
-    })
-
-    test("focuses first matching client", async () => {
-      addClient("https://tackupnow.com/place", "window", true)
-      const matchingClient = addClient(
-        "https://tackupnow.com/otherplace",
-        "window",
-        true
-      )
-      addClient("https://tackupnow.com/yetanotherotherplace", "window", true)
-
-      initWorker(self)
-
-      const notificationHandler = getHandler("notificationclick")
-
-      const event = createNotificationEvent("https://tackupnow.com/otherplace")
-      notificationHandler(event)
-      await waitUntilCalls(event)
-
-      expect(matchingClient.focus).toHaveBeenCalled()
-    })
-
-    test("focuses uncontrolled matching clients", async () => {
-      addClient("https://derpatious.world", "window", false)
-      addClient("https://tackupnow.com/1", "window", false)
-      const matchingClient = addClient(
-        "https://tackupnow.com/2",
-        "window",
-        false
-      )
-      addClient("https://tackupnow.com/controlled", "window", true)
-
-      initWorker(self)
-
-      const notificationHandler = getHandler("notificationclick")
-
-      const event = createNotificationEvent("https://tackupnow.com/2")
-      notificationHandler(event)
-      await waitUntilCalls(event)
-
-      expect(matchingClient.focus).toHaveBeenCalled()
-    })
-  })
-
-  test("claims on activate", async () => {
-    initWorker(self)
-
-    const activateHandler = getHandler("activate")
-
-    const event = createEvent()
-    activateHandler(event)
-    await waitUntilCalls(event)
-
-    expect(self.clients.claim).toHaveBeenCalled()
-  })
-
-  test("skips waiting on install", async () => {
-    initWorker(self)
-
-    const installHandler = getHandler("install")
-
-    const event = createEvent()
-    installHandler(event)
-    await waitUntilCalls(event)
-
-    expect(self.skipWaiting).toHaveBeenCalled()
-  })
-
-  describe("on subscription message", () => {
-    test("puts push subscription if the subscription id is set", async () => {
-      initWorker(self)
-      await setSavedSubscription(5000)
-
-      const messageHandler = getHandler("message")
-
-      const messageEvent = createEvent({
-        data: {
-          subscription: { subscription: "YO" },
-          type: "subscribed",
-        },
-      })
-      messageHandler(messageEvent)
-      await waitUntilCalls(messageEvent)
-
-      expect(fetch).toHaveBeenCalledWith(
-        `${process.env.BASE_URL}/api/subscription/5000`,
-        {
-          method: "PUT",
-          body: JSON.stringify({ subscription: "YO" }),
-          headers: {
-            "Content-Type": "application/json",
-          },
-        }
-      )
-    })
-
-    test("posts to subscriptions when there is no user set", async () => {
-      initWorker(self)
-
-      const messageHandler = getHandler("message")
-
-      const messageEvent = createEvent({
-        data: {
-          subscription: { subscription: "YO" },
-          type: "subscribed",
-        },
-      })
-      messageHandler(messageEvent)
-      await waitUntilCalls(messageEvent)
-
-      expect(fetch).toHaveBeenCalledWith(
-        `${process.env.BASE_URL}/api/subscription/`,
-        {
-          method: "POST",
-          body: JSON.stringify({ subscription: "YO" }),
-          headers: {
-            "Content-Type": "application/json",
-          },
-        }
-      )
-    })
-
-    test("subscription id is saved on first subscription change", async () => {
-      initWorker(self)
-
-      const messageHandler = getHandler("message")
-
-      const messageEvent = createEvent({
-        data: {
-          subscription: { subscription: "YO" },
-          type: "subscribed",
-        },
-      })
-      messageHandler(messageEvent)
-      await waitUntilCalls(messageEvent)
-
-      expect(await getSavedSubscription()).toEqual({
-        id: 1,
-        subscriptionId: 123,
-      })
-    })
-  })
-
-  describe("on subscription change", () => {
-    test("puts push subscription if the subscription id is set", async () => {
-      initWorker(self)
-      await setSavedSubscription(5000)
-
-      const changeHandler = getHandler("pushsubscriptionchange")
-
-      const changeEvent = createEvent()
-      changeHandler(changeEvent)
-      await waitUntilCalls(changeEvent)
-
-      expect(self.registration.pushManager.subscribe).toHaveBeenCalledWith({
-        userVisibleOnly: true,
-        applicationServerKey: expect.any(Uint8Array),
-      })
-
-      expect(fetch).toHaveBeenCalledWith(
-        `${process.env.BASE_URL}/api/subscription/5000`,
-        {
-          method: "PUT",
-          body: JSON.stringify({ subscription: "HI" }),
-          headers: {
-            "Content-Type": "application/json",
-          },
-        }
-      )
-    })
-
-    test("posts to subscriptions when there is no user set", async () => {
-      initWorker(self)
-
-      const changeHandler = getHandler("pushsubscriptionchange")
-
-      const changeEvent = createEvent()
-      changeHandler(changeEvent)
-      await waitUntilCalls(changeEvent)
-
-      expect(self.registration.pushManager.subscribe).toHaveBeenCalledWith({
-        userVisibleOnly: true,
-        applicationServerKey: expect.any(Uint8Array),
-      })
-
-      expect(fetch).toHaveBeenCalledWith(
-        `${process.env.BASE_URL}/api/subscription/`,
-        {
-          method: "POST",
-          body: JSON.stringify({ subscription: "HI" }),
-          headers: {
-            "Content-Type": "application/json",
-          },
-        }
-      )
-    })
-
-    test("subscription id is saved on first subscription change", async () => {
-      initWorker(self)
-
-      const changeHandler = getHandler("pushsubscriptionchange")
-
-      const changeEvent = createEvent()
-      changeHandler(changeEvent)
-      await waitUntilCalls(changeEvent)
-
-      expect(await getSavedSubscription()).toEqual({
-        id: 1,
-        subscriptionId: 123,
-      })
-    })
-  })
-
-  function addClient(url: string, type: ClientTypes, controlled: boolean) {
-    const matchAllMock = self.clients.matchAll as jest.Mock
-
-    matchAllMock.mockImplementation(
-      (args: { type: string; includeUncontrolled?: boolean }) => {
-        const clientList = args.includeUncontrolled
-          ? [...uncontrolledClients, ...controlledClients]
-          : controlledClients
-        return clientList.filter((client) => client.type === args.type)
-      }
-    )
-
-    const clientList = controlled ? controlledClients : uncontrolledClients
-
-    const client: WindowClient = {
-      url,
-      type,
-      focus: jest.fn(() => Promise.resolve(client)) as WindowClient["focus"],
-    } as WindowClient
-
-    clientList.push(client)
-
-    return client
-  }
-
-  function getHandler(eventName: string) {
-    expect(self.addEventListener).toHaveBeenCalledWith(
-      eventName,
-      expect.anything()
-    )
-
-    const [, handler] = (self.addEventListener as jest.Mock).mock.calls.find(
-      ([event]: [string]) => event === eventName
-    )
-
-    return handler
-  }
-})
-
-async function getSavedSubscription() {
-  const database = new Dexie("tack-up-now", { indexedDB }) as Dexie & {
-    subscriptions: EntityTable<{ id: number; subscriptionId: number }, "id">
-  }
-
-  database.version(1).stores({ subscriptions: "id++, subscriptionId&" })
-
-  return (await database.subscriptions.toArray())[0]
-}
-
-async function setSavedSubscription(subscriptionId: number) {
-  const database = new Dexie("tack-up-now", { indexedDB }) as Dexie & {
-    subscriptions: EntityTable<{ id: number; subscriptionId: number }, "id">
-  }
-
-  database.version(1).stores({ subscriptions: "id++, subscriptionId&" })
-
-  await database.subscriptions.put({ id: 1, subscriptionId })
-}
-
-function createPushEvent(data: string) {
-  const pushFields = {
-    data: {
-      blob: () => new Blob([data], { type: "text/plain" }),
-      json: () => JSON.parse(data),
-      text: () => data,
-      arrayBuffer: () => new TextEncoder().encode(data),
-    },
-  }
-
-  return createEvent(pushFields)
-}
-
-function createNotificationEvent(destination: string): NotificationEvent & {
-  waitUntil: jest.Mock<void, Parameters<ExtendableEvent["waitUntil"]>>
-} {
-  return createEvent({
-    notification: {
-      close: jest.fn(),
-      data: {
-        destination,
-      },
-    },
-  }) as any as NotificationEvent & {
-    waitUntil: jest.Mock<void, Parameters<ExtendableEvent["waitUntil"]>>
-  }
-}
-
-function createEvent(properties?: object) {
-  return {
-    waitUntil: jest.fn(),
-    ...properties,
-  }
-}
-
-function waitUntilCalls(event: {
-  waitUntil: jest.Mock<void, Parameters<ExtendableEvent["waitUntil"]>>
-}) {
-  return Promise.all(event.waitUntil.mock.calls.map(([promise]) => promise))
-}

app/worker.ts

@@ -1,127 +0,0 @@
-import Dexie, { EntityTable } from "dexie"
-import urlB64ToUint8Array from "../b64ToUInt8"
-import pushPublicKey from "../pushPublicKey"
-
-interface SubscriptionRecord {
-  id: number
-  subscriptionId: number
-}
-
-export default function start(self: ServiceWorkerGlobalScope) {
-  self.addEventListener("install", (event) => {
-    event.waitUntil(self.skipWaiting())
-  })
-
-  self.addEventListener("activate", (event) => {
-    event.waitUntil(self.clients.claim())
-  })
-
-  self.addEventListener("push", function (event: PushEvent) {
-    const { title, body, badge, icon, destination } = event.data?.json()
-
-    event.waitUntil(
-      self.registration.showNotification(title, {
-        body,
-        badge,
-        icon,
-        data: { destination },
-      })
-    )
-  })
-
-  self.addEventListener("notificationclick", function (event) {
-    event.notification.close()
-    const destination = event.notification.data.destination
-
-    event.waitUntil(
-      (async () => {
-        const clients = await self.clients.matchAll({
-          type: "window",
-          includeUncontrolled: true,
-        })
-
-        const existingClient = clients.find(
-          (client) => client.url === event.notification.data.destination
-        )
-
-        if (existingClient === undefined) {
-          await self.clients.openWindow(destination)
-        } else {
-          await existingClient.focus()
-        }
-      })()
-    )
-  })
-
-  self.addEventListener("message", function (event) {
-    const waitEvent = event as ExtendableEvent
-
-    if ("type" in event.data && event.data.type === "subscribed") {
-      waitEvent.waitUntil(submitSubscription(event.data.subscription))
-    }
-  })
-
-  self.addEventListener("pushsubscriptionchange", function (event) {
-    const waitEvent = event as ExtendableEvent
-
-    waitEvent.waitUntil(
-      (async () => {
-        const applicationServerKey = urlB64ToUint8Array(pushPublicKey)
-        const newSubscription = await self.registration.pushManager.subscribe({
-          userVisibleOnly: true,
-          applicationServerKey: applicationServerKey,
-        })
-
-        await submitSubscription(newSubscription.toJSON())
-      })()
-    )
-  })
-}
-
-async function submitSubscription(subscription: PushSubscriptionJSON) {
-  const db = database()
-
-  const existingSubscriptionId = await db.subscriptions.get(1)
-
-  await (existingSubscriptionId === undefined
-    ? postSubscription(subscription, db)
-    : putSubscription(subscription, existingSubscriptionId.subscriptionId))
-}
-
-async function postSubscription(
-  subscription: PushSubscriptionJSON,
-  db: ReturnType<typeof database>
-) {
-  const response = await fetch(`${process.env.BASE_URL}/api/subscription/`, {
-    method: "POST",
-    body: JSON.stringify(subscription),
-    headers: {
-      "Content-Type": "application/json",
-    },
-  })
-
-  db.subscriptions.put({
-    id: 1,
-    subscriptionId: (await response.json()).subscriptionId,
-  })
-}
-
-function putSubscription(subscription: PushSubscriptionJSON, id: number) {
-  return fetch(`${process.env.BASE_URL}/api/subscription/${id}`, {
-    method: "PUT",
-    body: JSON.stringify(subscription),
-    headers: {
-      "Content-Type": "application/json",
-    },
-  })
-}
-
-function database() {
-  const db = new Dexie("tack-up-now", { indexedDB }) as Dexie & {
-    subscriptions: EntityTable<SubscriptionRecord, "id">
-  }
-
-  db.version(1).stores({ subscriptions: "id++, subscriptionId&" })
-
-  return db
-}

b64ToUInt8.ts

@@ -1,12 +0,0 @@
-export default function urlB64ToUint8Array(base64String: string) {
-  const padding = "=".repeat((4 - (base64String.length % 4)) % 4)
-  const base64 = (base64String + padding).replace(/\-/g, "+").replace(/_/g, "/")
-
-  const rawData = atob(base64)
-  const outputArray = new Uint8Array(rawData.length)
-
-  for (let i = 0; i < rawData.length; ++i) {
-    outputArray[i] = rawData.charCodeAt(i)
-  }
-  return outputArray
-}

docker-compose-test.yaml

@@ -1,11 +0,0 @@
-services:
-  database:
-    image: postgres:16
-    ports:
-      - "5434:5432"
-    environment:
-      POSTGRES_PASSWORD: testpassword
-      POSTGRES_USER: postgres
-      POSTGRES_DB: test
-    volumes:
-      - ./data-test:/var/lib/postgresql/data

docker-compose.yaml

@@ -3,12 +3,13 @@ services:
     build: .
     ports:
       - "9000:3000"
-    env_file: ".env"
   database:
-    image: postgres:16
+    image: postgres
+    ports:
+      - "5433:5432"
     environment:
+      POSTGRES_PASSWORD: $POSTGRES_PASSWORD
       POSTGRES_USER: postgres
       POSTGRES_DB: postgres
-    env_file: ".env"
     volumes:
       - ./data:/var/lib/postgresql/data

e2e/install.spec.ts

@@ -1,6 +1,4 @@
 import { test, expect, Page } from "@playwright/test"
-import matchPath from "./urlMatcher"
-import { messageSW } from "@remix-pwa/sw"
 
 const { describe, beforeEach, skip, use } = test
 
@@ -10,12 +8,6 @@ function webkitOnly() {
   })
 }
 
-function nonWebkitOnly() {
-  beforeEach(async ({ browserName }) => {
-    if (browserName === "webkit") skip()
-  })
-}
-
 describe("when user is on iOS", () => {
   webkitOnly()
 
@@ -76,6 +68,21 @@ describe("when user is on iOS", () => {
               permission: "default",
               requestPermissionResult: "granted",
             })
+            await page.route("/api/subscribe", async (route) => {
+              await route.fulfill()
+            })
+          })
+
+          test("their push token is submitted after notifications are enabled", async ({
+            page,
+          }) => {
+            await page.goto("/")
+
+            const requestPromise = page.waitForRequest("/api/subscribe")
+            await page.getByText(/Enable Notifications/).click()
+            const request = await requestPromise
+
+            await expect(request.postDataJSON()).toEqual({ hi: "subscription" })
           })
 
           test("users see tack up now after enabling notifications", async ({
@@ -83,42 +90,18 @@ describe("when user is on iOS", () => {
           }) => {
             await page.goto("/")
 
+            const requestPromise = page.waitForRequest("/api/subscribe")
             await page.getByText(/Enable Notifications/).click()
+            await requestPromise
 
             const yourNotificationsHeading =
-              page.getByText(/Your Notifications/)
+              await page.getByText(/Your Notifications/)
 
             await expect(yourNotificationsHeading).toBeVisible()
           })
-
-          test("the subscription is submitted", async ({ page }) => {
-            await page.goto("/")
-
-            await page.getByText(/Enable Notifications/).click()
-
-            const postedMessages = await page.evaluate(() => {
-              return (window as any).postedMessages
-            })
-
-            expect(postedMessages).toContainEqual({
-              type: "subscribed",
-              subscription: {
-                subscription: "HI",
-              },
-            })
-          })
         })
       })
 
-      test("and notifications have been denied", async ({ page }) => {
-        await stubNotifications(page, { permission: "denied" })
-
-        await page.goto("/")
-
-        const deniedText = page.getByText(/requires notifications permissions/)
-        await expect(deniedText).toBeAttached()
-      })
-
       describe("and notifications are enabled", () => {
         beforeEach(async ({ page }) => {
           await stubNotifications(page, { permission: "granted" })
@@ -128,7 +111,7 @@ describe("when user is on iOS", () => {
           await page.goto("/")
           await page.evaluate(async () => await navigator.serviceWorker.ready)
 
-          const notificationText = page.getByText(/Enable Notifications/)
+          const notificationText = await page.getByText(/Enable Notifications/)
 
           await expect(notificationText).not.toBeAttached()
         })
@@ -136,7 +119,8 @@ describe("when user is on iOS", () => {
         test("users see tack up now", async ({ page }) => {
           await page.goto("/")
 
-          const yourNotificationsHeading = page.getByText(/Your Notifications/)
+          const yourNotificationsHeading =
+            await page.getByText(/Your Notifications/)
 
           await expect(yourNotificationsHeading).toBeVisible()
         })
@@ -155,53 +139,13 @@ describe("when user is on iOS", () => {
     }) => {
       await page.goto("/")
 
-      const sorryText = page.getByText(/Sorry/)
+      const sorryText = await page.getByText(/Sorry/)
 
       await expect(sorryText).toBeVisible()
     })
   })
 })
 
-describe("other browsers", () => {
-  nonWebkitOnly()
-
-  beforeEach(async ({ page }) => {
-    await page.route(matchPath(page, "/api/subscription"), async (route) => {
-      await route.fulfill()
-    })
-    await stubServiceWorker(page)
-  })
-
-  test("prompt the user to allow notifications", async ({ page }) => {
-    await stubNotifications(page, { permission: "default" })
-    await page.goto("/")
-
-    const notificationText = page.getByText(/Enable Notifications/)
-
-    await expect(notificationText).toBeAttached()
-  })
-
-  test("show tack up now when permission is granted", async ({ page }) => {
-    await stubNotifications(page, { permission: "granted" })
-
-    await page.goto("/")
-
-    const yourNotificationsHeading = page.getByText(/Your Notifications/)
-    await expect(yourNotificationsHeading).toBeVisible()
-  })
-
-  test("prompt to allow notifications if permission was denied", async ({
-    page,
-  }) => {
-    await stubNotifications(page, { permission: "denied" })
-
-    await page.goto("/")
-
-    const deniedText = page.getByText(/requires notifications permissions/)
-    await expect(deniedText).toBeAttached()
-  })
-})
-
 function stubNotifications(
   page: Page,
   args: {
@@ -230,40 +174,19 @@ function stubNotifications(
 
 function stubServiceWorker(page: Page) {
   return page.addInitScript(() => {
-    function createSubscription(testToken = "HI") {
-      return {
-        toJSON: () => ({
-          subscription: testToken,
-        }),
-      }
-    }
-
-    let postedMessages: any[] = []
-
-    const serviceWorker = {
-      postMessage: (message: any) => postedMessages.push(message),
-    }
-
     const registration = {
       pushManager: {
         getSubscription() {
-          return Promise.resolve(createSubscription())
+          return Promise.resolve({ hi: "subscription" })
         },
         subscribe(args: Parameters<PushManager["subscribe"]>[0]) {
-          return Promise.resolve(createSubscription())
+          return Promise.resolve({ hi: "subscription" })
         },
       },
-      active: serviceWorker,
     }
 
-    Object.defineProperty(window, "postedMessages", {
-      value: postedMessages,
-      writable: true,
-    })
-
     Object.defineProperty(navigator, "serviceWorker", {
       value: {
-        ready: Promise.resolve(registration),
         register() {
           return Promise.resolve(registration)
         },

e2e/urlMatcher.ts

@@ -1,6 +0,0 @@
-import { Page, Request } from "@playwright/test"
-
-export default function matchPath(page: Page, path: string) {
-  return (url: URL | Request) =>
-    new URL(page.url()).hostname === url.hostname && url.pathname === path
-}

jest.config.ts

@@ -4,8 +4,7 @@ const ignorePatterns = [
   "\\/\\.vscode\\/",
   "\\/\\.tmp\\/",
   "\\/\\.cache\\/",
-  "^\\/data/",
+  "data",
-  "^\\/data-test/",
   "e2e",
 ]
 

package-lock.json

@@ -5,6 +5,7 @@
   "packages": {
     "": {
       "name": "site",
+      "hasInstallScript": true,
       "dependencies": {
         "@remix-pwa/sw": "^3.0.9",
         "@remix-pwa/worker-runtime": "^2.1.4",
@@ -13,16 +14,12 @@
         "@remix-run/react": "^2.9.0",
         "@remix-run/serve": "^2.9.0",
         "cross-env": "^7.0.3",
-        "dexie": "^4.0.8",
         "express": "^4.19.2",
         "isbot": "^4.1.0",
-        "kysely": "^0.27.4",
-        "pg": "^8.13.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "semver": "^7.6.3",
-        "ua-parser-js": "^1.0.39",
+        "ua-parser-js": "^1.0.39"
-        "web-push": "^3.6.7"
       },
       "devDependencies": {
         "@babel/core": "^7.24.5",
@@ -31,7 +28,7 @@
         "@babel/preset-env": "^7.24.5",
         "@babel/preset-react": "^7.24.1",
         "@babel/preset-typescript": "^7.24.1",
-        "@playwright/test": "^1.48.1",
+        "@playwright/test": "^1.44.1",
         "@remix-pwa/dev": "^3.1.0",
         "@remix-run/dev": "^2.9.0",
         "@remix-run/testing": "^2.9.1",
@@ -42,7 +39,6 @@
         "@types/express": "^4.17.21",
         "@types/jest": "^29.5.12",
         "@types/node": "^20.14.5",
-        "@types/pg": "^8.11.10",
         "@types/react": "^18.2.20",
         "@types/react-dom": "^18.2.7",
         "@types/semver": "^7.5.8",
@@ -52,17 +48,14 @@
         "@typescript-eslint/parser": "^6.7.4",
         "babel-jest": "^29.7.0",
         "babel-plugin-transform-remove-console": "^6.9.4",
-        "core-js": "^3.38.1",
         "eslint": "^8.38.0",
         "eslint-import-resolver-typescript": "^3.6.1",
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-jsx-a11y": "^6.7.1",
         "eslint-plugin-react": "^7.33.2",
         "eslint-plugin-react-hooks": "^4.6.0",
-        "fake-indexeddb": "^6.0.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "jest-fetch-mock": "^3.0.3",
         "jest-matchmedia-mock": "^1.1.0",
         "jest-watch-typeahead": "^2.2.2",
         "prettier": "^3.3.3",
@@ -3324,18 +3317,18 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.48.1",
+      "version": "1.44.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.44.1.tgz",
-      "integrity": "sha512-s9RtWoxkOLmRJdw3oFvhFbs9OJS0BzrLUc8Hf6l2UdCNd1rqeEyD4BhCJkvzeEoD1FsK4mirsWwGerhVmYKtZg==",
+      "integrity": "sha512-1hZ4TNvD5z9VuhNJ/walIjvMVvYkZKf71axoF/uiAqpntQJXpG64dlXhoDXE3OczPuTuvjf/M5KWFg5VAVUS3Q==",
       "dev": true,
       "dependencies": {
-        "playwright": "1.48.1"
+        "playwright": "1.44.1"
       },
       "bin": {
         "playwright": "cli.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=16"
       }
     },
     "node_modules/@remix-pwa/dev": {
@@ -5318,74 +5311,6 @@
         "undici-types": "~5.26.4"
       }
     },
-    "node_modules/@types/pg": {
-      "version": "8.11.10",
-      "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.11.10.tgz",
-      "integrity": "sha512-LczQUW4dbOQzsH2RQ5qoeJ6qJPdrcM/DcMLoqWQkMLMsq83J5lAX3LXjdkWdpscFy67JSOWDnh7Ny/sPFykmkg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "pg-protocol": "*",
-        "pg-types": "^4.0.1"
-      }
-    },
-    "node_modules/@types/pg/node_modules/pg-types": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-4.0.2.tgz",
-      "integrity": "sha512-cRL3JpS3lKMGsKaWndugWQoLOCoP+Cic8oseVcbr0qhPzYD5DWXK+RZ9LY9wxRf7RQia4SCwQlXk0q6FCPrVng==",
-      "dev": true,
-      "dependencies": {
-        "pg-int8": "1.0.1",
-        "pg-numeric": "1.0.2",
-        "postgres-array": "~3.0.1",
-        "postgres-bytea": "~3.0.0",
-        "postgres-date": "~2.1.0",
-        "postgres-interval": "^3.0.0",
-        "postgres-range": "^1.1.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@types/pg/node_modules/postgres-array": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-3.0.2.tgz",
-      "integrity": "sha512-6faShkdFugNQCLwucjPcY5ARoW1SlbnrZjmGl0IrrqewpvxvhSLHimCVzqeuULCbG0fQv7Dtk1yDbG3xv7Veog==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@types/pg/node_modules/postgres-bytea": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-3.0.0.tgz",
-      "integrity": "sha512-CNd4jim9RFPkObHSjVHlVrxoVQXz7quwNFpz7RY1okNNme49+sVyiTvTRobiLV548Hx/hb1BG+iE7h9493WzFw==",
-      "dev": true,
-      "dependencies": {
-        "obuf": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@types/pg/node_modules/postgres-date": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-2.1.0.tgz",
-      "integrity": "sha512-K7Juri8gtgXVcDfZttFKVmhglp7epKb1K4pgrkLxehjqkrgPhfG6OO8LHLkfaqkbpjNRnra018XwAr1yQFWGcA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@types/pg/node_modules/postgres-interval": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-3.0.0.tgz",
-      "integrity": "sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@types/prop-types": {
       "version": "15.7.12",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
@@ -6155,17 +6080,6 @@
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
       "dev": true
     },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
     "node_modules/ast-types-flow": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz",
@@ -6453,11 +6367,6 @@
         "readable-stream": "^3.4.0"
       }
     },
-    "node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-    },
     "node_modules/body-parser": {
       "version": "1.20.2",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
@@ -6592,11 +6501,6 @@
         "ieee754": "^1.1.13"
       }
     },
-    "node_modules/buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
-    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -7125,17 +7029,6 @@
       "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
       "dev": true
     },
-    "node_modules/core-js": {
-      "version": "3.38.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
-      "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
     "node_modules/core-js-compat": {
       "version": "3.37.1",
       "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz",
@@ -7198,15 +7091,6 @@
         "yarn": ">=1"
       }
     },
-    "node_modules/cross-fetch": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
-      "dev": true,
-      "dependencies": {
-        "node-fetch": "^2.6.12"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -7524,11 +7408,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/dexie": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/dexie/-/dexie-4.0.8.tgz",
-      "integrity": "sha512-1G6cJevS17KMDK847V3OHvK2zei899GwpDiqfEXHP1ASvme6eWJmAp9AU4s1son2TeGkWmC0g3y8ezOBPnalgQ=="
-    },
     "node_modules/dezalgo": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
@@ -7653,14 +7532,6 @@
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
     },
-    "node_modules/ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -8800,15 +8671,6 @@
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
-    "node_modules/fake-indexeddb": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/fake-indexeddb/-/fake-indexeddb-6.0.0.tgz",
-      "integrity": "sha512-YEboHE5VfopUclOck7LncgIqskAqnv4q0EWbYCaxKKjAvO93c+TJIaBuGy8CBFdbg9nKdpN3AuPRwVBJ4k7NrQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -9512,14 +9374,6 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
-    "node_modules/http_ece": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.2.0.tgz",
-      "integrity": "sha512-JrF8SSLVmcvc5NducxgyOrKXe3EsyHMgBFgSaIUGmArKe+rwr0uphRkRXvwiom3I+fpIfoItveHrfudL8/rxuA==",
-      "engines": {
-        "node": ">=16"
-      }
-    },
     "node_modules/http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
@@ -10789,16 +10643,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-fetch-mock": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz",
-      "integrity": "sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==",
-      "dev": true,
-      "dependencies": {
-        "cross-fetch": "^3.0.4",
-        "promise-polyfill": "^8.1.3"
-      }
-    },
     "node_modules/jest-get-type": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
@@ -11658,25 +11502,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/jwa": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
-      "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
-      "dependencies": {
-        "buffer-equal-constant-time": "1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/jws": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
-      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
-      "dependencies": {
-        "jwa": "^2.0.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -11694,14 +11519,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/kysely": {
-      "version": "0.27.4",
-      "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.27.4.tgz",
-      "integrity": "sha512-dyNKv2KRvYOQPLCAOCjjQuCk4YFd33BvGdf/o5bC7FiW+BB6snA81Zt+2wT9QDFzKqxKa5rrOmvlK/anehCcgA==",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/language-subtag-registry": {
       "version": "0.3.22",
       "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
@@ -12787,11 +12604,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-    },
     "node_modules/minimatch": {
       "version": "9.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
@@ -13054,48 +12866,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/node-fetch/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true
-    },
-    "node_modules/node-fetch/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true
-    },
-    "node_modules/node-fetch/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -13317,12 +13087,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
     "node_modules/on-finished": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
@@ -13642,96 +13406,6 @@
         "is-reference": "^3.0.0"
       }
     },
-    "node_modules/pg": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.13.0.tgz",
-      "integrity": "sha512-34wkUTh3SxTClfoHB3pQ7bIMvw9dpFU1audQQeZG837fmHfHpr14n/AELVDoOYVDW2h5RDWU78tFjkD+erSBsw==",
-      "dependencies": {
-        "pg-connection-string": "^2.7.0",
-        "pg-pool": "^3.7.0",
-        "pg-protocol": "^1.7.0",
-        "pg-types": "^2.1.0",
-        "pgpass": "1.x"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      },
-      "optionalDependencies": {
-        "pg-cloudflare": "^1.1.1"
-      },
-      "peerDependencies": {
-        "pg-native": ">=3.0.1"
-      },
-      "peerDependenciesMeta": {
-        "pg-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/pg-cloudflare": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz",
-      "integrity": "sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==",
-      "optional": true
-    },
-    "node_modules/pg-connection-string": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.7.0.tgz",
-      "integrity": "sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA=="
-    },
-    "node_modules/pg-int8": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
-      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/pg-numeric": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pg-numeric/-/pg-numeric-1.0.2.tgz",
-      "integrity": "sha512-BM/Thnrw5jm2kKLE5uJkXqqExRUY/toLHda65XgFTBTFYZyopbKjBe29Ii3RbkvlsMoFwD+tHeGaCjjv0gHlyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pg-pool": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.7.0.tgz",
-      "integrity": "sha512-ZOBQForurqh4zZWjrgSwwAtzJ7QiRX0ovFkZr2klsen3Nm0aoh33Ls0fzfv3imeH/nw/O27cjdz5kzYJfeGp/g==",
-      "peerDependencies": {
-        "pg": ">=8.0"
-      }
-    },
-    "node_modules/pg-protocol": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.7.0.tgz",
-      "integrity": "sha512-hTK/mE36i8fDDhgDFjy6xNOG+LCorxLG3WO17tku+ij6sVHXh1jQUJ8hYAnRhNla4QVD2H8er/FOjc/+EgC6yQ=="
-    },
-    "node_modules/pg-types": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
-      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
-      "dependencies": {
-        "pg-int8": "1.0.1",
-        "postgres-array": "~2.0.0",
-        "postgres-bytea": "~1.0.0",
-        "postgres-date": "~1.0.4",
-        "postgres-interval": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pgpass": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
-      "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
-      "dependencies": {
-        "split2": "^4.1.0"
-      }
-    },
     "node_modules/picocolors": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
@@ -13843,33 +13517,33 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.48.1",
+      "version": "1.44.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.44.1.tgz",
-      "integrity": "sha512-j8CiHW/V6HxmbntOfyB4+T/uk08tBy6ph0MpBXwuoofkSnLmlfdYNNkFTYD6ofzzlSqLA1fwH4vwvVFvJgLN0w==",
+      "integrity": "sha512-qr/0UJ5CFAtloI3avF95Y0L1xQo6r3LQArLIg/z/PoGJ6xa+EwzrwO5lpNr/09STxdHuUoP2mvuELJS+hLdtgg==",
       "dev": true,
       "dependencies": {
-        "playwright-core": "1.48.1"
+        "playwright-core": "1.44.1"
       },
       "bin": {
         "playwright": "cli.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=16"
       },
       "optionalDependencies": {
         "fsevents": "2.3.2"
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.48.1",
+      "version": "1.44.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.44.1.tgz",
-      "integrity": "sha512-Yw/t4VAFX/bBr1OzwCuOMZkY1Cnb4z/doAFSwf4huqAGWmf9eMNjmK7NiOljCdLmxeRYcGPPmcDgU0zOlzP0YA==",
+      "integrity": "sha512-wh0JWtYTrhv1+OSsLPgFzGzt67Y7BE/ZS3jEqgGBlp2ppp1ZDj8c+9IARNW4dwf1poq5MgHreEM2KV/GuR4cFA==",
       "dev": true,
       "bin": {
         "playwright-core": "cli.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=16"
       }
     },
     "node_modules/playwright/node_modules/fsevents": {
@@ -14056,47 +13730,6 @@
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
-    "node_modules/postgres-array": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
-      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postgres-bytea": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
-      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postgres-date": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
-      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postgres-interval": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
-      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
-      "dependencies": {
-        "xtend": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postgres-range": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/postgres-range/-/postgres-range-1.1.4.tgz",
-      "integrity": "sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==",
-      "dev": true
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -14185,12 +13818,6 @@
       "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
       "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="
     },
-    "node_modules/promise-polyfill": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.3.0.tgz",
-      "integrity": "sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==",
-      "dev": true
-    },
     "node_modules/promise-retry": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
@@ -15205,14 +14832,6 @@
       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
       "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg=="
     },
-    "node_modules/split2": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
-      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
-      "engines": {
-        "node": ">= 10.x"
-      }
-    },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -17090,47 +16709,6 @@
         "@zxing/text-encoding": "0.9.0"
       }
     },
-    "node_modules/web-push": {
-      "version": "3.6.7",
-      "resolved": "https://registry.npmjs.org/web-push/-/web-push-3.6.7.tgz",
-      "integrity": "sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==",
-      "dependencies": {
-        "asn1.js": "^5.3.0",
-        "http_ece": "1.2.0",
-        "https-proxy-agent": "^7.0.0",
-        "jws": "^4.0.0",
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "web-push": "src/cli.js"
-      },
-      "engines": {
-        "node": ">= 16"
-      }
-    },
-    "node_modules/web-push/node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/web-push/node_modules/https-proxy-agent": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/web-streams-polyfill": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",

package.json

@@ -9,9 +9,8 @@
     "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
     "start": "remix-serve ./build/server/index.js",
     "typecheck": "tsc",
-    "watch": "export $(cat .env.test | xargs) && docker compose -f docker-compose-test.yaml up database -d --remove-orphans && jest --watch --config=jest.config.ts",
+    "watch": "jest --watch --config=jest.config.ts",
-    "test": "export $(cat .env.test | xargs) && docker compose -f docker-compose-test.yaml up database -d --remove-orphans && sleep 5 && jest --config=jest.config.ts",
+    "test": "jest --config=jest.config.ts"
-    "ci": "export $(cat .env.ci | xargs) && jest --config=jest.config.ts"
   },
   "dependencies": {
     "@remix-pwa/sw": "^3.0.9",
@@ -21,16 +20,12 @@
     "@remix-run/react": "^2.9.0",
     "@remix-run/serve": "^2.9.0",
     "cross-env": "^7.0.3",
-    "dexie": "^4.0.8",
     "express": "^4.19.2",
     "isbot": "^4.1.0",
-    "kysely": "^0.27.4",
-    "pg": "^8.13.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "semver": "^7.6.3",
-    "ua-parser-js": "^1.0.39",
+    "ua-parser-js": "^1.0.39"
-    "web-push": "^3.6.7"
   },
   "devDependencies": {
     "@babel/core": "^7.24.5",
@@ -39,7 +34,7 @@
     "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",
     "@babel/preset-typescript": "^7.24.1",
-    "@playwright/test": "^1.48.1",
+    "@playwright/test": "^1.44.1",
     "@remix-pwa/dev": "^3.1.0",
     "@remix-run/dev": "^2.9.0",
     "@remix-run/testing": "^2.9.1",
@@ -50,7 +45,6 @@
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.14.5",
-    "@types/pg": "^8.11.10",
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
     "@types/semver": "^7.5.8",
@@ -60,17 +54,14 @@
     "@typescript-eslint/parser": "^6.7.4",
     "babel-jest": "^29.7.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
-    "core-js": "^3.38.1",
     "eslint": "^8.38.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "fake-indexeddb": "^6.0.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "jest-fetch-mock": "^3.0.3",
     "jest-matchmedia-mock": "^1.1.0",
     "jest-watch-typeahead": "^2.2.2",
     "prettier": "^3.3.3",

pushPublicKey.ts

@@ -1 +0,0 @@
-export default "BNwr5jYXxBwSRGooQWx6nzsrG5XejgAskVqowkc_O0rutL9PgRIkQAnDh4nz1yoPQEw40juMuqL2NEHSaD3XcxA"

server.ts

@@ -1,11 +1,16 @@
 import { createRequestHandler } from "@remix-run/express"
 import express from "express"
 
+// notice that the result of `remix vite:build` is "just a module"
 import * as build from "./build/server/index.js"
+import { subscribe } from "./api/subscribe.js"
 
-import app from "./api/app"
+const app = express()
-
 app.use(express.static("build/client"))
+app.get("/api", (req, res) => res.send("HI"))
+app.post("/api/subscribe", subscribe)
+
+// and your app is "just a request handler"
 app.all("*", createRequestHandler({ build }))
 
 app.listen(3000, () => {

setupTests.ts

@@ -2,20 +2,15 @@
 // allows you to do things like:
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
-import React from "react"
+import React from 'react'
-import "@testing-library/jest-dom"
+import '@testing-library/jest-dom'
-import { enableFetchMocks } from "jest-fetch-mock"
 
-const JSDOMFormData = global.FormData
+const JSDOMFormData = global.FormData;
 global.React = React
-global.TextDecoder = require("util").TextDecoder
+global.TextDecoder = require("util").TextDecoder;
-global.TextEncoder = require("util").TextEncoder
+global.TextEncoder = require("util").TextEncoder;
-global.ReadableStream = require("stream/web").ReadableStream
+global.ReadableStream = require("stream/web").ReadableStream;
-global.WritableStream = require("stream/web").WritableStream
+global.WritableStream = require("stream/web").WritableStream;
 
-require("@remix-run/node").installGlobals({ nativeFetch: true })
+require("@remix-run/node").installGlobals({ nativeFetch: true });
-global.FormData = JSDOMFormData
+global.FormData = JSDOMFormData;
-
-process.env.BASE_URL = "http://localhost"
-
-enableFetchMocks()

start.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-npx tsx api/data/upgrade.ts
-npx tsx server.ts

vite.config.ts

@@ -7,13 +7,5 @@ import { remixPWA } from "@remix-pwa/dev"
 installGlobals()
 
 export default defineConfig({
-  plugins: [
+  plugins: [remix(), tsconfigPaths(), remixPWA()],
-    remix({ ignoredRouteFiles: ["**/*.test.*"] }),
-    tsconfigPaths(),
-    remixPWA({
-      buildVariables: {
-        "process.env.BASE_URL": process.env.BASE_URL ?? "http://localhost:5173",
-      },
-    }),
-  ],
 })