From a5840d54dc48fb8444fcf2f89405312fb474815b Mon Sep 17 00:00:00 2001
From: CoolElectronics <me@coolelectronics.me>
Date: Sat, 12 Aug 2023 17:06:11 -0400
Subject: [PATCH] fix single-file bundle

---
 .gitmodules             |   3 +
 frontend/package.json   |  19 ++---
 frontend/src/App.svelte |  24 ++++++
 pnpm-lock.yaml          | 157 ++++++++++++++++++++++++++++++++++++----
 vite-plugin-singlefile  |   1 +
 5 files changed, 181 insertions(+), 23 deletions(-)
 create mode 160000 vite-plugin-singlefile

diff --git a/.gitmodules b/.gitmodules
index 77f9f25..1ddbd06 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "Ultraviolet"]
 	path = Ultraviolet
 	url = https://github.com/titaniumnetwork-dev/Ultraviolet
+[submodule "vite-plugin-singlefile"]
+	path = vite-plugin-singlefile
+	url = https://github.com/CoolElectronics/vite-plugin-singlefile
diff --git a/frontend/package.json b/frontend/package.json
index ef6d8be..58c623f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,18 +13,19 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@rollup/browser": "^3.28.0",
     "@sveltejs/vite-plugin-svelte": "^2.4.5",
+    "bare-client-custom": "file:../bare-client-custom",
+    "client": "workspace:*",
+    "corium": "file:../corium",
     "firebase": "^10.1.0",
+    "firebase-config": "workspace:*",
+    "protocol": "workspace:*",
     "svelte": "^4.2.0",
     "svelte-preprocess": "^5.0.4",
     "typescript": "^5.1.6",
     "vite": "^4.4.9",
-    "vite-plugin-singlefile": "^0.13.5",
-    "vite-plugin-svelte": "^3.0.1",
-    "bare-client-custom": "file:../bare-client-custom",
-    "firebase-config": "workspace:*",
-    "client": "workspace:*",
-    "protocol": "workspace:*"
-  },
-  "devDependencies": {}
-}
+    "vite-plugin-singlefile": "git://github.com/CoolElectronics/vite-plugin-singlefile.git",
+    "vite-plugin-svelte": "^3.0.1"
+  }
+}
\ No newline at end of file
diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
index c2e88dc..cf065f4 100644
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import {
+    BareClient,
     registerRemoteListener,
     setBareClientImplementation,
   } from "bare-client-custom";
@@ -15,6 +16,8 @@
   import { getDatabase, onValue, ref, set } from "firebase/database";
   import type { Transport } from "protocol";
 
+  import { openWindow } from "../../corium";
+
   let transport: Transport;
 
   let wstransport: DevWsTransport | undefined;
@@ -23,6 +26,11 @@
   let email = "test@test.com";
   let password = "123456";
 
+  let ready = false;
+
+  let url: string;
+  let proxyIframe: HTMLIFrameElement;
+
   if (import.meta.env.VITE_ADRIFT_DEV) {
     console.log(
       "%cADRIFT RUNNING IN DEVELOPMENT MODE",
@@ -46,6 +54,7 @@
     let connection = new Connection(transport);
     let bare = new AdriftBareClient(connection);
     setBareClientImplementation(bare);
+    ready = true;
   }
 
   function onTransportClose() {
@@ -114,6 +123,15 @@
       console.log("onclose")
     );
   }
