From ebb6a436a6be14d2c57214afb810cd755add8a3b Mon Sep 17 00:00:00 2001
From: cohenerickson <cohenerickson@gmail.com>
Date: Thu, 28 Dec 2023 13:53:00 -0600
Subject: [PATCH] Merge Dynamic and UV sw

---
 index.html                |  7 ++----
 public/{dysw.js => sw.js} | 51 +++++++++++++++++++++++----------------
 public/uvsw.js            | 10 --------
 3 files changed, 32 insertions(+), 36 deletions(-)
 rename public/{dysw.js => sw.js} (62%)
 delete mode 100644 public/uvsw.js

diff --git a/index.html b/index.html
index e626d4d..ca884aa 100644
--- a/index.html
+++ b/index.html
@@ -17,11 +17,8 @@
     <script>
       if ("serviceWorker" in navigator) {
         window.addEventListener("load", () => {
-          navigator.serviceWorker.register("/uvsw.js", {
-            scope: __uv$config.prefix
-          });
-          navigator.serviceWorker.register("/dysw.js", {
-            scope: __dynamic$config.prefix
+          navigator.serviceWorker.register("/sw.js", {
+            scope: "/~/"
           });
         });
       }
diff --git a/public/dysw.js b/public/sw.js
similarity index 62%
rename from public/dysw.js
rename to public/sw.js
index 1159615..698d259 100644
--- a/public/dysw.js
+++ b/public/sw.js
@@ -1,21 +1,30 @@
-importScripts("/dynamic/dynamic.config.js");
-importScripts("/dynamic/dynamic.worker.js");
-
-const dynamic = new Dynamic();
-
-self.dynamic = dynamic;
-
-self.addEventListener("fetch", (event) => {
-  if (
-    event.request.url.startsWith(location.origin + self.__dynamic$config.prefix)
-  )
-    event.respondWith(
-      (async function () {
-        if (await dynamic.route(event)) {
-          return await dynamic.fetch(event);
-        }
-
-        return await fetch(event.request);
-      })()
-    );
-});
+importScripts("/uv/uv.bundle.js");
+importScripts("/uv/uv.config.js");
+importScripts(__uv$config.sw || "/uv/uv.sw.js");
+importScripts("/dynamic/dynamic.config.js");
+importScripts("/dynamic/dynamic.worker.js");
+
+const sw = new UVServiceWorker();
+const dynamic = new Dynamic();
+
+self.dynamic = dynamic;
+
+self.addEventListener("fetch", (event) => {
+  if (
+    event.request.url.startsWith(location.origin + self.__dynamic$config.prefix)
+  ) {
+    event.respondWith(
+      (async function () {
+        if (await dynamic.route(event)) {
+          return await dynamic.fetch(event);
+        }
+
+        return await fetch(event.request);
+      })()
+    );
+  } else if (
+    event.request.url.startsWith(location.origin + __uv$config.prefix)
+  ) {
+    event.respondWith(sw.fetch(event));
+  }
+});
diff --git a/public/uvsw.js b/public/uvsw.js
deleted file mode 100644
index ae7354b..0000000
--- a/public/uvsw.js
+++ /dev/null
@@ -1,10 +0,0 @@
-importScripts("/uv/uv.bundle.js");
-importScripts("/uv/uv.config.js");
-importScripts(__uv$config.sw || "/uv/uv.sw.js");
-
-const sw = new UVServiceWorker();
-
-self.addEventListener("fetch", (event) => {
-  if (event.request.url.startsWith(location.origin + __uv$config.prefix))
-    return event.respondWith(sw.fetch(event));
-});