[scramjet] delete scramjet.all.js, add non esm builds of bundled

Author: velzie

packages/scramjet/lib/noop.js

@@ -33,16 +33,16 @@
 	},
 	"exports": {
 		".": {
-			"types": "./dist/types/types.d.ts",
-			"default": "./lib/noop.js"
+			"types": "./dist/types/index.d.ts",
+			"default": "./dist/scramjet.mjs"
 		},
 		"./path": {
 			"types": "./lib/index.d.ts",
 			"default": "./lib/index.cjs"
 		},
 		"./bundled": {
 			"types": "./dist/types/index.d.ts",
-			"default": "./dist/scramjet.bundle.js"
+			"default": "./dist/scramjet_bundled.mjs"
 		}
 	},
 	"files": [

packages/scramjet/package.json

@@ -59,6 +59,4 @@ export function loadAndHook(init: ScramjetClientEntryInit) {
 		const urlchangeev = new UrlChangeEvent(client.url.href);
 		if (!client.isSubframe) client.frame?.dispatchEvent(urlchangeev);
 	}
-
-	Reflect.deleteProperty(globalThis, "WASM");
 }

packages/scramjet/src/client/entry.ts

@@ -2,11 +2,18 @@
 // as such it exports everything in scramjet
 // the entry point for scramjet.all.js (what most sites wil use) is entry.ts
 
+import { setWasm } from "@rewriters/wasm";
 import "./global.d";
 export * from "./client";
 export * from "./controller";
 export * from "./shared";
 export * from "./worker";
-export * from "./entry";
 export * from "./symbols";
 export * from "./types";
+
+declare const REWRITERWASM: string | undefined;
+
+// bundled build will have the wasm binary inlined as a base64 string
+if (REWRITERWASM) {
+	setWasm(Uint8Array.from(atob(REWRITERWASM), (c) => c.charCodeAt(0)));
+}

packages/scramjet/src/entry.ts

@@ -11,26 +11,17 @@ import { rewriteCss } from "@rewriters/css";
 import { rewriteJs } from "@rewriters/js";
 import { CookieJar } from "@/shared/cookie";
 
-let wasm_u8: Uint8Array<ArrayBuffer>;
-
-declare const REWRITERWASM: string | undefined;
-if (REWRITERWASM)
-	wasm_u8 = Uint8Array.from(atob(REWRITERWASM), (c) => c.charCodeAt(0));
-else if (self.WASM)
-	wasm_u8 = Uint8Array.from(atob(self.WASM), (c) => c.charCodeAt(0));
-
-// only use in sw
-export async function asyncSetWasm() {
-	const buf = await fetch(config.files.wasm).then((r) => r.arrayBuffer());
-	wasm_u8 = new Uint8Array(buf);
+let wasm_u8: Uint8Array;
+export function setWasm(u8: Uint8Array | ArrayBuffer) {
+	wasm_u8 = u8 instanceof Uint8Array ? u8 : new Uint8Array(u8);
 }
 
 export const textDecoder = new TextDecoder();
 let MAGIC = "\0asm".split("").map((x) => x.charCodeAt(0));
 
 function initWasm() {
 	if (!(wasm_u8 instanceof Uint8Array))
-		throw new Error("rewriter wasm not found (was it fetched correctly?)");
+		throw new Error("rewriter wasm not found (was setWasm called?)");
 
 	if (![...wasm_u8.slice(0, 4)].every((x, i) => x === MAGIC[i]))
 		throw new Error(
@@ -39,7 +30,7 @@ function initWasm() {
 		);
 
 	initSync({
-		module: new WebAssembly.Module(wasm_u8),
+		module: new WebAssembly.Module(wasm_u8 as unknown as BufferSource),
 	});
 }
 

packages/scramjet/src/index.ts

@@ -76,10 +76,6 @@ export interface ScramjetInitConfig
 	};
 }
 declare global {
-	var $scramjetLoadController: () => typeof controller;
-	var $scramjetLoadClient: () => typeof client;
-	var $scramjetLoadWorker: () => typeof worker;
-	var $scramjetVersion: ScramjetVersionInfo;
 	interface Window {
 		WASM: string;
 		REAL_WASM: Uint8Array;