+
+  function visitURL() {
+    if (!import.meta.env.VITE_ADRIFT_SINGLEFILE) {
+      alert("TODO");
+    } else {
+      let bare = new BareClient();
+      openWindow(new Request(url), "_self", bare, "replace");
+    }
+  }
 </script>
 
 {#if !import.meta.env.VITE_ADRIFT_DEV}
@@ -131,6 +149,12 @@
   <button on:click={connectDevWS}>Connect with dev websocket</button>
 {/if}
 
+{#if ready}
+  <input bind:value={url} type="text" />
+  <button on:click={visitURL}>Go!</button>
+  <iframe bind:this={proxyIframe} />
+{/if}
+
 <style>
   .container {
     display: flex;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 662625b..01cc9ba 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -28,6 +28,9 @@ importers:
 
   frontend:
     dependencies:
+      '@rollup/browser':
+        specifier: ^3.28.0
+        version: 3.28.0
       '@sveltejs/vite-plugin-svelte':
         specifier: ^2.4.5
         version: 2.4.5(svelte@4.2.0)(vite@4.4.9)
@@ -37,6 +40,9 @@ importers:
       client:
         specifier: workspace:*
         version: link:../client
+      corium:
+        specifier: file:../corium
+        version: file:corium
       firebase:
         specifier: ^10.1.0
         version: 10.1.0(react-native@0.72.3)
@@ -59,8 +65,8 @@ importers:
         specifier: ^4.4.9
         version: 4.4.9
       vite-plugin-singlefile:
-        specifier: ^0.13.5
-        version: 0.13.5(rollup@3.28.0)(vite@4.4.9)
+        specifier: git://github.com/CoolElectronics/vite-plugin-singlefile.git
+        version: github.com/CoolElectronics/vite-plugin-singlefile/0d528cf28b80545b7423150252fd18e7efd8a5e3(rollup@3.28.0)(vite@4.4.9)
       vite-plugin-svelte:
         specifier: ^3.0.1
         version: 3.0.1(rollup@3.28.0)(svelte@4.2.0)(vite@4.4.9)
@@ -2631,6 +2637,10 @@ packages:
       react-native: 0.72.3(@babel/core@7.22.10)(@babel/preset-env@7.22.10)(react@18.2.0)
     dev: false
 
+  /@rollup/browser@3.28.0:
+    resolution: {integrity: sha512-7U9WFjEArYZF0GVz/durys8tzBePwu4HkI5yxDmaRFn0B0qH1yabvworYZiGZYhevlZ+jDFAU4gKgF0gNsANDg==}
+    dev: false
+
   /@sideway/address@4.1.4:
     resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
     dependencies:
@@ -2697,6 +2707,16 @@ packages:
       - supports-color
     dev: false
 
+  /@swc/helpers@0.4.14:
+    resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==}
+    dependencies:
+      tslib: 2.6.1
+    dev: false
+
+  /@tomphttp/bare-client@1.1.2-beta.3:
+    resolution: {integrity: sha512-WyIVnSAqzfrLejmOhh/l/LtDOeK+SHnBGi/z+QyliVP1T1JxoNE5eecwxlV+osM9J6FTAYVGNHr8/5bubaIj6Q==}
+    dev: false
+
   /@tsconfig/node10@1.0.9:
     resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
     dev: false
@@ -2726,6 +2746,10 @@ packages:
       '@types/node': 20.4.10
     dev: true
 
+  /@types/escodegen@0.0.7:
+    resolution: {integrity: sha512-46oENdSRNEJXCNrPJoC3vRolZJpfeEm7yvATkd2bCncKFG0PUEyfBCaoacfpcXH4Y5RRuqdVj3J7TI+wwn2SbQ==}
+    dev: false
+
   /@types/estree@1.0.1:
     resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==}
     dev: false
@@ -2876,6 +2900,13 @@ packages:
       negotiator: 0.6.3
     dev: false
 
+  /acorn-loose@8.3.0:
+    resolution: {integrity: sha512-75lAs9H19ldmW+fAbyqHdjgdCrz0pWGXKmnqFoh8PyVd1L2RIb4RzYrSjmopeqv3E1G3/Pimu6GgLlrGbrkF7w==}
+    engines: {node: '>=0.4.0'}
+    dependencies:
+      acorn: 8.10.0
+    dev: false
+
   /acorn-walk@8.2.0:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
     engines: {node: '>=0.4.0'}
@@ -2979,6 +3010,13 @@ packages:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
     dev: false
 
+  /ast-types@0.14.2:
+    resolution: {integrity: sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==}
+    engines: {node: '>=4'}
+    dependencies:
+      tslib: 2.6.1
+    dev: false
+
   /ast-types@0.15.2:
     resolution: {integrity: sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==}
     engines: {node: '>=4'}
@@ -3709,12 +3747,29 @@ packages:
     engines: {node: '>=8'}
     dev: false
 
+  /escodegen@2.1.0:
+    resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==}
+    engines: {node: '>=6.0'}
+    hasBin: true
+    dependencies:
+      esprima: 4.0.1
+      estraverse: 5.3.0
+      esutils: 2.0.3
+    optionalDependencies:
+      source-map: 0.6.1
+    dev: false
+
   /esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
     hasBin: true
     dev: false
 
+  /estraverse@5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+    dev: false
+
   /estree-walker@0.6.1:
     resolution: {integrity: sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==}
     dev: false
@@ -4641,6 +4696,11 @@ packages:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
     dev: false
 
+  /meriyah@4.3.7:
+    resolution: {integrity: sha512-JAlSOUqFU/rmLy2CEdZO5hN5E5dyUj1f4AlRR4GCQMjfobvd5lcm9JLkrqq0MgVaLQ/Zur590A+0RyUZhj0b5A==}
+    engines: {node: '>=10.4.0'}
+    dev: false
+
   /methods@1.1.2:
     resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
     engines: {node: '>= 0.6'}
@@ -5513,10 +5573,19 @@ packages:
       ipaddr.js: 1.9.1
     dev: false
 
+  /psl@1.9.0:
+    resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
+    dev: false
+
   /pstree.remy@1.1.8:
     resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==}
     dev: true
 
+  /punycode@2.3.0:
+    resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
+    engines: {node: '>=6'}
+    dev: false
+
   /qs@6.11.0:
     resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
     engines: {node: '>=0.6'}
@@ -5524,6 +5593,10 @@ packages:
       side-channel: 1.0.4
     dev: false
 
