From 929dfcca2435bef44dc53ec7b1f236f730544ba8 Mon Sep 17 00:00:00 2001
From: velzie <velzie@velzie.rip>
Date: Fri, 2 Aug 2024 17:14:56 -0400
Subject: [PATCH] fix bundle duplication

---
 src/client/dom/open.ts                         |  2 +-
 src/client/dom/serviceworker.ts                |  2 +-
 src/client/shared/eval.ts                      |  3 +--
 src/client/shared/worker.ts                    |  2 +-
 src/client/swruntime.ts                        |  2 +-
 src/client/window.ts                           |  2 +-
 .../worker/{worker.ts => importScripts.ts}     |  2 +-
 src/scramjet.config.ts                         | 18 ------------------
 8 files changed, 7 insertions(+), 26 deletions(-)
 rename src/client/worker/{worker.ts => importScripts.ts} (76%)
 delete mode 100644 src/scramjet.config.ts

diff --git a/src/client/dom/open.ts b/src/client/dom/open.ts
index 62c6fa9..2139aad 100644
--- a/src/client/dom/open.ts
+++ b/src/client/dom/open.ts
@@ -1,4 +1,4 @@
-import { encodeUrl } from "../../shared/rewriters/url";
+import { encodeUrl } from "../shared";
 import { ScramjetClient } from "../client";
 
 export default function (client: ScramjetClient) {
diff --git a/src/client/dom/serviceworker.ts b/src/client/dom/serviceworker.ts
index 8f9e127..5fd2ad2 100644
--- a/src/client/dom/serviceworker.ts
+++ b/src/client/dom/serviceworker.ts
@@ -1,4 +1,4 @@
-import { encodeUrl } from "../../shared/rewriters/url";
+import { encodeUrl } from "../shared";
 import { ScramjetClient } from "../client";
 
 // we need a late order because we're mangling with addEventListener at a higher level
diff --git a/src/client/shared/eval.ts b/src/client/shared/eval.ts
index 742b02f..56e369b 100644
--- a/src/client/shared/eval.ts
+++ b/src/client/shared/eval.ts
@@ -1,6 +1,5 @@
-import { rewriteJs } from "../../shared/rewriters/js";
 import { ScramjetClient } from "../client";
-import { config } from "../shared";
+import { config, rewriteJs } from "../shared";
 
 export default function (client: ScramjetClient, self: Self) {
 	// used for proxying *direct eval*
diff --git a/src/client/shared/worker.ts b/src/client/shared/worker.ts
index a5c58b9..ddec901 100644
--- a/src/client/shared/worker.ts
+++ b/src/client/shared/worker.ts
@@ -1,4 +1,4 @@
-import { encodeUrl } from "../../shared/rewriters/url";
+import { encodeUrl } from "../shared";
 import { ScramjetClient } from "../client";
 
 export default function (client: ScramjetClient, self: typeof globalThis) {
diff --git a/src/client/swruntime.ts b/src/client/swruntime.ts
index 28fda91..4694c92 100644
--- a/src/client/swruntime.ts
+++ b/src/client/swruntime.ts
@@ -1,4 +1,4 @@
-import { encodeUrl } from "../shared/rewriters/url";
+import { encodeUrl } from "./shared";
 
 class ScramjetServiceWorkerRuntime {
 	constructor() {
diff --git a/src/client/window.ts b/src/client/window.ts
index 8d20877..026e60c 100644
--- a/src/client/window.ts
+++ b/src/client/window.ts
@@ -1,4 +1,4 @@
-import { encodeUrl } from "../shared/rewriters/url";
+import { encodeUrl } from "./shared";
 import { ScramjetClient } from "./client";
 import { indirectEval } from "./shared/eval";
 import { config } from "./shared";
diff --git a/src/client/worker/worker.ts b/src/client/worker/importScripts.ts
similarity index 76%
rename from src/client/worker/worker.ts
rename to src/client/worker/importScripts.ts
index 310b23c..8ed0219 100644
--- a/src/client/worker/worker.ts
+++ b/src/client/worker/importScripts.ts
@@ -1,4 +1,4 @@
-import { encodeUrl } from "../../shared/rewriters/url";
+import { encodeUrl } from "../shared";
 
 export default function (client, self) {
 	client.Proxy("importScripts", {
diff --git a/src/scramjet.config.ts b/src/scramjet.config.ts
deleted file mode 100644
index d698e81..0000000
--- a/src/scramjet.config.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// if (!self.$scramjet) {
-// 	//@ts-expect-error really dumb workaround
-// 	self.$scramjet = {};
-// }
-// self.$scramjet.config = {
-// 	prefix: "/scramjet/",
-// 	codec: self.$scramjet.codecs.plain,
-// 	wrapfn: "$scramjet$wrap",
-// 	trysetfn: "$scramjet$tryset",
-// 	importfn: "$scramjet$import",
-// 	rewritefn: "$scramjet$rewrite",
-// 	config: "/scram/scramjet.config.js",
-// 	shared: "/scram/scramjet.shared.js",
-// 	worker: "/scram/scramjet.worker.js",
-// 	thread: "/scram/scramjet.thread.js",
-// 	client: "/scram/scramjet.client.js",
-// 	codecs: "/scram/scramjet.codecs.js",
-// };