From dbf2346176f19b1092e39574b86e45abfdba4788 Mon Sep 17 00:00:00 2001
From: Kieran <kieran@harkin.me>
Date: Thu, 7 Mar 2024 13:42:29 +0000
Subject: [PATCH] fix: main branch

---
 packages/app/package.json                 |  2 +-
 packages/app/src/Cache/index.ts           |  6 ++++--
 packages/app/vite.config.ts               | 10 +---------
 packages/worker-relay/src/custom.d.ts     | 10 +++++++---
 packages/worker-relay/src/sqlite-relay.ts |  2 +-
 yarn.lock                                 | 20 ++++++++++----------
 6 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/packages/app/package.json b/packages/app/package.json
index 6e55de2b..9035fc0f 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -119,7 +119,7 @@
     "tailwindcss": "^3.3.3",
     "tinybench": "^2.5.1",
     "typescript": "^5.2.2",
-    "vite": "^5.0.12",
+    "vite": "^5.1.5",
     "vite-plugin-pwa": "^0.17.0",
     "vite-plugin-version-mark": "^0.0.10",
     "vitest": "^0.34.6"
diff --git a/packages/app/src/Cache/index.ts b/packages/app/src/Cache/index.ts
index 1a671eb9..1dae30e7 100644
--- a/packages/app/src/Cache/index.ts
+++ b/packages/app/src/Cache/index.ts
@@ -1,14 +1,16 @@
 import { RelayMetricCache, UserRelaysCache } from "@snort/system";
 import { SnortSystemDb } from "@snort/system-web";
 import { WorkerRelayInterface } from "@snort/worker-relay";
-import WorkerRelayPath from "@snort/worker-relay/dist/worker?worker&url";
+import WorkerVite from "@snort/worker-relay/src/worker?worker";
 
 import { EventCacheWorker } from "./EventCacheWorker";
 import { GiftWrapCache } from "./GiftWrapCache";
 import { ProfileCacheRelayWorker } from "./ProfileWorkerCache";
 import { UserFollowsWorker } from "./UserFollowsWorker";
 
-export const Relay = new WorkerRelayInterface(WorkerRelayPath);
+export const Relay = new WorkerRelayInterface(
+  import.meta.env.DEV ? new URL("@snort/worker-relay/dist/esm/worker.mjs", import.meta.url) : new WorkerVite()
+);
 export async function initRelayWorker() {
   try {
     await Relay.init("relay.db");
diff --git a/packages/app/vite.config.ts b/packages/app/vite.config.ts
index 765bc176..6f468225 100644
--- a/packages/app/vite.config.ts
+++ b/packages/app/vite.config.ts
@@ -55,19 +55,11 @@ export default defineConfig({
       "Cross-Origin-Embedder-Policy": "require-corp",
     },
   },
-  optimizeDeps: {
-    exclude: ["@sqlite.org/sqlite-wasm"],
-  },
   define: {
     CONFIG: JSON.stringify(appConfig),
     global: {}, // needed for custom-event lib
   },
   worker: {
-    format: "es",
-    rollupOptions: {
-      output: {
-        format: "module"
-      }
-    }
+    format: "es"
   },
 });
diff --git a/packages/worker-relay/src/custom.d.ts b/packages/worker-relay/src/custom.d.ts
index 4aedb8e0..ab0060b2 100644
--- a/packages/worker-relay/src/custom.d.ts
+++ b/packages/worker-relay/src/custom.d.ts
@@ -1,4 +1,8 @@
 declare module "*.wasm" {
-    const value: string;
-    export default value;
-  }
\ No newline at end of file
+  const value: string;
+  export default value;
+}
+declare module "*.wasm?url" {
+  const value: string;
+  export default value;
+}
\ No newline at end of file
diff --git a/packages/worker-relay/src/sqlite-relay.ts b/packages/worker-relay/src/sqlite-relay.ts
index f34aad5e..66d82c50 100644
--- a/packages/worker-relay/src/sqlite-relay.ts
+++ b/packages/worker-relay/src/sqlite-relay.ts
@@ -5,7 +5,7 @@ import migrate from "./migrations";
 import { debugLog } from "./debug";
 
 // import wasm file directly, this needs to be copied from https://sqlite.org/download.html
-import SqlitePath from "./sqlite3.wasm";
+import SqlitePath from "./sqlite3.wasm?url";
 
 export class SqliteRelay extends EventEmitter<RelayHandlerEvents> implements RelayHandler {
   #sqlite?: Sqlite3Static;
diff --git a/yarn.lock b/yarn.lock
index 3d1eabd6..3a07f77b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3171,7 +3171,7 @@ __metadata:
     use-long-press: ^3.2.0
     use-sync-external-store: ^1.2.0
     uuid: ^9.0.0
-    vite: ^5.0.12
+    vite: ^5.1.5
     vite-plugin-pwa: ^0.17.0
     vite-plugin-version-mark: ^0.0.10
     vitest: ^0.34.6
@@ -9854,14 +9854,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.4.32":
-  version: 8.4.33
-  resolution: "postcss@npm:8.4.33"
+"postcss@npm:^8.4.35":
+  version: 8.4.35
+  resolution: "postcss@npm:8.4.35"
   dependencies:
     nanoid: ^3.3.7
     picocolors: ^1.0.0
     source-map-js: ^1.0.2
-  checksum: 6f98b2af4b76632a3de20c4f47bf0e984a1ce1a531cf11adcb0b1d63a6cbda0aae4165e578b66c32ca4879038e3eaad386a6be725a8fb4429c78e3c1ab858fe9
+  checksum: cf3c3124d3912a507603f6d9a49b3783f741075e9aa73eb592a6dd9194f9edab9d20a8875d16d137d4f779fe7b6fbd1f5727e39bfd1c3003724980ee4995e1da
   languageName: node
   linkType: hard
 
@@ -12031,13 +12031,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^5.0.12":
-  version: 5.0.12
-  resolution: "vite@npm:5.0.12"
+"vite@npm:^5.1.5":
+  version: 5.1.5
+  resolution: "vite@npm:5.1.5"
   dependencies:
     esbuild: ^0.19.3
     fsevents: ~2.3.3
-    postcss: ^8.4.32
+    postcss: ^8.4.35
     rollup: ^4.2.0
   peerDependencies:
     "@types/node": ^18.0.0 || >=20.0.0
@@ -12067,7 +12067,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: b97b6f1c204d9091d0973626827a6e9d8e8b1959ebd0877b6f76e7068e1e7adf9ecd3b1cc382cbab9d421e3eeca5e1a95f27f9c1734439b229f5a58ef2052fa4
+  checksum: 14c079ebe508d55198a3b1ca528d13515c745d7ae279e4864e89110a1661a4cfa880d894c2d7dcf557f6ed3ffc17fa3abea9d9ea4b6f256f0cab99d16a3b385b
   languageName: node
   linkType: hard