+  /querystringify@2.2.0:
+    resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
+    dev: false
+
   /queue@6.0.2:
     resolution: {integrity: sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==}
     dependencies:
@@ -5751,6 +5824,10 @@ packages:
     resolution: {integrity: sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg==}
     dev: false
 
+  /requires-port@1.0.0:
+    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+    dev: false
+
   /resolve-from@3.0.0:
     resolution: {integrity: sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==}
     engines: {node: '>=4'}
@@ -6015,6 +6092,11 @@ packages:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
     dev: false
 
+  /srcset@5.0.0:
+    resolution: {integrity: sha512-SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dev: false
+
   /stack-utils@2.0.6:
     resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
     engines: {node: '>=10'}
@@ -6297,6 +6379,16 @@ packages:
       nopt: 1.0.10
     dev: true
 
+  /tough-cookie@4.1.3:
+    resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}
+    engines: {node: '>=6'}
+    dependencies:
+      psl: 1.9.0
+      punycode: 2.3.0
+      universalify: 0.2.0
+      url-parse: 1.5.10
+    dev: false
+
   /tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
     dev: false
@@ -6402,6 +6494,11 @@ packages:
     engines: {node: '>= 4.0.0'}
     dev: false
 
+  /universalify@0.2.0:
+    resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
+    engines: {node: '>= 4.0.0'}
+    dev: false
+
   /unpipe@1.0.0:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
@@ -6418,6 +6515,13 @@ packages:
       picocolors: 1.0.0
     dev: false
 
+  /url-parse@1.5.10:
+    resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
+    dependencies:
+      querystringify: 2.2.0
+      requires-port: 1.0.0
+    dev: false
+
   /use-sync-external-store@1.2.0(react@18.2.0):
     resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==}
     peerDependencies:
@@ -6449,18 +6553,6 @@ packages:
     engines: {node: '>= 0.8'}
     dev: false
 
-  /vite-plugin-singlefile@0.13.5(rollup@3.28.0)(vite@4.4.9):
-    resolution: {integrity: sha512-y/aRGh8qHmw2f1IhaI/C6PJAaov47ESYDvUv1am1YHMhpY+19B5k5Odp8P+tgs+zhfvak6QB1ykrALQErEAo7g==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    peerDependencies:
-      rollup: '>=2.79.0'
-      vite: '>=3.2.0'
-    dependencies:
-      micromatch: 4.0.5
-      rollup: 3.28.0
-      vite: 4.4.9
-    dev: false
-
   /vite-plugin-svelte@3.0.1(rollup@3.28.0)(svelte@4.2.0)(vite@4.4.9):
     resolution: {integrity: sha512-R4XFM4pmeJ9GwKs5mcDDDQs1e6xvCrBumGLnApPdYarS6+kfDqeC0U1WOLp6LLUx1sUdv7poywnr9eNKenQfkg==}
     deprecated: use @sveltejs/vite-plugin-svelte for vite2.0+ support
@@ -6767,3 +6859,40 @@ packages:
       '@types/uuid': 9.0.2
       uuid: 9.0.0
     dev: false
+
+  file:corium:
+    resolution: {directory: corium, type: directory}
+    name: corium
+    version: 1.0.0-alpha.2
+    dependencies:
+      '@rollup/browser': 3.28.0
+      '@swc/helpers': 0.4.14
+      '@tomphttp/bare-client': 1.1.2-beta.3
+      '@types/escodegen': 0.0.7
+      acorn: 8.10.0
+      acorn-loose: 8.3.0
+      ast-types: 0.14.2
+      css-tree: 2.3.1
+      escodegen: 2.1.0
+      meriyah: 4.3.7
+      rollup: 3.28.0
+      srcset: 5.0.0
+      tough-cookie: 4.1.3
+    dev: false
+
+  github.com/CoolElectronics/vite-plugin-singlefile/0d528cf28b80545b7423150252fd18e7efd8a5e3(rollup@3.28.0)(vite@4.4.9):
+    resolution: {tarball: https://codeload.github.com/CoolElectronics/vite-plugin-singlefile/tar.gz/0d528cf28b80545b7423150252fd18e7efd8a5e3}
+    id: github.com/CoolElectronics/vite-plugin-singlefile/0d528cf28b80545b7423150252fd18e7efd8a5e3
+    name: vite-plugin-singlefile
+    version: 0.13.5
+    engines: {node: ^14.18.0 || >=16.0.0}
+    prepare: true
+    requiresBuild: true
+    peerDependencies:
+      rollup: '>=2.79.0'
+      vite: '>=3.2.0'
+    dependencies:
+      micromatch: 4.0.5
+      rollup: 3.28.0
+      vite: 4.4.9
+    dev: false
diff --git a/vite-plugin-singlefile b/vite-plugin-singlefile
new file mode 160000
index 0000000..0d528cf
--- /dev/null
+++ b/vite-plugin-singlefile
@@ -0,0 +1 @@
+Subproject commit 0d528cf28b80545b7423150252fd18e7efd8a5e3