change the directory structurejarred/rename

919 files changed, 1958 insertions, 1727 deletions

diff --git a/.docker/run-test.sh b/.docker/run-test.sh
index 74d901753..c088adf5a 100755
--- a/.docker/run-test.sh
+++ b/.docker/run-test.sh
@@ -3,7 +3,7 @@
 set -euxo pipefail
 
 bun install
-bun install --cwd ./integration/snippets
-bun install --cwd ./integration/scripts
+bun install --cwd ./test/snippets
+bun install --cwd ./test/scripts
 
 make $BUN_TEST_NAME
diff --git a/.dockerignore b/.dockerignore
index 22bc44d45..25ea26522 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,6 @@
 node_modules
 **/node_modules
-src/javascript/jsc/WebKit/LayoutTests
+src/bun.js/WebKit/LayoutTests
 zig-out
 zig-build
 **/*.o
@@ -10,7 +10,7 @@ examples
 
 **/.next
 .git
-src/javascript/jsc/WebKit
+src/bun.js/WebKit
 **/CMakeCache.txt
 packages/**/bun
 packages/**/bun-profile
diff --git a/.gitattributes b/.gitattributes
index ef212175f..4aa7a62d6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
 .vscode/launch.json linguist-generated
 src/api/schema.d.ts linguist-generated
 src/api/schema.js linguist-generated
-src/javascript/jsc/bindings/sqlite/sqlite3.c linguist-vendored
-src/javascript/jsc/bindings/sqlite/sqlite3_local.h linguist-vendored
+src/bun.js/bindings/sqlite/sqlite3.c linguist-vendored
+src/bun.js/bindings/sqlite/sqlite3_local.h linguist-vendored
 *.lockb binary diff=lockb
 *.zig text eol=lf
diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml
index af71c6f7f..dffab549c 100644
--- a/.github/workflows/bun.yml
+++ b/.github/workflows/bun.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Checkout submodules
-        run: git -c submodule."src/javascript/jsc/WebKit".update=none submodule update --init --recursive --depth=1 --progress -j 8
+        run: git -c submodule."src/bun.js/WebKit".update=none submodule update --init --recursive --depth=1 --progress -j 8
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Login to Dockerhub
@@ -94,7 +94,7 @@ jobs:
   #     - name: Checkout
   #       uses: actions/checkout@v2
   #     - name: Checkout submodules
-  #       run: git -c submodule."src/javascript/jsc/WebKit".update=none submodule update --init --recursive --depth=1 --progress -j 8
+  #       run: git -c submodule."src/bun.js/WebKit".update=none submodule update --init --recursive --depth=1 --progress -j 8
   #     - name: Set up Docker Buildx
   #       uses: docker/setup-buildx-action@v1
   #     - name: Login to Dockerhub
@@ -127,7 +127,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Checkout submodules
-        run: git -c submodule."src/javascript/jsc/WebKit".update=none submodule update --init --recursive --depth=1 --progress -j 8
+        run: git -c submodule."src/bun.js/WebKit".update=none submodule update --init --recursive --depth=1 --progress -j 8
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
diff --git a/.gitmodules b/.gitmodules
index 2620e2dd7..138c5d05f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,53 +1,50 @@
-# [submodule "src/deps/zig-clap"]
-# 	path = src/deps/zig-clap
-# 	url = https://github.com/Hejsil/zig-clap
 [submodule "src/deps/picohttpparser"]
-	path = src/deps/picohttpparser
-	url = https://github.com/h2o/picohttpparser.git
-	ignore = dirty
-	depth = 1
+path = src/deps/picohttpparser
+url = https://github.com/h2o/picohttpparser.git
+ignore = dirty
+depth = 1
 [submodule "src/javascript/jsc/WebKit"]
-	path = src/javascript/jsc/WebKit
-	url = https://github.com/Jarred-Sumner/WebKit.git
-	ignore = dirty
-	depth = 1
+	path = src/bun.js/WebKit
+url = https://github.com/Jarred-Sumner/WebKit.git
+ignore = dirty
+depth = 1
 [submodule "src/deps/mimalloc"]
-	path = src/deps/mimalloc
-	url = https://github.com/Jarred-Sumner/mimalloc.git
-	ignore = dirty
-	depth = 1
+path = src/deps/mimalloc
+url = https://github.com/Jarred-Sumner/mimalloc.git
+ignore = dirty
+depth = 1
 [submodule "src/deps/zlib"]
-	path = src/deps/zlib
-	url = https://github.com/cloudflare/zlib.git
-	ignore = dirty
-	depth = 1
+path = src/deps/zlib
+url = https://github.com/cloudflare/zlib.git
+ignore = dirty
+depth = 1
 [submodule "src/deps/libarchive"]
-	path = src/deps/libarchive
-	url = https://github.com/libarchive/libarchive.git
-	ignore = dirty
-	depth = 1
+path = src/deps/libarchive
+url = https://github.com/libarchive/libarchive.git
+ignore = dirty
+depth = 1
 [submodule "src/deps/boringssl"]
-	path = src/deps/boringssl
-	url = https://github.com/google/boringssl.git
-	ignore = dirty
-	depth = 1
+path = src/deps/boringssl
+url = https://github.com/google/boringssl.git
+ignore = dirty
+depth = 1
 [submodule "src/deps/libbacktrace"]
-	path = src/deps/libbacktrace
-	url = https://github.com/ianlancetaylor/libbacktrace
-	ignore = dirty
-	depth = 1
+path = src/deps/libbacktrace
+url = https://github.com/ianlancetaylor/libbacktrace
+ignore = dirty
+depth = 1
 [submodule "src/deps/lol-html"]
-	path = src/deps/lol-html
-	url = https://github.com/cloudflare/lol-html
-	ignore = dirty
-	depth = 1
+path = src/deps/lol-html
+url = https://github.com/cloudflare/lol-html
+ignore = dirty
+depth = 1
 [submodule "src/deps/uws"]
-	path = src/deps/uws
-	url = https://github.com/Jarred-Sumner/uWebSockets
-	ignore = dirty
-	depth = 1
+path = src/deps/uws
+url = https://github.com/Jarred-Sumner/uWebSockets
+ignore = dirty
+depth = 1
 [submodule "src/deps/tinycc"]
-	path = src/deps/tinycc
-	url = https://github.com/Jarred-Sumner/tinycc.git
-	ignore = dirty
-	depth = 1
+path = src/deps/tinycc
+url = https://github.com/Jarred-Sumner/tinycc.git
+ignore = dirty
+depth = 1
diff --git a/.scripts/write-versions.sh b/.scripts/write-versions.sh
index 5fed3ee18..cad659b89 100644
--- a/.scripts/write-versions.sh
+++ b/.scripts/write-versions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euxo pipefail
 
-WEBKIT_VERSION=$(git rev-parse HEAD:./src/javascript/jsc/WebKit)
+WEBKIT_VERSION=$(git rev-parse HEAD:./src/bun.js/WebKit)
 MIMALLOC_VERSION=$(git rev-parse HEAD:./src/deps/mimalloc)
 LIBARCHIVE_VERSION=$(git rev-parse HEAD:./src/deps/libarchive)
 PICOHTTPPARSER_VERSION=$(git rev-parse HEAD:./src/deps/picohttpparser)
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 55a36b9e9..35928d4e7 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -2,26 +2,24 @@
   "configurations": [
     {
       "name": "Mac",
-      "forcedInclude": [
-        "${workspaceFolder}/src/javascript/jsc/bindings/root.h"
-      ],
+      "forcedInclude": ["${workspaceFolder}/src/bun.js/bindings/root.h"],
       "includePath": [
         "${workspaceFolder}/src/JavaScript/jsc/WebKit/WebKitBuild/Release/JavaScriptCore/PrivateHeaders/",
         "${workspaceFolder}/src/JavaScript/jsc/WebKit/WebKitBuild/Release/WTF/Headers",
         "${workspaceFolder}/src/JavaScript/jsc/WebKit/WebKitBuild/Release/*",
         "${workspaceFolder}/src/JavaScript/jsc/bindings/",
         "${workspaceFolder}/src/JavaScript/jsc/WebKit/Source/bmalloc/",
-        "${workspaceFolder}/src/javascript/jsc/WebKit/WebKitBuild/Release/ICU/Headers/"
+        "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/ICU/Headers/"
       ],
       "browse": {
         "path": [
-          "${workspaceFolder}/src/javascript/jsc/bindings/*",
+          "${workspaceFolder}/src/bun.js/bindings/*",
           "${workspaceFolder}/src/JavaScript/jsc/WebKit/WebKitBuild/Release/JavaScriptCore/PrivateHeaders/",
           "${workspaceFolder}/src/JavaScript/jsc/WebKit/WebKitBuild/Release/WTF/Headers/**",
           "${workspaceFolder}/src/JavaScript/jsc/WebKit/WebKitBuild/Release/*",
           "${workspaceFolder}/src/JavaScript/jsc/bindings/**",
           "${workspaceFolder}/src/JavaScript/jsc/WebKit/Source/bmalloc/**",
-          "${workspaceFolder}/src/javascript/jsc/WebKit/WebKitBuild/Release/ICU/Headers/"
+          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/ICU/Headers/"
         ],
         "limitSymbolsToIncludedHeaders": true,
         "databaseFilename": ".vscode/cppdb"
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 650d7c454..b8a42377a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -125,7 +125,7 @@
       "name": "bun routes",
       "program": "bun-debug",
       "args": [],
-      "cwd": "${workspaceFolder}/integration/apps/routing",
+      "cwd": "${workspaceFolder}/test/apps/routing",
       "console": "internalConsole"
     },
     {
@@ -239,7 +239,7 @@
       "name": "wiptest",
       "program": "bun-debug",
       "args": ["wiptest", "transpiler"],
-      "cwd": "${workspaceFolder}/integration",
+      "cwd": "${workspaceFolder}/test",
       "console": "internalConsole"
     },
     {
@@ -293,7 +293,7 @@
       "name": "bun test",
       "program": "bun-debug",
       "args": ["wiptest"],
-      "cwd": "${workspaceFolder}/integration",
+      "cwd": "${workspaceFolder}",
       "env": {
         "FORCE_COLOR": "1"
       },
@@ -304,8 +304,8 @@
       "request": "launch",
       "name": "bun test current",
       "program": "bun-debug",
-      "args": ["wiptest", "mmap"],
-      "cwd": "${workspaceFolder}/integration",
+      "args": ["wiptest", "websocket"],
+      "cwd": "${workspaceFolder}/test",
       "env": {
         "FORCE_COLOR": "1"
       },
@@ -352,8 +352,8 @@
       "request": "launch",
       "name": "bun tes2t",
       "program": "bun-debug",
-      "args": ["add", "imagemin-webpack-plugin"],
-      "cwd": "/tmp/testfoo",
+      "args": ["/Users/jarred/Code/bun-invite/server.ts"],
+      "cwd": "/Users/jarred/Code/bun-invite",
       "env": {
         "FORCE_COLOR": "1"
       },
@@ -473,7 +473,7 @@
       "name": "Integration Test Dev",
       "program": "bun-debug",
       "args": [],
-      "cwd": "${workspaceFolder}/integration/snippets",
+      "cwd": "${workspaceFolder}/test/snippets",
       "console": "internalConsole"
     },
     {
@@ -563,7 +563,7 @@
       "name": "Integration Test Dev (no hmr)",
       "program": "bun-debug",
       "args": ["--disable-hmr"],
-      "cwd": "${workspaceFolder}/integration/snippets",
+      "cwd": "${workspaceFolder}/test/snippets",
       "console": "internalConsole"
     },
     {
diff --git a/.vscode/settings.json b/.vscode/settings.json
index e59f7a559..d0d9a341d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -44,9 +44,9 @@
     "**/*.xcodeproj": true,
     "packages/bun-types/*.d.ts": true,
 
-    "integration/snapshots": true,
-    "integration/snapshots-no-hmr": true,
-    "src/javascript/jsc/WebKit": true,
+    "test/snapshots": true,
+    "test/snapshots-no-hmr": true,
+    "src/bun.js/WebKit": true,
     "src/deps/libarchive": true,
     "src/deps/mimalloc": true,
     "src/deps/s2n-tls": true,
@@ -55,25 +55,25 @@
     "src/deps/uws": true,
     "src/deps/zlib": true,
     "src/deps/lol-html": true,
-    "integration/snippets/package-json-exports/_node_modules_copy": true
+    "test/snippets/package-json-exports/_node_modules_copy": true
   },
   "C_Cpp.files.exclude": {
     "**/.vscode": true,
-    "src/javascript/jsc/WebKit/JSTests": true,
-    "src/javascript/jsc/WebKit/Tools": true,
-    "src/javascript/jsc/WebKit/WebDriverTests": true,
-    "src/javascript/jsc/WebKit/WebKit.xcworkspace": true,
-    "src/javascript/jsc/WebKit/WebKitLibraries": true,
-    "src/javascript/jsc/WebKit/Websites": true,
-    "src/javascript/jsc/WebKit/resources": true,
-    "src/javascript/jsc/WebKit/LayoutTests": true,
-    "src/javascript/jsc/WebKit/ManualTests": true,
-    "src/javascript/jsc/WebKit/PerformanceTests": true,
-    "src/javascript/jsc/WebKit/WebKitLegacy": true,
-    "src/javascript/jsc/WebKit/WebCore": true,
-    "src/javascript/jsc/WebKit/WebDriver": true,
-    "src/javascript/jsc/WebKit/WebKitBuild": true,
-    "src/javascript/jsc/WebKit/WebInspectorUI": true
+    "src/bun.js/WebKit/JSTests": true,
+    "src/bun.js/WebKit/Tools": true,
+    "src/bun.js/WebKit/WebDriverTests": true,
+    "src/bun.js/WebKit/WebKit.xcworkspace": true,
+    "src/bun.js/WebKit/WebKitLibraries": true,
+    "src/bun.js/WebKit/Websites": true,
+    "src/bun.js/WebKit/resources": true,
+    "src/bun.js/WebKit/LayoutTests": true,
+    "src/bun.js/WebKit/ManualTests": true,
+    "src/bun.js/WebKit/PerformanceTests": true,
+    "src/bun.js/WebKit/WebKitLegacy": true,
+    "src/bun.js/WebKit/WebCore": true,
+    "src/bun.js/WebKit/WebDriver": true,
+    "src/bun.js/WebKit/WebKitBuild": true,
+    "src/bun.js/WebKit/WebInspectorUI": true
   },
   "[cpp]": {
     "editor.defaultFormatter": "xaver.clang-format"
diff --git a/Dockerfile b/Dockerfile
index bd7c1a367..0683a40f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -428,7 +428,7 @@ ENV PATH "${BUN_DIR}/packages/bun-linux-x64:${BUN_DIR}/packages/bun-linux-aarch6
 ENV CI 1
 ENV BROWSER_EXECUTABLE /usr/bin/chromium
 
-COPY ./integration ${BUN_DIR}/integration
+COPY ./test ${BUN_DIR}/test
 COPY Makefile ${BUN_DIR}/Makefile
 COPY package.json ${BUN_DIR}/package.json
 COPY .docker/run-test.sh ${BUN_DIR}/run-test.sh
diff --git a/Dockerfile.musl b/Dockerfile.musl
index ce198eaa6..ffdca5538 100644
--- a/Dockerfile.musl
+++ b/Dockerfile.musl
@@ -130,9 +130,9 @@
 
 # WORKDIR /bun
 
-# COPY ./integration /bun/integration
-# COPY ./integration/snippets/package-json-exports/_node_modules_copy /bun/integration/snippets/package-json-exports/_node_modules_copy 
-# CMD [ "bash", "-c", "npm install && cd /bun/integration/snippets && npm install && cd /bun && make copy-test-node-modules test-all"]
+# COPY ./test /bun/test
+# COPY ./test/snippets/package-json-exports/_node_modules_copy /bun/test/snippets/package-json-exports/_node_modules_copy 
+# CMD [ "bash", "-c", "npm install && cd /bun/test/snippets && npm install && cd /bun && make copy-test-node-modules test-all"]
 
 
 # # FROM bun
diff --git a/Makefile b/Makefile
index f315a01aa..75060cab3 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ BUN_BUILD_TAG = bun-v$(PACKAGE_JSON_VERSION)
 BUN_RELEASE_BIN = $(PACKAGE_DIR)/bun
 PRETTIER ?= $(shell which prettier || echo "./node_modules/.bin/prettier")
 DSYMUTIL ?= $(shell which dsymutil || which dsymutil-13)
-WEBKIT_DIR ?= $(realpath src/javascript/jsc/WebKit)
+WEBKIT_DIR ?= $(realpath src/bun.js/WebKit)
 WEBKIT_RELEASE_DIR ?= $(WEBKIT_DIR)/WebKitBuild/Release
 WEBKIT_DEBUG_DIR ?= $(WEBKIT_DIR)/WebKitBuild/Debug
 WEBKIT_RELEASE_DIR_LTO ?= $(WEBKIT_DIR)/WebKitBuild/ReleaseLTO
@@ -200,36 +200,36 @@ endif
 HOMEBREW_PREFIX ?= $(BREW_PREFIX_PATH)
 
 
-SRC_DIR := src/javascript/jsc/bindings
-OBJ_DIR := src/javascript/jsc/bindings-obj
+SRC_DIR := src/bun.js/bindings
+OBJ_DIR := src/bun.js/bindings-obj
 SRC_PATH := $(realpath $(SRC_DIR))
 SRC_FILES := $(wildcard $(SRC_DIR)/*.cpp) 
 SRC_WEBCORE_FILES := $(wildcard $(SRC_DIR)/webcore/*.cpp) 
 SRC_SQLITE_FILES := $(wildcard $(SRC_DIR)/sqlite/*.cpp) 
-SRC_BUILTINS_FILES := $(wildcard  src/javascript/jsc/builtins/*.cpp) 
+SRC_BUILTINS_FILES := $(wildcard  src/bun.js/builtins/*.cpp) 
 OBJ_FILES := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRC_FILES))
 WEBCORE_OBJ_FILES := $(patsubst $(SRC_DIR)/webcore/%.cpp,$(OBJ_DIR)/%.o,$(SRC_WEBCORE_FILES))
 SQLITE_OBJ_FILES := $(patsubst $(SRC_DIR)/sqlite/%.cpp,$(OBJ_DIR)/%.o,$(SRC_SQLITE_FILES))
-BUILTINS_OBJ_FILES := $(patsubst src/javascript/jsc/builtins/%.cpp,$(OBJ_DIR)/%.o,$(SRC_BUILTINS_FILES))
+BUILTINS_OBJ_FILES := $(patsubst src/bun.js/builtins/%.cpp,$(OBJ_DIR)/%.o,$(SRC_BUILTINS_FILES))
 BINDINGS_OBJ := $(OBJ_FILES) $(WEBCORE_OBJ_FILES) $(SQLITE_OBJ_FILES) $(BUILTINS_OBJ_FILES)
 MAC_INCLUDE_DIRS := -I$(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders \
 		-I$(WEBKIT_RELEASE_DIR)/WTF/Headers \
 		-I$(WEBKIT_RELEASE_DIR)/ICU/Headers \
 		-I$(WEBKIT_RELEASE_DIR)/ \
-		-Isrc/javascript/jsc/bindings/ \
-		-Isrc/javascript/jsc/builtins/ \
-		-Isrc/javascript/jsc/bindings/webcore \
-		-Isrc/javascript/jsc/bindings/sqlite \
-		-Isrc/javascript/jsc/builtins/cpp \
+		-Isrc/bun.js/bindings/ \
+		-Isrc/bun.js/builtins/ \
+		-Isrc/bun.js/bindings/webcore \
+		-Isrc/bun.js/bindings/sqlite \
+		-Isrc/bun.js/builtins/cpp \
 		-I$(WEBKIT_DIR)/Source/bmalloc  \
 		-I$(WEBKIT_DIR)/Source
 
 LINUX_INCLUDE_DIRS := -I$(JSC_INCLUDE_DIR) \
-						-Isrc/javascript/jsc/builtins/ \
-					  -Isrc/javascript/jsc/bindings/ \
-					  -Isrc/javascript/jsc/bindings/webcore \
-					  -Isrc/javascript/jsc/bindings/sqlite \
-					  -Isrc/javascript/jsc/builtins/cpp \
+						-Isrc/bun.js/builtins/ \
+					  -Isrc/bun.js/bindings/ \
+					  -Isrc/bun.js/bindings/webcore \
+					  -Isrc/bun.js/bindings/sqlite \
+					  -Isrc/bun.js/builtins/cpp \
 					  -I$(ZLIB_INCLUDE_DIR)
 					  
 
@@ -401,17 +401,17 @@ tinycc:
 		cp $(TINYCC_DIR)/*.a $(BUN_DEPS_OUT_DIR)
 		
 generate-builtins:
-	rm -f src/javascript/jsc/bindings/*Builtin*.cpp src/javascript/jsc/bindings/*Builtin*.h src/javascript/jsc/bindings/*Builtin*.cpp
-	rm -rf src/javascript/jsc/builtins/cpp
-	mkdir -p src/javascript/jsc/builtins/cpp
-	$(shell which python || which python2) $(realpath $(WEBKIT_DIR)/Source/JavaScriptCore/Scripts/generate-js-builtins.py) -i $(realpath src)/javascript/jsc/builtins/js  -o $(realpath src)/javascript/jsc/builtins/cpp --framework WebCore --force 
-	$(shell which python || which python2) $(realpath $(WEBKIT_DIR)/Source/JavaScriptCore/Scripts/generate-js-builtins.py) -i $(realpath src)/javascript/jsc/builtins/js  -o $(realpath src)/javascript/jsc/builtins/cpp --framework WebCore --wrappers-only
+	rm -f src/bun.js/bindings/*Builtin*.cpp src/bun.js/bindings/*Builtin*.h src/bun.js/bindings/*Builtin*.cpp
+	rm -rf src/bun.js/builtins/cpp
+	mkdir -p src/bun.js/builtins/cpp
+	$(shell which python || which python2) $(realpath $(WEBKIT_DIR)/Source/JavaScriptCore/Scripts/generate-js-builtins.py) -i $(realpath src)/bun.js/builtins/js  -o $(realpath src)/bun.js/builtins/cpp --framework WebCore --force 
+	$(shell which python || which python2) $(realpath $(WEBKIT_DIR)/Source/JavaScriptCore/Scripts/generate-js-builtins.py) -i $(realpath src)/bun.js/builtins/js  -o $(realpath src)/bun.js/builtins/cpp --framework WebCore --wrappers-only
 	echo 'namespace Zig { class GlobalObject; }' >> /tmp/1.h
-	cat /tmp/1.h  src/javascript/jsc/builtins/cpp/WebCoreJSBuiltinInternals.h > src/javascript/jsc/builtins/cpp/WebCoreJSBuiltinInternals.h.1
-	mv src/javascript/jsc/builtins/cpp/WebCoreJSBuiltinInternals.h.1 src/javascript/jsc/builtins/cpp/WebCoreJSBuiltinInternals.h
-	$(SED) -i -e 's/class JSDOMGlobalObject/using JSDOMGlobalObject = Zig::GlobalObject/' src/javascript/jsc/builtins/cpp/WebCoreJSBuiltinInternals.h
+	cat /tmp/1.h  src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h > src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h.1
+	mv src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h.1 src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h
+	$(SED) -i -e 's/class JSDOMGlobalObject/using JSDOMGlobalObject = Zig::GlobalObject/' src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h
 	# this is the one we actually build
-	mv src/javascript/jsc/builtins/cpp/*JSBuiltin*.cpp src/javascript/jsc/builtins
+	mv src/bun.js/builtins/cpp/*JSBuiltin*.cpp src/bun.js/builtins
 
 vendor-without-check: api analytics node-fallbacks runtime_js fallback_decoder bun_error mimalloc picohttp zlib boringssl libarchive libbacktrace lolhtml usockets uws base64 tinycc
 
@@ -423,8 +423,8 @@ release-types:
 	cd packages/bun-types && npm publish
 
 format:
-	$(PRETTIER) --write integration/bunjs-only-snippets/*.js
-	$(PRETTIER) --write integration/bunjs-only-snippets/solid-dom-fixtures/**/*.js
+	$(PRETTIER) --write test/bun.js/*.js
+	$(PRETTIER) --write test/bun.js/solid-dom-fixtures/**/*.js
 
 lolhtml:
 	cd $(BUN_DEPS_DIR)/lol-html/ && cd $(BUN_DEPS_DIR)/lol-html/c-api && cargo build --release && cp target/release/liblolhtml.a $(BUN_DEPS_OUT_DIR)
@@ -443,7 +443,7 @@ boringssl: boringssl-build boringssl-copy
 boringssl-debug: boringssl-build-debug boringssl-copy
 
 compile-ffi-test:
-	clang $(OPTIMIZATION_LEVEL) -shared -undefined dynamic_lookup -o /tmp/bun-ffi-test.dylib -fPIC ./integration/bunjs-only-snippets/ffi-test.c
+	clang $(OPTIMIZATION_LEVEL) -shared -undefined dynamic_lookup -o /tmp/bun-ffi-test.dylib -fPIC ./test/bun.js/ffi-test.c
 
 libbacktrace:
 	cd $(BUN_DEPS_DIR)/libbacktrace && \
@@ -592,14 +592,14 @@ release: all-js jsc-bindings-mac build-obj cls bun-link-lld-release bun-link-lld
 release-safe: all-js jsc-bindings-mac build-obj-safe cls bun-link-lld-release bun-link-lld-release-dsym release-bin-entitlements
 
 jsc-check:
-	@ls $(JSC_BASE_DIR)  >/dev/null 2>&1 || (echo "Failed to access WebKit build. Please compile the WebKit submodule using the Dockerfile at $(shell pwd)/src/javascript/WebKit/Dockerfile and then copy from /output in the Docker container to $(JSC_BASE_DIR). You can override the directory via JSC_BASE_DIR. \n\n 	DOCKER_BUILDKIT=1 docker build -t bun-webkit $(shell pwd)/src/javascript/jsc/WebKit -f $(shell pwd)/src/javascript/jsc/WebKit/Dockerfile --progress=plain\n\n 	docker container create bun-webkit\n\n 	# Get the container ID\n	docker container ls\n\n 	docker cp DOCKER_CONTAINER_ID_YOU_JUST_FOUND:/output $(JSC_BASE_DIR)" && exit 1)	
+	@ls $(JSC_BASE_DIR)  >/dev/null 2>&1 || (echo "Failed to access WebKit build. Please compile the WebKit submodule using the Dockerfile at $(shell pwd)/src/javascript/WebKit/Dockerfile and then copy from /output in the Docker container to $(JSC_BASE_DIR). You can override the directory via JSC_BASE_DIR. \n\n 	DOCKER_BUILDKIT=1 docker build -t bun-webkit $(shell pwd)/src/bun.js/WebKit -f $(shell pwd)/src/bun.js/WebKit/Dockerfile --progress=plain\n\n 	docker container create bun-webkit\n\n 	# Get the container ID\n	docker container ls\n\n 	docker cp DOCKER_CONTAINER_ID_YOU_JUST_FOUND:/output $(JSC_BASE_DIR)" && exit 1)	
 	@ls $(JSC_INCLUDE_DIR)  >/dev/null 2>&1 || (echo "Failed to access WebKit include directory at $(JSC_INCLUDE_DIR)." && exit 1)	
 	@ls $(JSC_LIB)  >/dev/null 2>&1 || (echo "Failed to access WebKit lib directory at $(JSC_LIB)." && exit 1)	
 
 all-js: runtime_js fallback_decoder bun_error node-fallbacks
 
 fmt-cpp:
-	cd src/javascript/jsc/bindings && clang-format *.cpp *.h -i
+	cd src/bun.js/bindings && clang-format *.cpp *.h -i
 
 fmt-zig:
 	cd src && zig fmt **/*.zig
@@ -699,7 +699,7 @@ jsc-build: $(JSC_BUILD_STEPS)
 jsc-bindings: jsc-bindings-headers jsc-bindings-mac
 
 clone-submodules:
-	git -c submodule."src/javascript/jsc/WebKit".update=none submodule update --init --recursive --depth=1 --progress
+	git -c submodule."src/bun.js/WebKit".update=none submodule update --init --recursive --depth=1 --progress
 
 devcontainer: clone-submodules mimalloc zlib libarchive boringssl picohttp identifier-cache node-fallbacks jsc-bindings-headers api analytics bun_error fallback_decoder jsc-bindings-mac dev runtime_js_dev
 
@@ -707,26 +707,26 @@ CLANG_FORMAT := $(shell command -v clang-format 2> /dev/null)
 
 
 jsc-bindings-headers: 
-	rm -f /tmp/build-jsc-headers src/javascript/jsc/bindings/headers.zig
-	touch src/javascript/jsc/bindings/headers.zig
-	mkdir -p src/javascript/jsc/bindings-obj/
+	rm -f /tmp/build-jsc-headers src/bun.js/bindings/headers.zig
+	touch src/bun.js/bindings/headers.zig
+	mkdir -p src/bun.js/bindings-obj/
 	$(ZIG) build headers-obj
 	$(CXX) $(PLATFORM_LINKER_FLAGS) $(JSC_FILES_DEBUG) ${ICU_FLAGS} $(BUN_LLD_FLAGS_WITHOUT_JSC)  -g $(DEBUG_BIN)/headers.o -W -o /tmp/build-jsc-headers -lc;
 	/tmp/build-jsc-headers
-	$(ZIG) translate-c src/javascript/jsc/bindings/headers.h > src/javascript/jsc/bindings/headers.zig
+	$(ZIG) translate-c src/bun.js/bindings/headers.h > src/bun.js/bindings/headers.zig
 	$(ZIG) run misctools/headers-cleaner.zig -lc
-	$(SED) -i '/pub const __darwin/d' src/javascript/jsc/bindings/headers.zig || echo "";
-	$(SED) -i '/pub const __builtin/d' src/javascript/jsc/bindings/headers.zig || echo "";
-	$(SED) -i '/pub const int/d' src/javascript/jsc/bindings/headers.zig || echo "";
-	$(SED) -i '/pub const uint/d' src/javascript/jsc/bindings/headers.zig || echo "";
-	$(SED) -i '/pub const intmax/d' src/javascript/jsc/bindings/headers.zig || echo "";
-	$(SED) -i '/pub const uintmax/d' src/javascript/jsc/bindings/headers.zig || echo "";
-	$(SED) -i '/pub const max_align_t/{N;N;N;d;}' src/javascript/jsc/bindings/headers.zig
-	$(SED) -i '/pub const ZigErrorCode/d' src/javascript/jsc/bindings/headers.zig
-	$(SED) -i '/pub const JSClassRef/d' src/javascript/jsc/bindings/headers.zig
-	cat src/javascript/jsc/bindings/headers.zig > /tmp/headers.zig
-	cat src/javascript/jsc/bindings/headers-replacements.zig /tmp/headers.zig > src/javascript/jsc/bindings/headers.zig
-	$(ZIG) fmt src/javascript/jsc/bindings/headers.zig
+	$(SED) -i '/pub const __darwin/d' src/bun.js/bindings/headers.zig || echo "";
+	$(SED) -i '/pub const __builtin/d' src/bun.js/bindings/headers.zig || echo "";
+	$(SED) -i '/pub const int/d' src/bun.js/bindings/headers.zig || echo "";
+	$(SED) -i '/pub const uint/d' src/bun.js/bindings/headers.zig || echo "";
+	$(SED) -i '/pub const intmax/d' src/bun.js/bindings/headers.zig || echo "";
+	$(SED) -i '/pub const uintmax/d' src/bun.js/bindings/headers.zig || echo "";
+	$(SED) -i '/pub const max_align_t/{N;N;N;d;}' src/bun.js/bindings/headers.zig
+	$(SED) -i '/pub const ZigErrorCode/d' src/bun.js/bindings/headers.zig
+	$(SED) -i '/pub const JSClassRef/d' src/bun.js/bindings/headers.zig
+	cat src/bun.js/bindings/headers.zig > /tmp/headers.zig
+	cat src/bun.js/bindings/headers-replacements.zig /tmp/headers.zig > src/bun.js/bindings/headers.zig
+	$(ZIG) fmt src/bun.js/bindings/headers.zig
 
 
 MIMALLOC_OVERRIDE_FLAG ?= 
@@ -863,70 +863,70 @@ mkdir-dev:
 	mkdir -p $(DEBUG_PACKAGE_DIR)/bin
 
 test-install:
-	cd integration/scripts && $(NPM_CLIENT) install
+	cd test/scripts && $(NPM_CLIENT) install
 
 test-bun-dev:
-	BUN_BIN=$(RELEASE_BUN) bash integration/apps/bun-dev.sh
-	BUN_BIN=$(RELEASE_BUN) bash integration/apps/bun-dev-index-html.sh
+	BUN_BIN=$(RELEASE_BUN) bash test/apps/bun-dev.sh
+	BUN_BIN=$(RELEASE_BUN) bash test/apps/bun-dev-index-html.sh
 	
 test-dev-bun-dev:
-	BUN_BIN=$(DEBUG_BUN) bash integration/apps/bun-dev.sh
-	BUN_BIN=$(DEBUG_BUN) bash integration/apps/bun-dev-index-html.sh
+	BUN_BIN=$(DEBUG_BUN) bash test/apps/bun-dev.sh
+	BUN_BIN=$(DEBUG_BUN) bash test/apps/bun-dev-index-html.sh
 
 test-all: test-install test-with-hmr test-no-hmr test-create-next test-create-react test-bun-run test-bun-install test-bun-dev
 
 copy-test-node-modules:
-	rm -rf integration/snippets/package-json-exports/node_modules || echo "";
-	cp -r integration/snippets/package-json-exports/_node_modules_copy integration/snippets/package-json-exports/node_modules || echo "";
+	rm -rf test/snippets/package-json-exports/node_modules || echo "";
+	cp -r test/snippets/package-json-exports/_node_modules_copy test/snippets/package-json-exports/node_modules || echo "";
 kill-bun:
 	-killall -9 bun bun-debug
 
 test-dev-create-next: 
-	BUN_BIN=$(DEBUG_BUN) bash integration/apps/bun-create-next.sh
+	BUN_BIN=$(DEBUG_BUN) bash test/apps/bun-create-next.sh
 
 test-dev-create-react: 
-	BUN_BIN=$(DEBUG_BUN) bash integration/apps/bun-create-react.sh
+	BUN_BIN=$(DEBUG_BUN) bash test/apps/bun-create-react.sh
 
 test-create-next: 
-	BUN_BIN=$(RELEASE_BUN) bash integration/apps/bun-create-next.sh
+	BUN_BIN=$(RELEASE_BUN) bash test/apps/bun-create-next.sh
 
 test-bun-run: 
-	cd integration/apps && BUN_BIN=$(RELEASE_BUN) bash ./bun-run-check.sh
+	cd test/apps && BUN_BIN=$(RELEASE_BUN) bash ./bun-run-check.sh
 
 test-bun-install: test-bun-install-git-status
-	cd integration/apps && JS_RUNTIME=$(RELEASE_BUN) NPM_CLIENT=$(RELEASE_BUN) bash ./bun-install.sh
-	cd integration/apps && BUN_BIN=$(RELEASE_BUN) bash ./bun-install-utf8.sh
+	cd test/apps && JS_RUNTIME=$(RELEASE_BUN) NPM_CLIENT=$(RELEASE_BUN) bash ./bun-install.sh
+	cd test/apps && BUN_BIN=$(RELEASE_BUN) bash ./bun-install-utf8.sh
 
 test-bun-install-git-status:
-	cd integration/apps && JS_RUNTIME=$(RELEASE_BUN) BUN_BIN=$(RELEASE_BUN) bash ./bun-install-lockfile-status.sh
+	cd test/apps && JS_RUNTIME=$(RELEASE_BUN) BUN_BIN=$(RELEASE_BUN) bash ./bun-install-lockfile-status.sh
 
 test-dev-bun-install: test-dev-bun-install-git-status
-	cd integration/apps && JS_RUNTIME=$(DEBUG_BUN) NPM_CLIENT=$(DEBUG_BUN) bash ./bun-install.sh
-	cd integration/apps && BUN_BIN=$(DEBUG_BUN) bash ./bun-install-utf8.sh
+	cd test/apps && JS_RUNTIME=$(DEBUG_BUN) NPM_CLIENT=$(DEBUG_BUN) bash ./bun-install.sh
+	cd test/apps && BUN_BIN=$(DEBUG_BUN) bash ./bun-install-utf8.sh
 
 test-dev-bun-install-git-status:
-	cd integration/apps && BUN_BIN=$(DEBUG_BUN) bash ./bun-install-lockfile-status.sh
+	cd test/apps && BUN_BIN=$(DEBUG_BUN) bash ./bun-install-lockfile-status.sh
 
 test-create-react: 
-	BUN_BIN=$(RELEASE_BUN) bash integration/apps/bun-create-react.sh
+	BUN_BIN=$(RELEASE_BUN) bash test/apps/bun-create-react.sh
 	
 test-with-hmr: kill-bun copy-test-node-modules
-	BUN_BIN=$(RELEASE_BUN) node integration/scripts/browser.js
+	BUN_BIN=$(RELEASE_BUN) node test/scripts/browser.js
 
 test-no-hmr: kill-bun copy-test-node-modules
 	-killall bun -9;
-	DISABLE_HMR="DISABLE_HMR" BUN_BIN=$(RELEASE_BUN) node integration/scripts/browser.js
+	DISABLE_HMR="DISABLE_HMR" BUN_BIN=$(RELEASE_BUN) node test/scripts/browser.js
 
 test-dev-with-hmr: copy-test-node-modules
 	-killall bun-debug -9;
-	BUN_BIN=$(DEBUG_BUN) node integration/scripts/browser.js
+	BUN_BIN=$(DEBUG_BUN) node test/scripts/browser.js
 
 test-dev-no-hmr: copy-test-node-modules
 	-killall bun-debug -9;
-	DISABLE_HMR="DISABLE_HMR" BUN_BIN=$(DEBUG_BUN) node integration/scripts/browser.js
+	DISABLE_HMR="DISABLE_HMR" BUN_BIN=$(DEBUG_BUN) node test/scripts/browser.js
 
 test-dev-bun-run: 
-	cd integration/apps && BUN_BIN=$(DEBUG_BUN) bash bun-run-check.sh
+	cd test/apps && BUN_BIN=$(DEBUG_BUN) bash bun-run-check.sh
 
 test-dev-all: test-dev-with-hmr test-dev-no-hmr test-dev-create-next test-dev-create-react test-dev-bun-run test-dev-bun-install test-dev-bun-dev
 test-dev-bunjs: 
@@ -1065,7 +1065,7 @@ jsc-build-linux-compile-config:
 			$(WEBKIT_RELEASE_DIR)
 
 # If you get "Error: could not load cache"
-# run  rm -rf src/javascript/jsc/WebKit/CMakeCache.txt
+# run  rm -rf src/bun.js/WebKit/CMakeCache.txt
 jsc-build-linux-compile-build:
 		mkdir -p $(WEBKIT_RELEASE_DIR)  && \
 		cd $(WEBKIT_RELEASE_DIR)  && \
@@ -1084,7 +1084,7 @@ jsc-build-mac-copy:
 	cp $(WEBKIT_RELEASE_DIR)/lib/libbmalloc.a $(BUN_DEPS_OUT_DIR)/libbmalloc.a
 
 clean-jsc:
-	cd src/javascript/jsc/WebKit && rm -rf **/CMakeCache.txt **/CMakeFiles && rm -rf src/javascript/jsc/WebKit/WebKitBuild
+	cd src/bun.js/WebKit && rm -rf **/CMakeCache.txt **/CMakeFiles && rm -rf src/bun.js/WebKit/WebKitBuild
 clean-bindings: 
 	rm -rf $(OBJ_DIR)/*.o
 	rm -rf $(OBJ_DIR)/webcore/*.o
@@ -1207,7 +1207,7 @@ endif
 bun-relink: bun-relink-copy bun-link-lld-release bun-link-lld-release-dsym
 
 wasm-return1:
-	zig build-lib -OReleaseSmall integration/bunjs-only-snippets/wasm-return-1-test.zig -femit-bin=integration/bunjs-only-snippets/wasm-return-1-test.wasm -target wasm32-freestanding
+	zig build-lib -OReleaseSmall test/bun.js/wasm-return-1-test.zig -femit-bin=test/bun.js/wasm-return-1-test.wasm -target wasm32-freestanding
 
 
 
@@ -1247,7 +1247,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/sqlite/%.cpp
 		$(EMIT_LLVM) \
 		-g3 -c -o $@ $<
 
-$(OBJ_DIR)/%.o: src/javascript/jsc/builtins/%.cpp
+$(OBJ_DIR)/%.o: src/bun.js/builtins/%.cpp
 	$(CXX) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(OPTIMIZATION_LEVEL) \
@@ -1258,8 +1258,8 @@ $(OBJ_DIR)/%.o: src/javascript/jsc/builtins/%.cpp
 		-g3 -c -o $@ $<
 
 sizegen:
-	$(CXX) src/javascript/jsc/headergen/sizegen.cpp -o $(BUN_TMP_DIR)/sizegen $(CLANG_FLAGS) -O1
-	$(BUN_TMP_DIR)/sizegen > src/javascript/jsc/bindings/sizes.zig
+	$(CXX) src/bun.js/headergen/sizegen.cpp -o $(BUN_TMP_DIR)/sizegen $(CLANG_FLAGS) -O1
+	$(BUN_TMP_DIR)/sizegen > src/bun.js/bindings/sizes.zig
 
 
 # Linux uses bundled SQLite3
@@ -1401,7 +1401,7 @@ run-unit:
 test: build-unit run-unit
 
 integration-test-dev: 
-	USE_EXISTING_PROCESS=true TEST_SERVER_URL=http://localhost:3000 node integration/scripts/browser.js
+	USE_EXISTING_PROCESS=true TEST_SERVER_URL=http://localhost:3000 node test/scripts/browser.js
 
 copy-install:
 	cp src/cli/install.sh ../bun.sh/docs/install.html
diff --git a/README.md b/README.md
index f151e83a3..4f7739df5 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ bun.js prefers Web API compatibility or node API compatibility instead of design
 - `.env` files automatically load into `process.env` and `Bun.env`
 - top level await
 
-The runtime uses JavaScriptCore, the JavaScript engine powering WebKit and Safari. Some web APIs like [`Headers`](https://developer.mozilla.org/en-US/docs/Web/API/Headers) and [`URL`](https://developer.mozilla.org/en-US/docs/Web/API/URL) directly use [Safari's implementation](https://github.com/Jarred-Sumner/bun/blob/e0011fd6baf2fe2b12d1b2a909981da1a183cdad/src/javascript/jsc/bindings/webcore/JSFetchHeaders.cpp#L1).
+The runtime uses JavaScriptCore, the JavaScript engine powering WebKit and Safari. Some web APIs like [`Headers`](https://developer.mozilla.org/en-US/docs/Web/API/Headers) and [`URL`](https://developer.mozilla.org/en-US/docs/Web/API/URL) directly use [Safari's implementation](https://github.com/Jarred-Sumner/bun/blob/e0011fd6baf2fe2b12d1b2a909981da1a183cdad/src/bun.js/bindings/webcore/JSFetchHeaders.cpp#L1).
 
 `cat` clone that runs [2x faster than GNU cat](https://twitter.com/jarredsumner/status/1511707890708586496) for large files on Linux
 
@@ -2667,7 +2667,7 @@ const out = encode_png(
 );
 ```
 
-The [auto-generated wrapper](https://github.com/Jarred-Sumner/bun/blob/c6d732eee2721cd6191672cbe2c57fb17c3fffe4/src/javascript/jsc/ffi.exports.js#L146-L148) converts the pointer to a TypedArray
+The [auto-generated wrapper](https://github.com/Jarred-Sumner/bun/blob/c6d732eee2721cd6191672cbe2c57fb17c3fffe4/src/bun.js/ffi.exports.js#L146-L148) converts the pointer to a TypedArray
 
 <details>
 
@@ -2766,7 +2766,7 @@ require("./my-node-module.node");
 import.meta.require("./my-node-module.node");
 ```
 
-Bun doesn't currently support dynamic requires, but `import.meta.require` is an escape hatch for that. It uses a [JavaScriptCore builtin function](https://github.com/Jarred-Sumner/bun/blob/aa87d40f4b7fdfb52575f44d151906ddba6a82d0/src/javascript/jsc/bindings/builtins/js/JSZigGlobalObject.js#L26).
+Bun doesn't currently support dynamic requires, but `import.meta.require` is an escape hatch for that. It uses a [JavaScriptCore builtin function](https://github.com/Jarred-Sumner/bun/blob/aa87d40f4b7fdfb52575f44d151906ddba6a82d0/src/bun.js/bindings/builtins/js/JSZigGlobalObject.js#L26).
 
 ### `Bun.Transpiler`
 
@@ -3092,7 +3092,7 @@ gh auth login
 gh repo clone Jarred-Sumner/bun . -- --depth=1 --progress -j8
 
 # update all submodules except webkit because webkit takes awhile and it's already compiled for you.
-git -c submodule."src/javascript/jsc/WebKit".update=none submodule update --init --recursive --depth=1 --progress
+git -c submodule."src/bun.js/WebKit".update=none submodule update --init --recursive --depth=1 --progress
 
 # Compile bun dependencies (zig is already compiled)
 make devcontainer
@@ -3153,7 +3153,7 @@ make vendor jsc identifier-cache dev
 First ensure the node dependencies are installed
 
 ```bash
-cd integration/snippets
+cd test/snippets
 npm i
 ```
 
diff --git a/bench/snippets/_fixture.txt b/bench/_fixture.txt
index d3c9bff5e..d3c9bff5e 100644
--- a/bench/snippets/_fixture.txt
+++ b/bench/_fixture.txt
diff --git a/bench/snippets/buffer-read.js b/bench/buffer-read.js
index 314f1d69e..5da645153 100644
--- a/bench/snippets/buffer-read.js
+++ b/bench/buffer-read.js
@@ -4,24 +4,28 @@ var buf = new Buffer(1024);
 var view = new DataView(buf.buffer);
 var INTERVAL = 9999999;
 var time = (name, fn) => {
-  for (let i = 0; i < INTERVAL; i++) fn();
+  console.log(name, fn());
+  //   for (let i = 0; i < INTERVAL; i++) fn();
 
-  console.time(name.padEnd("DataView.readBigUInt64 (LE)".length));
-  for (let i = 0; i < INTERVAL; i++) fn();
-  console.timeEnd(name.padEnd("DataView.readBigUInt64 (LE)".length));
-};
+  //   console.time(name.padEnd("DataView.readBigUInt64 (LE)".length));
+  //   for (let i = 0; i < INTERVAL; i++) fn();
+  //   console.timeEnd(name.padEnd("DataView.readBigUInt64 (LE)".length));
+  // };
 
-console.log(
-  `Run ${new Intl.NumberFormat().format(INTERVAL)} times with a warmup:`,
-  "\n"
-);
+  // console.log(
+  //   `Run ${new Intl.NumberFormat().format(INTERVAL)} times with a warmup:`,
+  //   "\n"
+};
 var array = new Uint8Array(1024);
+new Uint8Array(buf.buffer).fill(255);
 time("Buffer[]     ", () => buf[0]);
 time("Uint8Array[]", () => array[0]);
 console.log("");
 
 time("Buffer.getBigInt64BE     ", () => buf.readBigInt64BE(0));
-time("DataView.getBigInt64 (BE)", () => view.getBigInt64(0, false));
+time("DataView.getBigInt64 (BE)", () =>
+  view.getBigInt64(0, false).toString(10)
+);
 console.log("");
 
 time("Buffer.readBigInt64LE     ", () => buf.readBigInt64LE(0));
diff --git a/bench/snippets/buffer.js b/bench/buffer.js
index 9ababbf35..9ababbf35 100644
--- a/bench/snippets/buffer.js
+++ b/bench/buffer.js
diff --git a/bench/snippets/callbacks-overhead.mjs b/bench/callbacks-overhead.mjs
index 65171145c..65171145c 100644
--- a/bench/snippets/callbacks-overhead.mjs
+++ b/bench/callbacks-overhead.mjs
diff --git a/bench/snippets/cat.bun.js b/bench/cat.bun.js
index 1bb1c809a..1bb1c809a 100644
--- a/bench/snippets/cat.bun.js
+++ b/bench/cat.bun.js
diff --git a/bench/snippets/cat.mjs b/bench/cat.mjs
index ca6dfe838..ca6dfe838 100644
--- a/bench/snippets/cat.mjs
+++ b/bench/cat.mjs
diff --git a/bench/snippets/cat.node.js b/bench/cat.node.js
index d38d7c537..d38d7c537 100644
--- a/bench/snippets/cat.node.js
+++ b/bench/cat.node.js
diff --git a/bench/snippets/concat.js b/bench/concat.js
index 46c6e0f7d..46c6e0f7d 100644
--- a/bench/snippets/concat.js
+++ b/bench/concat.js
diff --git a/bench/snippets/copy.bun.js b/bench/copy.bun.js
index 20269212a..20269212a 100644
--- a/bench/snippets/copy.bun.js
+++ b/bench/copy.bun.js
diff --git a/bench/snippets/copyfile.mjs b/bench/copyfile.mjs
index 9db9faefe..9db9faefe 100644
--- a/bench/snippets/copyfile.mjs
+++ b/bench/copyfile.mjs
diff --git a/bench/snippets/escapeHTML.js b/bench/escapeHTML.js
index f186b1d2f..f186b1d2f 100644
--- a/bench/snippets/escapeHTML.js
+++ b/bench/escapeHTML.js
diff --git a/bench/snippets/exists.js b/bench/exists.js
index 1d1d6cfe0..1d1d6cfe0 100644
--- a/bench/snippets/exists.js
+++ b/bench/exists.js
diff --git a/bench/snippets/gzip.js b/bench/gzip.js
index 6d9971b39..6d9971b39 100644
--- a/bench/snippets/gzip.js
+++ b/bench/gzip.js
diff --git a/bench/snippets/gzip.node.mjs b/bench/gzip.node.mjs
index d93104850..d93104850 100644
--- a/bench/snippets/gzip.node.mjs
+++ b/bench/gzip.node.mjs
diff --git a/bench/snippets/jsx-entity-decoding.jsx b/bench/jsx-entity-decoding.jsx
index 29834d781..29834d781 100644
--- a/bench/snippets/jsx-entity-decoding.jsx
+++ b/bench/jsx-entity-decoding.jsx
diff --git a/bench/snippets/noop.js b/bench/noop.js
index 789e6abbb..789e6abbb 100644
--- a/bench/snippets/noop.js
+++ b/bench/noop.js
diff --git a/bench/snippets/package.json b/bench/package.json
index 1025e4fd8..1025e4fd8 100644
--- a/bench/snippets/package.json
+++ b/bench/package.json
diff --git a/bench/snippets/realpath.mjs b/bench/realpath.mjs
index 9c3793d80..9c3793d80 100644
--- a/bench/snippets/realpath.mjs
+++ b/bench/realpath.mjs
diff --git a/bench/snippets/render.js b/bench/render.js
index 9ef70bc27..9ef70bc27 100644
--- a/bench/snippets/render.js
+++ b/bench/render.js
diff --git a/bench/snippets/scanner/bun.lockb b/bench/scanner/bun.lockb
index 90bb78996..90bb78996 100755
--- a/bench/snippets/scanner/bun.lockb
+++ b/bench/scanner/bun.lockb
diff --git a/bench/snippets/scanner/package.json b/bench/scanner/package.json
index 7bb4e8990..7bb4e8990 100644
--- a/bench/snippets/scanner/package.json
+++ b/bench/scanner/package.json
diff --git a/bench/snippets/scanner/remix-route.ts b/bench/scanner/remix-route.ts
index dbacf3a4c..dbacf3a4c 100644
--- a/bench/snippets/scanner/remix-route.ts
+++ b/bench/scanner/remix-route.ts
diff --git a/bench/snippets/scanner/scan-imports-only.js b/bench/scanner/scan-imports-only.js
index 53222d57c..53222d57c 100644
--- a/bench/snippets/scanner/scan-imports-only.js
+++ b/bench/scanner/scan-imports-only.js
diff --git a/bench/snippets/scanner/scan.bun.js b/bench/scanner/scan.bun.js
index eb2b09452..eb2b09452 100644
--- a/bench/snippets/scanner/scan.bun.js
+++ b/bench/scanner/scan.bun.js
diff --git a/bench/snippets/scanner/scan.node-esbuild.mjs b/bench/scanner/scan.node-esbuild.mjs
index 1a7fa79d8..1a7fa79d8 100644
--- a/bench/snippets/scanner/scan.node-esbuild.mjs
+++ b/bench/scanner/scan.node-esbuild.mjs
diff --git a/bench/snippets/transpiler.mjs b/bench/transpiler.mjs
index 6872d88b7..6872d88b7 100644
--- a/bench/snippets/transpiler.mjs
+++ b/bench/transpiler.mjs
diff --git a/bun.lockb b/bun.lockb
index b4fe11747..cee4b7721 100755
--- a/bun.lockb
+++ b/bun.lockb
diff --git a/docs/upgrading-webkit.md b/docs/upgrading-webkit.md
index 39b5c3efc..dc67e9e09 100644
--- a/docs/upgrading-webkit.md
+++ b/docs/upgrading-webkit.md
@@ -12,7 +12,7 @@ It's important to periodically update WebKit for many reasons:
 To upgrade, first find the commit in **bun's WebKit fork** (not bun!) between when we last upgraded and now.
 
 ```bash
-cd src/javascript/jsc/WebKit # In the WebKit directory! not bun
+cd src/bun.js/WebKit # In the WebKit directory! not bun
 git checkout $COMMIT
 ```
 
@@ -38,7 +38,7 @@ Make sure that JSC's CLI is able to load successfully. This verifies that the bu
 You know this worked when it printed help options. If it complains about symbols, crashes, or anything else that looks wrong, something is wrong.
 
 ```bash
-src/javascript/jsc/WebKit/WebKitBuild/Release/bin/jsc --help
+src/bun.js/WebKit/WebKitBuild/Release/bin/jsc --help
 ```
 
 Then, clear out our bindings and regenerate the C++<>Zig headers:
diff --git a/integration/bunjs-only-snippets/buffer.test.js b/integration/bunjs-only-snippets/buffer.test.js
deleted file mode 100644
index dd5327ca3..000000000
--- a/integration/bunjs-only-snippets/buffer.test.js
+++ /dev/null
@@ -1,305 +0,0 @@
-import { gc } from "bun";
-import { describe, it, expect, beforeEach, afterEach } from "bun:test";
-import { gc } from "./gc";
-
-beforeEach(() => gc());
-afterEach(() => gc());
-
-it("buffer", () => {
-  var buf = new Buffer(20);
-  gc();
-  // if this fails or infinitely loops, it means there is a memory issue with the JSC::Structure object
-  expect(Object.keys(buf).length > 0).toBe(true);
-  gc();
-  expect(buf.write("hello world ")).toBe(12);
-  expect(buf.write("hello world ", "utf8")).toBe(12);
-
-  gc();
-  expect(buf.toString("utf8", 0, "hello world ".length)).toBe("hello world ");
-  gc();
-  expect(buf.toString("base64url", 0, "hello world ".length)).toBe(
-    btoa("hello world ")
-  );
-  gc();
-  expect(buf instanceof Uint8Array).toBe(true);
-  gc();
-  expect(buf instanceof Buffer).toBe(true);
-  gc();
-  expect(buf.slice() instanceof Uint8Array).toBe(true);
-  gc();
-  expect(buf.slice(0, 1) instanceof Buffer).toBe(true);
-  gc();
-  expect(buf.slice(0, 1) instanceof Uint8Array).toBe(true);
-  gc();
-  expect(buf.slice(0, 1) instanceof Buffer).toBe(true);
-  gc();
-});
-
-it("Buffer", () => {
-  var inputs = [
-    "hello world",
-    "hello world".repeat(100),
-    `😋 Get Emoji — All Emojis to ✂️ Copy and 📋 Paste 👌`,
-  ];
-  var good = inputs.map((a) => new TextEncoder().encode(a));
-  for (let i = 0; i < inputs.length; i++) {
-    var input = inputs[i];
-    expect(new Buffer(input).toString("utf8")).toBe(inputs[i]);
-    gc();
-    expect(Array.from(new Buffer(input)).join(",")).toBe(good[i].join(","));
-    gc();
-    expect(Buffer.byteLength(input)).toBe(good[i].length);
-    gc();
-    expect(Buffer.from(input).byteLength).toBe(Buffer.byteLength(input));
-  }
-});
-
-it("Buffer.byteLength", () => {
-  expect(Buffer.byteLength("😀😃😄😁😆😅😂🤣☺️😊😊😇")).toBe(
-    new TextEncoder().encode("😀😃😄😁😆😅😂🤣☺️😊😊😇").byteLength
-  );
-});
-
-it("Buffer.isBuffer", () => {
-  expect(Buffer.isBuffer(new Buffer(1))).toBe(true);
-  gc();
-  expect(Buffer.isBuffer(new Buffer(0))).toBe(true);
-  gc();
-  expect(Buffer.isBuffer(new Uint8Array(0))).toBe(false);
-  gc();
-  expect(Buffer.isBuffer(new Uint8Array(1))).toBe(false);
-  gc();
-  var a = new Uint8Array(1);
-  gc();
-  expect(Buffer.isBuffer(a)).toBe(false);
-  gc();
-  Buffer.toBuffer(a);
-  gc();
-  expect(Buffer.isBuffer(a)).toBe(true);
-  gc();
-});
-
-it("Buffer.toBuffer throws", () => {
-  const checks = [
-    [],
-    {},
-    "foo",
-    new Uint16Array(),
-    new DataView(new Uint8Array(14).buffer),
-  ];
-  for (let i = 0; i < checks.length; i++) {
-    try {
-      Buffer.toBuffer(checks[i]);
-      expect(false).toBe(true);
-    } catch (exception) {
-      expect(exception.message).toBe("Expected Uint8Array");
-    }
-  }
-  expect(true).toBe(true);
-});
-
-it("Buffer.toBuffer works", () => {
-  var array = new Uint8Array(20);
-  expect(array instanceof Buffer).toBe(false);
-  var buf = Buffer.toBuffer(array);
-  expect(array instanceof Buffer).toBe(true);
-  // if this fails or infinitely loops, it means there is a memory issue with the JSC::Structure object
-  expect(Object.keys(buf).length > 0).toBe(true);
-
-  expect(buf.write("hello world ")).toBe(12);
-  gc();
-  expect(buf.toString("utf8", 0, "hello world ".length)).toBe("hello world ");
-  gc();
-  expect(buf.toString("base64url", 0, "hello world ".length)).toBe(
-    btoa("hello world ")
-  );
-  gc();
-
-  expect(buf instanceof Uint8Array).toBe(true);
-  expect(buf instanceof Buffer).toBe(true);
-  expect(buf.slice() instanceof Uint8Array).toBe(true);
-  expect(buf.slice(0, 1) instanceof Buffer).toBe(true);
-  expect(buf.slice(0, 1) instanceof Uint8Array).toBe(true);
-  expect(buf.slice(0, 1) instanceof Buffer).toBe(true);
-  expect(new Buffer(buf) instanceof Buffer).toBe(true);
-  expect(new Buffer(buf.buffer) instanceof Buffer).toBe(true);
-});
-
-it("writeInt", () => {
-  var buf = new Buffer(1024);
-  var data = new DataView(buf.buffer);
-  buf.writeInt32BE(100);
-  expect(data.getInt32(0, false)).toBe(100);
-  buf.writeInt32BE(100);
-  expect(data.getInt32(0, false)).toBe(100);
-  var childBuf = buf.subarray(0, 4);
-  expect(data.getInt32(0, false)).toBe(100);
-  expect(childBuf.readInt32BE(0, false)).toBe(100);
-});
-
-it("Buffer.from", () => {
-  expect(Buffer.from("hello world").toString("utf8")).toBe("hello world");
-  expect(Buffer.from("hello world", "ascii").toString("utf8")).toBe(
-    "hello world"
-  );
-  expect(Buffer.from("hello world", "latin1").toString("utf8")).toBe(
-    "hello world"
-  );
-  gc();
-  expect(Buffer.from([254]).join(",")).toBe("254");
-  expect(Buffer.from(123).join(",")).toBe(Uint8Array.from(123).join(","));
-  expect(Buffer.from({ length: 124 }).join(",")).toBe(
-    Uint8Array.from({ length: 124 }).join(",")
-  );
-
-  expect(Buffer.from(new ArrayBuffer(1024), 0, 512).join(",")).toBe(
-    new Uint8Array(512).join(",")
-  );
-
-  expect(Buffer.from(new Buffer(new ArrayBuffer(1024), 0, 512)).join(",")).toBe(
-    new Uint8Array(512).join(",")
-  );
-  gc();
-});
-
-it("Buffer.equals", () => {
-  var a = new Uint8Array(10);
-  a[2] = 1;
-  var b = new Uint8Array(10);
-  b[2] = 1;
-  Buffer.toBuffer(a);
-  Buffer.toBuffer(b);
-  expect(a.equals(b)).toBe(true);
-  b[2] = 0;
-  expect(a.equals(b)).toBe(false);
-});
-
-it("Buffer.compare", () => {
-  var a = new Uint8Array(10);
-  a[2] = 1;
-  var b = new Uint8Array(10);
-  b[2] = 1;
-  Buffer.toBuffer(a);
-  Buffer.toBuffer(b);
-  expect(a.compare(b)).toBe(0);
-  b[2] = 0;
-  expect(a.compare(b)).toBe(1);
-  expect(b.compare(a)).toBe(-1);
-});
-
-it("Buffer.copy", () => {
-  var array1 = new Uint8Array(128);
-  array1.fill(100);
-  Buffer.toBuffer(array1);
-  var array2 = new Uint8Array(128);
-  array2.fill(200);
-  Buffer.toBuffer(array2);
-  var array3 = new Uint8Array(128);
-  Buffer.toBuffer(array3);
-  gc();
-  expect(array1.copy(array2)).toBe(128);
-  expect(array1.join("")).toBe(array2.join(""));
-});
-
-it("Buffer.concat", () => {
-  var array1 = new Uint8Array(128);
-  array1.fill(100);
-  var array2 = new Uint8Array(128);
-  array2.fill(200);
-  var array3 = new Uint8Array(128);
-  array3.fill(300);
-  gc();
-  expect(Buffer.concat([array1, array2, array3]).join("")).toBe(
-    array1.join("") + array2.join("") + array3.join("")
-  );
-  expect(Buffer.concat([array1, array2, array3], 222).length).toBe(222);
-  expect(
-    Buffer.concat([array1, array2, array3], 222).subarray(0, 128).join("")
-  ).toBe("100".repeat(128));
-  expect(
-    Buffer.concat([array1, array2, array3], 222).subarray(129, 222).join("")
-  ).toBe("200".repeat(222 - 129));
-});
-
-it("read", () => {
-  var buf = new Buffer(1024);
-  var data = new DataView(buf.buffer);
-  function reset() {
-    new Uint8Array(buf.buffer).fill(0);
-  }
-  data.setBigInt64(0, BigInt(1000), false);
-  expect(buf.readBigInt64BE(0)).toBe(BigInt(1000));
-  reset();
-
-  data.setBigInt64(0, BigInt(1000), false);
-  expect(buf.readBigInt64LE(0)).toBe(BigInt(1000));
-  reset();
-
-  data.setBigUint64(0, BigInt(1000), false);
-  expect(buf.readBigUInt64BE(0)).toBe(BigInt(1000));
-  reset();
-
-  data.setBigUint64(0, BigInt(1000), false);
-  expect(buf.readBigUInt64LE(0)).toBe(BigInt(1000));
-  reset();
-
-  data.setFloat64(0, 1000, false);
-  expect(buf.readDoubleBE(0)).toBe(1000);
-  reset();
-
-  data.setFloat64(0, 1000, true);
-  expect(buf.readDoubleLE(0)).toBe(1000);
-  reset();
-
-  data.setFloat32(0, 1000, false);
-  expect(buf.readFloatBE(0)).toBe(1000);
-  reset();
-
-  data.setFloat32(0, 1000, true);
-  expect(buf.readFloatLE(0)).toBe(1000);
-  reset();
-
-  data.setInt16(0, 1000, false);
-  expect(buf.readInt16BE(0)).toBe(1000);
-  reset();
-
-  data.setInt16(0, 1000, true);
-  expect(buf.readInt16LE(0)).toBe(1000);
-  reset();
-
-  data.setInt32(0, 1000, false);
-  expect(buf.readInt32BE(0)).toBe(1000);
-  reset();
-
-  data.setInt32(0, 1000, true);
-  expect(buf.readInt32LE(0)).toBe(1000);
-  reset();
-
-  data.setInt8(0, 100, false);
-  expect(buf.readInt8(0)).toBe(100);
-  reset();
-
-  data.setUint16(0, 1000, false);
-  expect(buf.readUInt16BE(0)).toBe(1000);
-  reset();
-
-  data.setUint16(0, 1000, true);
-  expect(buf.readUInt16LE(0)).toBe(1000);
-  reset();
-
-  data.setUint32(0, 1000, false);
-  expect(buf.readUInt32BE(0)).toBe(1000);
-  reset();
-
-  data.setUint32(0, 1000, true);
-  expect(buf.readUInt32LE(0)).toBe(1000);
-  reset();
-
-  data.setUint8(0, 255, false);
-  expect(buf.readUInt8(0)).toBe(255);
-  reset();
-
-  data.setUint8(0, 255, false);
-  expect(buf.readUInt8(0)).toBe(255);
-  reset();
-});
diff --git a/integration/bunjs-only-snippets/ffi.test.js b/integration/bunjs-only-snippets/ffi.test.js
deleted file mode 100644
index b8d79887b..000000000
--- a/integration/bunjs-only-snippets/ffi.test.js
+++ /dev/null
@@ -1,537 +0,0 @@
-import { describe, it, expect } from "bun:test";
-import { unsafe } from "bun";
-//
-import {
-  native,
-  viewSource,
-  dlopen,
-  CString,
-  ptr,
-  toBuffer,
-  toArrayBuffer,
-  FFIType,
-  callback,
-  CFunction,
-} from "bun:ffi";
-
-it("ffi print", async () => {
-  await Bun.write(
-    import.meta.dir + "/ffi.test.fixture.callback.c",
-    viewSource(
-      {
-        returns: "bool",
-        args: ["ptr"],
-      },
-      true
-    )
-  );
-  await Bun.write(
-    import.meta.dir + "/ffi.test.fixture.receiver.c",
-    viewSource(
-      {
-        not_a_callback: {
-          returns: "float",
-          args: ["float"],
-        },
-      },
-      false
-    )[0]
-  );
-  expect(
-    viewSource(
-      {
-        returns: "int8_t",
-        args: [],
-      },
-      true
-    ).length > 0
-  ).toBe(true);
-  expect(
-    viewSource(
-      {
-        a: {
-          returns: "int8_t",
-          args: [],
-        },
-      },
-      false
-    ).length > 0
-  ).toBe(true);
-});
-
-function getTypes(fast) {
-  const int64_t = fast ? "i64_fast" : "int64_t";
-  const uint64_t = fast ? "u64_fast" : "uint64_t";
-  return {
-    returns_true: {
-      returns: "bool",
-      args: [],
-    },
-    returns_false: {
-      returns: "bool",
-      args: [],
-    },
-    returns_42_char: {
-      returns: "char",
-      args: [],
-    },
-    returns_42_float: {
-      returns: "float",
-      args: [],
-    },
-    returns_42_double: {
-      returns: "double",
-      args: [],
-    },
-    returns_42_uint8_t: {
-      returns: "uint8_t",
-      args: [],
-    },
-    returns_neg_42_int8_t: {
-      returns: "int8_t",
-      args: [],
-    },
-    returns_42_uint16_t: {
-      returns: "uint16_t",
-      args: [],
-    },
-    returns_42_uint32_t: {
-      returns: "uint32_t",
-      args: [],
-    },
-    returns_42_uint64_t: {
-      returns: uint64_t,
-      args: [],
-    },
-    returns_neg_42_int16_t: {
-      returns: "int16_t",
-      args: [],
-    },
-    returns_neg_42_int32_t: {
-      returns: "int32_t",
-      args: [],
-    },
-    returns_neg_42_int64_t: {
-      returns: int64_t,
-      args: [],
-    },
-
-    identity_char: {
-      returns: "char",
-      args: ["char"],
-    },
-    identity_float: {
-      returns: "float",
-      args: ["float"],
-    },
-    identity_bool: {
-      returns: "bool",
-      args: ["bool"],
-    },
-    identity_double: {
-      returns: "double",
-      args: ["double"],
-    },
-    identity_int8_t: {
-      returns: "int8_t",
-      args: ["int8_t"],
-    },
-    identity_int16_t: {
-      returns: "int16_t",
-      args: ["int16_t"],
-    },
-    identity_int32_t: {
-      returns: "int32_t",
-      args: ["int32_t"],
-    },
-    identity_int64_t: {
-      returns: int64_t,
-      args: [int64_t],
-    },
-    identity_uint8_t: {
-      returns: "uint8_t",
-      args: ["uint8_t"],
-    },
-    identity_uint16_t: {
-      returns: "uint16_t",
-      args: ["uint16_t"],
-    },
-    identity_uint32_t: {
-      returns: "uint32_t",
-      args: ["uint32_t"],
-    },
-    identity_uint64_t: {
-      returns: uint64_t,
-      args: [uint64_t],
-    },
-
-    add_char: {
-      returns: "char",
-      args: ["char", "char"],
-    },
-    add_float: {
-      returns: "float",
-      args: ["float", "float"],
-    },
-    add_double: {
-      returns: "double",
-      args: ["double", "double"],
-    },
-    add_int8_t: {
-      returns: "int8_t",
-      args: ["int8_t", "int8_t"],
-    },
-    add_int16_t: {
-      returns: "int16_t",
-      args: ["int16_t", "int16_t"],
-    },
-    add_int32_t: {
-      returns: "int32_t",
-      args: ["int32_t", "int32_t"],
-    },
-    add_int64_t: {
-      returns: int64_t,
-      args: [int64_t, int64_t],
-    },
-    add_uint8_t: {
-      returns: "uint8_t",
-      args: ["uint8_t", "uint8_t"],
-    },
-    add_uint16_t: {
-      returns: "uint16_t",
-      args: ["uint16_t", "uint16_t"],
-    },
-    add_uint32_t: {
-      returns: "uint32_t",
-      args: ["uint32_t", "uint32_t"],
-    },
-
-    does_pointer_equal_42_as_int32_t: {
-      returns: "bool",
-      args: ["ptr"],
-    },
-
-    ptr_should_point_to_42_as_int32_t: {
-      returns: "ptr",
-      args: [],
-    },
-    identity_ptr: {
-      returns: "ptr",
-      args: ["ptr"],
-    },
-    add_uint64_t: {
-      returns: uint64_t,
-      args: [uint64_t, uint64_t],
-    },
-
-    cb_identity_true: {
-      returns: "bool",
-      args: ["ptr"],
-    },
-    cb_identity_false: {
-      returns: "bool",
-      args: ["ptr"],
-    },
-    cb_identity_42_char: {
-      returns: "char",
-      args: ["ptr"],
-    },
-    cb_identity_42_float: {
-      returns: "float",
-      args: ["ptr"],
-    },
-    cb_identity_42_double: {
-      returns: "double",
-      args: ["ptr"],
-    },
-    cb_identity_42_uint8_t: {
-      returns: "uint8_t",
-      args: ["ptr"],
-    },
-    cb_identity_neg_42_int8_t: {
-      returns: "int8_t",
-      args: ["ptr"],
-    },
-    cb_identity_42_uint16_t: {
-      returns: "uint16_t",
-      args: ["ptr"],
-    },
-    cb_identity_42_uint32_t: {
-      returns: "uint32_t",
-      args: ["ptr"],
-    },
-    cb_identity_42_uint64_t: {
-      returns: uint64_t,
-      args: ["ptr"],
-    },
-    cb_identity_neg_42_int16_t: {
-      returns: "int16_t",
-      args: ["ptr"],
-    },
-    cb_identity_neg_42_int32_t: {
-      returns: "int32_t",
-      args: ["ptr"],
-    },
-    cb_identity_neg_42_int64_t: {
-      returns: int64_t,
-      args: ["ptr"],
-    },
-
-    return_a_function_ptr_to_function_that_returns_true: {
-      returns: "ptr",
-      args: [],
-    },
-  };
-}
-
-function ffiRunner(types) {
-  const {
-    symbols: {
-      returns_true,
-      returns_false,
-      return_a_function_ptr_to_function_that_returns_true,
-      returns_42_char,
-      returns_42_float,
-      returns_42_double,
-      returns_42_uint8_t,
-      returns_neg_42_int8_t,
-      returns_42_uint16_t,
-      returns_42_uint32_t,
-      returns_42_uint64_t,
-      returns_neg_42_int16_t,
-      returns_neg_42_int32_t,
-      returns_neg_42_int64_t,
-      identity_char,
-      identity_float,
-      identity_bool,
-      identity_double,
-      identity_int8_t,
-      identity_int16_t,
-      identity_int32_t,
-      identity_int64_t,
-      identity_uint8_t,
-      identity_uint16_t,
-      identity_uint32_t,
-      identity_uint64_t,
-      add_char,
-      add_float,
-      add_double,
-      add_int8_t,
-      add_int16_t,
-      add_int32_t,
-      add_int64_t,
-      add_uint8_t,
-      add_uint16_t,
-      identity_ptr,
-      add_uint32_t,
-      add_uint64_t,
-      does_pointer_equal_42_as_int32_t,
-      ptr_should_point_to_42_as_int32_t,
-      cb_identity_true,
-      cb_identity_false,
-      cb_identity_42_char,
-      cb_identity_42_float,
-      cb_identity_42_double,
-      cb_identity_42_uint8_t,
-      cb_identity_neg_42_int8_t,
-      cb_identity_42_uint16_t,
-      cb_identity_42_uint32_t,
-      cb_identity_42_uint64_t,
-      cb_identity_neg_42_int16_t,
-      cb_identity_neg_42_int32_t,
-      cb_identity_neg_42_int64_t,
-    },
-    close,
-  } = dlopen("/tmp/bun-ffi-test.dylib", types);
-
-  expect(returns_true()).toBe(true);
-
-  expect(returns_false()).toBe(false);
-
-  expect(returns_42_char()).toBe(42);
-  expect(returns_42_uint64_t().valueOf()).toBe(42);
-
-  expect(Math.fround(returns_42_float())).toBe(Math.fround(42.41999804973602));
-  expect(returns_42_double()).toBe(42.42);
-  expect(returns_42_uint8_t()).toBe(42);
-  expect(returns_neg_42_int8_t()).toBe(-42);
-  expect(returns_42_uint16_t()).toBe(42);
-  expect(returns_42_uint32_t()).toBe(42);
-  expect(returns_42_uint64_t()).toBe(42);
-  expect(returns_neg_42_int16_t()).toBe(-42);
-  expect(returns_neg_42_int32_t()).toBe(-42);
-  expect(identity_int32_t(10)).toBe(10);
-  expect(returns_neg_42_int64_t()).toBe(-42);
-
-  expect(identity_char(10)).toBe(10);
-
-  expect(identity_float(10.199999809265137)).toBe(10.199999809265137);
-
-  expect(identity_bool(true)).toBe(true);
-
-  expect(identity_bool(false)).toBe(false);
-  expect(identity_double(10.100000000000364)).toBe(10.100000000000364);
-
-  expect(identity_int8_t(10)).toBe(10);
-  expect(identity_int16_t(10)).toBe(10);
-  expect(identity_int64_t(10)).toBe(10);
-  expect(identity_uint8_t(10)).toBe(10);
-  expect(identity_uint16_t(10)).toBe(10);
-  expect(identity_uint32_t(10)).toBe(10);
-  expect(identity_uint64_t(10)).toBe(10);
-
-  var bigArray = new BigUint64Array(8);
-  new Uint8Array(bigArray.buffer).fill(255);
-  var bigIntArray = new BigInt64Array(bigArray.buffer);
-  expect(identity_uint64_t(bigArray[0])).toBe(bigArray[0]);
-  expect(identity_uint64_t(bigArray[0] - BigInt(1))).toBe(
-    bigArray[0] - BigInt(1)
-  );
-  expect(add_uint64_t(BigInt(-1) * bigArray[0], bigArray[0])).toBe(0);
-  expect(add_uint64_t(BigInt(-1) * bigArray[0] + BigInt(10), bigArray[0])).toBe(
-    10
-  );
-  expect(identity_uint64_t(0)).toBe(0);
-  expect(identity_uint64_t(100)).toBe(100);
-  expect(identity_uint64_t(BigInt(100))).toBe(100);
-  expect(identity_int64_t(bigIntArray[0])).toBe(bigIntArray[0]);
-  expect(identity_int64_t(bigIntArray[0] - BigInt(1))).toBe(
-    bigIntArray[0] - BigInt(1)
-  );
-
-  expect(add_char(1, 1)).toBe(2);
-  expect(add_float(2.4, 2.8)).toBe(Math.fround(5.2));
-  expect(add_double(4.2, 0.1)).toBe(4.3);
-  expect(add_int8_t(1, 1)).toBe(2);
-  expect(add_int16_t(1, 1)).toBe(2);
-  expect(add_int32_t(1, 1)).toBe(2);
-  expect(add_int64_t(1, 1)).toBe(2);
-  expect(add_uint8_t(1, 1)).toBe(2);
-  expect(add_uint16_t(1, 1)).toBe(2);
-  expect(add_uint32_t(1, 1)).toBe(2);
-
-  const cptr = ptr_should_point_to_42_as_int32_t();
-  expect(cptr != 0).toBe(true);
-  expect(typeof cptr === "number").toBe(true);
-  expect(does_pointer_equal_42_as_int32_t(cptr)).toBe(true);
-  const buffer = toBuffer(cptr, 0, 4);
-  expect(buffer.readInt32(0)).toBe(42);
-  expect(new DataView(toArrayBuffer(cptr, 0, 4), 0, 4).getInt32(0, true)).toBe(
-    42
-  );
-  expect(ptr(buffer)).toBe(cptr);
-  expect(new CString(cptr, 0, 1).toString()).toBe("*");
-  expect(identity_ptr(cptr)).toBe(cptr);
-  const second_ptr = ptr(new Buffer(8));
-  expect(identity_ptr(second_ptr)).toBe(second_ptr);
-
-  var myCFunction = new CFunction({
-    ptr: return_a_function_ptr_to_function_that_returns_true(),
-    returns: "bool",
-  });
-  expect(myCFunction()).toBe(true);
-
-  // function identityBool() {
-  //   return true;
-  // }
-  // globalThis.identityBool = identityBool;
-
-  // const first = native.callback(
-  //   {
-  //     returns: "bool",
-  //   },
-  //   identityBool
-  // );
-  // expect(
-  // cb_identity_true()
-  // ).toBe(true);
-
-  // expect(cb_identity_true(first)).toBe(true);
-
-  // expect(
-  //   cb_identity_false(
-  //     callback(
-  //       {
-  //         returns: "bool",
-  //       },
-  //       () => false
-  //     )
-  //   )
-  // ).toBe(false);
-
-  // expect(
-  //   cb_identity_42_char(
-  //     callback(
-  //       {
-  //         returns: "char",
-  //       },
-  //       () => 42
-  //     )
-  //   )
-  // ).toBe(42);
-  // expect(
-  //   cb_identity_42_uint8_t(
-  //     callback(
-  //       {
-  //         returns: "uint8_t",
-  //       },
-  //       () => 42
-  //     )
-  //   )
-  // ).toBe(42);
-
-  // cb_identity_neg_42_int8_t(
-  //   callback(
-  //     {
-  //       returns: "int8_t",
-  //     },
-  //     () => -42
-  //   )
-  // ).toBe(-42);
-
-  // cb_identity_42_uint16_t(
-  //   callback(
-  //     {
-  //       returns: "uint16_t",
-  //     },
-  //     () => 42
-  //   )
-  // ).toBe(42);
-
-  // cb_identity_42_uint32_t(
-  //   callback(
-  //     {
-  //       returns: "uint32_t",
-  //     },
-  //     () => 42
-  //   )
-  // ).toBe(42);
-
-  // cb_identity_neg_42_int16_t(
-  //   callback(
-  //     {
-  //       returns: "int16_t",
-  //     },
-  //     () => -42
-  //   )
-  // ).toBe(-42);
-
-  // cb_identity_neg_42_int32_t(
-  //   callback(
-  //     {
-  //       returns: "int32_t",
-  //     },
-  //     () => -42
-  //   )
-  // ).toBe(-42);
-
-  close();
-}
-
-it("run ffi fast", () => {
-  ffiRunner(getTypes(true));
-});
-
-it("run ffi", () => {
-  ffiRunner(getTypes(false));
-});
diff --git a/misctools/headers-cleaner.zig b/misctools/headers-cleaner.zig
index 161573938..4715a2c97 100644
--- a/misctools/headers-cleaner.zig
+++ b/misctools/headers-cleaner.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 
 pub fn main() anyerror!void {
     const headers_zig_file_src: std.builtin.SourceLocation = @src();
-    var paths = [_][]const u8{ std.mem.span(headers_zig_file_src.file), "../../src/javascript/jsc/bindings/headers.zig" };
+    var paths = [_][]const u8{ std.mem.span(headers_zig_file_src.file), "../../src/bun.js/bindings/headers.zig" };
     const headers_zig_file = try std.fs.path.resolve(std.heap.c_allocator, &paths);
     std.debug.print("Writing to {s}", .{headers_zig_file});
     var headers_zig: std.fs.File = try std.fs.openFileAbsolute(headers_zig_file, .{ .mode = .read_write });
diff --git a/misctools/http_bench.zig b/misctools/http_bench.zig
index 2884fdd28..40938b172 100644
--- a/misctools/http_bench.zig
+++ b/misctools/http_bench.zig
@@ -12,7 +12,7 @@ const C = bun.C;
 const clap = @import("../src/deps/zig-clap/clap.zig");
 
 const URL = @import("../src/url.zig").URL;
-const Headers = @import("../src/javascript/jsc/webcore/response.zig").Headers;
+const Headers = @import("../src/bun.js/webcore/response.zig").Headers;
 const Method = @import("../src/http/method.zig").Method;
 const ColonListType = @import("../src/cli/colon_list_type.zig").ColonListType;
 const HeadersTuple = ColonListType(string, noop_resolver);
diff --git a/src/bindgen.zig b/src/bindgen.zig
index adca78331..919ae4eaa 100644
--- a/src/bindgen.zig
+++ b/src/bindgen.zig
@@ -1,5 +1,5 @@
 pub const bindgen = true;
 
-pub const main = @import("./javascript/jsc/bindings/bindings-generator.zig").main;
+pub const main = @import("./bun.js/bindings/bindings-generator.zig").main;
 pub export fn PLCrashReportHandler(_: ?*anyopaque) void {}
 pub export fn mkdirp(_: ?*anyopaque) void {}
diff --git a/src/javascript/jsc/WebKit b/src/bun.js/WebKit
-Subproject 259c1c815bef5be18722910a2652684059851b8
+Subproject 259c1c815bef5be18722910a2652684059851b8
diff --git a/src/javascript/jsc/api/FFI.h b/src/bun.js/api/FFI.h
index 75ac3171d..e17e15d30 100644
--- a/src/javascript/jsc/api/FFI.h
+++ b/src/bun.js/api/FFI.h
@@ -1,6 +1,6 @@
 // This file is part of Bun!
 // You can find the original source:
-// https://github.com/Jarred-Sumner/bun/blob/main/src/javascript/jsc/api/FFI.h#L2
+// https://github.com/Jarred-Sumner/bun/blob/main/src/bun.js/api/FFI.h#L2
 //
 // clang-format off
 // This file is only compatible with 64 bit CPUs
diff --git a/src/javascript/jsc/api/bun.zig b/src/bun.js/api/bun.zig
index f062a5130..c5831ed59 100644
--- a/src/javascript/jsc/api/bun.zig
+++ b/src/bun.js/api/bun.zig
@@ -1,81 +1,81 @@
 const Bun = @This();
-const default_allocator = @import("../../../global.zig").default_allocator;
-const bun = @import("../../../global.zig");
+const default_allocator = @import("../../global.zig").default_allocator;
+const bun = @import("../../global.zig");
 const Environment = bun.Environment;
 const NetworkThread = @import("http").NetworkThread;
 const Global = bun.Global;
 const strings = bun.strings;
 const string = bun.string;
-const Output = @import("../../../global.zig").Output;
-const MutableString = @import("../../../global.zig").MutableString;
+const Output = @import("../../global.zig").Output;
+const MutableString = @import("../../global.zig").MutableString;
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const IdentityContext = @import("../../../identity_context.zig").IdentityContext;
-const Fs = @import("../../../fs.zig");
-const Resolver = @import("../../../resolver/resolver.zig");
-const ast = @import("../../../import_record.zig");
-const NodeModuleBundle = @import("../../../node_module_bundle.zig").NodeModuleBundle;
-const MacroEntryPoint = @import("../../../bundler.zig").MacroEntryPoint;
-const logger = @import("../../../logger.zig");
-const Api = @import("../../../api/schema.zig").Api;
-const options = @import("../../../options.zig");
-const Bundler = @import("../../../bundler.zig").Bundler;
-const ServerEntryPoint = @import("../../../bundler.zig").ServerEntryPoint;
-const js_printer = @import("../../../js_printer.zig");
-const js_parser = @import("../../../js_parser.zig");
-const js_ast = @import("../../../js_ast.zig");
-const hash_map = @import("../../../hash_map.zig");
-const http = @import("../../../http.zig");
-const NodeFallbackModules = @import("../../../node_fallbacks.zig");
+const IdentityContext = @import("../../identity_context.zig").IdentityContext;
+const Fs = @import("../../fs.zig");
+const Resolver = @import("../../resolver/resolver.zig");
+const ast = @import("../../import_record.zig");
+const NodeModuleBundle = @import("../../node_module_bundle.zig").NodeModuleBundle;
+const MacroEntryPoint = @import("../../bundler.zig").MacroEntryPoint;
+const logger = @import("../../logger.zig");
+const Api = @import("../../api/schema.zig").Api;
+const options = @import("../../options.zig");
+const Bundler = @import("../../bundler.zig").Bundler;
+const ServerEntryPoint = @import("../../bundler.zig").ServerEntryPoint;
+const js_printer = @import("../../js_printer.zig");
+const js_parser = @import("../../js_parser.zig");
+const js_ast = @import("../../js_ast.zig");
+const hash_map = @import("../../hash_map.zig");
+const http = @import("../../http.zig");
+const NodeFallbackModules = @import("../../node_fallbacks.zig");
 const ImportKind = ast.ImportKind;
-const Analytics = @import("../../../analytics/analytics_thread.zig");
-const ZigString = @import("../../../jsc.zig").ZigString;
-const Runtime = @import("../../../runtime.zig");
+const Analytics = @import("../../analytics/analytics_thread.zig");
+const ZigString = @import("../../jsc.zig").ZigString;
+const Runtime = @import("../../runtime.zig");
 const Router = @import("./router.zig");
 const ImportRecord = ast.ImportRecord;
-const DotEnv = @import("../../../env_loader.zig");
-const ParseResult = @import("../../../bundler.zig").ParseResult;
-const PackageJSON = @import("../../../resolver/package_json.zig").PackageJSON;
-const MacroRemap = @import("../../../resolver/package_json.zig").MacroMap;
-const WebCore = @import("../../../jsc.zig").WebCore;
+const DotEnv = @import("../../env_loader.zig");
+const ParseResult = @import("../../bundler.zig").ParseResult;
+const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON;
+const MacroRemap = @import("../../resolver/package_json.zig").MacroMap;
+const WebCore = @import("../../jsc.zig").WebCore;
 const Request = WebCore.Request;
 const Response = WebCore.Response;
 const Headers = WebCore.Headers;
 const Fetch = WebCore.Fetch;
 const FetchEvent = WebCore.FetchEvent;
-const js = @import("../../../jsc.zig").C;
-const JSC = @import("../../../jsc.zig");
+const js = @import("../../jsc.zig").C;
+const JSC = @import("../../jsc.zig");
 const JSError = @import("../base.zig").JSError;
 const d = @import("../base.zig").d;
 const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer;
 const getAllocator = @import("../base.zig").getAllocator;
-const JSValue = @import("../../../jsc.zig").JSValue;
+const JSValue = @import("../../jsc.zig").JSValue;
 const NewClass = @import("../base.zig").NewClass;
-const Microtask = @import("../../../jsc.zig").Microtask;
-const JSGlobalObject = @import("../../../jsc.zig").JSGlobalObject;
-const ExceptionValueRef = @import("../../../jsc.zig").ExceptionValueRef;
-const JSPrivateDataPtr = @import("../../../jsc.zig").JSPrivateDataPtr;
-const ZigConsoleClient = @import("../../../jsc.zig").ZigConsoleClient;
-const Node = @import("../../../jsc.zig").Node;
-const ZigException = @import("../../../jsc.zig").ZigException;
-const ZigStackTrace = @import("../../../jsc.zig").ZigStackTrace;
-const ErrorableResolvedSource = @import("../../../jsc.zig").ErrorableResolvedSource;
-const ResolvedSource = @import("../../../jsc.zig").ResolvedSource;
-const JSPromise = @import("../../../jsc.zig").JSPromise;
-const JSInternalPromise = @import("../../../jsc.zig").JSInternalPromise;
-const JSModuleLoader = @import("../../../jsc.zig").JSModuleLoader;
-const JSPromiseRejectionOperation = @import("../../../jsc.zig").JSPromiseRejectionOperation;
-const Exception = @import("../../../jsc.zig").Exception;
-const ErrorableZigString = @import("../../../jsc.zig").ErrorableZigString;
-const ZigGlobalObject = @import("../../../jsc.zig").ZigGlobalObject;
-const VM = @import("../../../jsc.zig").VM;
-const JSFunction = @import("../../../jsc.zig").JSFunction;
+const Microtask = @import("../../jsc.zig").Microtask;
+const JSGlobalObject = @import("../../jsc.zig").JSGlobalObject;
+const ExceptionValueRef = @import("../../jsc.zig").ExceptionValueRef;
+const JSPrivateDataPtr = @import("../../jsc.zig").JSPrivateDataPtr;
+const ZigConsoleClient = @import("../../jsc.zig").ZigConsoleClient;
+const Node = @import("../../jsc.zig").Node;
+const ZigException = @import("../../jsc.zig").ZigException;
+const ZigStackTrace = @import("../../jsc.zig").ZigStackTrace;
+const ErrorableResolvedSource = @import("../../jsc.zig").ErrorableResolvedSource;
+const ResolvedSource = @import("../../jsc.zig").ResolvedSource;
+const JSPromise = @import("../../jsc.zig").JSPromise;
+const JSInternalPromise = @import("../../jsc.zig").JSInternalPromise;
+const JSModuleLoader = @import("../../jsc.zig").JSModuleLoader;
+const JSPromiseRejectionOperation = @import("../../jsc.zig").JSPromiseRejectionOperation;
+const Exception = @import("../../jsc.zig").Exception;
+const ErrorableZigString = @import("../../jsc.zig").ErrorableZigString;
+const ZigGlobalObject = @import("../../jsc.zig").ZigGlobalObject;
+const VM = @import("../../jsc.zig").VM;
+const JSFunction = @import("../../jsc.zig").JSFunction;
 const Config = @import("../config.zig");
-const URL = @import("../../../url.zig").URL;
+const URL = @import("../../url.zig").URL;
 const Transpiler = @import("./transpiler.zig");
 const VirtualMachine = @import("../javascript.zig").VirtualMachine;
 const IOTask = JSC.IOTask;
-const zlib = @import("../../../zlib.zig");
+const zlib = @import("../../zlib.zig");
 
 const is_bindgen = JSC.is_bindgen;
 const max_addressible_memory = std.math.maxInt(u56);
@@ -622,7 +622,7 @@ pub fn getRouteNames(
     return ref;
 }
 
-const Editor = @import("../../../open.zig").Editor;
+const Editor = @import("../../open.zig").Editor;
 pub fn openInEditor(
     _: void,
     ctx: js.JSContextRef,
@@ -1242,7 +1242,7 @@ pub const Class = NewClass(
 );
 
 pub const Crypto = struct {
-    const Hashers = @import("../../../sha.zig");
+    const Hashers = @import("../../sha.zig");
 
     fn CryptoHasher(comptime Hasher: type, comptime name: [:0]const u8, cached_constructor_name: []const u8) type {
         return struct {
@@ -2010,7 +2010,7 @@ pub const Unsafe = struct {
         _: js.ExceptionRef,
     ) js.JSValueRef {
         _ = ctx;
-        const Reporter = @import("../../../report.zig");
+        const Reporter = @import("../../report.zig");
         Reporter.globalError(error.SegfaultTest);
     }
 
@@ -2043,7 +2043,7 @@ pub const Unsafe = struct {
 };
 
 // pub const Lockfile = struct {
-//     const BunLockfile = @import("../../../install/install.zig").Lockfile;
+//     const BunLockfile = @import("../../install/install.zig").Lockfile;
 //     lockfile: *BunLockfile,
 
 //     pub const RefCountedLockfile = bun.RefCount(Lockfile, true);
@@ -2151,7 +2151,7 @@ pub const Unsafe = struct {
 // };
 
 pub const TOML = struct {
-    const TOMLParser = @import("../../../toml/toml_parser.zig").TOML;
+    const TOMLParser = @import("../../toml/toml_parser.zig").TOML;
     pub const Class = NewClass(
         void,
         .{
diff --git a/src/javascript/jsc/api/ffi.zig b/src/bun.js/api/ffi.zig
index 864a5d889..b4db32e4a 100644
--- a/src/javascript/jsc/api/ffi.zig
+++ b/src/bun.js/api/ffi.zig
@@ -1,83 +1,83 @@
 const Bun = @This();
-const default_allocator = @import("../../../global.zig").default_allocator;
-const bun = @import("../../../global.zig");
+const default_allocator = @import("../../global.zig").default_allocator;
+const bun = @import("../../global.zig");
 const Environment = bun.Environment;
 const NetworkThread = @import("http").NetworkThread;
 const Global = bun.Global;
 const strings = bun.strings;
 const string = bun.string;
-const Output = @import("../../../global.zig").Output;
-const MutableString = @import("../../../global.zig").MutableString;
+const Output = @import("../../global.zig").Output;
+const MutableString = @import("../../global.zig").MutableString;
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const IdentityContext = @import("../../../identity_context.zig").IdentityContext;
-const Fs = @import("../../../fs.zig");
-const Resolver = @import("../../../resolver/resolver.zig");
-const ast = @import("../../../import_record.zig");
-const NodeModuleBundle = @import("../../../node_module_bundle.zig").NodeModuleBundle;
-const MacroEntryPoint = @import("../../../bundler.zig").MacroEntryPoint;
-const logger = @import("../../../logger.zig");
-const Api = @import("../../../api/schema.zig").Api;
-const options = @import("../../../options.zig");
-const Bundler = @import("../../../bundler.zig").Bundler;
-const ServerEntryPoint = @import("../../../bundler.zig").ServerEntryPoint;
-const js_printer = @import("../../../js_printer.zig");
-const js_parser = @import("../../../js_parser.zig");
-const js_ast = @import("../../../js_ast.zig");
-const hash_map = @import("../../../hash_map.zig");
-const http = @import("../../../http.zig");
-const NodeFallbackModules = @import("../../../node_fallbacks.zig");
+const IdentityContext = @import("../../identity_context.zig").IdentityContext;
+const Fs = @import("../../fs.zig");
+const Resolver = @import("../../resolver/resolver.zig");
+const ast = @import("../../import_record.zig");
+const NodeModuleBundle = @import("../../node_module_bundle.zig").NodeModuleBundle;
+const MacroEntryPoint = @import("../../bundler.zig").MacroEntryPoint;
+const logger = @import("../../logger.zig");
+const Api = @import("../../api/schema.zig").Api;
+const options = @import("../../options.zig");
+const Bundler = @import("../../bundler.zig").Bundler;
+const ServerEntryPoint = @import("../../bundler.zig").ServerEntryPoint;
+const js_printer = @import("../../js_printer.zig");
+const js_parser = @import("../../js_parser.zig");
+const js_ast = @import("../../js_ast.zig");
+const hash_map = @import("../../hash_map.zig");
+const http = @import("../../http.zig");
+const NodeFallbackModules = @import("../../node_fallbacks.zig");
 const ImportKind = ast.ImportKind;
-const Analytics = @import("../../../analytics/analytics_thread.zig");
-const ZigString = @import("../../../jsc.zig").ZigString;
-const Runtime = @import("../../../runtime.zig");
+const Analytics = @import("../../analytics/analytics_thread.zig");
+const ZigString = @import("../../jsc.zig").ZigString;
+const Runtime = @import("../../runtime.zig");
 const Router = @import("./router.zig");
 const ImportRecord = ast.ImportRecord;
-const DotEnv = @import("../../../env_loader.zig");
-const ParseResult = @import("../../../bundler.zig").ParseResult;
-const PackageJSON = @import("../../../resolver/package_json.zig").PackageJSON;
-const MacroRemap = @import("../../../resolver/package_json.zig").MacroMap;
-const WebCore = @import("../../../jsc.zig").WebCore;
+const DotEnv = @import("../../env_loader.zig");
+const ParseResult = @import("../../bundler.zig").ParseResult;
+const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON;
+const MacroRemap = @import("../../resolver/package_json.zig").MacroMap;
+const WebCore = @import("../../jsc.zig").WebCore;
 const Request = WebCore.Request;
 const Response = WebCore.Response;
 const Headers = WebCore.Headers;
 const Fetch = WebCore.Fetch;
 const FetchEvent = WebCore.FetchEvent;
-const js = @import("../../../jsc.zig").C;
-const JSC = @import("../../../jsc.zig");
+const js = @import("../../jsc.zig").C;
+const JSC = @import("../../jsc.zig");
 const JSError = @import("../base.zig").JSError;
 const d = @import("../base.zig").d;
 const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer;
 const getAllocator = @import("../base.zig").getAllocator;
-const JSValue = @import("../../../jsc.zig").JSValue;
+const JSValue = @import("../../jsc.zig").JSValue;
 const NewClass = @import("../base.zig").NewClass;
-const Microtask = @import("../../../jsc.zig").Microtask;
-const JSGlobalObject = @import("../../../jsc.zig").JSGlobalObject;
-const ExceptionValueRef = @import("../../../jsc.zig").ExceptionValueRef;
-const JSPrivateDataPtr = @import("../../../jsc.zig").JSPrivateDataPtr;
-const ZigConsoleClient = @import("../../../jsc.zig").ZigConsoleClient;
-const Node = @import("../../../jsc.zig").Node;
-const ZigException = @import("../../../jsc.zig").ZigException;
-const ZigStackTrace = @import("../../../jsc.zig").ZigStackTrace;
-const ErrorableResolvedSource = @import("../../../jsc.zig").ErrorableResolvedSource;
-const ResolvedSource = @import("../../../jsc.zig").ResolvedSource;
-const JSPromise = @import("../../../jsc.zig").JSPromise;
-const JSInternalPromise = @import("../../../jsc.zig").JSInternalPromise;
-const JSModuleLoader = @import("../../../jsc.zig").JSModuleLoader;
-const JSPromiseRejectionOperation = @import("../../../jsc.zig").JSPromiseRejectionOperation;
-const Exception = @import("../../../jsc.zig").Exception;
-const ErrorableZigString = @import("../../../jsc.zig").ErrorableZigString;
-const ZigGlobalObject = @import("../../../jsc.zig").ZigGlobalObject;
-const VM = @import("../../../jsc.zig").VM;
-const JSFunction = @import("../../../jsc.zig").JSFunction;
+const Microtask = @import("../../jsc.zig").Microtask;
+const JSGlobalObject = @import("../../jsc.zig").JSGlobalObject;
+const ExceptionValueRef = @import("../../jsc.zig").ExceptionValueRef;
+const JSPrivateDataPtr = @import("../../jsc.zig").JSPrivateDataPtr;
+const ZigConsoleClient = @import("../../jsc.zig").ZigConsoleClient;
+const Node = @import("../../jsc.zig").Node;
+const ZigException = @import("../../jsc.zig").ZigException;
+const ZigStackTrace = @import("../../jsc.zig").ZigStackTrace;
+const ErrorableResolvedSource = @import("../../jsc.zig").ErrorableResolvedSource;
+const ResolvedSource = @import("../../jsc.zig").ResolvedSource;
+const JSPromise = @import("../../jsc.zig").JSPromise;
+const JSInternalPromise = @import("../../jsc.zig").JSInternalPromise;
+const JSModuleLoader = @import("../../jsc.zig").JSModuleLoader;
+const JSPromiseRejectionOperation = @import("../../jsc.zig").JSPromiseRejectionOperation;
+const Exception = @import("../../jsc.zig").Exception;
+const ErrorableZigString = @import("../../jsc.zig").ErrorableZigString;
+const ZigGlobalObject = @import("../../jsc.zig").ZigGlobalObject;
+const VM = @import("../../jsc.zig").VM;
+const JSFunction = @import("../../jsc.zig").JSFunction;
 const Config = @import("../config.zig");
-const URL = @import("../../../url.zig").URL;
+const URL = @import("../../url.zig").URL;
 const Transpiler = @import("./transpiler.zig");
 const VirtualMachine = @import("../javascript.zig").VirtualMachine;
 const IOTask = JSC.IOTask;
-const ComptimeStringMap = @import("../../../comptime_string_map.zig").ComptimeStringMap;
+const ComptimeStringMap = @import("../../comptime_string_map.zig").ComptimeStringMap;
 
-const TCC = @import("../../../tcc.zig");
+const TCC = @import("../../tcc.zig");
 
 pub const FFI = struct {
     dylib: ?std.DynLib = null,
@@ -655,7 +655,7 @@ pub const FFI = struct {
                     env.get("USER").?,
                 ) catch unreachable;
                 var runtime_path = std.fs.path.join(default_allocator, &[_]string{ dir, "FFI.h" }) catch unreachable;
-                const file = std.fs.openFileAbsolute(runtime_path, .{}) catch @panic("Missing bun/src/javascript/jsc/api/FFI.h.");
+                const file = std.fs.openFileAbsolute(runtime_path, .{}) catch @panic("Missing bun/src/bun.js/api/FFI.h.");
                 defer file.close();
                 return file.readToEndAlloc(default_allocator, (file.stat() catch unreachable).size) catch unreachable;
             } else {
diff --git a/src/javascript/jsc/api/html_rewriter.zig b/src/bun.js/api/html_rewriter.zig
index 302af6aac..fc91c76ad 100644
--- a/src/javascript/jsc/api/html_rewriter.zig
+++ b/src/bun.js/api/html_rewriter.zig
@@ -1,21 +1,21 @@
 const std = @import("std");
-const Api = @import("../../../api/schema.zig").Api;
-const FilesystemRouter = @import("../../../router.zig");
-const http = @import("../../../http.zig");
+const Api = @import("../../api/schema.zig").Api;
+const FilesystemRouter = @import("../../router.zig");
+const http = @import("../../http.zig");
 const JavaScript = @import("../javascript.zig");
-const QueryStringMap = @import("../../../url.zig").QueryStringMap;
-const CombinedScanner = @import("../../../url.zig").CombinedScanner;
-const bun = @import("../../../global.zig");
+const QueryStringMap = @import("../../url.zig").QueryStringMap;
+const CombinedScanner = @import("../../url.zig").CombinedScanner;
+const bun = @import("../../global.zig");
 const string = bun.string;
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("../../jsc.zig");
 const js = JSC.C;
 const WebCore = @import("../webcore/response.zig");
 const Router = @This();
-const Bundler = @import("../../../bundler.zig");
+const Bundler = @import("../../bundler.zig");
 const VirtualMachine = JavaScript.VirtualMachine;
 const ScriptSrcStream = std.io.FixedBufferStream([]u8);
 const ZigString = JSC.ZigString;
-const Fs = @import("../../../fs.zig");
+const Fs = @import("../../fs.zig");
 const Base = @import("../base.zig");
 const getAllocator = Base.getAllocator;
 const JSObject = JSC.JSObject;
diff --git a/src/javascript/jsc/api/libtcc1.a.macos-aarch64 b/src/bun.js/api/libtcc1.a.macos-aarch64
index 60696b611..60696b611 100644
--- a/src/javascript/jsc/api/libtcc1.a.macos-aarch64
+++ b/src/bun.js/api/libtcc1.a.macos-aarch64
diff --git a/src/javascript/jsc/api/libtcc1.c b/src/bun.js/api/libtcc1.c
index 38750b825..38750b825 100644
--- a/src/javascript/jsc/api/libtcc1.c
+++ b/src/bun.js/api/libtcc1.c
diff --git a/src/javascript/jsc/api/router.zig b/src/bun.js/api/router.zig
index 8bf1ab7e0..847e7a756 100644
--- a/src/javascript/jsc/api/router.zig
+++ b/src/bun.js/api/router.zig
@@ -1,21 +1,21 @@
 const std = @import("std");
-const Api = @import("../../../api/schema.zig").Api;
-const FilesystemRouter = @import("../../../router.zig");
-const http = @import("../../../http.zig");
+const Api = @import("../../api/schema.zig").Api;
+const FilesystemRouter = @import("../../router.zig");
+const http = @import("../../http.zig");
 const JavaScript = @import("../javascript.zig");
-const QueryStringMap = @import("../../../url.zig").QueryStringMap;
-const CombinedScanner = @import("../../../url.zig").CombinedScanner;
-const bun = @import("../../../global.zig");
+const QueryStringMap = @import("../../url.zig").QueryStringMap;
+const CombinedScanner = @import("../../url.zig").CombinedScanner;
+const bun = @import("../../global.zig");
 const string = bun.string;
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("../../jsc.zig");
 const js = JSC.C;
 const WebCore = @import("../webcore/response.zig");
 const Router = @This();
-const Bundler = @import("../../../bundler.zig");
+const Bundler = @import("../../bundler.zig");
 const VirtualMachine = JavaScript.VirtualMachine;
 const ScriptSrcStream = std.io.FixedBufferStream([]u8);
 const ZigString = JSC.ZigString;
-const Fs = @import("../../../fs.zig");
+const Fs = @import("../../fs.zig");
 const Base = @import("../base.zig");
 const getAllocator = Base.getAllocator;
 const JSObject = JSC.JSObject;
@@ -28,8 +28,8 @@ const To = Base.To;
 const Request = WebCore.Request;
 const d = Base.d;
 const FetchEvent = WebCore.FetchEvent;
-const URLPath = @import("../../../http/url_path.zig");
-const URL = @import("../../../url.zig").URL;
+const URLPath = @import("../../http/url_path.zig");
+const URL = @import("../../url.zig").URL;
 route: *const FilesystemRouter.Match,
 route_holder: FilesystemRouter.Match = undefined,
 needs_deinit: bool = false,
diff --git a/src/javascript/jsc/api/server.zig b/src/bun.js/api/server.zig
index 711329a95..cb3c4387a 100644
--- a/src/javascript/jsc/api/server.zig
+++ b/src/bun.js/api/server.zig
@@ -1,77 +1,77 @@
 const Bun = @This();
-const default_allocator = @import("../../../global.zig").default_allocator;
-const bun = @import("../../../global.zig");
+const default_allocator = @import("../../global.zig").default_allocator;
+const bun = @import("../../global.zig");
 const Environment = bun.Environment;
 const NetworkThread = @import("http").NetworkThread;
 const Global = bun.Global;
 const strings = bun.strings;
 const string = bun.string;
-const Output = @import("../../../global.zig").Output;
-const MutableString = @import("../../../global.zig").MutableString;
+const Output = @import("../../global.zig").Output;
+const MutableString = @import("../../global.zig").MutableString;
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const IdentityContext = @import("../../../identity_context.zig").IdentityContext;
-const Fs = @import("../../../fs.zig");
-const Resolver = @import("../../../resolver/resolver.zig");
-const ast = @import("../../../import_record.zig");
-const NodeModuleBundle = @import("../../../node_module_bundle.zig").NodeModuleBundle;
-const MacroEntryPoint = @import("../../../bundler.zig").MacroEntryPoint;
-const logger = @import("../../../logger.zig");
-const Api = @import("../../../api/schema.zig").Api;
-const options = @import("../../../options.zig");
-const Bundler = @import("../../../bundler.zig").Bundler;
-const ServerEntryPoint = @import("../../../bundler.zig").ServerEntryPoint;
-const js_printer = @import("../../../js_printer.zig");
-const js_parser = @import("../../../js_parser.zig");
-const js_ast = @import("../../../js_ast.zig");
-const hash_map = @import("../../../hash_map.zig");
-const http = @import("../../../http.zig");
-const NodeFallbackModules = @import("../../../node_fallbacks.zig");
+const IdentityContext = @import("../../identity_context.zig").IdentityContext;
+const Fs = @import("../../fs.zig");
+const Resolver = @import("../../resolver/resolver.zig");
+const ast = @import("../../import_record.zig");
+const NodeModuleBundle = @import("../../node_module_bundle.zig").NodeModuleBundle;
+const MacroEntryPoint = @import("../../bundler.zig").MacroEntryPoint;
+const logger = @import("../../logger.zig");
+const Api = @import("../../api/schema.zig").Api;
+const options = @import("../../options.zig");
+const Bundler = @import("../../bundler.zig").Bundler;
+const ServerEntryPoint = @import("../../bundler.zig").ServerEntryPoint;
+const js_printer = @import("../../js_printer.zig");
+const js_parser = @import("../../js_parser.zig");
+const js_ast = @import("../../js_ast.zig");
+const hash_map = @import("../../hash_map.zig");
+const http = @import("../../http.zig");
+const NodeFallbackModules = @import("../../node_fallbacks.zig");
 const ImportKind = ast.ImportKind;
-const Analytics = @import("../../../analytics/analytics_thread.zig");
-const ZigString = @import("../../../jsc.zig").ZigString;
-const Runtime = @import("../../../runtime.zig");
+const Analytics = @import("../../analytics/analytics_thread.zig");
+const ZigString = @import("../../jsc.zig").ZigString;
+const Runtime = @import("../../runtime.zig");
 const Router = @import("./router.zig");
 const ImportRecord = ast.ImportRecord;
-const DotEnv = @import("../../../env_loader.zig");
-const ParseResult = @import("../../../bundler.zig").ParseResult;
-const PackageJSON = @import("../../../resolver/package_json.zig").PackageJSON;
-const MacroRemap = @import("../../../resolver/package_json.zig").MacroMap;
-const WebCore = @import("../../../jsc.zig").WebCore;
+const DotEnv = @import("../../env_loader.zig");
+const ParseResult = @import("../../bundler.zig").ParseResult;
+const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON;
+const MacroRemap = @import("../../resolver/package_json.zig").MacroMap;
+const WebCore = @import("../../jsc.zig").WebCore;
 const Request = WebCore.Request;
 const Response = WebCore.Response;
 const Headers = WebCore.Headers;
 const Fetch = WebCore.Fetch;
 const HTTP = @import("http");
 const FetchEvent = WebCore.FetchEvent;
-const js = @import("../../../jsc.zig").C;
-const JSC = @import("../../../jsc.zig");
+const js = @import("../../jsc.zig").C;
+const JSC = @import("../../jsc.zig");
 const JSError = @import("../base.zig").JSError;
 const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer;
 const getAllocator = @import("../base.zig").getAllocator;
-const JSValue = @import("../../../jsc.zig").JSValue;
+const JSValue = @import("../../jsc.zig").JSValue;
 const NewClass = @import("../base.zig").NewClass;
-const Microtask = @import("../../../jsc.zig").Microtask;
-const JSGlobalObject = @import("../../../jsc.zig").JSGlobalObject;
-const ExceptionValueRef = @import("../../../jsc.zig").ExceptionValueRef;
-const JSPrivateDataPtr = @import("../../../jsc.zig").JSPrivateDataPtr;
-const ZigConsoleClient = @import("../../../jsc.zig").ZigConsoleClient;
-const Node = @import("../../../jsc.zig").Node;
-const ZigException = @import("../../../jsc.zig").ZigException;
-const ZigStackTrace = @import("../../../jsc.zig").ZigStackTrace;
-const ErrorableResolvedSource = @import("../../../jsc.zig").ErrorableResolvedSource;
-const ResolvedSource = @import("../../../jsc.zig").ResolvedSource;
-const JSPromise = @import("../../../jsc.zig").JSPromise;
-const JSInternalPromise = @import("../../../jsc.zig").JSInternalPromise;
-const JSModuleLoader = @import("../../../jsc.zig").JSModuleLoader;
-const JSPromiseRejectionOperation = @import("../../../jsc.zig").JSPromiseRejectionOperation;
-const Exception = @import("../../../jsc.zig").Exception;
-const ErrorableZigString = @import("../../../jsc.zig").ErrorableZigString;
-const ZigGlobalObject = @import("../../../jsc.zig").ZigGlobalObject;
-const VM = @import("../../../jsc.zig").VM;
-const JSFunction = @import("../../../jsc.zig").JSFunction;
+const Microtask = @import("../../jsc.zig").Microtask;
+const JSGlobalObject = @import("../../jsc.zig").JSGlobalObject;
+const ExceptionValueRef = @import("../../jsc.zig").ExceptionValueRef;
+const JSPrivateDataPtr = @import("../../jsc.zig").JSPrivateDataPtr;
+const ZigConsoleClient = @import("../../jsc.zig").ZigConsoleClient;
+const Node = @import("../../jsc.zig").Node;
+const ZigException = @import("../../jsc.zig").ZigException;
+const ZigStackTrace = @import("../../jsc.zig").ZigStackTrace;
+const ErrorableResolvedSource = @import("../../jsc.zig").ErrorableResolvedSource;
+const ResolvedSource = @import("../../jsc.zig").ResolvedSource;
+const JSPromise = @import("../../jsc.zig").JSPromise;
+const JSInternalPromise = @import("../../jsc.zig").JSInternalPromise;
+const JSModuleLoader = @import("../../jsc.zig").JSModuleLoader;
+const JSPromiseRejectionOperation = @import("../../jsc.zig").JSPromiseRejectionOperation;
+const Exception = @import("../../jsc.zig").Exception;
+const ErrorableZigString = @import("../../jsc.zig").ErrorableZigString;
+const ZigGlobalObject = @import("../../jsc.zig").ZigGlobalObject;
+const VM = @import("../../jsc.zig").VM;
+const JSFunction = @import("../../jsc.zig").JSFunction;
 const Config = @import("../config.zig");
-const URL = @import("../../../url.zig").URL;
+const URL = @import("../../url.zig").URL;
 const Transpiler = @import("./transpiler.zig");
 const VirtualMachine = @import("../javascript.zig").VirtualMachine;
 const IOTask = JSC.IOTask;
@@ -81,7 +81,7 @@ const Fallback = Runtime.Fallback;
 const MimeType = HTTP.MimeType;
 const Blob = JSC.WebCore.Blob;
 const BoringSSL = @import("boringssl");
-const Arena = @import("../../../mimalloc_arena.zig").Arena;
+const Arena = @import("../../mimalloc_arena.zig").Arena;
 const SendfileContext = struct {
     fd: i32,
     socket_fd: i32 = 0,
diff --git a/src/javascript/jsc/api/transpiler.zig b/src/bun.js/api/transpiler.zig
index 69732c643..6d3f3f6fd 100644
--- a/src/javascript/jsc/api/transpiler.zig
+++ b/src/bun.js/api/transpiler.zig
@@ -1,21 +1,21 @@
 const std = @import("std");
-const Api = @import("../../../api/schema.zig").Api;
-const FilesystemRouter = @import("../../../router.zig");
-const http = @import("../../../http.zig");
+const Api = @import("../../api/schema.zig").Api;
+const FilesystemRouter = @import("../../router.zig");
+const http = @import("../../http.zig");
 const JavaScript = @import("../javascript.zig");
-const QueryStringMap = @import("../../../url.zig").QueryStringMap;
-const CombinedScanner = @import("../../../url.zig").CombinedScanner;
-const bun = @import("../../../global.zig");
+const QueryStringMap = @import("../../url.zig").QueryStringMap;
+const CombinedScanner = @import("../../url.zig").CombinedScanner;
+const bun = @import("../../global.zig");
 const string = bun.string;
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("../../jsc.zig");
 const js = JSC.C;
 const WebCore = @import("../webcore/response.zig");
-const Bundler = @import("../../../bundler.zig");
-const options = @import("../../../options.zig");
+const Bundler = @import("../../bundler.zig");
+const options = @import("../../options.zig");
 const VirtualMachine = JavaScript.VirtualMachine;
 const ScriptSrcStream = std.io.FixedBufferStream([]u8);
 const ZigString = JSC.ZigString;
-const Fs = @import("../../../fs.zig");
+const Fs = @import("../../fs.zig");
 const Base = @import("../base.zig");
 const getAllocator = Base.getAllocator;
 const JSObject = JSC.JSObject;
@@ -28,20 +28,20 @@ const To = Base.To;
 const Request = WebCore.Request;
 const d = Base.d;
 const FetchEvent = WebCore.FetchEvent;
-const MacroMap = @import("../../../resolver/package_json.zig").MacroMap;
-const TSConfigJSON = @import("../../../resolver/tsconfig_json.zig").TSConfigJSON;
-const PackageJSON = @import("../../../resolver/package_json.zig").PackageJSON;
-const logger = @import("../../../logger.zig");
+const MacroMap = @import("../../resolver/package_json.zig").MacroMap;
+const TSConfigJSON = @import("../../resolver/tsconfig_json.zig").TSConfigJSON;
+const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON;
+const logger = @import("../../logger.zig");
 const Loader = options.Loader;
 const Platform = options.Platform;
-const JSAst = @import("../../../js_ast.zig");
+const JSAst = @import("../../js_ast.zig");
 const Transpiler = @This();
-const JSParser = @import("../../../js_parser.zig");
-const JSPrinter = @import("../../../js_printer.zig");
+const JSParser = @import("../../js_parser.zig");
+const JSPrinter = @import("../../js_printer.zig");
 const ScanPassResult = JSParser.ScanPassResult;
-const Mimalloc = @import("../../../mimalloc_arena.zig");
-const Runtime = @import("../../../runtime.zig").Runtime;
-const JSLexer = @import("../../../js_lexer.zig");
+const Mimalloc = @import("../../mimalloc_arena.zig");
+const Runtime = @import("../../runtime.zig").Runtime;
+const JSLexer = @import("../../js_lexer.zig");
 const Expr = JSAst.Expr;
 
 bundler: Bundler.Bundler,
@@ -1167,7 +1167,7 @@ fn namedExportsToJS(global: *JSGlobalObject, named_exports: JSAst.Ast.NamedExpor
     return JSC.JSValue.createStringArray(global, names.ptr, names.len, true);
 }
 
-const ImportRecord = @import("../../../import_record.zig").ImportRecord;
+const ImportRecord = @import("../../import_record.zig").ImportRecord;
 
 fn namedImportsToJS(
     global: *JSGlobalObject,
diff --git a/src/javascript/jsc/base.zig b/src/bun.js/base.zig
index eaf15beba..1271deb19 100644
--- a/src/javascript/jsc/base.zig
+++ b/src/bun.js/base.zig
@@ -1,6 +1,6 @@
-pub const js = @import("../../jsc.zig").C;
+pub const js = @import("../jsc.zig").C;
 const std = @import("std");
-const bun = @import("../../global.zig");
+const bun = @import("../global.zig");
 const string = bun.string;
 const Output = bun.Output;
 const Global = bun.Global;
@@ -13,7 +13,7 @@ const C = bun.C;
 const JavaScript = @import("./javascript.zig");
 const ResolveError = JavaScript.ResolveError;
 const BuildError = JavaScript.BuildError;
-const JSC = @import("../../jsc.zig");
+const JSC = @import("../jsc.zig");
 const WebCore = @import("./webcore.zig");
 const Test = @import("./test/jest.zig");
 const Fetch = WebCore.Fetch;
@@ -21,10 +21,10 @@ const Response = WebCore.Response;
 const Request = WebCore.Request;
 const Router = @import("./api/router.zig");
 const FetchEvent = WebCore.FetchEvent;
-const IdentityContext = @import("../../identity_context.zig").IdentityContext;
+const IdentityContext = @import("../identity_context.zig").IdentityContext;
 
 const Body = WebCore.Body;
-const TaggedPointerTypes = @import("../../tagged_pointer.zig");
+const TaggedPointerTypes = @import("../tagged_pointer.zig");
 const TaggedPointerUnion = TaggedPointerTypes.TaggedPointerUnion;
 
 pub const ExceptionValueRef = [*c]js.JSValueRef;
@@ -2564,7 +2564,7 @@ pub export fn ExternalBuffer_deallocator(bytes_: *anyopaque, ctx: *anyopaque) ca
 }
 
 pub export fn MarkedArrayBuffer_deallocator(bytes_: *anyopaque, _: *anyopaque) void {
-    const mimalloc = @import("../../allocators/mimalloc.zig");
+    const mimalloc = @import("../allocators/mimalloc.zig");
     // zig's memory allocator interface won't work here
     // mimalloc knows the size of things
     // but we don't
@@ -2583,9 +2583,9 @@ pub fn castObj(obj: js.JSObjectRef, comptime Type: type) *Type {
     return JSPrivateDataPtr.from(js.JSObjectGetPrivate(obj)).as(Type);
 }
 
-const JSNode = @import("../../js_ast.zig").Macro.JSNode;
-const LazyPropertiesObject = @import("../../js_ast.zig").Macro.LazyPropertiesObject;
-const ModuleNamespace = @import("../../js_ast.zig").Macro.ModuleNamespace;
+const JSNode = @import("../js_ast.zig").Macro.JSNode;
+const LazyPropertiesObject = @import("../js_ast.zig").Macro.LazyPropertiesObject;
+const ModuleNamespace = @import("../js_ast.zig").Macro.ModuleNamespace;
 const FetchTaskletContext = Fetch.FetchTasklet.FetchTaskletContext;
 const Expect = Test.Expect;
 const DescribeScope = Test.DescribeScope;
diff --git a/src/javascript/jsc/bindings/.clang-format b/src/bun.js/bindings/.clang-format
index d8fb9d0b9..d8fb9d0b9 100644
--- a/src/javascript/jsc/bindings/.clang-format
+++ b/src/bun.js/bindings/.clang-format
diff --git a/src/javascript/jsc/bindings/ActiveDOMCallback.cpp b/src/bun.js/bindings/ActiveDOMCallback.cpp
index 2f7936aef..2f7936aef 100644
--- a/src/javascript/jsc/bindings/ActiveDOMCallback.cpp
+++ b/src/bun.js/bindings/ActiveDOMCallback.cpp
diff --git a/src/javascript/jsc/bindings/ActiveDOMCallback.h b/src/bun.js/bindings/ActiveDOMCallback.h
index bed84a90b..bed84a90b 100644
--- a/src/javascript/jsc/bindings/ActiveDOMCallback.h
+++ b/src/bun.js/bindings/ActiveDOMCallback.h
diff --git a/src/javascript/jsc/bindings/Buffer.cpp b/src/bun.js/bindings/Buffer.cpp
index 28b49791f..28b49791f 100644
--- a/src/javascript/jsc/bindings/Buffer.cpp
+++ b/src/bun.js/bindings/Buffer.cpp
diff --git a/src/javascript/jsc/bindings/Buffer.h b/src/bun.js/bindings/Buffer.h
index 3dc828c87..3dc828c87 100644
--- a/src/javascript/jsc/bindings/Buffer.h
+++ b/src/bun.js/bindings/Buffer.h
diff --git a/src/javascript/jsc/bindings/BufferEncodingType.h b/src/bun.js/bindings/BufferEncodingType.h
index 0d5058712..0d5058712 100644
--- a/src/javascript/jsc/bindings/BufferEncodingType.h
+++ b/src/bun.js/bindings/BufferEncodingType.h
diff --git a/src/javascript/jsc/bindings/BunClientData.cpp b/src/bun.js/bindings/BunClientData.cpp
index 2cdd8b25a..2cdd8b25a 100644
--- a/src/javascript/jsc/bindings/BunClientData.cpp
+++ b/src/bun.js/bindings/BunClientData.cpp
diff --git a/src/javascript/jsc/bindings/BunClientData.h b/src/bun.js/bindings/BunClientData.h
index 2b4668d51..2b4668d51 100644
--- a/src/javascript/jsc/bindings/BunClientData.h
+++ b/src/bun.js/bindings/BunClientData.h
diff --git a/src/javascript/jsc/bindings/BunGCOutputConstraint.cpp b/src/bun.js/bindings/BunGCOutputConstraint.cpp
index 97ee0761b..97ee0761b 100644
--- a/src/javascript/jsc/bindings/BunGCOutputConstraint.cpp
+++ b/src/bun.js/bindings/BunGCOutputConstraint.cpp
diff --git a/src/javascript/jsc/bindings/BunGCOutputConstraint.h b/src/bun.js/bindings/BunGCOutputConstraint.h
index eaf4ef9ec..eaf4ef9ec 100644
--- a/src/javascript/jsc/bindings/BunGCOutputConstraint.h
+++ b/src/bun.js/bindings/BunGCOutputConstraint.h
diff --git a/src/javascript/jsc/bindings/BunJSCModule.cpp b/src/bun.js/bindings/BunJSCModule.cpp
index 027cb3778..027cb3778 100644
--- a/src/javascript/jsc/bindings/BunJSCModule.cpp
+++ b/src/bun.js/bindings/BunJSCModule.cpp
diff --git a/src/javascript/jsc/bindings/BunJSCModule.h b/src/bun.js/bindings/BunJSCModule.h
index 7df47a566..7df47a566 100644
--- a/src/javascript/jsc/bindings/BunJSCModule.h
+++ b/src/bun.js/bindings/BunJSCModule.h
diff --git a/src/javascript/jsc/bindings/BunStream.cpp b/src/bun.js/bindings/BunStream.cpp
index 2dbb53562..2dbb53562 100644
--- a/src/javascript/jsc/bindings/BunStream.cpp
+++ b/src/bun.js/bindings/BunStream.cpp
diff --git a/src/javascript/jsc/bindings/BunStream.h b/src/bun.js/bindings/BunStream.h
index 64837c219..64837c219 100644
--- a/src/javascript/jsc/bindings/BunStream.h
+++ b/src/bun.js/bindings/BunStream.h
diff --git a/src/javascript/jsc/bindings/CachedScript.h b/src/bun.js/bindings/CachedScript.h
index 3f54613d8..3f54613d8 100644
--- a/src/javascript/jsc/bindings/CachedScript.h
+++ b/src/bun.js/bindings/CachedScript.h
diff --git a/src/javascript/jsc/bindings/DOMException.cpp b/src/bun.js/bindings/DOMException.cpp
index b3912124c..b3912124c 100644
--- a/src/javascript/jsc/bindings/DOMException.cpp
+++ b/src/bun.js/bindings/DOMException.cpp
diff --git a/src/javascript/jsc/bindings/DOMException.h b/src/bun.js/bindings/DOMException.h
index f5e48262b..f5e48262b 100644
--- a/src/javascript/jsc/bindings/DOMException.h
+++ b/src/bun.js/bindings/DOMException.h
diff --git a/src/javascript/jsc/bindings/DOMURL.cpp b/src/bun.js/bindings/DOMURL.cpp
index 31381b867..31381b867 100644
--- a/src/javascript/jsc/bindings/DOMURL.cpp
+++ b/src/bun.js/bindings/DOMURL.cpp
diff --git a/src/javascript/jsc/bindings/DOMURL.h b/src/bun.js/bindings/DOMURL.h
index 0a6210690..0a6210690 100644
--- a/src/javascript/jsc/bindings/DOMURL.h
+++ b/src/bun.js/bindings/DOMURL.h
diff --git a/src/javascript/jsc/bindings/DOMWrapperWorld-class.h b/src/bun.js/bindings/DOMWrapperWorld-class.h
index d2d4fb00c..d2d4fb00c 100644
--- a/src/javascript/jsc/bindings/DOMWrapperWorld-class.h
+++ b/src/bun.js/bindings/DOMWrapperWorld-class.h
diff --git a/src/javascript/jsc/bindings/DOMWrapperWorld.cpp b/src/bun.js/bindings/DOMWrapperWorld.cpp
index f0d92ee84..f0d92ee84 100644
--- a/src/javascript/jsc/bindings/DOMWrapperWorld.cpp
+++ b/src/bun.js/bindings/DOMWrapperWorld.cpp
diff --git a/src/javascript/jsc/bindings/DOMWrapperWorld.h b/src/bun.js/bindings/DOMWrapperWorld.h
index c03b5ed41..c03b5ed41 100644
--- a/src/javascript/jsc/bindings/DOMWrapperWorld.h
+++ b/src/bun.js/bindings/DOMWrapperWorld.h
diff --git a/src/javascript/jsc/bindings/Exception.h b/src/bun.js/bindings/Exception.h
index 8607e3115..8607e3115 100644
--- a/src/javascript/jsc/bindings/Exception.h
+++ b/src/bun.js/bindings/Exception.h
diff --git a/src/javascript/jsc/bindings/ExceptionCode.h b/src/bun.js/bindings/ExceptionCode.h
index 26c1e4ada..26c1e4ada 100644
--- a/src/javascript/jsc/bindings/ExceptionCode.h
+++ b/src/bun.js/bindings/ExceptionCode.h
diff --git a/src/javascript/jsc/bindings/ExceptionOr.h b/src/bun.js/bindings/ExceptionOr.h
index f3378466e..f3378466e 100644
--- a/src/javascript/jsc/bindings/ExceptionOr.h
+++ b/src/bun.js/bindings/ExceptionOr.h
diff --git a/src/javascript/jsc/bindings/FFI.zig b/src/bun.js/bindings/FFI.zig
index 5a4a61862..433772f81 100644
--- a/src/javascript/jsc/bindings/FFI.zig
+++ b/src/bun.js/bindings/FFI.zig
@@ -144,7 +144,7 @@ pub const __nonnull = @compileError("unable to translate macro: undefined identi
 pub const __null_unspecified = @compileError("unable to translate macro: undefined identifier `_Null_unspecified`"); // (no file):323:9
 pub const __nullable = @compileError("unable to translate macro: undefined identifier `_Nullable`"); // (no file):324:9
 pub const __weak = @compileError("unable to translate macro: undefined identifier `__attribute__`"); // (no file):382:9
-pub const LOAD_ARGUMENTS_FROM_CALL_FRAME = @compileError("unable to translate macro: undefined identifier `argsPtr`"); // /Users/jarred/Code/bun/src/javascript/jsc/api/FFI.h:95:9
+pub const LOAD_ARGUMENTS_FROM_CALL_FRAME = @compileError("unable to translate macro: undefined identifier `argsPtr`"); // /Users/jarred/Code/bun/src/bun.js/api/FFI.h:95:9
 pub const __llvm__ = @as(c_int, 1);
 pub const __clang__ = @as(c_int, 1);
 pub const __clang_major__ = @as(c_int, 13);
diff --git a/src/javascript/jsc/bindings/GCDefferalContext.h b/src/bun.js/bindings/GCDefferalContext.h
index 7bedfb3e0..7bedfb3e0 100644
--- a/src/javascript/jsc/bindings/GCDefferalContext.h
+++ b/src/bun.js/bindings/GCDefferalContext.h
diff --git a/src/javascript/jsc/bindings/IDLTypes.h b/src/bun.js/bindings/IDLTypes.h
index 96906331b..96906331b 100644
--- a/src/javascript/jsc/bindings/IDLTypes.h
+++ b/src/bun.js/bindings/IDLTypes.h
diff --git a/src/javascript/jsc/bindings/JSBuffer.cpp b/src/bun.js/bindings/JSBuffer.cpp
index daca67676..daca67676 100644
--- a/src/javascript/jsc/bindings/JSBuffer.cpp
+++ b/src/bun.js/bindings/JSBuffer.cpp
diff --git a/src/javascript/jsc/bindings/JSBuffer.h b/src/bun.js/bindings/JSBuffer.h
index 0ec0863ca..0ec0863ca 100644
--- a/src/javascript/jsc/bindings/JSBuffer.h
+++ b/src/bun.js/bindings/JSBuffer.h
diff --git a/src/javascript/jsc/bindings/JSBufferEncodingType.cpp b/src/bun.js/bindings/JSBufferEncodingType.cpp
index d88429d48..d88429d48 100644
--- a/src/javascript/jsc/bindings/JSBufferEncodingType.cpp
+++ b/src/bun.js/bindings/JSBufferEncodingType.cpp
diff --git a/src/javascript/jsc/bindings/JSBufferEncodingType.h b/src/bun.js/bindings/JSBufferEncodingType.h
index ee7880062..ee7880062 100644
--- a/src/javascript/jsc/bindings/JSBufferEncodingType.h
+++ b/src/bun.js/bindings/JSBufferEncodingType.h
diff --git a/src/javascript/jsc/bindings/JSCInlines.h b/src/bun.js/bindings/JSCInlines.h
index 30e8b4133..30e8b4133 100644
--- a/src/javascript/jsc/bindings/JSCInlines.h
+++ b/src/bun.js/bindings/JSCInlines.h
diff --git a/src/javascript/jsc/bindings/JSDOMBinding.h b/src/bun.js/bindings/JSDOMBinding.h
index 607eafa78..607eafa78 100644
--- a/src/javascript/jsc/bindings/JSDOMBinding.h
+++ b/src/bun.js/bindings/JSDOMBinding.h
diff --git a/src/javascript/jsc/bindings/JSDOMConvertBufferSource+JSBuffer.h b/src/bun.js/bindings/JSDOMConvertBufferSource+JSBuffer.h
index 76d05e1b1..76d05e1b1 100644
--- a/src/javascript/jsc/bindings/JSDOMConvertBufferSource+JSBuffer.h
+++ b/src/bun.js/bindings/JSDOMConvertBufferSource+JSBuffer.h
diff --git a/src/javascript/jsc/bindings/JSDOMExceptionHandling.cpp b/src/bun.js/bindings/JSDOMExceptionHandling.cpp
index b3627481d..b3627481d 100644
--- a/src/javascript/jsc/bindings/JSDOMExceptionHandling.cpp
+++ b/src/bun.js/bindings/JSDOMExceptionHandling.cpp
diff --git a/src/javascript/jsc/bindings/JSDOMExceptionHandling.h b/src/bun.js/bindings/JSDOMExceptionHandling.h
index 01dc44790..01dc44790 100644
--- a/src/javascript/jsc/bindings/JSDOMExceptionHandling.h
+++ b/src/bun.js/bindings/JSDOMExceptionHandling.h
diff --git a/src/javascript/jsc/bindings/JSDOMGlobalObject.cpp b/src/bun.js/bindings/JSDOMGlobalObject.cpp
index cc0bb87de..cc0bb87de 100644
--- a/src/javascript/jsc/bindings/JSDOMGlobalObject.cpp
+++ b/src/bun.js/bindings/JSDOMGlobalObject.cpp
diff --git a/src/javascript/jsc/bindings/JSDOMGlobalObject.h b/src/bun.js/bindings/JSDOMGlobalObject.h
index b22700d7d..b22700d7d 100644
--- a/src/javascript/jsc/bindings/JSDOMGlobalObject.h
+++ b/src/bun.js/bindings/JSDOMGlobalObject.h
diff --git a/src/javascript/jsc/bindings/JSDOMWrapper.cpp b/src/bun.js/bindings/JSDOMWrapper.cpp
index 3af4dff5e..3af4dff5e 100644
--- a/src/javascript/jsc/bindings/JSDOMWrapper.cpp
+++ b/src/bun.js/bindings/JSDOMWrapper.cpp
diff --git a/src/javascript/jsc/bindings/JSDOMWrapper.h b/src/bun.js/bindings/JSDOMWrapper.h
index 726b2e8bf..726b2e8bf 100644
--- a/src/javascript/jsc/bindings/JSDOMWrapper.h
+++ b/src/bun.js/bindings/JSDOMWrapper.h
diff --git a/src/javascript/jsc/bindings/JSDOMWrapperCache.cpp b/src/bun.js/bindings/JSDOMWrapperCache.cpp
index 662462bac..662462bac 100644
--- a/src/javascript/jsc/bindings/JSDOMWrapperCache.cpp
+++ b/src/bun.js/bindings/JSDOMWrapperCache.cpp
diff --git a/src/javascript/jsc/bindings/JSDOMWrapperCache.h b/src/bun.js/bindings/JSDOMWrapperCache.h
index 7656c7c17..7656c7c17 100644
--- a/src/javascript/jsc/bindings/JSDOMWrapperCache.h
+++ b/src/bun.js/bindings/JSDOMWrapperCache.h
diff --git a/src/javascript/jsc/bindings/JSFFIFunction.cpp b/src/bun.js/bindings/JSFFIFunction.cpp
index 731ea60c6..731ea60c6 100644
--- a/src/javascript/jsc/bindings/JSFFIFunction.cpp
+++ b/src/bun.js/bindings/JSFFIFunction.cpp
diff --git a/src/javascript/jsc/bindings/JSFFIFunction.h b/src/bun.js/bindings/JSFFIFunction.h
index e30beb5ea..e30beb5ea 100644
--- a/src/javascript/jsc/bindings/JSFFIFunction.h
+++ b/src/bun.js/bindings/JSFFIFunction.h
diff --git a/src/javascript/jsc/bindings/JSSink+custom.h b/src/bun.js/bindings/JSSink+custom.h
index 8b1378917..8b1378917 100644
--- a/src/javascript/jsc/bindings/JSSink+custom.h
+++ b/src/bun.js/bindings/JSSink+custom.h
diff --git a/src/javascript/jsc/bindings/JSSink.cpp b/src/bun.js/bindings/JSSink.cpp
index 60227464c..3c0d03174 100644
--- a/src/javascript/jsc/bindings/JSSink.cpp
+++ b/src/bun.js/bindings/JSSink.cpp
@@ -1,9 +1,9 @@
 
 // AUTO-GENERATED FILE. DO NOT EDIT.
-// Generated by /Users/jarred/Code/bun/src/javascript/jsc/generate-jssink.js at 2022-06-15T10:28:21.211Z
+// Generated by /Users/jarred/Code/bun/src/bun.js/generate-jssink.js at 2022-06-15T10:28:21.211Z
 // To regenerate this file, run:
 //
-//  bun src/javascript/jsc/generate-jssink.js
+//  bun src/bun.js/generate-jssink.js
 //
 #include "root.h"
 #include "JSSink.h"
diff --git a/src/bun.js/bindings/JSSink.h b/src/bun.js/bindings/JSSink.h
new file mode 100644
index 000000000..4aa522699
--- /dev/null
+++ b/src/bun.js/bindings/JSSink.h
@@ -0,0 +1,165 @@
+
+// AUTO-GENERATED FILE. DO NOT EDIT.
+// Generated by /Users/jarred/Code/bun/src/bun.js/generate-jssink.js at 2022-06-15T10:28:21.209Z
+//
+#pragma once
+
+#include "root.h"
+
+#include "JSDOMWrapper.h"
+#include "wtf/NeverDestroyed.h"
+
+#include "Sink.h"
+
+extern "C" bool JSSink_isSink(JSC::JSGlobalObject*, JSC::EncodedJSValue);
+
+namespace WebCore {
+using namespace JSC;
+
+JSC_DECLARE_HOST_FUNCTION(functionStartDirectStream);
+class JSArrayBufferSinkConstructor final : public JSC::InternalFunction {
+public:
+    using Base = JSC::InternalFunction;
+    static JSArrayBufferSinkConstructor* create(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::Structure* structure, JSC::JSObject* prototype);
+    static constexpr SinkID Sink = SinkID::ArrayBufferSink;
+
+    static constexpr unsigned StructureFlags = Base::StructureFlags;
+    static constexpr bool needsDestruction = false;
+
+    DECLARE_EXPORT_INFO;
+    template<typename, JSC::SubspaceAccess mode> static JSC::GCClient::IsoSubspace* subspaceFor(JSC::VM& vm)
+    {
+        if constexpr (mode == JSC::SubspaceAccess::Concurrently)
+            return nullptr;
+        return WebCore::subspaceForImpl<JSArrayBufferSinkConstructor, WebCore::UseCustomHeapCellType::No>(
+            vm,
+            [](auto& spaces) { return spaces.m_clientSubspaceForJSSinkConstructor.get(); },
+            [](auto& spaces, auto&& space) { spaces.m_clientSubspaceForJSSinkConstructor = WTFMove(space); },
+            [](auto& spaces) { return spaces.m_subspaceForJSSinkConstructor.get(); },
+            [](auto& spaces, auto&& space) { spaces.m_subspaceForJSSinkConstructor = WTFMove(space); });
+    }
+
+    static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
+    {
+        return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::InternalFunctionType, StructureFlags), info());
+    }
+    void initializeProperties(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSObject* prototype);
+
+    // Must be defined for each specialization class.
+    static JSC::EncodedJSValue JSC_HOST_CALL_ATTRIBUTES construct(JSC::JSGlobalObject*, JSC::CallFrame*);
+
+private:
+    JSArrayBufferSinkConstructor(JSC::VM& vm, JSC::Structure* structure, JSC::NativeFunction nativeFunction)
+        : Base(vm, structure, nativeFunction, nativeFunction)
+
+    {
+    }
+
+    void finishCreation(JSC::VM&, JSC::JSGlobalObject* globalObject, JSC::JSObject* prototype);
+};
+
+class JSArrayBufferSink final : public JSC::JSDestructibleObject {
+public:
+    using Base = JSC::JSDestructibleObject;
+    static JSArrayBufferSink* create(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::Structure* structure, void* sinkPtr);
+    static constexpr SinkID Sink = SinkID::ArrayBufferSink;
+
+    DECLARE_EXPORT_INFO;
+    template<typename, JSC::SubspaceAccess mode> static JSC::GCClient::IsoSubspace* subspaceFor(JSC::VM& vm)
+    {
+        if constexpr (mode == JSC::SubspaceAccess::Concurrently)
+            return nullptr;
+        return WebCore::subspaceForImpl<JSArrayBufferSink, WebCore::UseCustomHeapCellType::No>(
+            vm,
+            [](auto& spaces) { return spaces.m_clientSubspaceForJSSink.get(); },
+            [](auto& spaces, auto&& space) { spaces.m_clientSubspaceForJSSink = WTFMove(space); },
+            [](auto& spaces) { return spaces.m_subspaceForJSSink.get(); },
+            [](auto& spaces, auto&& space) { spaces.m_subspaceForJSSink = WTFMove(space); });
+    }
+
+    static void destroy(JSC::JSCell*);
+    static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
+    {
+        return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
+    }
+
+    ~JSArrayBufferSink();
+
+    void* wrapped() const { return m_sinkPtr; }
+
+    void detach()
+    {
+        m_sinkPtr = nullptr;
+    }
+
+    static void analyzeHeap(JSCell*, JSC::HeapAnalyzer&);
+
+    void* m_sinkPtr;
+
+    JSArrayBufferSink(JSC::VM& vm, JSC::Structure* structure, void* sinkPtr)
+        : Base(vm, structure)
+    {
+        m_sinkPtr = sinkPtr;
+    }
+
+    void finishCreation(JSC::VM&);
+};
+
+class JSReadableArrayBufferSinkController final : public JSC::JSDestructibleObject {
+public:
+    using Base = JSC::JSDestructibleObject;
+    static JSReadableArrayBufferSinkController* create(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::Structure* structure, void* sinkPtr);
+    static constexpr SinkID Sink = SinkID::ArrayBufferSink;
+
+    DECLARE_EXPORT_INFO;
+    template<typename, JSC::SubspaceAccess mode> static JSC::GCClient::IsoSubspace* subspaceFor(JSC::VM& vm)
+    {
+        if constexpr (mode == JSC::SubspaceAccess::Concurrently)
+            return nullptr;
+        return WebCore::subspaceForImpl<JSReadableArrayBufferSinkController, WebCore::UseCustomHeapCellType::No>(
+            vm,
+            [](auto& spaces) { return spaces.m_clientSubspaceForJSSinkController.get(); },
+            [](auto& spaces, auto&& space) { spaces.m_clientSubspaceForJSSinkController = WTFMove(space); },
+            [](auto& spaces) { return spaces.m_subspaceForJSSinkController.get(); },
+            [](auto& spaces, auto&& space) { spaces.m_subspaceForJSSinkController = WTFMove(space); });
+    }
+
+    static void destroy(JSC::JSCell*);
+    static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
+    {
+        return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
+    }
+
+    ~JSReadableArrayBufferSinkController();
+
+    void* wrapped() const { return m_sinkPtr; }
+    void detach()
+    {
+        m_sinkPtr = nullptr;
+    }
+
+    void start(JSC::JSGlobalObject* globalObject, JSC::JSValue readableStream, JSC::JSFunction* onPull, JSC::JSFunction* onClose);
+    DECLARE_VISIT_CHILDREN;
+
+    static void analyzeHeap(JSCell*, JSC::HeapAnalyzer&);
+
+    void* m_sinkPtr;
+    mutable WriteBarrier<JSC::JSFunction> m_onPull;
+    mutable WriteBarrier<JSC::JSFunction> m_onClose;
+    mutable JSC::Weak<JSObject> m_weakReadableStream;
+
+    JSReadableArrayBufferSinkController(JSC::VM& vm, JSC::Structure* structure, void* sinkPtr)
+        : Base(vm, structure)
+    {
+        m_sinkPtr = sinkPtr;
+    }
+
+    void finishCreation(JSC::VM&);
+};
+
+JSC_DECLARE_CUSTOM_GETTER(functionArrayBufferSink__getter);
+
+JSObject* createJSSinkPrototype(JSC::VM& vm, JSC::JSGlobalObject* globalObject, WebCore::SinkID sinkID);
+JSObject* createJSSinkControllerPrototype(JSC::VM& vm, JSC::JSGlobalObject* globalObject, WebCore::SinkID sinkID);
+
+} // namespace WebCore
diff --git a/src/javascript/jsc/bindings/MarkingConstraint.cpp b/src/bun.js/bindings/MarkingConstraint.cpp
index e69de29bb..e69de29bb 100644
--- a/src/javascript/jsc/bindings/MarkingConstraint.cpp
+++ b/src/bun.js/bindings/MarkingConstraint.cpp
diff --git a/src/javascript/jsc/bindings/NodeConstants.h b/src/bun.js/bindings/NodeConstants.h
index ebbdc7812..ebbdc7812 100644
--- a/src/javascript/jsc/bindings/NodeConstants.h
+++ b/src/bun.js/bindings/NodeConstants.h
diff --git a/src/javascript/jsc/bindings/Path.cpp b/src/bun.js/bindings/Path.cpp
index 6e3e27b0e..6e3e27b0e 100644
--- a/src/javascript/jsc/bindings/Path.cpp
+++ b/src/bun.js/bindings/Path.cpp
diff --git a/src/javascript/jsc/bindings/Path.h b/src/bun.js/bindings/Path.h
index e69de29bb..e69de29bb 100644
--- a/src/javascript/jsc/bindings/Path.h
+++ b/src/bun.js/bindings/Path.h
diff --git a/src/javascript/jsc/bindings/Process.cpp b/src/bun.js/bindings/Process.cpp
index 34597ade4..34597ade4 100644
--- a/src/javascript/jsc/bindings/Process.cpp
+++ b/src/bun.js/bindings/Process.cpp
diff --git a/src/javascript/jsc/bindings/Process.h b/src/bun.js/bindings/Process.h
index a710edbad..a710edbad 100644
--- a/src/javascript/jsc/bindings/Process.h
+++ b/src/bun.js/bindings/Process.h
diff --git a/src/javascript/jsc/bindings/ScriptExecutionContext.cpp b/src/bun.js/bindings/ScriptExecutionContext.cpp
index 73b8b4c01..73b8b4c01 100644
--- a/src/javascript/jsc/bindings/ScriptExecutionContext.cpp
+++ b/src/bun.js/bindings/ScriptExecutionContext.cpp
diff --git a/src/javascript/jsc/bindings/ScriptExecutionContext.h b/src/bun.js/bindings/ScriptExecutionContext.h
index 227c57e6a..227c57e6a 100644
--- a/src/javascript/jsc/bindings/ScriptExecutionContext.h
+++ b/src/bun.js/bindings/ScriptExecutionContext.h
diff --git a/src/javascript/jsc/bindings/Sink.h b/src/bun.js/bindings/Sink.h
index 3d7435b29..3d7435b29 100644
--- a/src/javascript/jsc/bindings/Sink.h
+++ b/src/bun.js/bindings/Sink.h
diff --git a/src/javascript/jsc/bindings/StreamGlobals.h b/src/bun.js/bindings/StreamGlobals.h
index e69de29bb..e69de29bb 100644
--- a/src/javascript/jsc/bindings/StreamGlobals.h
+++ b/src/bun.js/bindings/StreamGlobals.h
diff --git a/src/javascript/jsc/bindings/StringAdaptors.h b/src/bun.js/bindings/StringAdaptors.h
index 28a732a42..28a732a42 100644
--- a/src/javascript/jsc/bindings/StringAdaptors.h
+++ b/src/bun.js/bindings/StringAdaptors.h
diff --git a/src/javascript/jsc/bindings/URLDecomposition.cpp b/src/bun.js/bindings/URLDecomposition.cpp
index 84e734528..84e734528 100644
--- a/src/javascript/jsc/bindings/URLDecomposition.cpp
+++ b/src/bun.js/bindings/URLDecomposition.cpp
diff --git a/src/javascript/jsc/bindings/URLDecomposition.h b/src/bun.js/bindings/URLDecomposition.h
index 15ae09384..15ae09384 100644
--- a/src/javascript/jsc/bindings/URLDecomposition.h
+++ b/src/bun.js/bindings/URLDecomposition.h
diff --git a/src/javascript/jsc/bindings/URLSearchParams.cpp b/src/bun.js/bindings/URLSearchParams.cpp
index 0ce9554c7..0ce9554c7 100644
--- a/src/javascript/jsc/bindings/URLSearchParams.cpp
+++ b/src/bun.js/bindings/URLSearchParams.cpp
diff --git a/src/javascript/jsc/bindings/URLSearchParams.h b/src/bun.js/bindings/URLSearchParams.h
index 3749ed9f9..3749ed9f9 100644
--- a/src/javascript/jsc/bindings/URLSearchParams.h
+++ b/src/bun.js/bindings/URLSearchParams.h
diff --git a/src/javascript/jsc/bindings/ZigConsoleClient.cpp b/src/bun.js/bindings/ZigConsoleClient.cpp
index e3556ee0b..e3556ee0b 100644
--- a/src/javascript/jsc/bindings/ZigConsoleClient.cpp
+++ b/src/bun.js/bindings/ZigConsoleClient.cpp
diff --git a/src/javascript/jsc/bindings/ZigConsoleClient.h b/src/bun.js/bindings/ZigConsoleClient.h
index 684e928fd..684e928fd 100644
--- a/src/javascript/jsc/bindings/ZigConsoleClient.h
+++ b/src/bun.js/bindings/ZigConsoleClient.h
diff --git a/src/javascript/jsc/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp
index e99f9a1cc..e99f9a1cc 100644
--- a/src/javascript/jsc/bindings/ZigGlobalObject.cpp
+++ b/src/bun.js/bindings/ZigGlobalObject.cpp
diff --git a/src/javascript/jsc/bindings/ZigGlobalObject.h b/src/bun.js/bindings/ZigGlobalObject.h
index 41556e639..41556e639 100644
--- a/src/javascript/jsc/bindings/ZigGlobalObject.h
+++ b/src/bun.js/bindings/ZigGlobalObject.h
diff --git a/src/bun.js/bindings/ZigLazyStaticFunctions-inlines.h b/src/bun.js/bindings/ZigLazyStaticFunctions-inlines.h
new file mode 100644
index 000000000..ebef57b4a
--- /dev/null
+++ b/src/bun.js/bindings/ZigLazyStaticFunctions-inlines.h
@@ -0,0 +1,143 @@
+// GENERATED FILE
+#pragma once
+
+namespace Zig {
+
+  template<typename Visitor>
+  void LazyStaticFunctions::visit(Visitor& visitor) {
+       this->m_Bun__HTTPRequestContext__reject.visit(visitor);
+  this->m_Bun__HTTPRequestContext__resolve.visit(visitor);
+  this->m_Bun__HTTPRequestContextTLS__reject.visit(visitor);
+  this->m_Bun__HTTPRequestContextTLS__resolve.visit(visitor);
+  this->m_Bun__HTTPRequestContextDebug__reject.visit(visitor);
+  this->m_Bun__HTTPRequestContextDebug__resolve.visit(visitor);
+  this->m_Bun__HTTPRequestContextDebugTLS__reject.visit(visitor);
+  this->m_Bun__HTTPRequestContextDebugTLS__resolve.visit(visitor);
+
+  }
+  
+  void LazyStaticFunctions::init(Zig::GlobalObject *globalObject) {
+    
+  m_Bun__HTTPRequestContext__reject.initLater(
+      [](const JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction>::Initializer& init) {
+          WTF::String functionName = WTF::String("reject"_s);
+          Zig::JSFFIFunction* function = Zig::JSFFIFunction::create(
+               init.vm,
+               init.owner, 
+               1,
+               functionName,
+               Bun__HTTPRequestContext__reject,
+               JSC::NoIntrinsic,
+               Bun__HTTPRequestContext__reject
+          );
+          init.set(function);
+      });
+
+  m_Bun__HTTPRequestContext__resolve.initLater(
+      [](const JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction>::Initializer& init) {
+          WTF::String functionName = WTF::String("resolve"_s);
+          Zig::JSFFIFunction* function = Zig::JSFFIFunction::create(
+               init.vm,
+               init.owner, 
+               1,
+               functionName,
+               Bun__HTTPRequestContext__resolve,
+               JSC::NoIntrinsic,
+               Bun__HTTPRequestContext__resolve
+          );
+          init.set(function);
+      });
+
+  m_Bun__HTTPRequestContextTLS__reject.initLater(
+      [](const JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction>::Initializer& init) {
+          WTF::String functionName = WTF::String("reject"_s);
+          Zig::JSFFIFunction* function = Zig::JSFFIFunction::create(
+               init.vm,
+               init.owner, 
+               1,
+               functionName,
+               Bun__HTTPRequestContextTLS__reject,
+               JSC::NoIntrinsic,
+               Bun__HTTPRequestContextTLS__reject
+          );
+          init.set(function);
+      });
+
+  m_Bun__HTTPRequestContextTLS__resolve.initLater(
+      [](const JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction>::Initializer& init) {
+          WTF::String functionName = WTF::String("resolve"_s);
+          Zig::JSFFIFunction* function = Zig::JSFFIFunction::create(
+               init.vm,
+               init.owner, 
+               1,
+               functionName,
+               Bun__HTTPRequestContextTLS__resolve,
+               JSC::NoIntrinsic,
+               Bun__HTTPRequestContextTLS__resolve
+          );
+          init.set(function);
+      });
+
+  m_Bun__HTTPRequestContextDebug__reject.initLater(
+      [](const JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction>::Initializer& init) {
+          WTF::String functionName = WTF::String("reject"_s);
+          Zig::JSFFIFunction* function = Zig::JSFFIFunction::create(
+               init.vm,
+               init.owner, 
+               1,
+               functionName,
+               Bun__HTTPRequestContextDebug__reject,
+               JSC::NoIntrinsic,
+               Bun__HTTPRequestContextDebug__reject
+          );
+          init.set(function);
+      });
+
+  m_Bun__HTTPRequestContextDebug__resolve.initLater(
+      [](const JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction>::Initializer& init) {
+          WTF::String functionName = WTF::String("resolve"_s);
+          Zig::JSFFIFunction* function = Zig::JSFFIFunction::create(
+               init.vm,
+               init.owner, 
+               1,
+               functionName,
+               Bun__HTTPRequestContextDebug__resolve,
+               JSC::NoIntrinsic,
+               Bun__HTTPRequestContextDebug__resolve
+          );
+          init.set(function);
+      });
+
+  m_Bun__HTTPRequestContextDebugTLS__reject.initLater(
+      [](const JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction>::Initializer& init) {
+          WTF::String functionName = WTF::String("reject"_s);
+          Zig::JSFFIFunction* function = Zig::JSFFIFunction::create(
+               init.vm,
+               init.owner, 
+               1,
+               functionName,
+               Bun__HTTPRequestContextDebugTLS__reject,
+               JSC::NoIntrinsic,
+               Bun__HTTPRequestContextDebugTLS__reject
+          );
+          init.set(function);
+      });
+
+  m_Bun__HTTPRequestContextDebugTLS__resolve.initLater(
+      [](const JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction>::Initializer& init) {
+          WTF::String functionName = WTF::String("resolve"_s);
+          Zig::JSFFIFunction* function = Zig::JSFFIFunction::create(
+               init.vm,
+               init.owner, 
+               1,
+               functionName,
+               Bun__HTTPRequestContextDebugTLS__resolve,
+               JSC::NoIntrinsic,
+               Bun__HTTPRequestContextDebugTLS__resolve
+          );
+          init.set(function);
+      });
+
+  }
+
+} // namespace Zig
diff --git a/src/bun.js/bindings/ZigLazyStaticFunctions.h b/src/bun.js/bindings/ZigLazyStaticFunctions.h
new file mode 100644
index 000000000..f262d6ce0
--- /dev/null
+++ b/src/bun.js/bindings/ZigLazyStaticFunctions.h
@@ -0,0 +1,51 @@
+// GENERATED FILE
+#pragma once
+#include "root.h"
+
+namespace Zig {
+  class GlobalObject;
+  class JSFFIFunction;
+ 
+  class LazyStaticFunctions {
+    public:
+
+    void init(Zig::GlobalObject* globalObject);
+
+    template<typename Visitor>
+    void visit(Visitor& visitor);
+    
+  
+  /* -- BEGIN FUNCTION DEFINITIONS -- */
+  
+#pragma mark HTTPRequestContext
+
+  JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction> m_Bun__HTTPRequestContext__reject;
+  Zig::JSFFIFunction* get__Bun__HTTPRequestContext__reject(Zig::GlobalObject *globalObject) { return m_Bun__HTTPRequestContext__reject.getInitializedOnMainThread(globalObject); }
+  JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction> m_Bun__HTTPRequestContext__resolve;
+  Zig::JSFFIFunction* get__Bun__HTTPRequestContext__resolve(Zig::GlobalObject *globalObject) { return m_Bun__HTTPRequestContext__resolve.getInitializedOnMainThread(globalObject); }
+
+#pragma mark HTTPRequestContextTLS
+
+  JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction> m_Bun__HTTPRequestContextTLS__reject;
+  Zig::JSFFIFunction* get__Bun__HTTPRequestContextTLS__reject(Zig::GlobalObject *globalObject) { return m_Bun__HTTPRequestContextTLS__reject.getInitializedOnMainThread(globalObject); }
+  JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction> m_Bun__HTTPRequestContextTLS__resolve;
+  Zig::JSFFIFunction* get__Bun__HTTPRequestContextTLS__resolve(Zig::GlobalObject *globalObject) { return m_Bun__HTTPRequestContextTLS__resolve.getInitializedOnMainThread(globalObject); }
+
+#pragma mark HTTPRequestContextDebug
+
+  JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction> m_Bun__HTTPRequestContextDebug__reject;
+  Zig::JSFFIFunction* get__Bun__HTTPRequestContextDebug__reject(Zig::GlobalObject *globalObject) { return m_Bun__HTTPRequestContextDebug__reject.getInitializedOnMainThread(globalObject); }
+  JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction> m_Bun__HTTPRequestContextDebug__resolve;
+  Zig::JSFFIFunction* get__Bun__HTTPRequestContextDebug__resolve(Zig::GlobalObject *globalObject) { return m_Bun__HTTPRequestContextDebug__resolve.getInitializedOnMainThread(globalObject); }
+
+#pragma mark HTTPRequestContextDebugTLS
+
+  JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction> m_Bun__HTTPRequestContextDebugTLS__reject;
+  Zig::JSFFIFunction* get__Bun__HTTPRequestContextDebugTLS__reject(Zig::GlobalObject *globalObject) { return m_Bun__HTTPRequestContextDebugTLS__reject.getInitializedOnMainThread(globalObject); }
+  JSC::LazyProperty<Zig::GlobalObject, Zig::JSFFIFunction> m_Bun__HTTPRequestContextDebugTLS__resolve;
+  Zig::JSFFIFunction* get__Bun__HTTPRequestContextDebugTLS__resolve(Zig::GlobalObject *globalObject) { return m_Bun__HTTPRequestContextDebugTLS__resolve.getInitializedOnMainThread(globalObject); }
+
+  /* -- END FUNCTION DEFINITIONS-- */
+  };
+
+} // namespace Zig
diff --git a/src/javascript/jsc/bindings/ZigSourceProvider.cpp b/src/bun.js/bindings/ZigSourceProvider.cpp
index 4e426b449..4e426b449 100644
--- a/src/javascript/jsc/bindings/ZigSourceProvider.cpp
+++ b/src/bun.js/bindings/ZigSourceProvider.cpp
diff --git a/src/javascript/jsc/bindings/ZigSourceProvider.h b/src/bun.js/bindings/ZigSourceProvider.h
index cd45a0217..cd45a0217 100644
--- a/src/javascript/jsc/bindings/ZigSourceProvider.h
+++ b/src/bun.js/bindings/ZigSourceProvider.h
diff --git a/src/javascript/jsc/bindings/bindings-generator.zig b/src/bun.js/bindings/bindings-generator.zig
index a828c5f9e..75f300b63 100644
--- a/src/javascript/jsc/bindings/bindings-generator.zig
+++ b/src/bun.js/bindings/bindings-generator.zig
@@ -15,7 +15,7 @@ const Allocator = std.mem.Allocator;
 
 pub const bindgen = true;
 
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("../../jsc.zig");
 
 const Classes = JSC.GlobalClasses;
 
@@ -36,7 +36,7 @@ pub fn main() anyerror!void {
         const HeaderGenerator = HeaderGen(
             Bindings,
             Exports,
-            "src/javascript/jsc/bindings/bindings.zig",
+            "src/bun.js/bindings/bindings.zig",
         );
         HeaderGenerator.exec(HeaderGenerator{}, file, cpp, static, staticInlines);
     }
diff --git a/src/javascript/jsc/bindings/bindings.cpp b/src/bun.js/bindings/bindings.cpp
index 69d836754..69d836754 100644
--- a/src/javascript/jsc/bindings/bindings.cpp
+++ b/src/bun.js/bindings/bindings.cpp
diff --git a/src/javascript/jsc/bindings/bindings.zig b/src/bun.js/bindings/bindings.zig
index a2757fc62..08c3f4fbd 100644
--- a/src/javascript/jsc/bindings/bindings.zig
+++ b/src/bun.js/bindings/bindings.zig
@@ -1,10 +1,10 @@
 const std = @import("std");
-const bun = @import("../../../global.zig");
+const bun = @import("../../global.zig");
 const string = bun.string;
 const Output = bun.Output;
 const hasRef = std.meta.trait.hasField("ref");
-const C_API = @import("../../../jsc.zig").C;
-const StringPointer = @import("../../../api/schema.zig").Api.StringPointer;
+const C_API = @import("../../jsc.zig").C;
+const StringPointer = @import("../../api/schema.zig").Api.StringPointer;
 const Exports = @import("./exports.zig");
 const strings = bun.strings;
 const ErrorableZigString = Exports.ErrorableZigString;
@@ -13,7 +13,7 @@ const ZigException = Exports.ZigException;
 const ZigStackTrace = Exports.ZigStackTrace;
 const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false;
 const ArrayBuffer = @import("../base.zig").ArrayBuffer;
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("../../jsc.zig");
 const Shimmer = JSC.Shimmer;
 const FFI = @import("./FFI.zig");
 pub const JSObject = extern struct {
@@ -479,7 +479,7 @@ pub const DOMURL = opaque {
     };
 };
 
-const Api = @import("../../../api/schema.zig").Api;
+const Api = @import("../../api/schema.zig").Api;
 
 pub const FetchHeaders = opaque {
     pub const shim = Shimmer("WebCore", "FetchHeaders", @This());
@@ -983,7 +983,7 @@ pub fn NewGlobalObject(comptime Type: type) type {
             }
 
             Output.flush();
-            const Reporter = @import("../../../report.zig");
+            const Reporter = @import("../../report.zig");
             Reporter.fatal(null, "A C++ exception occurred");
         }
     };
diff --git a/src/javascript/jsc/bindings/bmalloc_heap_ref.h b/src/bun.js/bindings/bmalloc_heap_ref.h
index d83e48483..d83e48483 100644
--- a/src/javascript/jsc/bindings/bmalloc_heap_ref.h
+++ b/src/bun.js/bindings/bmalloc_heap_ref.h
diff --git a/src/javascript/jsc/bindings/exports.zig b/src/bun.js/bindings/exports.zig
index cb62ba383..b442be742 100644
--- a/src/javascript/jsc/bindings/exports.zig
+++ b/src/bun.js/bindings/exports.zig
@@ -1,11 +1,11 @@
-const JSC = @import("../../../jsc.zig");
-const Fs = @import("../../../fs.zig");
+const JSC = @import("../../jsc.zig");
+const Fs = @import("../../fs.zig");
 const CAPI = JSC.C;
 const JS = @import("../javascript.zig");
 const JSBase = @import("../base.zig");
-const ZigURL = @import("../../../url.zig").URL;
-const Api = @import("../../../api/schema.zig").Api;
-const bun = @import("../../../global.zig");
+const ZigURL = @import("../../url.zig").URL;
+const Api = @import("../../api/schema.zig").Api;
+const bun = @import("../../global.zig");
 const std = @import("std");
 const Shimmer = @import("./shimmer.zig").Shimmer;
 const strings = @import("strings");
@@ -26,9 +26,9 @@ const JSModuleLoader = JSC.JSModuleLoader;
 const JSModuleRecord = JSC.JSModuleRecord;
 const Microtask = JSC.Microtask;
 const JSPrivateDataPtr = @import("../base.zig").JSPrivateDataPtr;
-const Backtrace = @import("../../../deps/backtrace.zig");
-const JSPrinter = @import("../../../js_printer.zig");
-const JSLexer = @import("../../../js_lexer.zig");
+const Backtrace = @import("../../deps/backtrace.zig");
+const JSPrinter = @import("../../js_printer.zig");
+const JSLexer = @import("../../js_lexer.zig");
 pub const ZigGlobalObject = extern struct {
     pub const shim = Shimmer("Zig", "GlobalObject", @This());
     bytes: shim.Bytes,
@@ -187,10 +187,10 @@ pub const JSReadableStreamFile = JSC.WebCore.FileBlobLoader.Source.JSReadableStr
 pub const JSArrayBufferSink = JSC.WebCore.ArrayBufferSink.JSSink;
 
 // WebSocket
-pub const WebSocketHTTPClient = @import("../../../http/websocket_http_client.zig").WebSocketHTTPClient;
-pub const WebSocketHTTSPClient = @import("../../../http/websocket_http_client.zig").WebSocketHTTPSClient;
-pub const WebSocketClient = @import("../../../http/websocket_http_client.zig").WebSocketClient;
-pub const WebSocketClientTLS = @import("../../../http/websocket_http_client.zig").WebSocketClientTLS;
+pub const WebSocketHTTPClient = @import("../../http/websocket_http_client.zig").WebSocketHTTPClient;
+pub const WebSocketHTTSPClient = @import("../../http/websocket_http_client.zig").WebSocketHTTPSClient;
+pub const WebSocketClient = @import("../../http/websocket_http_client.zig").WebSocketClient;
+pub const WebSocketClientTLS = @import("../../http/websocket_http_client.zig").WebSocketClientTLS;
 
 pub fn Errorable(comptime Type: type) type {
     return extern struct {
@@ -246,7 +246,7 @@ pub const ResolvedSource = extern struct {
     };
 };
 
-const Mimalloc = @import("../../../allocators/mimalloc.zig");
+const Mimalloc = @import("../../allocators/mimalloc.zig");
 
 export fn ZigString__free(raw: [*]const u8, len: usize, allocator_: ?*anyopaque) void {
     var allocator: std.mem.Allocator = @ptrCast(*std.mem.Allocator, @alignCast(@alignOf(*std.mem.Allocator), allocator_ orelse return)).*;
@@ -1162,7 +1162,7 @@ pub const ZigConsoleClient = struct {
 
         // For detecting circular references
         pub const Visited = struct {
-            const ObjectPool = @import("../../../pool.zig").ObjectPool;
+            const ObjectPool = @import("../../pool.zig").ObjectPool;
             pub const Map = std.AutoHashMap(JSValue.Type, void);
             pub const Pool = ObjectPool(
                 Map,
diff --git a/src/javascript/jsc/bindings/header-gen.zig b/src/bun.js/bindings/header-gen.zig
index c11241233..c11241233 100644
--- a/src/javascript/jsc/bindings/header-gen.zig
+++ b/src/bun.js/bindings/header-gen.zig
diff --git a/src/javascript/jsc/bindings/headers-cpp.h b/src/bun.js/bindings/headers-cpp.h
index e5de168b4..e5de168b4 100644
--- a/src/javascript/jsc/bindings/headers-cpp.h
+++ b/src/bun.js/bindings/headers-cpp.h
diff --git a/src/javascript/jsc/bindings/headers-handwritten.h b/src/bun.js/bindings/headers-handwritten.h
index 3f0bf5327..3f0bf5327 100644
--- a/src/javascript/jsc/bindings/headers-handwritten.h
+++ b/src/bun.js/bindings/headers-handwritten.h
diff --git a/src/javascript/jsc/bindings/headers-replacements.zig b/src/bun.js/bindings/headers-replacements.zig
index 712a63454..662502bb2 100644
--- a/src/javascript/jsc/bindings/headers-replacements.zig
+++ b/src/bun.js/bindings/headers-replacements.zig
@@ -1,5 +1,5 @@
 // GENERATED FILE - do not modify!
-const bindings = @import("../../../jsc.zig");
+const bindings = @import("../../jsc.zig");
 pub const struct_JSC__CallFrame = bindings.CallFrame;
 pub const struct_JSC__StringPrototype = bindings.StringPrototype;
 pub const struct_JSC__SetIteratorPrototype = bindings.SetIteratorPrototype;
@@ -62,7 +62,7 @@ pub const Bun__Writable = bindings.NodeWritableStream;
 pub const Bun__ArrayBuffer = bindings.ArrayBuffer;
 pub const struct_WebCore__DOMURL = bindings.DOMURL;
 pub const struct_WebCore__FetchHeaders = bindings.FetchHeaders;
-pub const StringPointer = @import("../../../api/schema.zig").Api.StringPointer;
+pub const StringPointer = @import("../../api/schema.zig").Api.StringPointer;
 pub const struct_VirtualMachine = bindings.VirtualMachine;
 pub const ArrayBufferSink = @import("../webcore/streams.zig").ArrayBufferSink;
 
diff --git a/src/javascript/jsc/bindings/headers.h b/src/bun.js/bindings/headers.h
index 1caed78b7..1caed78b7 100644
--- a/src/javascript/jsc/bindings/headers.h
+++ b/src/bun.js/bindings/headers.h
diff --git a/src/javascript/jsc/bindings/headers.zig b/src/bun.js/bindings/headers.zig
index 1a42b9532..77ef7ecb5 100644
--- a/src/javascript/jsc/bindings/headers.zig
+++ b/src/bun.js/bindings/headers.zig
@@ -1,5 +1,5 @@
 // GENERATED FILE - do not modify!
-const bindings = @import("../../../jsc.zig");
+const bindings = @import("../../jsc.zig");
 pub const struct_JSC__CallFrame = bindings.CallFrame;
 pub const struct_JSC__StringPrototype = bindings.StringPrototype;
 pub const struct_JSC__SetIteratorPrototype = bindings.SetIteratorPrototype;
@@ -62,7 +62,7 @@ pub const Bun__Writable = bindings.NodeWritableStream;
 pub const Bun__ArrayBuffer = bindings.ArrayBuffer;
 pub const struct_WebCore__DOMURL = bindings.DOMURL;
 pub const struct_WebCore__FetchHeaders = bindings.FetchHeaders;
-pub const StringPointer = @import("../../../api/schema.zig").Api.StringPointer;
+pub const StringPointer = @import("../../api/schema.zig").Api.StringPointer;
 pub const struct_VirtualMachine = bindings.VirtualMachine;
 pub const ArrayBufferSink = @import("../webcore/streams.zig").ArrayBufferSink;
 
diff --git a/src/javascript/jsc/bindings/helpers.h b/src/bun.js/bindings/helpers.h
index 5b5fb5fd2..5b5fb5fd2 100644
--- a/src/javascript/jsc/bindings/helpers.h
+++ b/src/bun.js/bindings/helpers.h
diff --git a/src/javascript/jsc/bindings/inlines.cpp b/src/bun.js/bindings/inlines.cpp
index e69de29bb..e69de29bb 100644
--- a/src/javascript/jsc/bindings/inlines.cpp
+++ b/src/bun.js/bindings/inlines.cpp
diff --git a/src/javascript/jsc/bindings/napi.cpp b/src/bun.js/bindings/napi.cpp
index 295a1e02b..295a1e02b 100644
--- a/src/javascript/jsc/bindings/napi.cpp
+++ b/src/bun.js/bindings/napi.cpp
diff --git a/src/javascript/jsc/bindings/napi.h b/src/bun.js/bindings/napi.h
index 754c34ec4..754c34ec4 100644
--- a/src/javascript/jsc/bindings/napi.h
+++ b/src/bun.js/bindings/napi.h
diff --git a/src/javascript/jsc/bindings/napi_external.cpp b/src/bun.js/bindings/napi_external.cpp
index 15e46aa97..15e46aa97 100644
--- a/src/javascript/jsc/bindings/napi_external.cpp
+++ b/src/bun.js/bindings/napi_external.cpp
diff --git a/src/javascript/jsc/bindings/napi_external.h b/src/bun.js/bindings/napi_external.h
index edac914f8..edac914f8 100644
--- a/src/javascript/jsc/bindings/napi_external.h
+++ b/src/bun.js/bindings/napi_external.h
diff --git a/src/javascript/jsc/bindings/objects.cpp b/src/bun.js/bindings/objects.cpp
index e69de29bb..e69de29bb 100644
--- a/src/javascript/jsc/bindings/objects.cpp
+++ b/src/bun.js/bindings/objects.cpp
diff --git a/src/javascript/jsc/bindings/objects.h b/src/bun.js/bindings/objects.h
index 622a46804..622a46804 100644
--- a/src/javascript/jsc/bindings/objects.h
+++ b/src/bun.js/bindings/objects.h
diff --git a/src/javascript/jsc/bindings/process.d.ts b/src/bun.js/bindings/process.d.ts
index 194ea2b6a..194ea2b6a 100644
--- a/src/javascript/jsc/bindings/process.d.ts
+++ b/src/bun.js/bindings/process.d.ts
diff --git a/src/javascript/jsc/bindings/root.h b/src/bun.js/bindings/root.h
index 0e8f2b262..0e8f2b262 100644
--- a/src/javascript/jsc/bindings/root.h
+++ b/src/bun.js/bindings/root.h
diff --git a/src/javascript/jsc/bindings/shimmer.zig b/src/bun.js/bindings/shimmer.zig
index c180fc864..c180fc864 100644
--- a/src/javascript/jsc/bindings/shimmer.zig
+++ b/src/bun.js/bindings/shimmer.zig
diff --git a/src/javascript/jsc/bindings/sizes.zig b/src/bun.js/bindings/sizes.zig
index 55cb26d8b..27505ebc0 100644
--- a/src/javascript/jsc/bindings/sizes.zig
+++ b/src/bun.js/bindings/sizes.zig
@@ -1,4 +1,4 @@
-// Auto-generated by src/javascript/jsc/headergen/sizegen.cpp at 2022-05-02 01:43:1651481039.
+// Auto-generated by src/bun.js/headergen/sizegen.cpp at 2022-05-02 01:43:1651481039.
 // These are the byte sizes for the different object types with bindings in JavaScriptCore.
 // This allows us to safely return stack allocated C++ types to Zig.
 // It is only safe to do this when these sizes are correct.
diff --git a/src/javascript/jsc/bindings/sqlite/JSSQLStatement.cpp b/src/bun.js/bindings/sqlite/JSSQLStatement.cpp
index 7f740ae66..7f740ae66 100644
--- a/src/javascript/jsc/bindings/sqlite/JSSQLStatement.cpp
+++ b/src/bun.js/bindings/sqlite/JSSQLStatement.cpp
diff --git a/src/javascript/jsc/bindings/sqlite/JSSQLStatement.h b/src/bun.js/bindings/sqlite/JSSQLStatement.h
index 6bf830ee2..6bf830ee2 100644
--- a/src/javascript/jsc/bindings/sqlite/JSSQLStatement.h
+++ b/src/bun.js/bindings/sqlite/JSSQLStatement.h
diff --git a/src/javascript/jsc/bindings/sqlite/lazy_sqlite3.h b/src/bun.js/bindings/sqlite/lazy_sqlite3.h
index 086111109..086111109 100644
--- a/src/javascript/jsc/bindings/sqlite/lazy_sqlite3.h
+++ b/src/bun.js/bindings/sqlite/lazy_sqlite3.h
diff --git a/src/javascript/jsc/bindings/sqlite/sqlite.exports.js b/src/bun.js/bindings/sqlite/sqlite.exports.js
index acd28164c..acd28164c 100644
--- a/src/javascript/jsc/bindings/sqlite/sqlite.exports.js
+++ b/src/bun.js/bindings/sqlite/sqlite.exports.js
diff --git a/src/javascript/jsc/bindings/sqlite/sqlite3.c b/src/bun.js/bindings/sqlite/sqlite3.c
index 568f3c679..568f3c679 100644
--- a/src/javascript/jsc/bindings/sqlite/sqlite3.c
+++ b/src/bun.js/bindings/sqlite/sqlite3.c
diff --git a/src/javascript/jsc/bindings/sqlite/sqlite3_local.h b/src/bun.js/bindings/sqlite/sqlite3_local.h
index de393da9d..de393da9d 100644
--- a/src/javascript/jsc/bindings/sqlite/sqlite3_local.h
+++ b/src/bun.js/bindings/sqlite/sqlite3_local.h
diff --git a/src/javascript/jsc/bindings/static_export.zig b/src/bun.js/bindings/static_export.zig
index f8936f0df..f8936f0df 100644
--- a/src/javascript/jsc/bindings/static_export.zig
+++ b/src/bun.js/bindings/static_export.zig
diff --git a/src/javascript/jsc/bindings/webcore/AbortAlgorithm.h b/src/bun.js/bindings/webcore/AbortAlgorithm.h
index 26dd666b4..26dd666b4 100644
--- a/src/javascript/jsc/bindings/webcore/AbortAlgorithm.h
+++ b/src/bun.js/bindings/webcore/AbortAlgorithm.h
diff --git a/src/javascript/jsc/bindings/webcore/AbortAlgorithm.idl b/src/bun.js/bindings/webcore/AbortAlgorithm.idl
index a28c77856..a28c77856 100644
--- a/src/javascript/jsc/bindings/webcore/AbortAlgorithm.idl
+++ b/src/bun.js/bindings/webcore/AbortAlgorithm.idl
diff --git a/src/javascript/jsc/bindings/webcore/AbortController.cpp b/src/bun.js/bindings/webcore/AbortController.cpp
index 8e419971a..8e419971a 100644
--- a/src/javascript/jsc/bindings/webcore/AbortController.cpp
+++ b/src/bun.js/bindings/webcore/AbortController.cpp
diff --git a/src/javascript/jsc/bindings/webcore/AbortController.h b/src/bun.js/bindings/webcore/AbortController.h
index f7bf96f25..f7bf96f25 100644
--- a/src/javascript/jsc/bindings/webcore/AbortController.h
+++ b/src/bun.js/bindings/webcore/AbortController.h
diff --git a/src/javascript/jsc/bindings/webcore/AbortController.idl b/src/bun.js/bindings/webcore/AbortController.idl
index 0d011e205..0d011e205 100644
--- a/src/javascript/jsc/bindings/webcore/AbortController.idl
+++ b/src/bun.js/bindings/webcore/AbortController.idl
diff --git a/src/javascript/jsc/bindings/webcore/AbortSignal.cpp b/src/bun.js/bindings/webcore/AbortSignal.cpp
index 8554b3b83..8554b3b83 100644
--- a/src/javascript/jsc/bindings/webcore/AbortSignal.cpp
+++ b/src/bun.js/bindings/webcore/AbortSignal.cpp
diff --git a/src/javascript/jsc/bindings/webcore/AbortSignal.h b/src/bun.js/bindings/webcore/AbortSignal.h
index 24f893f22..24f893f22 100644
--- a/src/javascript/jsc/bindings/webcore/AbortSignal.h
+++ b/src/bun.js/bindings/webcore/AbortSignal.h
diff --git a/src/javascript/jsc/bindings/webcore/AbortSignal.idl b/src/bun.js/bindings/webcore/AbortSignal.idl
index f81c5b0a2..f81c5b0a2 100644
--- a/src/javascript/jsc/bindings/webcore/AbortSignal.idl
+++ b/src/bun.js/bindings/webcore/AbortSignal.idl
diff --git a/src/javascript/jsc/bindings/webcore/ActiveDOMObject.cpp b/src/bun.js/bindings/webcore/ActiveDOMObject.cpp
index d2662f8e9..d2662f8e9 100644
--- a/src/javascript/jsc/bindings/webcore/ActiveDOMObject.cpp
+++ b/src/bun.js/bindings/webcore/ActiveDOMObject.cpp
diff --git a/src/javascript/jsc/bindings/webcore/ActiveDOMObject.h b/src/bun.js/bindings/webcore/ActiveDOMObject.h
index e483a46b7..e483a46b7 100644
--- a/src/javascript/jsc/bindings/webcore/ActiveDOMObject.h
+++ b/src/bun.js/bindings/webcore/ActiveDOMObject.h
diff --git a/src/javascript/jsc/bindings/webcore/AddEventListenerOptions.h b/src/bun.js/bindings/webcore/AddEventListenerOptions.h
index 79128ee15..79128ee15 100644
--- a/src/javascript/jsc/bindings/webcore/AddEventListenerOptions.h
+++ b/src/bun.js/bindings/webcore/AddEventListenerOptions.h
diff --git a/src/javascript/jsc/bindings/webcore/BufferSource.h b/src/bun.js/bindings/webcore/BufferSource.h
index ee78e38d1..ee78e38d1 100644
--- a/src/javascript/jsc/bindings/webcore/BufferSource.h
+++ b/src/bun.js/bindings/webcore/BufferSource.h
diff --git a/src/javascript/jsc/bindings/webcore/CallbackResult.h b/src/bun.js/bindings/webcore/CallbackResult.h
index 878fe4221..878fe4221 100644
--- a/src/javascript/jsc/bindings/webcore/CallbackResult.h
+++ b/src/bun.js/bindings/webcore/CallbackResult.h
diff --git a/src/javascript/jsc/bindings/webcore/CloseEvent.cpp b/src/bun.js/bindings/webcore/CloseEvent.cpp
index 7d0522adb..7d0522adb 100644
--- a/src/javascript/jsc/bindings/webcore/CloseEvent.cpp
+++ b/src/bun.js/bindings/webcore/CloseEvent.cpp
diff --git a/src/javascript/jsc/bindings/webcore/CloseEvent.h b/src/bun.js/bindings/webcore/CloseEvent.h
index 6681727f6..6681727f6 100644
--- a/src/javascript/jsc/bindings/webcore/CloseEvent.h
+++ b/src/bun.js/bindings/webcore/CloseEvent.h
diff --git a/src/javascript/jsc/bindings/webcore/CloseEvent.idl b/src/bun.js/bindings/webcore/CloseEvent.idl
index acb852e46..acb852e46 100644
--- a/src/javascript/jsc/bindings/webcore/CloseEvent.idl
+++ b/src/bun.js/bindings/webcore/CloseEvent.idl
diff --git a/src/javascript/jsc/bindings/webcore/CommonAtomStrings.cpp b/src/bun.js/bindings/webcore/CommonAtomStrings.cpp
index 57cdc3d24..57cdc3d24 100644
--- a/src/javascript/jsc/bindings/webcore/CommonAtomStrings.cpp
+++ b/src/bun.js/bindings/webcore/CommonAtomStrings.cpp
diff --git a/src/javascript/jsc/bindings/webcore/CommonAtomStrings.h b/src/bun.js/bindings/webcore/CommonAtomStrings.h
index 0385f8222..0385f8222 100644
--- a/src/javascript/jsc/bindings/webcore/CommonAtomStrings.h
+++ b/src/bun.js/bindings/webcore/CommonAtomStrings.h
diff --git a/src/javascript/jsc/bindings/webcore/ContextDestructionObserver.h b/src/bun.js/bindings/webcore/ContextDestructionObserver.h
index ccf20f301..ccf20f301 100644
--- a/src/javascript/jsc/bindings/webcore/ContextDestructionObserver.h
+++ b/src/bun.js/bindings/webcore/ContextDestructionObserver.h
diff --git a/src/javascript/jsc/bindings/webcore/CustomEvent.cpp b/src/bun.js/bindings/webcore/CustomEvent.cpp
index 2f17f794b..2f17f794b 100644
--- a/src/javascript/jsc/bindings/webcore/CustomEvent.cpp
+++ b/src/bun.js/bindings/webcore/CustomEvent.cpp
diff --git a/src/javascript/jsc/bindings/webcore/CustomEvent.h b/src/bun.js/bindings/webcore/CustomEvent.h
index 53df6d985..53df6d985 100644
--- a/src/javascript/jsc/bindings/webcore/CustomEvent.h
+++ b/src/bun.js/bindings/webcore/CustomEvent.h
diff --git a/src/javascript/jsc/bindings/webcore/CustomEvent.idl b/src/bun.js/bindings/webcore/CustomEvent.idl
index 4b48b4335..4b48b4335 100644
--- a/src/javascript/jsc/bindings/webcore/CustomEvent.idl
+++ b/src/bun.js/bindings/webcore/CustomEvent.idl
diff --git a/src/javascript/jsc/bindings/webcore/CustomEventCustom.cpp b/src/bun.js/bindings/webcore/CustomEventCustom.cpp
index a5da060e3..a5da060e3 100644
--- a/src/javascript/jsc/bindings/webcore/CustomEventCustom.cpp
+++ b/src/bun.js/bindings/webcore/CustomEventCustom.cpp
diff --git a/src/javascript/jsc/bindings/webcore/DOMClientIsoSubspaces.h b/src/bun.js/bindings/webcore/DOMClientIsoSubspaces.h
index b437e5879..b437e5879 100644
--- a/src/javascript/jsc/bindings/webcore/DOMClientIsoSubspaces.h
+++ b/src/bun.js/bindings/webcore/DOMClientIsoSubspaces.h
diff --git a/src/javascript/jsc/bindings/webcore/DOMConstructors.h b/src/bun.js/bindings/webcore/DOMConstructors.h
index b0219fffc..b0219fffc 100644
--- a/src/javascript/jsc/bindings/webcore/DOMConstructors.h
+++ b/src/bun.js/bindings/webcore/DOMConstructors.h
diff --git a/src/javascript/jsc/bindings/webcore/DOMHighResTimeStamp.h b/src/bun.js/bindings/webcore/DOMHighResTimeStamp.h
index 11b678600..11b678600 100644
--- a/src/javascript/jsc/bindings/webcore/DOMHighResTimeStamp.h
+++ b/src/bun.js/bindings/webcore/DOMHighResTimeStamp.h
diff --git a/src/javascript/jsc/bindings/webcore/DOMIsoSubspaces.h b/src/bun.js/bindings/webcore/DOMIsoSubspaces.h
index 66b94e359..66b94e359 100644
--- a/src/javascript/jsc/bindings/webcore/DOMIsoSubspaces.h
+++ b/src/bun.js/bindings/webcore/DOMIsoSubspaces.h
diff --git a/src/javascript/jsc/bindings/webcore/DOMPromiseProxy.h b/src/bun.js/bindings/webcore/DOMPromiseProxy.h
index 2b8706e76..2b8706e76 100644
--- a/src/javascript/jsc/bindings/webcore/DOMPromiseProxy.h
+++ b/src/bun.js/bindings/webcore/DOMPromiseProxy.h
diff --git a/src/javascript/jsc/bindings/webcore/ErrorCallback.cpp b/src/bun.js/bindings/webcore/ErrorCallback.cpp
index 5b81eea06..5b81eea06 100644
--- a/src/javascript/jsc/bindings/webcore/ErrorCallback.cpp
+++ b/src/bun.js/bindings/webcore/ErrorCallback.cpp
diff --git a/src/javascript/jsc/bindings/webcore/ErrorCallback.h b/src/bun.js/bindings/webcore/ErrorCallback.h
index 8c1eaff9a..8c1eaff9a 100644
--- a/src/javascript/jsc/bindings/webcore/ErrorCallback.h
+++ b/src/bun.js/bindings/webcore/ErrorCallback.h
diff --git a/src/javascript/jsc/bindings/webcore/ErrorCallback.idl b/src/bun.js/bindings/webcore/ErrorCallback.idl
index 4dd3901da..4dd3901da 100644
--- a/src/javascript/jsc/bindings/webcore/ErrorCallback.idl
+++ b/src/bun.js/bindings/webcore/ErrorCallback.idl
diff --git a/src/javascript/jsc/bindings/webcore/ErrorEvent.cpp b/src/bun.js/bindings/webcore/ErrorEvent.cpp
index 4f6c618f7..4f6c618f7 100644
--- a/src/javascript/jsc/bindings/webcore/ErrorEvent.cpp
+++ b/src/bun.js/bindings/webcore/ErrorEvent.cpp
diff --git a/src/javascript/jsc/bindings/webcore/ErrorEvent.h b/src/bun.js/bindings/webcore/ErrorEvent.h
index 400c91dae..400c91dae 100644
--- a/src/javascript/jsc/bindings/webcore/ErrorEvent.h
+++ b/src/bun.js/bindings/webcore/ErrorEvent.h
diff --git a/src/javascript/jsc/bindings/webcore/ErrorEvent.idl b/src/bun.js/bindings/webcore/ErrorEvent.idl
index 1ea1ccff1..1ea1ccff1 100644
--- a/src/javascript/jsc/bindings/webcore/ErrorEvent.idl
+++ b/src/bun.js/bindings/webcore/ErrorEvent.idl
diff --git a/src/javascript/jsc/bindings/webcore/Event.cpp b/src/bun.js/bindings/webcore/Event.cpp
index f488f0106..f488f0106 100644
--- a/src/javascript/jsc/bindings/webcore/Event.cpp
+++ b/src/bun.js/bindings/webcore/Event.cpp
diff --git a/src/javascript/jsc/bindings/webcore/Event.h b/src/bun.js/bindings/webcore/Event.h
index 5b7d5cba2..5b7d5cba2 100644
--- a/src/javascript/jsc/bindings/webcore/Event.h
+++ b/src/bun.js/bindings/webcore/Event.h
diff --git a/src/javascript/jsc/bindings/webcore/Event.idl b/src/bun.js/bindings/webcore/Event.idl
index 2d6ba61f7..2d6ba61f7 100644
--- a/src/javascript/jsc/bindings/webcore/Event.idl
+++ b/src/bun.js/bindings/webcore/Event.idl
diff --git a/src/javascript/jsc/bindings/webcore/EventContext.cpp b/src/bun.js/bindings/webcore/EventContext.cpp
index c80863a7d..c80863a7d 100644
--- a/src/javascript/jsc/bindings/webcore/EventContext.cpp
+++ b/src/bun.js/bindings/webcore/EventContext.cpp
diff --git a/src/javascript/jsc/bindings/webcore/EventContext.h b/src/bun.js/bindings/webcore/EventContext.h
index 8fbd3c19f..8fbd3c19f 100644
--- a/src/javascript/jsc/bindings/webcore/EventContext.h
+++ b/src/bun.js/bindings/webcore/EventContext.h
diff --git a/src/javascript/jsc/bindings/webcore/EventDispatcher.cpp b/src/bun.js/bindings/webcore/EventDispatcher.cpp
index 9c83aa0e2..9c83aa0e2 100644
--- a/src/javascript/jsc/bindings/webcore/EventDispatcher.cpp
+++ b/src/bun.js/bindings/webcore/EventDispatcher.cpp
diff --git a/src/javascript/jsc/bindings/webcore/EventDispatcher.h b/src/bun.js/bindings/webcore/EventDispatcher.h
index 63ee34bfb..63ee34bfb 100644
--- a/src/javascript/jsc/bindings/webcore/EventDispatcher.h
+++ b/src/bun.js/bindings/webcore/EventDispatcher.h
diff --git a/src/javascript/jsc/bindings/webcore/EventFactory.cpp b/src/bun.js/bindings/webcore/EventFactory.cpp
index 3677b9dfe..3677b9dfe 100644
--- a/src/javascript/jsc/bindings/webcore/EventFactory.cpp
+++ b/src/bun.js/bindings/webcore/EventFactory.cpp
diff --git a/src/javascript/jsc/bindings/webcore/EventHeaders.h b/src/bun.js/bindings/webcore/EventHeaders.h
index 347d333d0..347d333d0 100644
--- a/src/javascript/jsc/bindings/webcore/EventHeaders.h
+++ b/src/bun.js/bindings/webcore/EventHeaders.h
diff --git a/src/javascript/jsc/bindings/webcore/EventInit.h b/src/bun.js/bindings/webcore/EventInit.h
index 0e588593c..0e588593c 100644
--- a/src/javascript/jsc/bindings/webcore/EventInit.h
+++ b/src/bun.js/bindings/webcore/EventInit.h
diff --git a/src/javascript/jsc/bindings/webcore/EventInit.idl b/src/bun.js/bindings/webcore/EventInit.idl
index e55a03034..e55a03034 100644
--- a/src/javascript/jsc/bindings/webcore/EventInit.idl
+++ b/src/bun.js/bindings/webcore/EventInit.idl
diff --git a/src/javascript/jsc/bindings/webcore/EventInterfaces.h b/src/bun.js/bindings/webcore/EventInterfaces.h
index 5bb0962b6..5bb0962b6 100644
--- a/src/javascript/jsc/bindings/webcore/EventInterfaces.h
+++ b/src/bun.js/bindings/webcore/EventInterfaces.h
diff --git a/src/javascript/jsc/bindings/webcore/EventListener.h b/src/bun.js/bindings/webcore/EventListener.h
index 7ceb38b1e..7ceb38b1e 100644
--- a/src/javascript/jsc/bindings/webcore/EventListener.h
+++ b/src/bun.js/bindings/webcore/EventListener.h
diff --git a/src/javascript/jsc/bindings/webcore/EventListener.idl b/src/bun.js/bindings/webcore/EventListener.idl
index 5813a3500..5813a3500 100644
--- a/src/javascript/jsc/bindings/webcore/EventListener.idl
+++ b/src/bun.js/bindings/webcore/EventListener.idl
diff --git a/src/javascript/jsc/bindings/webcore/EventListenerMap.cpp b/src/bun.js/bindings/webcore/EventListenerMap.cpp
index 5014cfa00..5014cfa00 100644
--- a/src/javascript/jsc/bindings/webcore/EventListenerMap.cpp
+++ b/src/bun.js/bindings/webcore/EventListenerMap.cpp
diff --git a/src/javascript/jsc/bindings/webcore/EventListenerMap.h b/src/bun.js/bindings/webcore/EventListenerMap.h
index d5b83c220..d5b83c220 100644
--- a/src/javascript/jsc/bindings/webcore/EventListenerMap.h
+++ b/src/bun.js/bindings/webcore/EventListenerMap.h
diff --git a/src/javascript/jsc/bindings/webcore/EventListenerOptions.h b/src/bun.js/bindings/webcore/EventListenerOptions.h
index 101b44bce..101b44bce 100644
--- a/src/javascript/jsc/bindings/webcore/EventListenerOptions.h
+++ b/src/bun.js/bindings/webcore/EventListenerOptions.h
diff --git a/src/javascript/jsc/bindings/webcore/EventListenerOptions.idl b/src/bun.js/bindings/webcore/EventListenerOptions.idl
index 70bb94225..70bb94225 100644
--- a/src/javascript/jsc/bindings/webcore/EventListenerOptions.idl
+++ b/src/bun.js/bindings/webcore/EventListenerOptions.idl
diff --git a/src/javascript/jsc/bindings/webcore/EventModifierInit.h b/src/bun.js/bindings/webcore/EventModifierInit.h
index 82fe54e17..82fe54e17 100644
--- a/src/javascript/jsc/bindings/webcore/EventModifierInit.h
+++ b/src/bun.js/bindings/webcore/EventModifierInit.h
diff --git a/src/javascript/jsc/bindings/webcore/EventNames.cpp b/src/bun.js/bindings/webcore/EventNames.cpp
index 42c4eb1cf..42c4eb1cf 100644
--- a/src/javascript/jsc/bindings/webcore/EventNames.cpp
+++ b/src/bun.js/bindings/webcore/EventNames.cpp
diff --git a/src/javascript/jsc/bindings/webcore/EventNames.h b/src/bun.js/bindings/webcore/EventNames.h
index ebd451814..ebd451814 100644
--- a/src/javascript/jsc/bindings/webcore/EventNames.h
+++ b/src/bun.js/bindings/webcore/EventNames.h
diff --git a/src/javascript/jsc/bindings/webcore/EventNames.in b/src/bun.js/bindings/webcore/EventNames.in
index 8c0fb6072..8c0fb6072 100644
--- a/src/javascript/jsc/bindings/webcore/EventNames.in
+++ b/src/bun.js/bindings/webcore/EventNames.in
diff --git a/src/javascript/jsc/bindings/webcore/EventOptions.h b/src/bun.js/bindings/webcore/EventOptions.h
index ec59b6980..ec59b6980 100644
--- a/src/javascript/jsc/bindings/webcore/EventOptions.h
+++ b/src/bun.js/bindings/webcore/EventOptions.h
diff --git a/src/javascript/jsc/bindings/webcore/EventPath.cpp b/src/bun.js/bindings/webcore/EventPath.cpp
index 30dbb5de9..30dbb5de9 100644
--- a/src/javascript/jsc/bindings/webcore/EventPath.cpp
+++ b/src/bun.js/bindings/webcore/EventPath.cpp
diff --git a/src/javascript/jsc/bindings/webcore/EventPath.h b/src/bun.js/bindings/webcore/EventPath.h
index feb86fb7b..feb86fb7b 100644
--- a/src/javascript/jsc/bindings/webcore/EventPath.h
+++ b/src/bun.js/bindings/webcore/EventPath.h
diff --git a/src/javascript/jsc/bindings/webcore/EventSender.h b/src/bun.js/bindings/webcore/EventSender.h
index d69a6e5e9..d69a6e5e9 100644
--- a/src/javascript/jsc/bindings/webcore/EventSender.h
+++ b/src/bun.js/bindings/webcore/EventSender.h
diff --git a/src/javascript/jsc/bindings/webcore/EventTarget.cpp b/src/bun.js/bindings/webcore/EventTarget.cpp
index 3b7128b7a..3b7128b7a 100644
--- a/src/javascript/jsc/bindings/webcore/EventTarget.cpp
+++ b/src/bun.js/bindings/webcore/EventTarget.cpp
diff --git a/src/javascript/jsc/bindings/webcore/EventTarget.h b/src/bun.js/bindings/webcore/EventTarget.h
index b763393d7..b763393d7 100644
--- a/src/javascript/jsc/bindings/webcore/EventTarget.h
+++ b/src/bun.js/bindings/webcore/EventTarget.h
diff --git a/src/javascript/jsc/bindings/webcore/EventTarget.idl b/src/bun.js/bindings/webcore/EventTarget.idl
index 3c3264b6e..3c3264b6e 100644
--- a/src/javascript/jsc/bindings/webcore/EventTarget.idl
+++ b/src/bun.js/bindings/webcore/EventTarget.idl
diff --git a/src/javascript/jsc/bindings/webcore/EventTargetConcrete.cpp b/src/bun.js/bindings/webcore/EventTargetConcrete.cpp
index ded224beb..ded224beb 100644
--- a/src/javascript/jsc/bindings/webcore/EventTargetConcrete.cpp
+++ b/src/bun.js/bindings/webcore/EventTargetConcrete.cpp
diff --git a/src/javascript/jsc/bindings/webcore/EventTargetConcrete.h b/src/bun.js/bindings/webcore/EventTargetConcrete.h
index 202be2d9e..202be2d9e 100644
--- a/src/javascript/jsc/bindings/webcore/EventTargetConcrete.h
+++ b/src/bun.js/bindings/webcore/EventTargetConcrete.h
diff --git a/src/javascript/jsc/bindings/webcore/EventTargetFactory.cpp b/src/bun.js/bindings/webcore/EventTargetFactory.cpp
index b52214fe0..b52214fe0 100644
--- a/src/javascript/jsc/bindings/webcore/EventTargetFactory.cpp
+++ b/src/bun.js/bindings/webcore/EventTargetFactory.cpp
diff --git a/src/javascript/jsc/bindings/webcore/EventTargetHeaders.h b/src/bun.js/bindings/webcore/EventTargetHeaders.h
index ae6ee0d3f..ae6ee0d3f 100644
--- a/src/javascript/jsc/bindings/webcore/EventTargetHeaders.h
+++ b/src/bun.js/bindings/webcore/EventTargetHeaders.h
diff --git a/src/javascript/jsc/bindings/webcore/EventTargetInterfaces.h b/src/bun.js/bindings/webcore/EventTargetInterfaces.h
index 0226d0c0e..0226d0c0e 100644
--- a/src/javascript/jsc/bindings/webcore/EventTargetInterfaces.h
+++ b/src/bun.js/bindings/webcore/EventTargetInterfaces.h
diff --git a/src/javascript/jsc/bindings/webcore/ExceptionDetails.h b/src/bun.js/bindings/webcore/ExceptionDetails.h
index d25c2e462..d25c2e462 100644
--- a/src/javascript/jsc/bindings/webcore/ExceptionDetails.h
+++ b/src/bun.js/bindings/webcore/ExceptionDetails.h
diff --git a/src/javascript/jsc/bindings/webcore/ExtendedDOMClientIsoSubspaces.h b/src/bun.js/bindings/webcore/ExtendedDOMClientIsoSubspaces.h
index 174eaa194..174eaa194 100644
--- a/src/javascript/jsc/bindings/webcore/ExtendedDOMClientIsoSubspaces.h
+++ b/src/bun.js/bindings/webcore/ExtendedDOMClientIsoSubspaces.h
diff --git a/src/javascript/jsc/bindings/webcore/ExtendedDOMIsoSubspaces.h b/src/bun.js/bindings/webcore/ExtendedDOMIsoSubspaces.h
index d5ccb4288..d5ccb4288 100644
--- a/src/javascript/jsc/bindings/webcore/ExtendedDOMIsoSubspaces.h
+++ b/src/bun.js/bindings/webcore/ExtendedDOMIsoSubspaces.h
diff --git a/src/javascript/jsc/bindings/webcore/FetchHeaders.cpp b/src/bun.js/bindings/webcore/FetchHeaders.cpp
index 26af08f1a..26af08f1a 100644
--- a/src/javascript/jsc/bindings/webcore/FetchHeaders.cpp
+++ b/src/bun.js/bindings/webcore/FetchHeaders.cpp
diff --git a/src/javascript/jsc/bindings/webcore/FetchHeaders.h b/src/bun.js/bindings/webcore/FetchHeaders.h
index b116cf978..b116cf978 100644
--- a/src/javascript/jsc/bindings/webcore/FetchHeaders.h
+++ b/src/bun.js/bindings/webcore/FetchHeaders.h
diff --git a/src/javascript/jsc/bindings/webcore/FetchHeaders.idl b/src/bun.js/bindings/webcore/FetchHeaders.idl
index daa0ebb8e..daa0ebb8e 100644
--- a/src/javascript/jsc/bindings/webcore/FetchHeaders.idl
+++ b/src/bun.js/bindings/webcore/FetchHeaders.idl
diff --git a/src/javascript/jsc/bindings/webcore/HTTPHeaderField.cpp b/src/bun.js/bindings/webcore/HTTPHeaderField.cpp
index a4d101bdd..a4d101bdd 100644
--- a/src/javascript/jsc/bindings/webcore/HTTPHeaderField.cpp
+++ b/src/bun.js/bindings/webcore/HTTPHeaderField.cpp
diff --git a/src/javascript/jsc/bindings/webcore/HTTPHeaderField.h b/src/bun.js/bindings/webcore/HTTPHeaderField.h
index c5fbc1b43..c5fbc1b43 100644
--- a/src/javascript/jsc/bindings/webcore/HTTPHeaderField.h
+++ b/src/bun.js/bindings/webcore/HTTPHeaderField.h
diff --git a/src/javascript/jsc/bindings/webcore/HTTPHeaderMap.cpp b/src/bun.js/bindings/webcore/HTTPHeaderMap.cpp
index bd516cf6c..bd516cf6c 100644
--- a/src/javascript/jsc/bindings/webcore/HTTPHeaderMap.cpp
+++ b/src/bun.js/bindings/webcore/HTTPHeaderMap.cpp
diff --git a/src/javascript/jsc/bindings/webcore/HTTPHeaderMap.h b/src/bun.js/bindings/webcore/HTTPHeaderMap.h
index 1fe19d311..1fe19d311 100644
--- a/src/javascript/jsc/bindings/webcore/HTTPHeaderMap.h
+++ b/src/bun.js/bindings/webcore/HTTPHeaderMap.h
diff --git a/src/javascript/jsc/bindings/webcore/HTTPHeaderNames.cpp b/src/bun.js/bindings/webcore/HTTPHeaderNames.cpp
index 2846f15e5..2846f15e5 100644
--- a/src/javascript/jsc/bindings/webcore/HTTPHeaderNames.cpp
+++ b/src/bun.js/bindings/webcore/HTTPHeaderNames.cpp
diff --git a/src/javascript/jsc/bindings/webcore/HTTPHeaderNames.gperf b/src/bun.js/bindings/webcore/HTTPHeaderNames.gperf
index 66a4b24e8..66a4b24e8 100644
--- a/src/javascript/jsc/bindings/webcore/HTTPHeaderNames.gperf
+++ b/src/bun.js/bindings/webcore/HTTPHeaderNames.gperf
diff --git a/src/javascript/jsc/bindings/webcore/HTTPHeaderNames.h b/src/bun.js/bindings/webcore/HTTPHeaderNames.h
index 066d40e90..066d40e90 100644
--- a/src/javascript/jsc/bindings/webcore/HTTPHeaderNames.h
+++ b/src/bun.js/bindings/webcore/HTTPHeaderNames.h
diff --git a/src/javascript/jsc/bindings/webcore/HTTPHeaderNames.in b/src/bun.js/bindings/webcore/HTTPHeaderNames.in
index 9edb2b2d7..9edb2b2d7 100644
--- a/src/javascript/jsc/bindings/webcore/HTTPHeaderNames.in
+++ b/src/bun.js/bindings/webcore/HTTPHeaderNames.in
diff --git a/src/javascript/jsc/bindings/webcore/HTTPHeaderValues.cpp b/src/bun.js/bindings/webcore/HTTPHeaderValues.cpp
index b4869e846..b4869e846 100644
--- a/src/javascript/jsc/bindings/webcore/HTTPHeaderValues.cpp
+++ b/src/bun.js/bindings/webcore/HTTPHeaderValues.cpp
diff --git a/src/javascript/jsc/bindings/webcore/HTTPHeaderValues.h b/src/bun.js/bindings/webcore/HTTPHeaderValues.h
index 6345a9a8f..6345a9a8f 100644
--- a/src/javascript/jsc/bindings/webcore/HTTPHeaderValues.h
+++ b/src/bun.js/bindings/webcore/HTTPHeaderValues.h
diff --git a/src/javascript/jsc/bindings/webcore/HTTPParsers.cpp b/src/bun.js/bindings/webcore/HTTPParsers.cpp
index 335afcec1..335afcec1 100644
--- a/src/javascript/jsc/bindings/webcore/HTTPParsers.cpp
+++ b/src/bun.js/bindings/webcore/HTTPParsers.cpp
diff --git a/src/javascript/jsc/bindings/webcore/HTTPParsers.h b/src/bun.js/bindings/webcore/HTTPParsers.h
index 917ab2eae..917ab2eae 100644
--- a/src/javascript/jsc/bindings/webcore/HTTPParsers.h
+++ b/src/bun.js/bindings/webcore/HTTPParsers.h
diff --git a/src/javascript/jsc/bindings/webcore/InternalWritableStream.cpp b/src/bun.js/bindings/webcore/InternalWritableStream.cpp
index d3988c908..d3988c908 100644
--- a/src/javascript/jsc/bindings/webcore/InternalWritableStream.cpp
+++ b/src/bun.js/bindings/webcore/InternalWritableStream.cpp
diff --git a/src/javascript/jsc/bindings/webcore/InternalWritableStream.h b/src/bun.js/bindings/webcore/InternalWritableStream.h
index a768f959d..a768f959d 100644
--- a/src/javascript/jsc/bindings/webcore/InternalWritableStream.h
+++ b/src/bun.js/bindings/webcore/InternalWritableStream.h
diff --git a/src/javascript/jsc/bindings/webcore/JSAbortAlgorithm.cpp b/src/bun.js/bindings/webcore/JSAbortAlgorithm.cpp
index 81310bbd5..81310bbd5 100644
--- a/src/javascript/jsc/bindings/webcore/JSAbortAlgorithm.cpp
+++ b/src/bun.js/bindings/webcore/JSAbortAlgorithm.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSAbortAlgorithm.h b/src/bun.js/bindings/webcore/JSAbortAlgorithm.h
index 9193ac7e6..9193ac7e6 100644
--- a/src/javascript/jsc/bindings/webcore/JSAbortAlgorithm.h
+++ b/src/bun.js/bindings/webcore/JSAbortAlgorithm.h
diff --git a/src/javascript/jsc/bindings/webcore/JSAbortController.cpp b/src/bun.js/bindings/webcore/JSAbortController.cpp
index b2ba038e3..b2ba038e3 100644
--- a/src/javascript/jsc/bindings/webcore/JSAbortController.cpp
+++ b/src/bun.js/bindings/webcore/JSAbortController.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSAbortController.dep b/src/bun.js/bindings/webcore/JSAbortController.dep
index c62eba8ee..c62eba8ee 100644
--- a/src/javascript/jsc/bindings/webcore/JSAbortController.dep
+++ b/src/bun.js/bindings/webcore/JSAbortController.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSAbortController.h b/src/bun.js/bindings/webcore/JSAbortController.h
index 7801a6207..7801a6207 100644
--- a/src/javascript/jsc/bindings/webcore/JSAbortController.h
+++ b/src/bun.js/bindings/webcore/JSAbortController.h
diff --git a/src/javascript/jsc/bindings/webcore/JSAbortSignal.cpp b/src/bun.js/bindings/webcore/JSAbortSignal.cpp
index bce823102..bce823102 100644
--- a/src/javascript/jsc/bindings/webcore/JSAbortSignal.cpp
+++ b/src/bun.js/bindings/webcore/JSAbortSignal.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSAbortSignal.dep b/src/bun.js/bindings/webcore/JSAbortSignal.dep
index ae214b504..ae214b504 100644
--- a/src/javascript/jsc/bindings/webcore/JSAbortSignal.dep
+++ b/src/bun.js/bindings/webcore/JSAbortSignal.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSAbortSignal.h b/src/bun.js/bindings/webcore/JSAbortSignal.h
index afca5f42c..afca5f42c 100644
--- a/src/javascript/jsc/bindings/webcore/JSAbortSignal.h
+++ b/src/bun.js/bindings/webcore/JSAbortSignal.h
diff --git a/src/javascript/jsc/bindings/webcore/JSAbortSignalCustom.cpp b/src/bun.js/bindings/webcore/JSAbortSignalCustom.cpp
index bc3bab081..bc3bab081 100644
--- a/src/javascript/jsc/bindings/webcore/JSAbortSignalCustom.cpp
+++ b/src/bun.js/bindings/webcore/JSAbortSignalCustom.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSAddEventListenerOptions.cpp b/src/bun.js/bindings/webcore/JSAddEventListenerOptions.cpp
index 6ef60b2a3..6ef60b2a3 100644
--- a/src/javascript/jsc/bindings/webcore/JSAddEventListenerOptions.cpp
+++ b/src/bun.js/bindings/webcore/JSAddEventListenerOptions.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSAddEventListenerOptions.dep b/src/bun.js/bindings/webcore/JSAddEventListenerOptions.dep
index da4d55f61..da4d55f61 100644
--- a/src/javascript/jsc/bindings/webcore/JSAddEventListenerOptions.dep
+++ b/src/bun.js/bindings/webcore/JSAddEventListenerOptions.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSAddEventListenerOptions.h b/src/bun.js/bindings/webcore/JSAddEventListenerOptions.h
index 77b1ca7ed..77b1ca7ed 100644
--- a/src/javascript/jsc/bindings/webcore/JSAddEventListenerOptions.h
+++ b/src/bun.js/bindings/webcore/JSAddEventListenerOptions.h
diff --git a/src/javascript/jsc/bindings/webcore/JSByteLengthQueuingStrategy.cpp b/src/bun.js/bindings/webcore/JSByteLengthQueuingStrategy.cpp
index d0e02a447..d0e02a447 100644
--- a/src/javascript/jsc/bindings/webcore/JSByteLengthQueuingStrategy.cpp
+++ b/src/bun.js/bindings/webcore/JSByteLengthQueuingStrategy.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSByteLengthQueuingStrategy.dep b/src/bun.js/bindings/webcore/JSByteLengthQueuingStrategy.dep
index 0b697d758..0b697d758 100644
--- a/src/javascript/jsc/bindings/webcore/JSByteLengthQueuingStrategy.dep
+++ b/src/bun.js/bindings/webcore/JSByteLengthQueuingStrategy.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSByteLengthQueuingStrategy.h b/src/bun.js/bindings/webcore/JSByteLengthQueuingStrategy.h
index 75d528814..75d528814 100644
--- a/src/javascript/jsc/bindings/webcore/JSByteLengthQueuingStrategy.h
+++ b/src/bun.js/bindings/webcore/JSByteLengthQueuingStrategy.h
diff --git a/src/javascript/jsc/bindings/webcore/JSCallbackData.cpp b/src/bun.js/bindings/webcore/JSCallbackData.cpp
index 671f168f7..671f168f7 100644
--- a/src/javascript/jsc/bindings/webcore/JSCallbackData.cpp
+++ b/src/bun.js/bindings/webcore/JSCallbackData.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSCallbackData.h b/src/bun.js/bindings/webcore/JSCallbackData.h
index ddfaf6e39..ddfaf6e39 100644
--- a/src/javascript/jsc/bindings/webcore/JSCallbackData.h
+++ b/src/bun.js/bindings/webcore/JSCallbackData.h
diff --git a/src/javascript/jsc/bindings/webcore/JSCloseEvent.cpp b/src/bun.js/bindings/webcore/JSCloseEvent.cpp
index 6c86ed3b3..6c86ed3b3 100644
--- a/src/javascript/jsc/bindings/webcore/JSCloseEvent.cpp
+++ b/src/bun.js/bindings/webcore/JSCloseEvent.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSCloseEvent.dep b/src/bun.js/bindings/webcore/JSCloseEvent.dep
index 25edceaab..25edceaab 100644
--- a/src/javascript/jsc/bindings/webcore/JSCloseEvent.dep
+++ b/src/bun.js/bindings/webcore/JSCloseEvent.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSCloseEvent.h b/src/bun.js/bindings/webcore/JSCloseEvent.h
index d7f25493b..d7f25493b 100644
--- a/src/javascript/jsc/bindings/webcore/JSCloseEvent.h
+++ b/src/bun.js/bindings/webcore/JSCloseEvent.h
diff --git a/src/javascript/jsc/bindings/webcore/JSCountQueuingStrategy.cpp b/src/bun.js/bindings/webcore/JSCountQueuingStrategy.cpp
index 286897c2d..286897c2d 100644
--- a/src/javascript/jsc/bindings/webcore/JSCountQueuingStrategy.cpp
+++ b/src/bun.js/bindings/webcore/JSCountQueuingStrategy.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSCountQueuingStrategy.dep b/src/bun.js/bindings/webcore/JSCountQueuingStrategy.dep
index 413363a34..413363a34 100644
--- a/src/javascript/jsc/bindings/webcore/JSCountQueuingStrategy.dep
+++ b/src/bun.js/bindings/webcore/JSCountQueuingStrategy.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSCountQueuingStrategy.h b/src/bun.js/bindings/webcore/JSCountQueuingStrategy.h
index 0cd89d4fc..0cd89d4fc 100644
--- a/src/javascript/jsc/bindings/webcore/JSCountQueuingStrategy.h
+++ b/src/bun.js/bindings/webcore/JSCountQueuingStrategy.h
diff --git a/src/javascript/jsc/bindings/webcore/JSCustomEvent.cpp b/src/bun.js/bindings/webcore/JSCustomEvent.cpp
index 383688c42..383688c42 100644
--- a/src/javascript/jsc/bindings/webcore/JSCustomEvent.cpp
+++ b/src/bun.js/bindings/webcore/JSCustomEvent.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSCustomEvent.dep b/src/bun.js/bindings/webcore/JSCustomEvent.dep
index 443684f8c..443684f8c 100644
--- a/src/javascript/jsc/bindings/webcore/JSCustomEvent.dep
+++ b/src/bun.js/bindings/webcore/JSCustomEvent.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSCustomEvent.h b/src/bun.js/bindings/webcore/JSCustomEvent.h
index 309b4a4a8..309b4a4a8 100644
--- a/src/javascript/jsc/bindings/webcore/JSCustomEvent.h
+++ b/src/bun.js/bindings/webcore/JSCustomEvent.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMAttribute.h b/src/bun.js/bindings/webcore/JSDOMAttribute.h
index 17b0f588c..17b0f588c 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMAttribute.h
+++ b/src/bun.js/bindings/webcore/JSDOMAttribute.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMBinding.h b/src/bun.js/bindings/webcore/JSDOMBinding.h
index cb9a3a1c6..cb9a3a1c6 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMBinding.h
+++ b/src/bun.js/bindings/webcore/JSDOMBinding.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMBindingInternalsBuiltins.cpp b/src/bun.js/bindings/webcore/JSDOMBindingInternalsBuiltins.cpp
index 2ae04a290..2ae04a290 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMBindingInternalsBuiltins.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMBindingInternalsBuiltins.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMBindingInternalsBuiltins.h b/src/bun.js/bindings/webcore/JSDOMBindingInternalsBuiltins.h
index 40b698c3a..40b698c3a 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMBindingInternalsBuiltins.h
+++ b/src/bun.js/bindings/webcore/JSDOMBindingInternalsBuiltins.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMBuiltinConstructor.h b/src/bun.js/bindings/webcore/JSDOMBuiltinConstructor.h
index 733a880f3..733a880f3 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMBuiltinConstructor.h
+++ b/src/bun.js/bindings/webcore/JSDOMBuiltinConstructor.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMBuiltinConstructorBase.cpp b/src/bun.js/bindings/webcore/JSDOMBuiltinConstructorBase.cpp
index 98058f5f4..98058f5f4 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMBuiltinConstructorBase.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMBuiltinConstructorBase.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMBuiltinConstructorBase.h b/src/bun.js/bindings/webcore/JSDOMBuiltinConstructorBase.h
index 9593d99c1..9593d99c1 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMBuiltinConstructorBase.h
+++ b/src/bun.js/bindings/webcore/JSDOMBuiltinConstructorBase.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMCastThisValue.h b/src/bun.js/bindings/webcore/JSDOMCastThisValue.h
index d7028c4b5..d7028c4b5 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMCastThisValue.h
+++ b/src/bun.js/bindings/webcore/JSDOMCastThisValue.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConstructor.h b/src/bun.js/bindings/webcore/JSDOMConstructor.h
index 680d71a4e..680d71a4e 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConstructor.h
+++ b/src/bun.js/bindings/webcore/JSDOMConstructor.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConstructorBase.cpp b/src/bun.js/bindings/webcore/JSDOMConstructorBase.cpp
index 76e5bed57..76e5bed57 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConstructorBase.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMConstructorBase.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConstructorBase.h b/src/bun.js/bindings/webcore/JSDOMConstructorBase.h
index 335c112d3..335c112d3 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConstructorBase.h
+++ b/src/bun.js/bindings/webcore/JSDOMConstructorBase.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConstructorNotCallable.h b/src/bun.js/bindings/webcore/JSDOMConstructorNotCallable.h
index 779bf8876..779bf8876 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConstructorNotCallable.h
+++ b/src/bun.js/bindings/webcore/JSDOMConstructorNotCallable.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConstructorNotConstructable.h b/src/bun.js/bindings/webcore/JSDOMConstructorNotConstructable.h
index ac173d0fe..ac173d0fe 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConstructorNotConstructable.h
+++ b/src/bun.js/bindings/webcore/JSDOMConstructorNotConstructable.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvert.h b/src/bun.js/bindings/webcore/JSDOMConvert.h
index f5c32823d..f5c32823d 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvert.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvert.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertAny.h b/src/bun.js/bindings/webcore/JSDOMConvertAny.h
index b744bbb89..b744bbb89 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertAny.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertAny.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertBase.h b/src/bun.js/bindings/webcore/JSDOMConvertBase.h
index 8cab2e7d8..8cab2e7d8 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertBase.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertBase.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertBoolean.h b/src/bun.js/bindings/webcore/JSDOMConvertBoolean.h
index ed8ea5211..ed8ea5211 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertBoolean.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertBoolean.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertBufferSource.h b/src/bun.js/bindings/webcore/JSDOMConvertBufferSource.h
index bab958a4f..bab958a4f 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertBufferSource.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertBufferSource.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertCallbacks.h b/src/bun.js/bindings/webcore/JSDOMConvertCallbacks.h
index c98ad316b..c98ad316b 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertCallbacks.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertCallbacks.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertDate.cpp b/src/bun.js/bindings/webcore/JSDOMConvertDate.cpp
index c624bd25b..c624bd25b 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertDate.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMConvertDate.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertDate.h b/src/bun.js/bindings/webcore/JSDOMConvertDate.h
index de0a9f770..de0a9f770 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertDate.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertDate.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertDictionary.h b/src/bun.js/bindings/webcore/JSDOMConvertDictionary.h
index 94173b16f..94173b16f 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertDictionary.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertDictionary.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertEnumeration.h b/src/bun.js/bindings/webcore/JSDOMConvertEnumeration.h
index d458e4aa8..d458e4aa8 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertEnumeration.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertEnumeration.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertEventListener.h b/src/bun.js/bindings/webcore/JSDOMConvertEventListener.h
index 09d0cbb6e..09d0cbb6e 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertEventListener.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertEventListener.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertInterface.h b/src/bun.js/bindings/webcore/JSDOMConvertInterface.h
index 349276467..349276467 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertInterface.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertInterface.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertJSON.h b/src/bun.js/bindings/webcore/JSDOMConvertJSON.h
index 9a289ef6c..9a289ef6c 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertJSON.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertJSON.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertNull.h b/src/bun.js/bindings/webcore/JSDOMConvertNull.h
index b132825d2..b132825d2 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertNull.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertNull.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertNullable.h b/src/bun.js/bindings/webcore/JSDOMConvertNullable.h
index a3e4b5cc4..a3e4b5cc4 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertNullable.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertNullable.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertNumbers.cpp b/src/bun.js/bindings/webcore/JSDOMConvertNumbers.cpp
index 438d32723..438d32723 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertNumbers.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMConvertNumbers.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertNumbers.h b/src/bun.js/bindings/webcore/JSDOMConvertNumbers.h
index 29413d8d9..29413d8d9 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertNumbers.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertNumbers.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertObject.h b/src/bun.js/bindings/webcore/JSDOMConvertObject.h
index 24dacac9e..24dacac9e 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertObject.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertObject.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertPromise.h b/src/bun.js/bindings/webcore/JSDOMConvertPromise.h
index e01a99884..e01a99884 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertPromise.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertPromise.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertRecord.h b/src/bun.js/bindings/webcore/JSDOMConvertRecord.h
index 0f4c84eff..0f4c84eff 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertRecord.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertRecord.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertScheduledAction.h b/src/bun.js/bindings/webcore/JSDOMConvertScheduledAction.h
index 72fb8450d..72fb8450d 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertScheduledAction.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertScheduledAction.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertSequences.h b/src/bun.js/bindings/webcore/JSDOMConvertSequences.h
index a08336f64..a08336f64 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertSequences.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertSequences.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertSerializedScriptValue.h b/src/bun.js/bindings/webcore/JSDOMConvertSerializedScriptValue.h
index ba714ff67..ba714ff67 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertSerializedScriptValue.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertSerializedScriptValue.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertStrings.cpp b/src/bun.js/bindings/webcore/JSDOMConvertStrings.cpp
index 00f385e07..00f385e07 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertStrings.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMConvertStrings.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertStrings.h b/src/bun.js/bindings/webcore/JSDOMConvertStrings.h
index 450caf7e9..450caf7e9 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertStrings.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertStrings.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertUnion.h b/src/bun.js/bindings/webcore/JSDOMConvertUnion.h
index 75ce6f86a..75ce6f86a 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertUnion.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertUnion.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertVariadic.h b/src/bun.js/bindings/webcore/JSDOMConvertVariadic.h
index dd16b1d66..dd16b1d66 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertVariadic.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertVariadic.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertWebGL.cpp b/src/bun.js/bindings/webcore/JSDOMConvertWebGL.cpp
index 7d4576661..7d4576661 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertWebGL.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMConvertWebGL.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertWebGL.h b/src/bun.js/bindings/webcore/JSDOMConvertWebGL.h
index ae8f7e688..ae8f7e688 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertWebGL.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertWebGL.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertXPathNSResolver.h b/src/bun.js/bindings/webcore/JSDOMConvertXPathNSResolver.h
index 6c48a072a..6c48a072a 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMConvertXPathNSResolver.h
+++ b/src/bun.js/bindings/webcore/JSDOMConvertXPathNSResolver.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMException.cpp b/src/bun.js/bindings/webcore/JSDOMException.cpp
index 5dde2de4e..5dde2de4e 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMException.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMException.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMException.h b/src/bun.js/bindings/webcore/JSDOMException.h
index 7c20a5745..7c20a5745 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMException.h
+++ b/src/bun.js/bindings/webcore/JSDOMException.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMGlobalObjectInlines.h b/src/bun.js/bindings/webcore/JSDOMGlobalObjectInlines.h
index 313b14aa2..313b14aa2 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMGlobalObjectInlines.h
+++ b/src/bun.js/bindings/webcore/JSDOMGlobalObjectInlines.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMGuardedObject.cpp b/src/bun.js/bindings/webcore/JSDOMGuardedObject.cpp
index 76fc86415..76fc86415 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMGuardedObject.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMGuardedObject.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMGuardedObject.h b/src/bun.js/bindings/webcore/JSDOMGuardedObject.h
index cf0887c32..cf0887c32 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMGuardedObject.h
+++ b/src/bun.js/bindings/webcore/JSDOMGuardedObject.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMIterator.cpp b/src/bun.js/bindings/webcore/JSDOMIterator.cpp
index 0bc957e17..0bc957e17 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMIterator.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMIterator.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMIterator.h b/src/bun.js/bindings/webcore/JSDOMIterator.h
index b9740d4f9..b9740d4f9 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMIterator.h
+++ b/src/bun.js/bindings/webcore/JSDOMIterator.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMOperation.h b/src/bun.js/bindings/webcore/JSDOMOperation.h
index c3f6d0451..c3f6d0451 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMOperation.h
+++ b/src/bun.js/bindings/webcore/JSDOMOperation.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMOperationReturningPromise.h b/src/bun.js/bindings/webcore/JSDOMOperationReturningPromise.h
index c4d1513ad..c4d1513ad 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMOperationReturningPromise.h
+++ b/src/bun.js/bindings/webcore/JSDOMOperationReturningPromise.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMPromise.cpp b/src/bun.js/bindings/webcore/JSDOMPromise.cpp
index db1597552..db1597552 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMPromise.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMPromise.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMPromise.h b/src/bun.js/bindings/webcore/JSDOMPromise.h
index 97ebafa74..97ebafa74 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMPromise.h
+++ b/src/bun.js/bindings/webcore/JSDOMPromise.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMPromiseDeferred.cpp b/src/bun.js/bindings/webcore/JSDOMPromiseDeferred.cpp
index 0c9f83ef7..0c9f83ef7 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMPromiseDeferred.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMPromiseDeferred.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMPromiseDeferred.h b/src/bun.js/bindings/webcore/JSDOMPromiseDeferred.h
index 701608677..701608677 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMPromiseDeferred.h
+++ b/src/bun.js/bindings/webcore/JSDOMPromiseDeferred.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMURL.cpp b/src/bun.js/bindings/webcore/JSDOMURL.cpp
index 95bf264dd..95bf264dd 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMURL.cpp
+++ b/src/bun.js/bindings/webcore/JSDOMURL.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMURL.h b/src/bun.js/bindings/webcore/JSDOMURL.h
index e89add235..e89add235 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMURL.h
+++ b/src/bun.js/bindings/webcore/JSDOMURL.h
diff --git a/src/javascript/jsc/bindings/webcore/JSDOMWindow.h b/src/bun.js/bindings/webcore/JSDOMWindow.h
index 472956eba..472956eba 100644
--- a/src/javascript/jsc/bindings/webcore/JSDOMWindow.h
+++ b/src/bun.js/bindings/webcore/JSDOMWindow.h
diff --git a/src/javascript/jsc/bindings/webcore/JSErrorCallback.cpp b/src/bun.js/bindings/webcore/JSErrorCallback.cpp
index de924d857..de924d857 100644
--- a/src/javascript/jsc/bindings/webcore/JSErrorCallback.cpp
+++ b/src/bun.js/bindings/webcore/JSErrorCallback.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSErrorCallback.h b/src/bun.js/bindings/webcore/JSErrorCallback.h
index ecfd5f04f..ecfd5f04f 100644
--- a/src/javascript/jsc/bindings/webcore/JSErrorCallback.h
+++ b/src/bun.js/bindings/webcore/JSErrorCallback.h
diff --git a/src/javascript/jsc/bindings/webcore/JSErrorEvent.cpp b/src/bun.js/bindings/webcore/JSErrorEvent.cpp
index 73010ffcb..73010ffcb 100644
--- a/src/javascript/jsc/bindings/webcore/JSErrorEvent.cpp
+++ b/src/bun.js/bindings/webcore/JSErrorEvent.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSErrorEvent.dep b/src/bun.js/bindings/webcore/JSErrorEvent.dep
index bc136344b..bc136344b 100644
--- a/src/javascript/jsc/bindings/webcore/JSErrorEvent.dep
+++ b/src/bun.js/bindings/webcore/JSErrorEvent.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSErrorEvent.h b/src/bun.js/bindings/webcore/JSErrorEvent.h
index 5f8bbd802..5f8bbd802 100644
--- a/src/javascript/jsc/bindings/webcore/JSErrorEvent.h
+++ b/src/bun.js/bindings/webcore/JSErrorEvent.h
diff --git a/src/javascript/jsc/bindings/webcore/JSErrorEventCustom.cpp b/src/bun.js/bindings/webcore/JSErrorEventCustom.cpp
index 728e404a9..728e404a9 100644
--- a/src/javascript/jsc/bindings/webcore/JSErrorEventCustom.cpp
+++ b/src/bun.js/bindings/webcore/JSErrorEventCustom.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSErrorHandler.cpp b/src/bun.js/bindings/webcore/JSErrorHandler.cpp
index ee5df32b5..ee5df32b5 100644
--- a/src/javascript/jsc/bindings/webcore/JSErrorHandler.cpp
+++ b/src/bun.js/bindings/webcore/JSErrorHandler.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSErrorHandler.h b/src/bun.js/bindings/webcore/JSErrorHandler.h
index d32c55a86..d32c55a86 100644
--- a/src/javascript/jsc/bindings/webcore/JSErrorHandler.h
+++ b/src/bun.js/bindings/webcore/JSErrorHandler.h
diff --git a/src/javascript/jsc/bindings/webcore/JSEvent.cpp b/src/bun.js/bindings/webcore/JSEvent.cpp
index fc729b4c8..fc729b4c8 100644
--- a/src/javascript/jsc/bindings/webcore/JSEvent.cpp
+++ b/src/bun.js/bindings/webcore/JSEvent.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSEvent.dep b/src/bun.js/bindings/webcore/JSEvent.dep
index 573e0bba5..573e0bba5 100644
--- a/src/javascript/jsc/bindings/webcore/JSEvent.dep
+++ b/src/bun.js/bindings/webcore/JSEvent.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSEvent.h b/src/bun.js/bindings/webcore/JSEvent.h
index 1f4c5f80a..1f4c5f80a 100644
--- a/src/javascript/jsc/bindings/webcore/JSEvent.h
+++ b/src/bun.js/bindings/webcore/JSEvent.h
diff --git a/src/javascript/jsc/bindings/webcore/JSEventCustom.cpp b/src/bun.js/bindings/webcore/JSEventCustom.cpp
index 2f8a9b04d..2f8a9b04d 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventCustom.cpp
+++ b/src/bun.js/bindings/webcore/JSEventCustom.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSEventCustom.h b/src/bun.js/bindings/webcore/JSEventCustom.h
index c910848f6..c910848f6 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventCustom.h
+++ b/src/bun.js/bindings/webcore/JSEventCustom.h
diff --git a/src/javascript/jsc/bindings/webcore/JSEventInit.cpp b/src/bun.js/bindings/webcore/JSEventInit.cpp
index 5ec28613e..5ec28613e 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventInit.cpp
+++ b/src/bun.js/bindings/webcore/JSEventInit.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSEventInit.dep b/src/bun.js/bindings/webcore/JSEventInit.dep
index e1d78f2d8..e1d78f2d8 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventInit.dep
+++ b/src/bun.js/bindings/webcore/JSEventInit.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSEventInit.h b/src/bun.js/bindings/webcore/JSEventInit.h
index c7cd96b65..c7cd96b65 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventInit.h
+++ b/src/bun.js/bindings/webcore/JSEventInit.h
diff --git a/src/javascript/jsc/bindings/webcore/JSEventListener.cpp b/src/bun.js/bindings/webcore/JSEventListener.cpp
index 3d6be9cd0..3d6be9cd0 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventListener.cpp
+++ b/src/bun.js/bindings/webcore/JSEventListener.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSEventListener.h b/src/bun.js/bindings/webcore/JSEventListener.h
index fb8da1bb6..fb8da1bb6 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventListener.h
+++ b/src/bun.js/bindings/webcore/JSEventListener.h
diff --git a/src/javascript/jsc/bindings/webcore/JSEventListenerOptions.cpp b/src/bun.js/bindings/webcore/JSEventListenerOptions.cpp
index a1e6fb69f..a1e6fb69f 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventListenerOptions.cpp
+++ b/src/bun.js/bindings/webcore/JSEventListenerOptions.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSEventListenerOptions.dep b/src/bun.js/bindings/webcore/JSEventListenerOptions.dep
index 6a7075b90..6a7075b90 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventListenerOptions.dep
+++ b/src/bun.js/bindings/webcore/JSEventListenerOptions.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSEventListenerOptions.h b/src/bun.js/bindings/webcore/JSEventListenerOptions.h
index 1b4e2027e..1b4e2027e 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventListenerOptions.h
+++ b/src/bun.js/bindings/webcore/JSEventListenerOptions.h
diff --git a/src/javascript/jsc/bindings/webcore/JSEventModifierInit.cpp b/src/bun.js/bindings/webcore/JSEventModifierInit.cpp
index 0e9d2c804..0e9d2c804 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventModifierInit.cpp
+++ b/src/bun.js/bindings/webcore/JSEventModifierInit.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSEventModifierInit.dep b/src/bun.js/bindings/webcore/JSEventModifierInit.dep
index f6b60a42f..f6b60a42f 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventModifierInit.dep
+++ b/src/bun.js/bindings/webcore/JSEventModifierInit.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSEventModifierInit.h b/src/bun.js/bindings/webcore/JSEventModifierInit.h
index 2f35a2fd2..2f35a2fd2 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventModifierInit.h
+++ b/src/bun.js/bindings/webcore/JSEventModifierInit.h
diff --git a/src/javascript/jsc/bindings/webcore/JSEventTarget.cpp b/src/bun.js/bindings/webcore/JSEventTarget.cpp
index 15f282ef8..15f282ef8 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventTarget.cpp
+++ b/src/bun.js/bindings/webcore/JSEventTarget.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSEventTarget.h b/src/bun.js/bindings/webcore/JSEventTarget.h
index ac19a2d35..ac19a2d35 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventTarget.h
+++ b/src/bun.js/bindings/webcore/JSEventTarget.h
diff --git a/src/javascript/jsc/bindings/webcore/JSEventTargetCustom.cpp b/src/bun.js/bindings/webcore/JSEventTargetCustom.cpp
index 3b24d0a8a..3b24d0a8a 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventTargetCustom.cpp
+++ b/src/bun.js/bindings/webcore/JSEventTargetCustom.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSEventTargetCustom.h b/src/bun.js/bindings/webcore/JSEventTargetCustom.h
index 9bbc58004..9bbc58004 100644
--- a/src/javascript/jsc/bindings/webcore/JSEventTargetCustom.h
+++ b/src/bun.js/bindings/webcore/JSEventTargetCustom.h
diff --git a/src/javascript/jsc/bindings/webcore/JSFetchHeaders.cpp b/src/bun.js/bindings/webcore/JSFetchHeaders.cpp
index 8ea72b567..8ea72b567 100644
--- a/src/javascript/jsc/bindings/webcore/JSFetchHeaders.cpp
+++ b/src/bun.js/bindings/webcore/JSFetchHeaders.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSFetchHeaders.dep b/src/bun.js/bindings/webcore/JSFetchHeaders.dep
index e553164bd..e553164bd 100644
--- a/src/javascript/jsc/bindings/webcore/JSFetchHeaders.dep
+++ b/src/bun.js/bindings/webcore/JSFetchHeaders.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSFetchHeaders.h b/src/bun.js/bindings/webcore/JSFetchHeaders.h
index 4761e3a66..4761e3a66 100644
--- a/src/javascript/jsc/bindings/webcore/JSFetchHeaders.h
+++ b/src/bun.js/bindings/webcore/JSFetchHeaders.h
diff --git a/src/javascript/jsc/bindings/webcore/JSMessageEvent.cpp b/src/bun.js/bindings/webcore/JSMessageEvent.cpp
index ef0a1093d..ef0a1093d 100644
--- a/src/javascript/jsc/bindings/webcore/JSMessageEvent.cpp
+++ b/src/bun.js/bindings/webcore/JSMessageEvent.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSMessageEvent.dep b/src/bun.js/bindings/webcore/JSMessageEvent.dep
index da20f76fa..da20f76fa 100644
--- a/src/javascript/jsc/bindings/webcore/JSMessageEvent.dep
+++ b/src/bun.js/bindings/webcore/JSMessageEvent.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSMessageEvent.h b/src/bun.js/bindings/webcore/JSMessageEvent.h
index 85424d9ec..85424d9ec 100644
--- a/src/javascript/jsc/bindings/webcore/JSMessageEvent.h
+++ b/src/bun.js/bindings/webcore/JSMessageEvent.h
diff --git a/src/javascript/jsc/bindings/webcore/JSMessageEventCustom.cpp b/src/bun.js/bindings/webcore/JSMessageEventCustom.cpp
index 66390f86b..66390f86b 100644
--- a/src/javascript/jsc/bindings/webcore/JSMessageEventCustom.cpp
+++ b/src/bun.js/bindings/webcore/JSMessageEventCustom.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableByteStreamController.cpp b/src/bun.js/bindings/webcore/JSReadableByteStreamController.cpp
index 7f151188f..7f151188f 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableByteStreamController.cpp
+++ b/src/bun.js/bindings/webcore/JSReadableByteStreamController.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableByteStreamController.dep b/src/bun.js/bindings/webcore/JSReadableByteStreamController.dep
index 605eb3e4a..605eb3e4a 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableByteStreamController.dep
+++ b/src/bun.js/bindings/webcore/JSReadableByteStreamController.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableByteStreamController.h b/src/bun.js/bindings/webcore/JSReadableByteStreamController.h
index 6d512aaed..6d512aaed 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableByteStreamController.h
+++ b/src/bun.js/bindings/webcore/JSReadableByteStreamController.h
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStream.cpp b/src/bun.js/bindings/webcore/JSReadableStream.cpp
index 7934bf004..7934bf004 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStream.cpp
+++ b/src/bun.js/bindings/webcore/JSReadableStream.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStream.dep b/src/bun.js/bindings/webcore/JSReadableStream.dep
index f4ea48d43..f4ea48d43 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStream.dep
+++ b/src/bun.js/bindings/webcore/JSReadableStream.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStream.h b/src/bun.js/bindings/webcore/JSReadableStream.h
index 137efe15d..137efe15d 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStream.h
+++ b/src/bun.js/bindings/webcore/JSReadableStream.h
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamBYOBReader.cpp b/src/bun.js/bindings/webcore/JSReadableStreamBYOBReader.cpp
index e6e5b7743..e6e5b7743 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamBYOBReader.cpp
+++ b/src/bun.js/bindings/webcore/JSReadableStreamBYOBReader.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamBYOBReader.dep b/src/bun.js/bindings/webcore/JSReadableStreamBYOBReader.dep
index 1acef694c..1acef694c 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamBYOBReader.dep
+++ b/src/bun.js/bindings/webcore/JSReadableStreamBYOBReader.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamBYOBReader.h b/src/bun.js/bindings/webcore/JSReadableStreamBYOBReader.h
index 8d69390ae..8d69390ae 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamBYOBReader.h
+++ b/src/bun.js/bindings/webcore/JSReadableStreamBYOBReader.h
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamBYOBRequest.cpp b/src/bun.js/bindings/webcore/JSReadableStreamBYOBRequest.cpp
index 0b3dec469..0b3dec469 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamBYOBRequest.cpp
+++ b/src/bun.js/bindings/webcore/JSReadableStreamBYOBRequest.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamBYOBRequest.dep b/src/bun.js/bindings/webcore/JSReadableStreamBYOBRequest.dep
index 12e0f602d..12e0f602d 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamBYOBRequest.dep
+++ b/src/bun.js/bindings/webcore/JSReadableStreamBYOBRequest.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamBYOBRequest.h b/src/bun.js/bindings/webcore/JSReadableStreamBYOBRequest.h
index 39f18c229..39f18c229 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamBYOBRequest.h
+++ b/src/bun.js/bindings/webcore/JSReadableStreamBYOBRequest.h
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamDefaultController.cpp b/src/bun.js/bindings/webcore/JSReadableStreamDefaultController.cpp
index c914cf022..c914cf022 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamDefaultController.cpp
+++ b/src/bun.js/bindings/webcore/JSReadableStreamDefaultController.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamDefaultController.dep b/src/bun.js/bindings/webcore/JSReadableStreamDefaultController.dep
index 3e3e1cd15..3e3e1cd15 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamDefaultController.dep
+++ b/src/bun.js/bindings/webcore/JSReadableStreamDefaultController.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamDefaultController.h b/src/bun.js/bindings/webcore/JSReadableStreamDefaultController.h
index a38c95daf..a38c95daf 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamDefaultController.h
+++ b/src/bun.js/bindings/webcore/JSReadableStreamDefaultController.h
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamDefaultReader.cpp b/src/bun.js/bindings/webcore/JSReadableStreamDefaultReader.cpp
index d1080c17e..d1080c17e 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamDefaultReader.cpp
+++ b/src/bun.js/bindings/webcore/JSReadableStreamDefaultReader.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamDefaultReader.dep b/src/bun.js/bindings/webcore/JSReadableStreamDefaultReader.dep
index 466ee5c61..466ee5c61 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamDefaultReader.dep
+++ b/src/bun.js/bindings/webcore/JSReadableStreamDefaultReader.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamDefaultReader.h b/src/bun.js/bindings/webcore/JSReadableStreamDefaultReader.h
index 61a4d1336..61a4d1336 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamDefaultReader.h
+++ b/src/bun.js/bindings/webcore/JSReadableStreamDefaultReader.h
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamSink.cpp b/src/bun.js/bindings/webcore/JSReadableStreamSink.cpp
index 2fd819460..2fd819460 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamSink.cpp
+++ b/src/bun.js/bindings/webcore/JSReadableStreamSink.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamSink.dep b/src/bun.js/bindings/webcore/JSReadableStreamSink.dep
index 9c5594686..9c5594686 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamSink.dep
+++ b/src/bun.js/bindings/webcore/JSReadableStreamSink.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamSink.h b/src/bun.js/bindings/webcore/JSReadableStreamSink.h
index 83fa457ad..83fa457ad 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamSink.h
+++ b/src/bun.js/bindings/webcore/JSReadableStreamSink.h
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamSource.cpp b/src/bun.js/bindings/webcore/JSReadableStreamSource.cpp
index af62fd511..af62fd511 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamSource.cpp
+++ b/src/bun.js/bindings/webcore/JSReadableStreamSource.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamSource.dep b/src/bun.js/bindings/webcore/JSReadableStreamSource.dep
index f459688e5..f459688e5 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamSource.dep
+++ b/src/bun.js/bindings/webcore/JSReadableStreamSource.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamSource.h b/src/bun.js/bindings/webcore/JSReadableStreamSource.h
index 4a7fec950..4a7fec950 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamSource.h
+++ b/src/bun.js/bindings/webcore/JSReadableStreamSource.h
diff --git a/src/javascript/jsc/bindings/webcore/JSReadableStreamSourceCustom.cpp b/src/bun.js/bindings/webcore/JSReadableStreamSourceCustom.cpp
index 476c0f852..476c0f852 100644
--- a/src/javascript/jsc/bindings/webcore/JSReadableStreamSourceCustom.cpp
+++ b/src/bun.js/bindings/webcore/JSReadableStreamSourceCustom.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSServiceWorker.h b/src/bun.js/bindings/webcore/JSServiceWorker.h
index d067d0b5a..d067d0b5a 100644
--- a/src/javascript/jsc/bindings/webcore/JSServiceWorker.h
+++ b/src/bun.js/bindings/webcore/JSServiceWorker.h
diff --git a/src/javascript/jsc/bindings/webcore/JSTextEncoder.cpp b/src/bun.js/bindings/webcore/JSTextEncoder.cpp
index c12c94d56..c12c94d56 100644
--- a/src/javascript/jsc/bindings/webcore/JSTextEncoder.cpp
+++ b/src/bun.js/bindings/webcore/JSTextEncoder.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSTextEncoder.dep b/src/bun.js/bindings/webcore/JSTextEncoder.dep
index bdb1dfb7c..bdb1dfb7c 100644
--- a/src/javascript/jsc/bindings/webcore/JSTextEncoder.dep
+++ b/src/bun.js/bindings/webcore/JSTextEncoder.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSTextEncoder.h b/src/bun.js/bindings/webcore/JSTextEncoder.h
index e37b96256..e37b96256 100644
--- a/src/javascript/jsc/bindings/webcore/JSTextEncoder.h
+++ b/src/bun.js/bindings/webcore/JSTextEncoder.h
diff --git a/src/javascript/jsc/bindings/webcore/JSTransformStream.cpp b/src/bun.js/bindings/webcore/JSTransformStream.cpp
index 68b9c4dae..68b9c4dae 100644
--- a/src/javascript/jsc/bindings/webcore/JSTransformStream.cpp
+++ b/src/bun.js/bindings/webcore/JSTransformStream.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSTransformStream.dep b/src/bun.js/bindings/webcore/JSTransformStream.dep
index 30374925b..30374925b 100644
--- a/src/javascript/jsc/bindings/webcore/JSTransformStream.dep
+++ b/src/bun.js/bindings/webcore/JSTransformStream.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSTransformStream.h b/src/bun.js/bindings/webcore/JSTransformStream.h
index 26646df03..26646df03 100644
--- a/src/javascript/jsc/bindings/webcore/JSTransformStream.h
+++ b/src/bun.js/bindings/webcore/JSTransformStream.h
diff --git a/src/javascript/jsc/bindings/webcore/JSTransformStreamDefaultController.cpp b/src/bun.js/bindings/webcore/JSTransformStreamDefaultController.cpp
index 77532ac9e..77532ac9e 100644
--- a/src/javascript/jsc/bindings/webcore/JSTransformStreamDefaultController.cpp
+++ b/src/bun.js/bindings/webcore/JSTransformStreamDefaultController.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSTransformStreamDefaultController.dep b/src/bun.js/bindings/webcore/JSTransformStreamDefaultController.dep
index 0d59bed06..0d59bed06 100644
--- a/src/javascript/jsc/bindings/webcore/JSTransformStreamDefaultController.dep
+++ b/src/bun.js/bindings/webcore/JSTransformStreamDefaultController.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSTransformStreamDefaultController.h b/src/bun.js/bindings/webcore/JSTransformStreamDefaultController.h
index e63fdd7c4..e63fdd7c4 100644
--- a/src/javascript/jsc/bindings/webcore/JSTransformStreamDefaultController.h
+++ b/src/bun.js/bindings/webcore/JSTransformStreamDefaultController.h
diff --git a/src/javascript/jsc/bindings/webcore/JSURLSearchParams.cpp b/src/bun.js/bindings/webcore/JSURLSearchParams.cpp
index e132aecf8..e132aecf8 100644
--- a/src/javascript/jsc/bindings/webcore/JSURLSearchParams.cpp
+++ b/src/bun.js/bindings/webcore/JSURLSearchParams.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSURLSearchParams.dep b/src/bun.js/bindings/webcore/JSURLSearchParams.dep
index 73a94dc7b..73a94dc7b 100644
--- a/src/javascript/jsc/bindings/webcore/JSURLSearchParams.dep
+++ b/src/bun.js/bindings/webcore/JSURLSearchParams.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSURLSearchParams.h b/src/bun.js/bindings/webcore/JSURLSearchParams.h
index b7e90a3fb..b7e90a3fb 100644
--- a/src/javascript/jsc/bindings/webcore/JSURLSearchParams.h
+++ b/src/bun.js/bindings/webcore/JSURLSearchParams.h
diff --git a/src/javascript/jsc/bindings/webcore/JSValueInWrappedObject.h b/src/bun.js/bindings/webcore/JSValueInWrappedObject.h
index d05fdb8fd..d05fdb8fd 100644
--- a/src/javascript/jsc/bindings/webcore/JSValueInWrappedObject.h
+++ b/src/bun.js/bindings/webcore/JSValueInWrappedObject.h
diff --git a/src/javascript/jsc/bindings/webcore/JSWebSocket.cpp b/src/bun.js/bindings/webcore/JSWebSocket.cpp
index aa351fba3..aa351fba3 100644
--- a/src/javascript/jsc/bindings/webcore/JSWebSocket.cpp
+++ b/src/bun.js/bindings/webcore/JSWebSocket.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSWebSocket.dep b/src/bun.js/bindings/webcore/JSWebSocket.dep
index 69bc1775b..69bc1775b 100644
--- a/src/javascript/jsc/bindings/webcore/JSWebSocket.dep
+++ b/src/bun.js/bindings/webcore/JSWebSocket.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSWebSocket.h b/src/bun.js/bindings/webcore/JSWebSocket.h
index ae99a9887..ae99a9887 100644
--- a/src/javascript/jsc/bindings/webcore/JSWebSocket.h
+++ b/src/bun.js/bindings/webcore/JSWebSocket.h
diff --git a/src/javascript/jsc/bindings/webcore/JSWindowProxy.h b/src/bun.js/bindings/webcore/JSWindowProxy.h
index d067d0b5a..d067d0b5a 100644
--- a/src/javascript/jsc/bindings/webcore/JSWindowProxy.h
+++ b/src/bun.js/bindings/webcore/JSWindowProxy.h
diff --git a/src/javascript/jsc/bindings/webcore/JSWritableStream.cpp b/src/bun.js/bindings/webcore/JSWritableStream.cpp
index 1d996f3ef..1d996f3ef 100644
--- a/src/javascript/jsc/bindings/webcore/JSWritableStream.cpp
+++ b/src/bun.js/bindings/webcore/JSWritableStream.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSWritableStream.dep b/src/bun.js/bindings/webcore/JSWritableStream.dep
index d936b4581..d936b4581 100644
--- a/src/javascript/jsc/bindings/webcore/JSWritableStream.dep
+++ b/src/bun.js/bindings/webcore/JSWritableStream.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSWritableStream.h b/src/bun.js/bindings/webcore/JSWritableStream.h
index d8b971645..d8b971645 100644
--- a/src/javascript/jsc/bindings/webcore/JSWritableStream.h
+++ b/src/bun.js/bindings/webcore/JSWritableStream.h
diff --git a/src/javascript/jsc/bindings/webcore/JSWritableStreamDefaultController.cpp b/src/bun.js/bindings/webcore/JSWritableStreamDefaultController.cpp
index fd4a50e3c..fd4a50e3c 100644
--- a/src/javascript/jsc/bindings/webcore/JSWritableStreamDefaultController.cpp
+++ b/src/bun.js/bindings/webcore/JSWritableStreamDefaultController.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSWritableStreamDefaultController.dep b/src/bun.js/bindings/webcore/JSWritableStreamDefaultController.dep
index a1ac70d47..a1ac70d47 100644
--- a/src/javascript/jsc/bindings/webcore/JSWritableStreamDefaultController.dep
+++ b/src/bun.js/bindings/webcore/JSWritableStreamDefaultController.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSWritableStreamDefaultController.h b/src/bun.js/bindings/webcore/JSWritableStreamDefaultController.h
index 8da0be568..8da0be568 100644
--- a/src/javascript/jsc/bindings/webcore/JSWritableStreamDefaultController.h
+++ b/src/bun.js/bindings/webcore/JSWritableStreamDefaultController.h
diff --git a/src/javascript/jsc/bindings/webcore/JSWritableStreamDefaultWriter.cpp b/src/bun.js/bindings/webcore/JSWritableStreamDefaultWriter.cpp
index 4a5eb707d..4a5eb707d 100644
--- a/src/javascript/jsc/bindings/webcore/JSWritableStreamDefaultWriter.cpp
+++ b/src/bun.js/bindings/webcore/JSWritableStreamDefaultWriter.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSWritableStreamDefaultWriter.dep b/src/bun.js/bindings/webcore/JSWritableStreamDefaultWriter.dep
index 3016ea662..3016ea662 100644
--- a/src/javascript/jsc/bindings/webcore/JSWritableStreamDefaultWriter.dep
+++ b/src/bun.js/bindings/webcore/JSWritableStreamDefaultWriter.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSWritableStreamDefaultWriter.h b/src/bun.js/bindings/webcore/JSWritableStreamDefaultWriter.h
index bc13fb8c1..bc13fb8c1 100644
--- a/src/javascript/jsc/bindings/webcore/JSWritableStreamDefaultWriter.h
+++ b/src/bun.js/bindings/webcore/JSWritableStreamDefaultWriter.h
diff --git a/src/javascript/jsc/bindings/webcore/JSWritableStreamSink.cpp b/src/bun.js/bindings/webcore/JSWritableStreamSink.cpp
index ffc2816f5..ffc2816f5 100644
--- a/src/javascript/jsc/bindings/webcore/JSWritableStreamSink.cpp
+++ b/src/bun.js/bindings/webcore/JSWritableStreamSink.cpp
diff --git a/src/javascript/jsc/bindings/webcore/JSWritableStreamSink.dep b/src/bun.js/bindings/webcore/JSWritableStreamSink.dep
index c1891fdd8..c1891fdd8 100644
--- a/src/javascript/jsc/bindings/webcore/JSWritableStreamSink.dep
+++ b/src/bun.js/bindings/webcore/JSWritableStreamSink.dep
diff --git a/src/javascript/jsc/bindings/webcore/JSWritableStreamSink.h b/src/bun.js/bindings/webcore/JSWritableStreamSink.h
index 7537792a2..7537792a2 100644
--- a/src/javascript/jsc/bindings/webcore/JSWritableStreamSink.h
+++ b/src/bun.js/bindings/webcore/JSWritableStreamSink.h
diff --git a/src/javascript/jsc/bindings/webcore/MessageEvent.cpp b/src/bun.js/bindings/webcore/MessageEvent.cpp
index b210f4cec..b210f4cec 100644
--- a/src/javascript/jsc/bindings/webcore/MessageEvent.cpp
+++ b/src/bun.js/bindings/webcore/MessageEvent.cpp
diff --git a/src/javascript/jsc/bindings/webcore/MessageEvent.h b/src/bun.js/bindings/webcore/MessageEvent.h
index 4089e2ca1..4089e2ca1 100644
--- a/src/javascript/jsc/bindings/webcore/MessageEvent.h
+++ b/src/bun.js/bindings/webcore/MessageEvent.h
diff --git a/src/javascript/jsc/bindings/webcore/MessageEvent.idl b/src/bun.js/bindings/webcore/MessageEvent.idl
index dff0a218a..dff0a218a 100644
--- a/src/javascript/jsc/bindings/webcore/MessageEvent.idl
+++ b/src/bun.js/bindings/webcore/MessageEvent.idl
diff --git a/src/javascript/jsc/bindings/webcore/Node.h b/src/bun.js/bindings/webcore/Node.h
index df9917a25..df9917a25 100644
--- a/src/javascript/jsc/bindings/webcore/Node.h
+++ b/src/bun.js/bindings/webcore/Node.h
diff --git a/src/javascript/jsc/bindings/webcore/ParsedContentType.cpp b/src/bun.js/bindings/webcore/ParsedContentType.cpp
index 04b30cf9b..04b30cf9b 100644
--- a/src/javascript/jsc/bindings/webcore/ParsedContentType.cpp
+++ b/src/bun.js/bindings/webcore/ParsedContentType.cpp
diff --git a/src/javascript/jsc/bindings/webcore/ParsedContentType.h b/src/bun.js/bindings/webcore/ParsedContentType.h
index 03837e6d9..03837e6d9 100644
--- a/src/javascript/jsc/bindings/webcore/ParsedContentType.h
+++ b/src/bun.js/bindings/webcore/ParsedContentType.h
diff --git a/src/javascript/jsc/bindings/webcore/ReadableStream.cpp b/src/bun.js/bindings/webcore/ReadableStream.cpp
index 0a85942b9..0a85942b9 100644
--- a/src/javascript/jsc/bindings/webcore/ReadableStream.cpp
+++ b/src/bun.js/bindings/webcore/ReadableStream.cpp
diff --git a/src/javascript/jsc/bindings/webcore/ReadableStream.h b/src/bun.js/bindings/webcore/ReadableStream.h
index f50185865..f50185865 100644
--- a/src/javascript/jsc/bindings/webcore/ReadableStream.h
+++ b/src/bun.js/bindings/webcore/ReadableStream.h
diff --git a/src/javascript/jsc/bindings/webcore/ReadableStreamDefaultController.cpp b/src/bun.js/bindings/webcore/ReadableStreamDefaultController.cpp
index 229a02d38..229a02d38 100644
--- a/src/javascript/jsc/bindings/webcore/ReadableStreamDefaultController.cpp
+++ b/src/bun.js/bindings/webcore/ReadableStreamDefaultController.cpp
diff --git a/src/javascript/jsc/bindings/webcore/ReadableStreamDefaultController.h b/src/bun.js/bindings/webcore/ReadableStreamDefaultController.h
index bb3bc9409..bb3bc9409 100644
--- a/src/javascript/jsc/bindings/webcore/ReadableStreamDefaultController.h
+++ b/src/bun.js/bindings/webcore/ReadableStreamDefaultController.h
diff --git a/src/javascript/jsc/bindings/webcore/ReadableStreamSink.cpp b/src/bun.js/bindings/webcore/ReadableStreamSink.cpp
index 960756a28..960756a28 100644
--- a/src/javascript/jsc/bindings/webcore/ReadableStreamSink.cpp
+++ b/src/bun.js/bindings/webcore/ReadableStreamSink.cpp
diff --git a/src/javascript/jsc/bindings/webcore/ReadableStreamSink.h b/src/bun.js/bindings/webcore/ReadableStreamSink.h
index fee988422..fee988422 100644
--- a/src/javascript/jsc/bindings/webcore/ReadableStreamSink.h
+++ b/src/bun.js/bindings/webcore/ReadableStreamSink.h
diff --git a/src/javascript/jsc/bindings/webcore/ReadableStreamSource.cpp b/src/bun.js/bindings/webcore/ReadableStreamSource.cpp
index f969c84b1..f969c84b1 100644
--- a/src/javascript/jsc/bindings/webcore/ReadableStreamSource.cpp
+++ b/src/bun.js/bindings/webcore/ReadableStreamSource.cpp
diff --git a/src/javascript/jsc/bindings/webcore/ReadableStreamSource.h b/src/bun.js/bindings/webcore/ReadableStreamSource.h
index 0886ab423..0886ab423 100644
--- a/src/javascript/jsc/bindings/webcore/ReadableStreamSource.h
+++ b/src/bun.js/bindings/webcore/ReadableStreamSource.h
diff --git a/src/javascript/jsc/bindings/webcore/RegisteredEventListener.h b/src/bun.js/bindings/webcore/RegisteredEventListener.h
index 1b2f48af4..1b2f48af4 100644
--- a/src/javascript/jsc/bindings/webcore/RegisteredEventListener.h
+++ b/src/bun.js/bindings/webcore/RegisteredEventListener.h
diff --git a/src/javascript/jsc/bindings/webcore/ScriptWrappable.cpp b/src/bun.js/bindings/webcore/ScriptWrappable.cpp
index c55b2ac92..c55b2ac92 100644
--- a/src/javascript/jsc/bindings/webcore/ScriptWrappable.cpp
+++ b/src/bun.js/bindings/webcore/ScriptWrappable.cpp
diff --git a/src/javascript/jsc/bindings/webcore/ScriptWrappable.h b/src/bun.js/bindings/webcore/ScriptWrappable.h
index 20aafa6a1..20aafa6a1 100644
--- a/src/javascript/jsc/bindings/webcore/ScriptWrappable.h
+++ b/src/bun.js/bindings/webcore/ScriptWrappable.h
diff --git a/src/javascript/jsc/bindings/webcore/ScriptWrappableInlines.h b/src/bun.js/bindings/webcore/ScriptWrappableInlines.h
index 80b8087bf..80b8087bf 100644
--- a/src/javascript/jsc/bindings/webcore/ScriptWrappableInlines.h
+++ b/src/bun.js/bindings/webcore/ScriptWrappableInlines.h
diff --git a/src/javascript/jsc/bindings/webcore/StructuredClone.cpp b/src/bun.js/bindings/webcore/StructuredClone.cpp
index aabc9009c..aabc9009c 100644
--- a/src/javascript/jsc/bindings/webcore/StructuredClone.cpp
+++ b/src/bun.js/bindings/webcore/StructuredClone.cpp
diff --git a/src/javascript/jsc/bindings/webcore/StructuredClone.h b/src/bun.js/bindings/webcore/StructuredClone.h
index af14c0873..af14c0873 100644
--- a/src/javascript/jsc/bindings/webcore/StructuredClone.h
+++ b/src/bun.js/bindings/webcore/StructuredClone.h
diff --git a/src/javascript/jsc/bindings/webcore/TaskSource.h b/src/bun.js/bindings/webcore/TaskSource.h
index 2c0a128e8..2c0a128e8 100644
--- a/src/javascript/jsc/bindings/webcore/TaskSource.h
+++ b/src/bun.js/bindings/webcore/TaskSource.h
diff --git a/src/javascript/jsc/bindings/webcore/TextEncoder.cpp b/src/bun.js/bindings/webcore/TextEncoder.cpp
index 1942694cc..1942694cc 100644
--- a/src/javascript/jsc/bindings/webcore/TextEncoder.cpp
+++ b/src/bun.js/bindings/webcore/TextEncoder.cpp
diff --git a/src/javascript/jsc/bindings/webcore/TextEncoder.h b/src/bun.js/bindings/webcore/TextEncoder.h
index 6a0145c78..6a0145c78 100644
--- a/src/javascript/jsc/bindings/webcore/TextEncoder.h
+++ b/src/bun.js/bindings/webcore/TextEncoder.h
diff --git a/src/javascript/jsc/bindings/webcore/UIEventInit.h b/src/bun.js/bindings/webcore/UIEventInit.h
index 4511ba84a..4511ba84a 100644
--- a/src/javascript/jsc/bindings/webcore/UIEventInit.h
+++ b/src/bun.js/bindings/webcore/UIEventInit.h
diff --git a/src/javascript/jsc/bindings/webcore/WebCoreBuiltins.h b/src/bun.js/bindings/webcore/WebCoreBuiltins.h
index abd53c142..abd53c142 100644
--- a/src/javascript/jsc/bindings/webcore/WebCoreBuiltins.h
+++ b/src/bun.js/bindings/webcore/WebCoreBuiltins.h
diff --git a/src/javascript/jsc/bindings/webcore/WebCoreJSClientData.h b/src/bun.js/bindings/webcore/WebCoreJSClientData.h
index 965f0bb98..965f0bb98 100644
--- a/src/javascript/jsc/bindings/webcore/WebCoreJSClientData.h
+++ b/src/bun.js/bindings/webcore/WebCoreJSClientData.h
diff --git a/src/javascript/jsc/bindings/webcore/WebCoreTypedArrayController.cpp b/src/bun.js/bindings/webcore/WebCoreTypedArrayController.cpp
index 4c9660e26..4c9660e26 100644
--- a/src/javascript/jsc/bindings/webcore/WebCoreTypedArrayController.cpp
+++ b/src/bun.js/bindings/webcore/WebCoreTypedArrayController.cpp
diff --git a/src/javascript/jsc/bindings/webcore/WebCoreTypedArrayController.h b/src/bun.js/bindings/webcore/WebCoreTypedArrayController.h
index c689e019d..c689e019d 100644
--- a/src/javascript/jsc/bindings/webcore/WebCoreTypedArrayController.h
+++ b/src/bun.js/bindings/webcore/WebCoreTypedArrayController.h
diff --git a/src/javascript/jsc/bindings/webcore/WebSocket.cpp b/src/bun.js/bindings/webcore/WebSocket.cpp
index 763668056..763668056 100644
--- a/src/javascript/jsc/bindings/webcore/WebSocket.cpp
+++ b/src/bun.js/bindings/webcore/WebSocket.cpp
diff --git a/src/javascript/jsc/bindings/webcore/WebSocket.h b/src/bun.js/bindings/webcore/WebSocket.h
index 03c0d7709..03c0d7709 100644
--- a/src/javascript/jsc/bindings/webcore/WebSocket.h
+++ b/src/bun.js/bindings/webcore/WebSocket.h
diff --git a/src/javascript/jsc/bindings/webcore/WebSocket.idl b/src/bun.js/bindings/webcore/WebSocket.idl
index 4f65c90f3..4f65c90f3 100644
--- a/src/javascript/jsc/bindings/webcore/WebSocket.idl
+++ b/src/bun.js/bindings/webcore/WebSocket.idl
diff --git a/src/javascript/jsc/bindings/webcore/WebSocketIdentifier.h b/src/bun.js/bindings/webcore/WebSocketIdentifier.h
index 97884abd8..97884abd8 100644
--- a/src/javascript/jsc/bindings/webcore/WebSocketIdentifier.h
+++ b/src/bun.js/bindings/webcore/WebSocketIdentifier.h
diff --git a/src/javascript/jsc/bindings/webcore/WritableStream.cpp b/src/bun.js/bindings/webcore/WritableStream.cpp
index 97d56b476..97d56b476 100644
--- a/src/javascript/jsc/bindings/webcore/WritableStream.cpp
+++ b/src/bun.js/bindings/webcore/WritableStream.cpp
diff --git a/src/javascript/jsc/bindings/webcore/WritableStream.h b/src/bun.js/bindings/webcore/WritableStream.h
index 63a4b3377..63a4b3377 100644
--- a/src/javascript/jsc/bindings/webcore/WritableStream.h
+++ b/src/bun.js/bindings/webcore/WritableStream.h
diff --git a/src/javascript/jsc/bindings/webcore/WritableStream.idl b/src/bun.js/bindings/webcore/WritableStream.idl
index cd32d17f0..cd32d17f0 100644
--- a/src/javascript/jsc/bindings/webcore/WritableStream.idl
+++ b/src/bun.js/bindings/webcore/WritableStream.idl
diff --git a/src/javascript/jsc/bindings/webcore/WritableStreamSink.h b/src/bun.js/bindings/webcore/WritableStreamSink.h
index 2caa86c39..2caa86c39 100644
--- a/src/javascript/jsc/bindings/webcore/WritableStreamSink.h
+++ b/src/bun.js/bindings/webcore/WritableStreamSink.h
diff --git a/src/javascript/jsc/bindings/webcore/config.h b/src/bun.js/bindings/webcore/config.h
index 8d25cbc46..8d25cbc46 100644
--- a/src/javascript/jsc/bindings/webcore/config.h
+++ b/src/bun.js/bindings/webcore/config.h
diff --git a/src/javascript/jsc/bindings/webcore/weak_handle.cpp b/src/bun.js/bindings/webcore/weak_handle.cpp
index e210a5ba1..e210a5ba1 100644
--- a/src/javascript/jsc/bindings/webcore/weak_handle.cpp
+++ b/src/bun.js/bindings/webcore/weak_handle.cpp
diff --git a/src/javascript/jsc/bindings/webcore/weak_handle.h b/src/bun.js/bindings/webcore/weak_handle.h
index 22d6e702c..22d6e702c 100644
--- a/src/javascript/jsc/bindings/webcore/weak_handle.h
+++ b/src/bun.js/bindings/webcore/weak_handle.h
diff --git a/src/javascript/jsc/bindings/wtf-bindings.cpp b/src/bun.js/bindings/wtf-bindings.cpp
index d715f4d45..d715f4d45 100644
--- a/src/javascript/jsc/bindings/wtf-bindings.cpp
+++ b/src/bun.js/bindings/wtf-bindings.cpp
diff --git a/src/javascript/jsc/bindings/wtf-bindings.h b/src/bun.js/bindings/wtf-bindings.h
index 2abd398fe..2abd398fe 100644
--- a/src/javascript/jsc/bindings/wtf-bindings.h
+++ b/src/bun.js/bindings/wtf-bindings.h
diff --git a/src/javascript/jsc/builtins/BunBuiltinNames.h b/src/bun.js/builtins/BunBuiltinNames.h
index 1b49338c0..1b49338c0 100644
--- a/src/javascript/jsc/builtins/BunBuiltinNames.h
+++ b/src/bun.js/builtins/BunBuiltinNames.h
diff --git a/src/javascript/jsc/builtins/README.md b/src/bun.js/builtins/README.md
index 8ec32e8b5..8ec32e8b5 100644
--- a/src/javascript/jsc/builtins/README.md
+++ b/src/bun.js/builtins/README.md
diff --git a/src/javascript/jsc/builtins/WebCoreJSBuiltinInternals.cpp b/src/bun.js/builtins/WebCoreJSBuiltinInternals.cpp
index 159e2f45b..159e2f45b 100644
--- a/src/javascript/jsc/builtins/WebCoreJSBuiltinInternals.cpp
+++ b/src/bun.js/builtins/WebCoreJSBuiltinInternals.cpp
diff --git a/src/javascript/jsc/builtins/WebCoreJSBuiltins.cpp b/src/bun.js/builtins/WebCoreJSBuiltins.cpp
index 00cde9f54..00cde9f54 100644
--- a/src/javascript/jsc/builtins/WebCoreJSBuiltins.cpp
+++ b/src/bun.js/builtins/WebCoreJSBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/ByteLengthQueuingStrategyBuiltins.cpp b/src/bun.js/builtins/cpp/ByteLengthQueuingStrategyBuiltins.cpp
index 320cba7da..320cba7da 100644
--- a/src/javascript/jsc/builtins/cpp/ByteLengthQueuingStrategyBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/ByteLengthQueuingStrategyBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/ByteLengthQueuingStrategyBuiltins.h b/src/bun.js/builtins/cpp/ByteLengthQueuingStrategyBuiltins.h
index 964ce15af..964ce15af 100644
--- a/src/javascript/jsc/builtins/cpp/ByteLengthQueuingStrategyBuiltins.h
+++ b/src/bun.js/builtins/cpp/ByteLengthQueuingStrategyBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/CountQueuingStrategyBuiltins.cpp b/src/bun.js/builtins/cpp/CountQueuingStrategyBuiltins.cpp
index 1a7100f00..1a7100f00 100644
--- a/src/javascript/jsc/builtins/cpp/CountQueuingStrategyBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/CountQueuingStrategyBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/CountQueuingStrategyBuiltins.h b/src/bun.js/builtins/cpp/CountQueuingStrategyBuiltins.h
index 3805d0873..3805d0873 100644
--- a/src/javascript/jsc/builtins/cpp/CountQueuingStrategyBuiltins.h
+++ b/src/bun.js/builtins/cpp/CountQueuingStrategyBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/JSBufferConstructorBuiltins.cpp b/src/bun.js/builtins/cpp/JSBufferConstructorBuiltins.cpp
index d605d5b1b..d605d5b1b 100644
--- a/src/javascript/jsc/builtins/cpp/JSBufferConstructorBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/JSBufferConstructorBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/JSBufferConstructorBuiltins.h b/src/bun.js/builtins/cpp/JSBufferConstructorBuiltins.h
index 1495b852d..1495b852d 100644
--- a/src/javascript/jsc/builtins/cpp/JSBufferConstructorBuiltins.h
+++ b/src/bun.js/builtins/cpp/JSBufferConstructorBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/JSBufferPrototypeBuiltins.cpp b/src/bun.js/builtins/cpp/JSBufferPrototypeBuiltins.cpp
index 3925e54f7..3925e54f7 100644
--- a/src/javascript/jsc/builtins/cpp/JSBufferPrototypeBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/JSBufferPrototypeBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/JSBufferPrototypeBuiltins.h b/src/bun.js/builtins/cpp/JSBufferPrototypeBuiltins.h
index 5fc08789e..5fc08789e 100644
--- a/src/javascript/jsc/builtins/cpp/JSBufferPrototypeBuiltins.h
+++ b/src/bun.js/builtins/cpp/JSBufferPrototypeBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/JSZigGlobalObjectBuiltins.cpp b/src/bun.js/builtins/cpp/JSZigGlobalObjectBuiltins.cpp
index 05863cc27..05863cc27 100644
--- a/src/javascript/jsc/builtins/cpp/JSZigGlobalObjectBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/JSZigGlobalObjectBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/JSZigGlobalObjectBuiltins.h b/src/bun.js/builtins/cpp/JSZigGlobalObjectBuiltins.h
index f02eec836..f02eec836 100644
--- a/src/javascript/jsc/builtins/cpp/JSZigGlobalObjectBuiltins.h
+++ b/src/bun.js/builtins/cpp/JSZigGlobalObjectBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/ReadableByteStreamControllerBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableByteStreamControllerBuiltins.cpp
index b09754494..b09754494 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableByteStreamControllerBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/ReadableByteStreamControllerBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/ReadableByteStreamControllerBuiltins.h b/src/bun.js/builtins/cpp/ReadableByteStreamControllerBuiltins.h
index 5513883db..5513883db 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableByteStreamControllerBuiltins.h
+++ b/src/bun.js/builtins/cpp/ReadableByteStreamControllerBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/ReadableByteStreamInternalsBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableByteStreamInternalsBuiltins.cpp
index 5f2f77b6a..5f2f77b6a 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableByteStreamInternalsBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/ReadableByteStreamInternalsBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/ReadableByteStreamInternalsBuiltins.h b/src/bun.js/builtins/cpp/ReadableByteStreamInternalsBuiltins.h
index 3bf0d406a..3bf0d406a 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableByteStreamInternalsBuiltins.h
+++ b/src/bun.js/builtins/cpp/ReadableByteStreamInternalsBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/ReadableStreamBYOBReaderBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamBYOBReaderBuiltins.cpp
index 81486dffe..81486dffe 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableStreamBYOBReaderBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/ReadableStreamBYOBReaderBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/ReadableStreamBYOBReaderBuiltins.h b/src/bun.js/builtins/cpp/ReadableStreamBYOBReaderBuiltins.h
index 0011df117..0011df117 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableStreamBYOBReaderBuiltins.h
+++ b/src/bun.js/builtins/cpp/ReadableStreamBYOBReaderBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/ReadableStreamBYOBRequestBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamBYOBRequestBuiltins.cpp
index 1c4d9fdb3..1c4d9fdb3 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableStreamBYOBRequestBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/ReadableStreamBYOBRequestBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/ReadableStreamBYOBRequestBuiltins.h b/src/bun.js/builtins/cpp/ReadableStreamBYOBRequestBuiltins.h
index 8e8aedff3..8e8aedff3 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableStreamBYOBRequestBuiltins.h
+++ b/src/bun.js/builtins/cpp/ReadableStreamBYOBRequestBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/ReadableStreamBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamBuiltins.cpp
index 7ce97e7bb..7ce97e7bb 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableStreamBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/ReadableStreamBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/ReadableStreamBuiltins.h b/src/bun.js/builtins/cpp/ReadableStreamBuiltins.h
index d009f8560..d009f8560 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableStreamBuiltins.h
+++ b/src/bun.js/builtins/cpp/ReadableStreamBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/ReadableStreamDefaultControllerBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamDefaultControllerBuiltins.cpp
index a7be93e52..a7be93e52 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableStreamDefaultControllerBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/ReadableStreamDefaultControllerBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/ReadableStreamDefaultControllerBuiltins.h b/src/bun.js/builtins/cpp/ReadableStreamDefaultControllerBuiltins.h
index 625da2f88..625da2f88 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableStreamDefaultControllerBuiltins.h
+++ b/src/bun.js/builtins/cpp/ReadableStreamDefaultControllerBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/ReadableStreamDefaultReaderBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamDefaultReaderBuiltins.cpp
index b1f8d4791..b1f8d4791 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableStreamDefaultReaderBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/ReadableStreamDefaultReaderBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/ReadableStreamDefaultReaderBuiltins.h b/src/bun.js/builtins/cpp/ReadableStreamDefaultReaderBuiltins.h
index 1dc33a831..1dc33a831 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableStreamDefaultReaderBuiltins.h
+++ b/src/bun.js/builtins/cpp/ReadableStreamDefaultReaderBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/ReadableStreamInternalsBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamInternalsBuiltins.cpp
index 09e96a121..09e96a121 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableStreamInternalsBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/ReadableStreamInternalsBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/ReadableStreamInternalsBuiltins.h b/src/bun.js/builtins/cpp/ReadableStreamInternalsBuiltins.h
index a17ea08bb..a17ea08bb 100644
--- a/src/javascript/jsc/builtins/cpp/ReadableStreamInternalsBuiltins.h
+++ b/src/bun.js/builtins/cpp/ReadableStreamInternalsBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/StreamInternalsBuiltins.cpp b/src/bun.js/builtins/cpp/StreamInternalsBuiltins.cpp
index 2203ed2f2..2203ed2f2 100644
--- a/src/javascript/jsc/builtins/cpp/StreamInternalsBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/StreamInternalsBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/StreamInternalsBuiltins.h b/src/bun.js/builtins/cpp/StreamInternalsBuiltins.h
index 61fb36b0e..61fb36b0e 100644
--- a/src/javascript/jsc/builtins/cpp/StreamInternalsBuiltins.h
+++ b/src/bun.js/builtins/cpp/StreamInternalsBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/TransformStreamBuiltins.cpp b/src/bun.js/builtins/cpp/TransformStreamBuiltins.cpp
index 027abb5c8..027abb5c8 100644
--- a/src/javascript/jsc/builtins/cpp/TransformStreamBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/TransformStreamBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/TransformStreamBuiltins.h b/src/bun.js/builtins/cpp/TransformStreamBuiltins.h
index bdf0c07cc..bdf0c07cc 100644
--- a/src/javascript/jsc/builtins/cpp/TransformStreamBuiltins.h
+++ b/src/bun.js/builtins/cpp/TransformStreamBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/TransformStreamDefaultControllerBuiltins.cpp b/src/bun.js/builtins/cpp/TransformStreamDefaultControllerBuiltins.cpp
index 31c509a1c..31c509a1c 100644
--- a/src/javascript/jsc/builtins/cpp/TransformStreamDefaultControllerBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/TransformStreamDefaultControllerBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/TransformStreamDefaultControllerBuiltins.h b/src/bun.js/builtins/cpp/TransformStreamDefaultControllerBuiltins.h
index 302e2e21c..302e2e21c 100644
--- a/src/javascript/jsc/builtins/cpp/TransformStreamDefaultControllerBuiltins.h
+++ b/src/bun.js/builtins/cpp/TransformStreamDefaultControllerBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/TransformStreamInternalsBuiltins.cpp b/src/bun.js/builtins/cpp/TransformStreamInternalsBuiltins.cpp
index 560a6350c..560a6350c 100644
--- a/src/javascript/jsc/builtins/cpp/TransformStreamInternalsBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/TransformStreamInternalsBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/TransformStreamInternalsBuiltins.h b/src/bun.js/builtins/cpp/TransformStreamInternalsBuiltins.h
index ad19d0a7e..ad19d0a7e 100644
--- a/src/javascript/jsc/builtins/cpp/TransformStreamInternalsBuiltins.h
+++ b/src/bun.js/builtins/cpp/TransformStreamInternalsBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/WebCoreJSBuiltinInternals.h b/src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h
index c52f65d85..c52f65d85 100644
--- a/src/javascript/jsc/builtins/cpp/WebCoreJSBuiltinInternals.h
+++ b/src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h
diff --git a/src/javascript/jsc/builtins/cpp/WebCoreJSBuiltins.h b/src/bun.js/builtins/cpp/WebCoreJSBuiltins.h
index 0650e1613..0650e1613 100644
--- a/src/javascript/jsc/builtins/cpp/WebCoreJSBuiltins.h
+++ b/src/bun.js/builtins/cpp/WebCoreJSBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/WritableStreamDefaultControllerBuiltins.cpp b/src/bun.js/builtins/cpp/WritableStreamDefaultControllerBuiltins.cpp
index c259364d7..c259364d7 100644
--- a/src/javascript/jsc/builtins/cpp/WritableStreamDefaultControllerBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/WritableStreamDefaultControllerBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/WritableStreamDefaultControllerBuiltins.h b/src/bun.js/builtins/cpp/WritableStreamDefaultControllerBuiltins.h
index 5ffd82b88..5ffd82b88 100644
--- a/src/javascript/jsc/builtins/cpp/WritableStreamDefaultControllerBuiltins.h
+++ b/src/bun.js/builtins/cpp/WritableStreamDefaultControllerBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/WritableStreamDefaultWriterBuiltins.cpp b/src/bun.js/builtins/cpp/WritableStreamDefaultWriterBuiltins.cpp
index 160f7af20..160f7af20 100644
--- a/src/javascript/jsc/builtins/cpp/WritableStreamDefaultWriterBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/WritableStreamDefaultWriterBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/WritableStreamDefaultWriterBuiltins.h b/src/bun.js/builtins/cpp/WritableStreamDefaultWriterBuiltins.h
index 28455eedf..28455eedf 100644
--- a/src/javascript/jsc/builtins/cpp/WritableStreamDefaultWriterBuiltins.h
+++ b/src/bun.js/builtins/cpp/WritableStreamDefaultWriterBuiltins.h
diff --git a/src/javascript/jsc/builtins/cpp/WritableStreamInternalsBuiltins.cpp b/src/bun.js/builtins/cpp/WritableStreamInternalsBuiltins.cpp
index 34a680bdc..34a680bdc 100644
--- a/src/javascript/jsc/builtins/cpp/WritableStreamInternalsBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/WritableStreamInternalsBuiltins.cpp
diff --git a/src/javascript/jsc/builtins/cpp/WritableStreamInternalsBuiltins.h b/src/bun.js/builtins/cpp/WritableStreamInternalsBuiltins.h
index bc41d2ee3..bc41d2ee3 100644
--- a/src/javascript/jsc/builtins/cpp/WritableStreamInternalsBuiltins.h
+++ b/src/bun.js/builtins/cpp/WritableStreamInternalsBuiltins.h
diff --git a/src/javascript/jsc/builtins/js/ByteLengthQueuingStrategy.js b/src/bun.js/builtins/js/ByteLengthQueuingStrategy.js
index e8f5b1cfc..e8f5b1cfc 100644
--- a/src/javascript/jsc/builtins/js/ByteLengthQueuingStrategy.js
+++ b/src/bun.js/builtins/js/ByteLengthQueuingStrategy.js
diff --git a/src/javascript/jsc/builtins/js/CountQueuingStrategy.js b/src/bun.js/builtins/js/CountQueuingStrategy.js
index 3cd9cffc2..3cd9cffc2 100644
--- a/src/javascript/jsc/builtins/js/CountQueuingStrategy.js
+++ b/src/bun.js/builtins/js/CountQueuingStrategy.js
diff --git a/src/javascript/jsc/builtins/js/JSBufferConstructor.js b/src/bun.js/builtins/js/JSBufferConstructor.js
index 9a3f0e1b7..9a3f0e1b7 100644
--- a/src/javascript/jsc/builtins/js/JSBufferConstructor.js
+++ b/src/bun.js/builtins/js/JSBufferConstructor.js
diff --git a/src/javascript/jsc/builtins/js/JSBufferPrototype.js b/src/bun.js/builtins/js/JSBufferPrototype.js
index c841bcd6c..c841bcd6c 100644
--- a/src/javascript/jsc/builtins/js/JSBufferPrototype.js
+++ b/src/bun.js/builtins/js/JSBufferPrototype.js
diff --git a/src/javascript/jsc/builtins/js/JSZigGlobalObject.js b/src/bun.js/builtins/js/JSZigGlobalObject.js
index cb3446159..cb3446159 100644
--- a/src/javascript/jsc/builtins/js/JSZigGlobalObject.js
+++ b/src/bun.js/builtins/js/JSZigGlobalObject.js
diff --git a/src/javascript/jsc/builtins/js/ReadableByteStreamController.js b/src/bun.js/builtins/js/ReadableByteStreamController.js
index 0b47d730c..0b47d730c 100644
--- a/src/javascript/jsc/builtins/js/ReadableByteStreamController.js
+++ b/src/bun.js/builtins/js/ReadableByteStreamController.js
diff --git a/src/javascript/jsc/builtins/js/ReadableByteStreamInternals.js b/src/bun.js/builtins/js/ReadableByteStreamInternals.js
index 01da62e1a..01da62e1a 100644
--- a/src/javascript/jsc/builtins/js/ReadableByteStreamInternals.js
+++ b/src/bun.js/builtins/js/ReadableByteStreamInternals.js
diff --git a/src/javascript/jsc/builtins/js/ReadableStream.js b/src/bun.js/builtins/js/ReadableStream.js
index db7cf85a8..db7cf85a8 100644
--- a/src/javascript/jsc/builtins/js/ReadableStream.js
+++ b/src/bun.js/builtins/js/ReadableStream.js
diff --git a/src/javascript/jsc/builtins/js/ReadableStreamBYOBReader.js b/src/bun.js/builtins/js/ReadableStreamBYOBReader.js
index 16e4ebce5..16e4ebce5 100644
--- a/src/javascript/jsc/builtins/js/ReadableStreamBYOBReader.js
+++ b/src/bun.js/builtins/js/ReadableStreamBYOBReader.js
diff --git a/src/javascript/jsc/builtins/js/ReadableStreamBYOBRequest.js b/src/bun.js/builtins/js/ReadableStreamBYOBRequest.js
index d97667165..d97667165 100644
--- a/src/javascript/jsc/builtins/js/ReadableStreamBYOBRequest.js
+++ b/src/bun.js/builtins/js/ReadableStreamBYOBRequest.js
diff --git a/src/javascript/jsc/builtins/js/ReadableStreamDefaultController.js b/src/bun.js/builtins/js/ReadableStreamDefaultController.js
index 07fc65cb1..07fc65cb1 100644
--- a/src/javascript/jsc/builtins/js/ReadableStreamDefaultController.js
+++ b/src/bun.js/builtins/js/ReadableStreamDefaultController.js
diff --git a/src/javascript/jsc/builtins/js/ReadableStreamDefaultReader.js b/src/bun.js/builtins/js/ReadableStreamDefaultReader.js
index 774c7161e..774c7161e 100644
--- a/src/javascript/jsc/builtins/js/ReadableStreamDefaultReader.js
+++ b/src/bun.js/builtins/js/ReadableStreamDefaultReader.js
diff --git a/src/javascript/jsc/builtins/js/ReadableStreamInternals.js b/src/bun.js/builtins/js/ReadableStreamInternals.js
index 3e6590f31..3e6590f31 100644
--- a/src/javascript/jsc/builtins/js/ReadableStreamInternals.js
+++ b/src/bun.js/builtins/js/ReadableStreamInternals.js
diff --git a/src/javascript/jsc/builtins/js/StreamInternals.js b/src/bun.js/builtins/js/StreamInternals.js
index c2ca3f5b5..c2ca3f5b5 100644
--- a/src/javascript/jsc/builtins/js/StreamInternals.js
+++ b/src/bun.js/builtins/js/StreamInternals.js
diff --git a/src/javascript/jsc/builtins/js/TransformStream.js b/src/bun.js/builtins/js/TransformStream.js
index 8d82d87d8..8d82d87d8 100644
--- a/src/javascript/jsc/builtins/js/TransformStream.js
+++ b/src/bun.js/builtins/js/TransformStream.js
diff --git a/src/javascript/jsc/builtins/js/TransformStreamDefaultController.js b/src/bun.js/builtins/js/TransformStreamDefaultController.js
index 5ed7d0dfa..5ed7d0dfa 100644
--- a/src/javascript/jsc/builtins/js/TransformStreamDefaultController.js
+++ b/src/bun.js/builtins/js/TransformStreamDefaultController.js
diff --git a/src/javascript/jsc/builtins/js/TransformStreamInternals.js b/src/bun.js/builtins/js/TransformStreamInternals.js
index 4263e3991..4263e3991 100644
--- a/src/javascript/jsc/builtins/js/TransformStreamInternals.js
+++ b/src/bun.js/builtins/js/TransformStreamInternals.js
diff --git a/src/javascript/jsc/builtins/js/WritableStreamDefaultController.js b/src/bun.js/builtins/js/WritableStreamDefaultController.js
index 8c42212e0..8c42212e0 100644
--- a/src/javascript/jsc/builtins/js/WritableStreamDefaultController.js
+++ b/src/bun.js/builtins/js/WritableStreamDefaultController.js
diff --git a/src/javascript/jsc/builtins/js/WritableStreamDefaultWriter.js b/src/bun.js/builtins/js/WritableStreamDefaultWriter.js
index 69a953fc3..69a953fc3 100644
--- a/src/javascript/jsc/builtins/js/WritableStreamDefaultWriter.js
+++ b/src/bun.js/builtins/js/WritableStreamDefaultWriter.js
diff --git a/src/javascript/jsc/builtins/js/WritableStreamInternals.js b/src/bun.js/builtins/js/WritableStreamInternals.js
index 5a97155f2..5a97155f2 100644
--- a/src/javascript/jsc/builtins/js/WritableStreamInternals.js
+++ b/src/bun.js/builtins/js/WritableStreamInternals.js
diff --git a/src/javascript/jsc/bun-jsc.exports.js b/src/bun.js/bun-jsc.exports.js
index 3f288a8e6..d94f69197 100644
--- a/src/javascript/jsc/bun-jsc.exports.js
+++ b/src/bun.js/bun-jsc.exports.js
@@ -1,23 +1,25 @@
 const jsc = globalThis[Symbol.for("Bun.lazy")]("bun:jsc");
 
+export const callerSourceOrigin = jsc.callerSourceOrigin;
 export const describe = jsc.describe;
 export const describeArray = jsc.describeArray;
-export const gcAndSweep = jsc.gcAndSweep;
-export const fullGC = jsc.fullGC;
+export const drainMicrotasks = jsc.drainMicrotasks;
 export const edenGC = jsc.edenGC;
+export const fullGC = jsc.fullGC;
+export const gcAndSweep = jsc.gcAndSweep;
+export const getRandomSeed = jsc.getRandomSeed;
 export const heapSize = jsc.heapSize;
 export const heapStats = jsc.heapStats;
-export const memoryUsage = jsc.memoryUsage;
-export const getRandomSeed = jsc.getRandomSeed;
-export const setRandomSeed = jsc.setRandomSeed;
 export const isRope = jsc.isRope;
-export const callerSourceOrigin = jsc.callerSourceOrigin;
+export const memoryUsage = jsc.memoryUsage;
 export const noFTL = jsc.noFTL;
 export const noOSRExitFuzzing = jsc.noOSRExitFuzzing;
-export const optimizeNextInvocation = jsc.optimizeNextInvocation;
 export const numberOfDFGCompiles = jsc.numberOfDFGCompiles;
+export const optimizeNextInvocation = jsc.optimizeNextInvocation;
 export const releaseWeakRefs = jsc.releaseWeakRefs;
-export const totalCompileTime = jsc.totalCompileTime;
 export const reoptimizationRetryCount = jsc.reoptimizationRetryCount;
-export const drainMicrotasks = jsc.drainMicrotasks;
+export const setRandomSeed = jsc.setRandomSeed;
+export const startRemoteDebugger = jsc.startRemoteDebugger;
+export const totalCompileTime = jsc.totalCompileTime;
+
 export default jsc;
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/exact/im-exact.js b/src/bun.js/child_process.exports.js
index e69de29bb..e69de29bb 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/exact/im-exact.js
+++ b/src/bun.js/child_process.exports.js
diff --git a/src/javascript/jsc/config.zig b/src/bun.js/config.zig
index 3feff8677..8ec9238f6 100644
--- a/src/javascript/jsc/config.zig
+++ b/src/bun.js/config.zig
@@ -1,4 +1,4 @@
-const bun = @import("../../global.zig");
+const bun = @import("../global.zig");
 const string = bun.string;
 const Output = bun.Output;
 const Global = bun.Global;
@@ -10,17 +10,17 @@ const default_allocator = bun.default_allocator;
 const C = bun.C;
 const std = @import("std");
 
-const Fs = @import("../../fs.zig");
-const resolver = @import("../../resolver/resolver.zig");
-const ast = @import("../../import_record.zig");
-const NodeModuleBundle = @import("../../node_module_bundle.zig").NodeModuleBundle;
-const logger = @import("../../logger.zig");
-const Api = @import("../../api/schema.zig").Api;
-const options = @import("../../options.zig");
-const Bundler = @import("../../bundler.zig").ServeBundler;
-const js_printer = @import("../../js_printer.zig");
-const hash_map = @import("../../hash_map.zig");
-const http = @import("../../http.zig");
+const Fs = @import("../fs.zig");
+const resolver = @import("../resolver/resolver.zig");
+const ast = @import("../import_record.zig");
+const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
+const logger = @import("../logger.zig");
+const Api = @import("../api/schema.zig").Api;
+const options = @import("../options.zig");
+const Bundler = @import("../bundler.zig").ServeBundler;
+const js_printer = @import("../js_printer.zig");
+const hash_map = @import("../hash_map.zig");
+const http = @import("../http.zig");
 
 pub const DefaultBunDefines = struct {
     pub const Keys = struct {
diff --git a/src/javascript/jsc/detect-libc.js b/src/bun.js/detect-libc.js
index 884385189..884385189 100644
--- a/src/javascript/jsc/detect-libc.js
+++ b/src/bun.js/detect-libc.js
diff --git a/src/javascript/jsc/detect-libc.linux.js b/src/bun.js/detect-libc.linux.js
index 3a46ffda0..3a46ffda0 100644
--- a/src/javascript/jsc/detect-libc.linux.js
+++ b/src/bun.js/detect-libc.linux.js
diff --git a/src/javascript/jsc/event_loop.zig b/src/bun.js/event_loop.zig
index 0a32732d0..d6b7f75da 100644
--- a/src/javascript/jsc/event_loop.zig
+++ b/src/bun.js/event_loop.zig
@@ -2,14 +2,14 @@ const std = @import("std");
 const JSC = @import("javascript_core");
 const JSGlobalObject = JSC.JSGlobalObject;
 const VirtualMachine = JSC.VirtualMachine;
-const Lock = @import("../../lock.zig").Lock;
+const Lock = @import("../lock.zig").Lock;
 const Microtask = JSC.Microtask;
-const bun = @import("../../global.zig");
+const bun = @import("../global.zig");
 const Environment = bun.Environment;
 const Fetch = JSC.WebCore.Fetch;
 const WebCore = JSC.WebCore;
 const Bun = JSC.API.Bun;
-const TaggedPointerUnion = @import("../../tagged_pointer.zig").TaggedPointerUnion;
+const TaggedPointerUnion = @import("../tagged_pointer.zig").TaggedPointerUnion;
 const CopyFilePromiseTask = WebCore.Blob.Store.CopyFile.CopyFilePromiseTask;
 const AsyncTransformTask = @import("./api/transpiler.zig").TransformTask.AsyncTransformTask;
 const BunTimerTimeoutTask = Bun.Timer.Timeout.TimeoutTask;
@@ -19,8 +19,8 @@ const napi_async_work = JSC.napi.napi_async_work;
 const FetchTasklet = Fetch.FetchTasklet;
 const JSValue = JSC.JSValue;
 const js = JSC.C;
-pub const WorkPool = @import("../../work_pool.zig").WorkPool;
-pub const WorkPoolTask = @import("../../work_pool.zig").Task;
+pub const WorkPool = @import("../work_pool.zig").WorkPool;
+pub const WorkPoolTask = @import("../work_pool.zig").Task;
 const NetworkThread = @import("http").NetworkThread;
 
 pub fn ConcurrentPromiseTask(comptime Context: type) type {
@@ -84,7 +84,7 @@ pub fn ConcurrentPromiseTask(comptime Context: type) type {
 
 pub fn SerialPromiseTask(comptime Context: type) type {
     return struct {
-        const SerialWorkPool = @import("../../work_pool.zig").NewWorkPool(1);
+        const SerialWorkPool = @import("../work_pool.zig").NewWorkPool(1);
         const This = @This();
 
         ctx: *Context,
diff --git a/src/javascript/jsc/ffi.exports.js b/src/bun.js/ffi.exports.js
index 1617ffc52..1617ffc52 100644
--- a/src/javascript/jsc/ffi.exports.js
+++ b/src/bun.js/ffi.exports.js
diff --git a/src/javascript/jsc/fs.exports.js b/src/bun.js/fs.exports.js
index 0680b3568..0680b3568 100644
--- a/src/javascript/jsc/fs.exports.js
+++ b/src/bun.js/fs.exports.js
diff --git a/src/javascript/jsc/fs_promises.exports.js b/src/bun.js/fs_promises.exports.js
index c1dce2291..c1dce2291 100644
--- a/src/javascript/jsc/fs_promises.exports.js
+++ b/src/bun.js/fs_promises.exports.js
diff --git a/src/javascript/jsc/generate-jssink.js b/src/bun.js/generate-jssink.js
index 924b8f059..1d20be64f 100644
--- a/src/javascript/jsc/generate-jssink.js
+++ b/src/bun.js/generate-jssink.js
@@ -203,7 +203,7 @@ async function implementation() {
 // Generated by ${import.meta.path} at ${new Date().toISOString()}
 // To regenerate this file, run:
 //
-//  bun src/javascript/jsc/generate-jssink.js
+//  bun src/bun.js/generate-jssink.js
 //
 #include "root.h"
 #include "JSSink.h"
diff --git a/src/javascript/jsc/headergen/sizegen.cpp b/src/bun.js/headergen/sizegen.cpp
index c8308d084..1249d93b1 100644
--- a/src/javascript/jsc/headergen/sizegen.cpp
+++ b/src/bun.js/headergen/sizegen.cpp
@@ -25,8 +25,8 @@ int main() {
 
   strftime(buf, 80, "%Y-%m-%d %H:%M:%s", timeinfo);
 
-  cout << "// Auto-generated by src/javascript/jsc/headergen/sizegen.cpp at "
-       << buf << ".\n";
+  cout << "// Auto-generated by src/bun.js/headergen/sizegen.cpp at " << buf
+       << ".\n";
   cout << "// These are the byte sizes for the different object types with "
           "bindings in JavaScriptCore.\n";
   cout << "// This allows us to safely return stack allocated C++ types to "
diff --git a/src/javascript/jsc/javascript.zig b/src/bun.js/javascript.zig
index a5c9f1e01..937b40cc6 100644
--- a/src/javascript/jsc/javascript.zig
+++ b/src/bun.js/javascript.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false;
 const StaticExport = @import("./bindings/static_export.zig");
 const c_char = StaticExport.c_char;
-const bun = @import("../../global.zig");
+const bun = @import("../global.zig");
 const string = bun.string;
 const Output = bun.Output;
 const Global = bun.Global;
@@ -12,7 +12,7 @@ const MutableString = bun.MutableString;
 const stringZ = bun.stringZ;
 const default_allocator = bun.default_allocator;
 const StoredFileDescriptorType = bun.StoredFileDescriptorType;
-const Arena = @import("../../mimalloc_arena.zig").Arena;
+const Arena = @import("../mimalloc_arena.zig").Arena;
 const C = bun.C;
 const NetworkThread = @import("http").NetworkThread;
 const IO = @import("io");
@@ -20,68 +20,68 @@ pub fn zigCast(comptime Destination: type, value: anytype) *Destination {
     return @ptrCast(*Destination, @alignCast(@alignOf(*Destination), value));
 }
 const Allocator = std.mem.Allocator;
-const IdentityContext = @import("../../identity_context.zig").IdentityContext;
-const Fs = @import("../../fs.zig");
-const Resolver = @import("../../resolver/resolver.zig");
-const ast = @import("../../import_record.zig");
-const NodeModuleBundle = @import("../../node_module_bundle.zig").NodeModuleBundle;
-const MacroEntryPoint = @import("../../bundler.zig").MacroEntryPoint;
-const logger = @import("../../logger.zig");
-const Api = @import("../../api/schema.zig").Api;
-const options = @import("../../options.zig");
-const Bundler = @import("../../bundler.zig").Bundler;
-const ServerEntryPoint = @import("../../bundler.zig").ServerEntryPoint;
-const js_printer = @import("../../js_printer.zig");
-const js_parser = @import("../../js_parser.zig");
-const js_ast = @import("../../js_ast.zig");
-const hash_map = @import("../../hash_map.zig");
-const http = @import("../../http.zig");
-const NodeFallbackModules = @import("../../node_fallbacks.zig");
+const IdentityContext = @import("../identity_context.zig").IdentityContext;
+const Fs = @import("../fs.zig");
+const Resolver = @import("../resolver/resolver.zig");
+const ast = @import("../import_record.zig");
+const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
+const MacroEntryPoint = @import("../bundler.zig").MacroEntryPoint;
+const logger = @import("../logger.zig");
+const Api = @import("../api/schema.zig").Api;
+const options = @import("../options.zig");
+const Bundler = @import("../bundler.zig").Bundler;
+const ServerEntryPoint = @import("../bundler.zig").ServerEntryPoint;
+const js_printer = @import("../js_printer.zig");
+const js_parser = @import("../js_parser.zig");
+const js_ast = @import("../js_ast.zig");
+const hash_map = @import("../hash_map.zig");
+const http = @import("../http.zig");
+const NodeFallbackModules = @import("../node_fallbacks.zig");
 const ImportKind = ast.ImportKind;
-const Analytics = @import("../../analytics/analytics_thread.zig");
-const ZigString = @import("../../jsc.zig").ZigString;
-const Runtime = @import("../../runtime.zig");
+const Analytics = @import("../analytics/analytics_thread.zig");
+const ZigString = @import("../jsc.zig").ZigString;
+const Runtime = @import("../runtime.zig");
 const Router = @import("./api/router.zig");
 const ImportRecord = ast.ImportRecord;
-const DotEnv = @import("../../env_loader.zig");
-const ParseResult = @import("../../bundler.zig").ParseResult;
-const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON;
-const MacroRemap = @import("../../resolver/package_json.zig").MacroMap;
-const WebCore = @import("../../jsc.zig").WebCore;
+const DotEnv = @import("../env_loader.zig");
+const ParseResult = @import("../bundler.zig").ParseResult;
+const PackageJSON = @import("../resolver/package_json.zig").PackageJSON;
+const MacroRemap = @import("../resolver/package_json.zig").MacroMap;
+const WebCore = @import("../jsc.zig").WebCore;
 const Request = WebCore.Request;
 const Response = WebCore.Response;
 const Headers = WebCore.Headers;
 const Fetch = WebCore.Fetch;
 const FetchEvent = WebCore.FetchEvent;
-const js = @import("../../jsc.zig").C;
-const JSC = @import("../../jsc.zig");
+const js = @import("../jsc.zig").C;
+const JSC = @import("../jsc.zig");
 const JSError = @import("./base.zig").JSError;
 const d = @import("./base.zig").d;
 const MarkedArrayBuffer = @import("./base.zig").MarkedArrayBuffer;
 const getAllocator = @import("./base.zig").getAllocator;
-const JSValue = @import("../../jsc.zig").JSValue;
+const JSValue = @import("../jsc.zig").JSValue;
 const NewClass = @import("./base.zig").NewClass;
-const Microtask = @import("../../jsc.zig").Microtask;
-const JSGlobalObject = @import("../../jsc.zig").JSGlobalObject;
-const ExceptionValueRef = @import("../../jsc.zig").ExceptionValueRef;
-const JSPrivateDataPtr = @import("../../jsc.zig").JSPrivateDataPtr;
-const ZigConsoleClient = @import("../../jsc.zig").ZigConsoleClient;
-const Node = @import("../../jsc.zig").Node;
-const ZigException = @import("../../jsc.zig").ZigException;
-const ZigStackTrace = @import("../../jsc.zig").ZigStackTrace;
-const ErrorableResolvedSource = @import("../../jsc.zig").ErrorableResolvedSource;
-const ResolvedSource = @import("../../jsc.zig").ResolvedSource;
-const JSPromise = @import("../../jsc.zig").JSPromise;
-const JSInternalPromise = @import("../../jsc.zig").JSInternalPromise;
-const JSModuleLoader = @import("../../jsc.zig").JSModuleLoader;
-const JSPromiseRejectionOperation = @import("../../jsc.zig").JSPromiseRejectionOperation;
-const Exception = @import("../../jsc.zig").Exception;
-const ErrorableZigString = @import("../../jsc.zig").ErrorableZigString;
-const ZigGlobalObject = @import("../../jsc.zig").ZigGlobalObject;
-const VM = @import("../../jsc.zig").VM;
-const JSFunction = @import("../../jsc.zig").JSFunction;
+const Microtask = @import("../jsc.zig").Microtask;
+const JSGlobalObject = @import("../jsc.zig").JSGlobalObject;
+const ExceptionValueRef = @import("../jsc.zig").ExceptionValueRef;
+const JSPrivateDataPtr = @import("../jsc.zig").JSPrivateDataPtr;
+const ZigConsoleClient = @import("../jsc.zig").ZigConsoleClient;
+const Node = @import("../jsc.zig").Node;
+const ZigException = @import("../jsc.zig").ZigException;
+const ZigStackTrace = @import("../jsc.zig").ZigStackTrace;
+const ErrorableResolvedSource = @import("../jsc.zig").ErrorableResolvedSource;
+const ResolvedSource = @import("../jsc.zig").ResolvedSource;
+const JSPromise = @import("../jsc.zig").JSPromise;
+const JSInternalPromise = @import("../jsc.zig").JSInternalPromise;
+const JSModuleLoader = @import("../jsc.zig").JSModuleLoader;
+const JSPromiseRejectionOperation = @import("../jsc.zig").JSPromiseRejectionOperation;
+const Exception = @import("../jsc.zig").Exception;
+const ErrorableZigString = @import("../jsc.zig").ErrorableZigString;
+const ZigGlobalObject = @import("../jsc.zig").ZigGlobalObject;
+const VM = @import("../jsc.zig").VM;
+const JSFunction = @import("../jsc.zig").JSFunction;
 const Config = @import("./config.zig");
-const URL = @import("../../url.zig").URL;
+const URL = @import("../url.zig").URL;
 const Transpiler = @import("./api/transpiler.zig");
 const Bun = JSC.API.Bun;
 const EventLoop = JSC.EventLoop;
@@ -111,11 +111,11 @@ pub const GlobalClasses = [_]type{
     // The last item in this array becomes "process.env"
     Bun.EnvironmentVariables.Class,
 };
-const TaggedPointerUnion = @import("../../tagged_pointer.zig").TaggedPointerUnion;
+const TaggedPointerUnion = @import("../tagged_pointer.zig").TaggedPointerUnion;
 const Task = JSC.Task;
-const Blob = @import("../../blob.zig");
+const Blob = @import("../blob.zig");
 pub const Buffer = MarkedArrayBuffer;
-const Lock = @import("../../lock.zig").Lock;
+const Lock = @import("../lock.zig").Lock;
 
 pub const OpaqueCallback = fn (current: ?*anyopaque) callconv(.C) void;
 pub fn OpaqueWrap(comptime Context: type, comptime Function: fn (this: *Context) void) OpaqueCallback {
@@ -129,7 +129,7 @@ pub fn OpaqueWrap(comptime Context: type, comptime Function: fn (this: *Context)
 
 const bun_file_import_path = "/node_modules.server.bun";
 
-const SourceMap = @import("../../sourcemap/sourcemap.zig");
+const SourceMap = @import("../sourcemap/sourcemap.zig");
 const MappingList = SourceMap.Mapping.List;
 
 pub const SavedSourceMap = struct {
diff --git a/src/javascript/jsc/javascript_core_c_api.zig b/src/bun.js/javascript_core_c_api.zig
index c2bcc45cf..c2bcc45cf 100644
--- a/src/javascript/jsc/javascript_core_c_api.zig
+++ b/src/bun.js/javascript_core_c_api.zig
diff --git a/src/javascript/jsc/module.exports.js b/src/bun.js/module.exports.js
index f0817a059..f0817a059 100644
--- a/src/javascript/jsc/module.exports.js
+++ b/src/bun.js/module.exports.js
diff --git a/src/javascript/jsc/node/buffer.js b/src/bun.js/node/buffer.js
index faee19655..faee19655 100644
--- a/src/javascript/jsc/node/buffer.js
+++ b/src/bun.js/node/buffer.js
diff --git a/src/javascript/jsc/node/buffer.zig b/src/bun.js/node/buffer.zig
index 2b604d594..412c61722 100644
--- a/src/javascript/jsc/node/buffer.zig
+++ b/src/bun.js/node/buffer.zig
@@ -1,9 +1,9 @@
 const std = @import("std");
-const bun = @import("../../../global.zig");
+const bun = @import("../../global.zig");
 const strings = bun.strings;
 const string = bun.string;
 const AsyncIO = @import("io");
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("../../jsc.zig");
 const PathString = JSC.PathString;
 const Environment = bun.Environment;
 const C = bun.C;
diff --git a/src/javascript/jsc/node/dir_iterator.zig b/src/bun.js/node/dir_iterator.zig
index 3d28541e7..19db4177d 100644
--- a/src/javascript/jsc/node/dir_iterator.zig
+++ b/src/bun.js/node/dir_iterator.zig
@@ -9,12 +9,12 @@ const std = @import("std");
 const os = std.os;
 
 const Dir = std.fs.Dir;
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("../../jsc.zig");
 const PathString = JSC.PathString;
 
 const IteratorError = error{ AccessDenied, SystemResources } || os.UnexpectedError;
 const mem = std.mem;
-const strings = @import("../../../global.zig").strings;
+const strings = @import("../../global.zig").strings;
 const Maybe = JSC.Maybe;
 const File = std.fs.File;
 const Result = Maybe(?Entry);
diff --git a/src/javascript/jsc/node/node_fs.zig b/src/bun.js/node/node_fs.zig
index 4a556f15c..3cacb57b2 100644
--- a/src/javascript/jsc/node/node_fs.zig
+++ b/src/bun.js/node/node_fs.zig
@@ -2,11 +2,11 @@
 // for interacting with the filesystem from JavaScript.
 // The top-level functions assume the arguments are already validated
 const std = @import("std");
-const bun = @import("../../../global.zig");
+const bun = @import("../../global.zig");
 const strings = bun.strings;
 const string = bun.string;
 const AsyncIO = @import("io");
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("../../jsc.zig");
 const PathString = JSC.PathString;
 const Environment = bun.Environment;
 const C = bun.C;
@@ -25,8 +25,8 @@ const PathLike = JSC.Node.PathLike;
 const PathOrFileDescriptor = JSC.Node.PathOrFileDescriptor;
 const FileDescriptor = JSC.Node.FileDescriptor;
 const DirIterator = @import("./dir_iterator.zig");
-const Path = @import("../../../resolver/resolve_path.zig");
-const FileSystem = @import("../../../fs.zig").FileSystem;
+const Path = @import("../../resolver/resolve_path.zig");
+const FileSystem = @import("../../fs.zig").FileSystem;
 const StringOrBuffer = JSC.Node.StringOrBuffer;
 const ArgumentsSlice = JSC.Node.ArgumentsSlice;
 const TimeLike = JSC.Node.TimeLike;
@@ -1873,7 +1873,7 @@ const Arguments = struct {
                         stream.end = end.toInt32();
                     }
 
-                    if (arg.getIfPropertyExists(ctx.ptr(), "highwaterMark")) |highwaterMark| {
+                    if (arg.getIfPropertyExists(ctx.ptr(), "highWaterMark")) |highwaterMark| {
                         stream.highwater_mark = highwaterMark.toU32();
                     }
                 }
diff --git a/src/javascript/jsc/node/node_fs_binding.zig b/src/bun.js/node/node_fs_binding.zig
index 9e689b929..298727fb9 100644
--- a/src/javascript/jsc/node/node_fs_binding.zig
+++ b/src/bun.js/node/node_fs_binding.zig
@@ -1,11 +1,11 @@
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("../../jsc.zig");
 const std = @import("std");
 const Flavor = JSC.Node.Flavor;
 const ArgumentsSlice = JSC.Node.ArgumentsSlice;
 const system = std.os.system;
 const Maybe = JSC.Maybe;
 const Encoding = JSC.Node.Encoding;
-const FeatureFlags = @import("../../../global.zig").FeatureFlags;
+const FeatureFlags = @import("../../global.zig").FeatureFlags;
 const Args = JSC.Node.NodeFS.Arguments;
 const d = JSC.d;
 
diff --git a/src/javascript/jsc/node/node_fs_constant.zig b/src/bun.js/node/node_fs_constant.zig
index 655c18a4c..72e752184 100644
--- a/src/javascript/jsc/node/node_fs_constant.zig
+++ b/src/bun.js/node/node_fs_constant.zig
@@ -1,4 +1,4 @@
-const bun = @import("../../../global.zig");
+const bun = @import("../../global.zig");
 const Environment = bun.Environment;
 const std = @import("std");
 
diff --git a/src/javascript/jsc/node/nodejs_error_code.zig b/src/bun.js/node/nodejs_error_code.zig
index 5c54791ee..5c54791ee 100644
--- a/src/javascript/jsc/node/nodejs_error_code.zig
+++ b/src/bun.js/node/nodejs_error_code.zig
diff --git a/src/javascript/jsc/node/syscall.zig b/src/bun.js/node/syscall.zig
index ad4545aa9..b931e9c0e 100644
--- a/src/javascript/jsc/node/syscall.zig
+++ b/src/bun.js/node/syscall.zig
@@ -5,14 +5,14 @@ const os = std.os;
 const builtin = @import("builtin");
 
 const Syscall = @This();
-const Environment = @import("../../../global.zig").Environment;
-const default_allocator = @import("../../../global.zig").default_allocator;
-const JSC = @import("../../../jsc.zig");
+const Environment = @import("../../global.zig").Environment;
+const default_allocator = @import("../../global.zig").default_allocator;
+const JSC = @import("../../jsc.zig");
 const SystemError = JSC.SystemError;
-const bun = @import("../../../global.zig");
+const bun = @import("../../global.zig");
 const MAX_PATH_BYTES = bun.MAX_PATH_BYTES;
 const fd_t = bun.FileDescriptorType;
-const C = @import("../../../global.zig").C;
+const C = @import("../../global.zig").C;
 const linux = os.linux;
 const Maybe = JSC.Maybe;
 
@@ -96,7 +96,7 @@ pub const Tag = enum(u8) {
     kqueue,
     pub var strings = std.EnumMap(Tag, JSC.C.JSStringRef).initFull(null);
 };
-const PathString = @import("../../../global.zig").PathString;
+const PathString = @import("../../global.zig").PathString;
 
 const mode_t = os.mode_t;
 
diff --git a/src/javascript/jsc/node/types.zig b/src/bun.js/node/types.zig
index 0f9c31683..52a35699b 100644
--- a/src/javascript/jsc/node/types.zig
+++ b/src/bun.js/node/types.zig
@@ -1,20 +1,20 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const bun = @import("../../../global.zig");
+const bun = @import("../../global.zig");
 const strings = bun.strings;
 const string = bun.string;
 const AsyncIO = @import("io");
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("../../jsc.zig");
 const PathString = JSC.PathString;
 const Environment = bun.Environment;
 const C = bun.C;
 const Syscall = @import("./syscall.zig");
 const os = std.os;
 const Buffer = JSC.MarkedArrayBuffer;
-const IdentityContext = @import("../../../identity_context.zig").IdentityContext;
-const logger = @import("../../../logger.zig");
-const Fs = @import("../../../fs.zig");
-const URL = @import("../../../url.zig").URL;
+const IdentityContext = @import("../../identity_context.zig").IdentityContext;
+const logger = @import("../../logger.zig");
+const Fs = @import("../../fs.zig");
+const URL = @import("../../url.zig").URL;
 const Shimmer = @import("../bindings/shimmer.zig").Shimmer;
 const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false;
 const meta = bun.meta;
@@ -2161,8 +2161,8 @@ pub const Path = struct {
     pub const name = "Bun__Path";
     pub const include = "Path.h";
     pub const namespace = shim.namespace;
-    const PathHandler = @import("../../../resolver/resolve_path.zig");
-    const StringBuilder = @import("../../../string_builder.zig");
+    const PathHandler = @import("../../resolver/resolve_path.zig");
+    const StringBuilder = @import("../../string_builder.zig");
     pub const code = @embedFile("../path.exports.js");
 
     pub fn create(globalObject: *JSC.JSGlobalObject, isWindows: bool) callconv(.C) JSC.JSValue {
diff --git a/src/javascript/jsc/node_streams_consumer.exports.js b/src/bun.js/node_streams_consumer.exports.js
index 83d447a43..83d447a43 100644
--- a/src/javascript/jsc/node_streams_consumer.exports.js
+++ b/src/bun.js/node_streams_consumer.exports.js
diff --git a/src/javascript/jsc/node_streams_web.exports.js b/src/bun.js/node_streams_web.exports.js
index a856839ec..a856839ec 100644
--- a/src/javascript/jsc/node_streams_web.exports.js
+++ b/src/bun.js/node_streams_web.exports.js
diff --git a/src/javascript/jsc/node_timers.exports.js b/src/bun.js/node_timers.exports.js
index 58e660412..58e660412 100644
--- a/src/javascript/jsc/node_timers.exports.js
+++ b/src/bun.js/node_timers.exports.js
diff --git a/src/javascript/jsc/node_timers_promises.exports.js b/src/bun.js/node_timers_promises.exports.js
index a2c6d4558..a2c6d4558 100644
--- a/src/javascript/jsc/node_timers_promises.exports.js
+++ b/src/bun.js/node_timers_promises.exports.js
diff --git a/src/javascript/jsc/path-posix.exports.js b/src/bun.js/path-posix.exports.js
index b3f61c1a2..b3f61c1a2 100644
--- a/src/javascript/jsc/path-posix.exports.js
+++ b/src/bun.js/path-posix.exports.js
diff --git a/src/javascript/jsc/path-win32.exports.js b/src/bun.js/path-win32.exports.js
index 932cc8960..932cc8960 100644
--- a/src/javascript/jsc/path-win32.exports.js
+++ b/src/bun.js/path-win32.exports.js
diff --git a/src/javascript/jsc/path.exports.js b/src/bun.js/path.exports.js
index 98f685fc1..98f685fc1 100644
--- a/src/javascript/jsc/path.exports.js
+++ b/src/bun.js/path.exports.js
diff --git a/src/javascript/jsc/perf_hooks.exports.js b/src/bun.js/perf_hooks.exports.js
index b49e2fc4a..b49e2fc4a 100644
--- a/src/javascript/jsc/perf_hooks.exports.js
+++ b/src/bun.js/perf_hooks.exports.js
diff --git a/src/javascript/jsc/process.exports.js b/src/bun.js/process.exports.js
index c3a789f23..c3a789f23 100644
--- a/src/javascript/jsc/process.exports.js
+++ b/src/bun.js/process.exports.js
diff --git a/src/javascript/jsc/rare_data.zig b/src/bun.js/rare_data.zig
index f82418da9..cfca61ce0 100644
--- a/src/javascript/jsc/rare_data.zig
+++ b/src/bun.js/rare_data.zig
@@ -1,13 +1,13 @@
-const EditorContext = @import("../../open.zig").EditorContext;
+const EditorContext = @import("../open.zig").EditorContext;
 const Blob = @import("./webcore/response.zig").Blob;
-const default_allocator = @import("../../global.zig").default_allocator;
-const Output = @import("../../global.zig").Output;
+const default_allocator = @import("../global.zig").default_allocator;
+const Output = @import("../global.zig").Output;
 const RareData = @This();
 const Syscall = @import("./node/syscall.zig");
 const JSC = @import("javascript_core");
 const std = @import("std");
 const BoringSSL = @import("boringssl");
-const WebSocketClientMask = @import("../../http/websocket_http_client.zig").Mask;
+const WebSocketClientMask = @import("../http/websocket_http_client.zig").Mask;
 
 boring_ssl_engine: ?*BoringSSL.ENGINE = null,
 editor_context: EditorContext = EditorContext{},
diff --git a/src/javascript/jsc/script_execution_context.zig b/src/bun.js/script_execution_context.zig
index 37594e0f4..551614ccc 100644
--- a/src/javascript/jsc/script_execution_context.zig
+++ b/src/bun.js/script_execution_context.zig
@@ -1,4 +1,4 @@
-const JSC = @import("../../jsc.zig");
+const JSC = @import("../jsc.zig");
 
 pub const ScriptExecutionContext = extern struct {
     main_file_path: JSC.ZigString,
diff --git a/src/javascript/jsc/test/jest.zig b/src/bun.js/test/jest.zig
index 5ca581d53..2128bc131 100644
--- a/src/javascript/jsc/test/jest.zig
+++ b/src/bun.js/test/jest.zig
@@ -1,26 +1,26 @@
 const std = @import("std");
-const Api = @import("../../../api/schema.zig").Api;
-const RequestContext = @import("../../../http.zig").RequestContext;
-const MimeType = @import("../../../http.zig").MimeType;
-const ZigURL = @import("../../../url.zig").URL;
+const Api = @import("../../api/schema.zig").Api;
+const RequestContext = @import("../../http.zig").RequestContext;
+const MimeType = @import("../../http.zig").MimeType;
+const ZigURL = @import("../../url.zig").URL;
 const HTTPClient = @import("http");
 const NetworkThread = HTTPClient.NetworkThread;
-const Environment = @import("../../../env.zig");
+const Environment = @import("../../env.zig");
 
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("../../jsc.zig");
 const js = JSC.C;
 
-const logger = @import("../../../logger.zig");
-const Method = @import("../../../http/method.zig").Method;
+const logger = @import("../../logger.zig");
+const Method = @import("../../http/method.zig").Method;
 
-const ObjectPool = @import("../../../pool.zig").ObjectPool;
+const ObjectPool = @import("../../pool.zig").ObjectPool;
 
-const Output = @import("../../../global.zig").Output;
-const MutableString = @import("../../../global.zig").MutableString;
-const strings = @import("../../../global.zig").strings;
-const string = @import("../../../global.zig").string;
-const default_allocator = @import("../../../global.zig").default_allocator;
-const FeatureFlags = @import("../../../global.zig").FeatureFlags;
+const Output = @import("../../global.zig").Output;
+const MutableString = @import("../../global.zig").MutableString;
+const strings = @import("../../global.zig").strings;
+const string = @import("../../global.zig").string;
+const default_allocator = @import("../../global.zig").default_allocator;
+const FeatureFlags = @import("../../global.zig").FeatureFlags;
 const ArrayBuffer = @import("../base.zig").ArrayBuffer;
 const Properties = @import("../base.zig").Properties;
 const NewClass = @import("../base.zig").NewClass;
@@ -40,7 +40,7 @@ const JSGlobalObject = JSC.JSGlobalObject;
 const VirtualMachine = @import("../javascript.zig").VirtualMachine;
 const Task = @import("../javascript.zig").Task;
 
-const Fs = @import("../../../fs.zig");
+const Fs = @import("../../fs.zig");
 const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false;
 
 fn notImplementedFn(_: *anyopaque, ctx: js.JSContextRef, _: js.JSObjectRef, _: js.JSObjectRef, _: []const js.JSValueRef, exception: js.ExceptionRef) js.JSValueRef {
@@ -59,7 +59,7 @@ fn notImplementedProp(
     return null;
 }
 
-const ArrayIdentityContext = @import("../../../identity_context.zig").ArrayIdentityContext;
+const ArrayIdentityContext = @import("../../identity_context.zig").ArrayIdentityContext;
 pub const TestRunner = struct {
     tests: TestRunner.Test.List = .{},
     log: *logger.Log,
diff --git a/src/javascript/jsc/typescript.zig b/src/bun.js/typescript.zig
index 8815071ee..6095320f6 100644
--- a/src/javascript/jsc/typescript.zig
+++ b/src/bun.js/typescript.zig
@@ -11,9 +11,9 @@ const print = std.debug.print;
 const mem = std.mem;
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
-const resolve_path = @import("../../resolver/resolve_path.zig");
-const JSC = @import("../../jsc.zig");
-const bun = @import("../../global.zig");
+const resolve_path = @import("../resolver/resolve_path.zig");
+const JSC = @import("../jsc.zig");
+const bun = @import("../global.zig");
 const string = bun.string;
 const strings = bun.strings;
 const default_allocator = bun.default_allocator;
diff --git a/src/javascript/jsc/undici.exports.js b/src/bun.js/undici.exports.js
index 70d7ebcae..70d7ebcae 100644
--- a/src/javascript/jsc/undici.exports.js
+++ b/src/bun.js/undici.exports.js
diff --git a/src/javascript/jsc/uuid.zig b/src/bun.js/uuid.zig
index 740309396..740309396 100644
--- a/src/javascript/jsc/uuid.zig
+++ b/src/bun.js/uuid.zig
diff --git a/src/javascript/jsc/webcore.zig b/src/bun.js/webcore.zig
index 799b408f2..0433402fc 100644
--- a/src/javascript/jsc/webcore.zig
+++ b/src/bun.js/webcore.zig
@@ -2,7 +2,7 @@ pub usingnamespace @import("./webcore/response.zig");
 pub usingnamespace @import("./webcore/encoding.zig");
 pub usingnamespace @import("./webcore/streams.zig");
 
-const JSC = @import("../../jsc.zig");
+const JSC = @import("../jsc.zig");
 const std = @import("std");
 
 pub const Lifetime = enum {
diff --git a/src/javascript/jsc/webcore/base64.zig b/src/bun.js/webcore/base64.zig
index 50c1ac68d..50c1ac68d 100644
--- a/src/javascript/jsc/webcore/base64.zig
+++ b/src/bun.js/webcore/base64.zig
diff --git a/src/javascript/jsc/webcore/encoding.zig b/src/bun.js/webcore/encoding.zig
index b168e97ff..cfef1c0d7 100644
--- a/src/javascript/jsc/webcore/encoding.zig
+++ b/src/bun.js/webcore/encoding.zig
@@ -1,24 +1,24 @@
 const std = @import("std");
-const Api = @import("../../../api/schema.zig").Api;
-const RequestContext = @import("../../../http.zig").RequestContext;
-const MimeType = @import("../../../http.zig").MimeType;
-const ZigURL = @import("../../../url.zig").URL;
+const Api = @import("../../api/schema.zig").Api;
+const RequestContext = @import("../../http.zig").RequestContext;
+const MimeType = @import("../../http.zig").MimeType;
+const ZigURL = @import("../../url.zig").URL;
 const HTTPClient = @import("http");
 const NetworkThread = HTTPClient.NetworkThread;
 
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("../../jsc.zig");
 const js = JSC.C;
 
-const Method = @import("../../../http/method.zig").Method;
+const Method = @import("../../http/method.zig").Method;
 
-const ObjectPool = @import("../../../pool.zig").ObjectPool;
-const bun = @import("../../../global.zig");
-const Output = @import("../../../global.zig").Output;
-const MutableString = @import("../../../global.zig").MutableString;
-const strings = @import("../../../global.zig").strings;
-const string = @import("../../../global.zig").string;
-const default_allocator = @import("../../../global.zig").default_allocator;
-const FeatureFlags = @import("../../../global.zig").FeatureFlags;
+const ObjectPool = @import("../../pool.zig").ObjectPool;
+const bun = @import("../../global.zig");
+const Output = @import("../../global.zig").Output;
+const MutableString = @import("../../global.zig").MutableString;
+const strings = @import("../../global.zig").strings;
+const string = @import("../../global.zig").string;
+const default_allocator = @import("../../global.zig").default_allocator;
+const FeatureFlags = @import("../../global.zig").FeatureFlags;
 const ArrayBuffer = @import("../base.zig").ArrayBuffer;
 const Properties = @import("../base.zig").Properties;
 const NewClass = @import("../base.zig").NewClass;
@@ -27,7 +27,7 @@ const castObj = @import("../base.zig").castObj;
 const getAllocator = @import("../base.zig").getAllocator;
 const JSPrivateDataPtr = @import("../base.zig").JSPrivateDataPtr;
 const GetJSPrivateData = @import("../base.zig").GetJSPrivateData;
-const Environment = @import("../../../env.zig");
+const Environment = @import("../../env.zig");
 const ZigString = JSC.ZigString;
 const JSInternalPromise = JSC.JSInternalPromise;
 const JSPromise = JSC.JSPromise;
diff --git a/src/javascript/jsc/webcore/response.zig b/src/bun.js/webcore/response.zig
index 75c9f8d98..017edb805 100644
--- a/src/javascript/jsc/webcore/response.zig
+++ b/src/bun.js/webcore/response.zig
@@ -1,25 +1,25 @@
 const std = @import("std");
-const Api = @import("../../../api/schema.zig").Api;
-const bun = @import("../../../global.zig");
-const RequestContext = @import("../../../http.zig").RequestContext;
-const MimeType = @import("../../../http.zig").MimeType;
-const ZigURL = @import("../../../url.zig").URL;
+const Api = @import("../../api/schema.zig").Api;
+const bun = @import("../../global.zig");
+const RequestContext = @import("../../http.zig").RequestContext;
+const MimeType = @import("../../http.zig").MimeType;
+const ZigURL = @import("../../url.zig").URL;
 const HTTPClient = @import("http");
 const NetworkThread = HTTPClient.NetworkThread;
 const AsyncIO = NetworkThread.AsyncIO;
 const JSC = @import("javascript_core");
 const js = JSC.C;
 
-const Method = @import("../../../http/method.zig").Method;
+const Method = @import("../../http/method.zig").Method;
 const FetchHeaders = JSC.FetchHeaders;
-const ObjectPool = @import("../../../pool.zig").ObjectPool;
+const ObjectPool = @import("../../pool.zig").ObjectPool;
 const SystemError = JSC.SystemError;
-const Output = @import("../../../global.zig").Output;
-const MutableString = @import("../../../global.zig").MutableString;
-const strings = @import("../../../global.zig").strings;
-const string = @import("../../../global.zig").string;
-const default_allocator = @import("../../../global.zig").default_allocator;
-const FeatureFlags = @import("../../../global.zig").FeatureFlags;
+const Output = @import("../../global.zig").Output;
+const MutableString = @import("../../global.zig").MutableString;
+const strings = @import("../../global.zig").strings;
+const string = @import("../../global.zig").string;
+const default_allocator = @import("../../global.zig").default_allocator;
+const FeatureFlags = @import("../../global.zig").FeatureFlags;
 const ArrayBuffer = @import("../base.zig").ArrayBuffer;
 const Properties = @import("../base.zig").Properties;
 const NewClass = @import("../base.zig").NewClass;
@@ -28,9 +28,9 @@ const castObj = @import("../base.zig").castObj;
 const getAllocator = @import("../base.zig").getAllocator;
 const JSPrivateDataPtr = @import("../base.zig").JSPrivateDataPtr;
 const GetJSPrivateData = @import("../base.zig").GetJSPrivateData;
-const Environment = @import("../../../env.zig");
+const Environment = @import("../../env.zig");
 const ZigString = JSC.ZigString;
-const IdentityContext = @import("../../../identity_context.zig").IdentityContext;
+const IdentityContext = @import("../../identity_context.zig").IdentityContext;
 const JSInternalPromise = JSC.JSInternalPromise;
 const JSPromise = JSC.JSPromise;
 const JSValue = JSC.JSValue;
@@ -39,9 +39,9 @@ const JSGlobalObject = JSC.JSGlobalObject;
 
 const VirtualMachine = @import("../javascript.zig").VirtualMachine;
 const Task = JSC.Task;
-const JSPrinter = @import("../../../js_printer.zig");
+const JSPrinter = @import("../../js_printer.zig");
 const picohttp = @import("picohttp");
-const StringJoiner = @import("../../../string_joiner.zig");
+const StringJoiner = @import("../../string_joiner.zig");
 const uws = @import("uws");
 
 pub const Response = struct {
diff --git a/src/javascript/jsc/webcore/streams.zig b/src/bun.js/webcore/streams.zig
index df5de24fa..f07cc7c26 100644
--- a/src/javascript/jsc/webcore/streams.zig
+++ b/src/bun.js/webcore/streams.zig
@@ -1,25 +1,25 @@
 const std = @import("std");
-const Api = @import("../../../api/schema.zig").Api;
-const bun = @import("../../../global.zig");
-const RequestContext = @import("../../../http.zig").RequestContext;
-const MimeType = @import("../../../http.zig").MimeType;
-const ZigURL = @import("../../../url.zig").URL;
+const Api = @import("../../api/schema.zig").Api;
+const bun = @import("../../global.zig");
+const RequestContext = @import("../../http.zig").RequestContext;
+const MimeType = @import("../../http.zig").MimeType;
+const ZigURL = @import("../../url.zig").URL;
 const HTTPClient = @import("http");
 const NetworkThread = HTTPClient.NetworkThread;
 const AsyncIO = NetworkThread.AsyncIO;
 const JSC = @import("javascript_core");
 const js = JSC.C;
 
-const Method = @import("../../../http/method.zig").Method;
+const Method = @import("../../http/method.zig").Method;
 const FetchHeaders = JSC.FetchHeaders;
-const ObjectPool = @import("../../../pool.zig").ObjectPool;
+const ObjectPool = @import("../../pool.zig").ObjectPool;
 const SystemError = JSC.SystemError;
-const Output = @import("../../../global.zig").Output;
-const MutableString = @import("../../../global.zig").MutableString;
-const strings = @import("../../../global.zig").strings;
-const string = @import("../../../global.zig").string;
-const default_allocator = @import("../../../global.zig").default_allocator;
-const FeatureFlags = @import("../../../global.zig").FeatureFlags;
+const Output = @import("../../global.zig").Output;
+const MutableString = @import("../../global.zig").MutableString;
+const strings = @import("../../global.zig").strings;
+const string = @import("../../global.zig").string;
+const default_allocator = @import("../../global.zig").default_allocator;
+const FeatureFlags = @import("../../global.zig").FeatureFlags;
 const ArrayBuffer = @import("../base.zig").ArrayBuffer;
 const Properties = @import("../base.zig").Properties;
 const NewClass = @import("../base.zig").NewClass;
@@ -28,9 +28,9 @@ const castObj = @import("../base.zig").castObj;
 const getAllocator = @import("../base.zig").getAllocator;
 const JSPrivateDataPtr = @import("../base.zig").JSPrivateDataPtr;
 const GetJSPrivateData = @import("../base.zig").GetJSPrivateData;
-const Environment = @import("../../../env.zig");
+const Environment = @import("../../env.zig");
 const ZigString = JSC.ZigString;
-const IdentityContext = @import("../../../identity_context.zig").IdentityContext;
+const IdentityContext = @import("../../identity_context.zig").IdentityContext;
 const JSInternalPromise = JSC.JSInternalPromise;
 const JSPromise = JSC.JSPromise;
 const JSValue = JSC.JSValue;
@@ -39,9 +39,9 @@ const JSGlobalObject = JSC.JSGlobalObject;
 
 const VirtualMachine = @import("../javascript.zig").VirtualMachine;
 const Task = JSC.Task;
-const JSPrinter = @import("../../../js_printer.zig");
+const JSPrinter = @import("../../js_printer.zig");
 const picohttp = @import("picohttp");
-const StringJoiner = @import("../../../string_joiner.zig");
+const StringJoiner = @import("../../string_joiner.zig");
 const uws = @import("uws");
 const Blob = JSC.WebCore.Blob;
 const Response = JSC.WebCore.Response;
@@ -179,7 +179,7 @@ pub const ReadableStream = struct {
         return ReadableStream__empty(globalThis);
     }
 
-    const Base = @import("../../../ast/base.zig");
+    const Base = @import("../../ast/base.zig");
     pub const StreamTag = enum(usize) {
         invalid = 0,
         _,
diff --git a/src/javascript/jsc/ws.exports.js b/src/bun.js/ws.exports.js
index 90d3f8911..90d3f8911 100644
--- a/src/javascript/jsc/ws.exports.js
+++ b/src/bun.js/ws.exports.js
diff --git a/src/bun_js.zig b/src/bun_js.zig
index 7ccdc8747..2ccc3f47f 100644
--- a/src/bun_js.zig
+++ b/src/bun_js.zig
@@ -22,7 +22,7 @@ const panicky = @import("panic_handler.zig");
 const sync = @import("./sync.zig");
 const Api = @import("api/schema.zig").Api;
 const resolve_path = @import("./resolver/resolve_path.zig");
-const configureTransformOptionsForBun = @import("./javascript/jsc/config.zig").configureTransformOptionsForBun;
+const configureTransformOptionsForBun = @import("./bun.js/config.zig").configureTransformOptionsForBun;
 const Command = @import("cli.zig").Command;
 const bundler = @import("bundler.zig");
 const NodeModuleBundle = @import("node_module_bundle.zig").NodeModuleBundle;
@@ -42,7 +42,7 @@ pub const Run = struct {
 
     pub fn boot(ctx: Command.Context, file: std.fs.File, entry_path: string) !void {
         if (comptime JSC.is_bindgen) unreachable;
-        @import("javascript/jsc/javascript_core_c_api.zig").JSCInitialize();
+        @import("bun.js/javascript_core_c_api.zig").JSCInitialize();
 
         js_ast.Expr.Data.Store.create(default_allocator);
         js_ast.Stmt.Data.Store.create(default_allocator);
diff --git a/src/cli.zig b/src/cli.zig
index 10721a5d2..971aafa84 100644
--- a/src/cli.zig
+++ b/src/cli.zig
@@ -24,7 +24,7 @@ const panicky = @import("panic_handler.zig");
 const sync = @import("./sync.zig");
 const Api = @import("api/schema.zig").Api;
 const resolve_path = @import("./resolver/resolve_path.zig");
-const configureTransformOptionsForBun = @import("./javascript/jsc/config.zig").configureTransformOptionsForBun;
+const configureTransformOptionsForBun = @import("./bun.js/config.zig").configureTransformOptionsForBun;
 const clap = @import("clap");
 const BunJS = @import("./bun_js.zig");
 const Install = @import("./install/install.zig");
diff --git a/src/cli/build_command.zig b/src/cli/build_command.zig
index eb2bb3141..fc63f10a7 100644
--- a/src/cli/build_command.zig
+++ b/src/cli/build_command.zig
@@ -23,7 +23,7 @@ const allocators = @import("../allocators.zig");
 const sync = @import("../sync.zig");
 const Api = @import("../api/schema.zig").Api;
 const resolve_path = @import("../resolver/resolve_path.zig");
-const configureTransformOptionsForBun = @import("../javascript/jsc/config.zig").configureTransformOptionsForBun;
+const configureTransformOptionsForBun = @import("../bun.js/config.zig").configureTransformOptionsForBun;
 const Command = @import("../cli.zig").Command;
 const bundler = @import("../bundler.zig");
 const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
diff --git a/src/cli/bun_command.zig b/src/cli/bun_command.zig
index 8305379d7..77e639f18 100644
--- a/src/cli/bun_command.zig
+++ b/src/cli/bun_command.zig
@@ -24,7 +24,7 @@ const panicky = @import("../panic_handler.zig");
 const sync = @import("../sync.zig");
 const Api = @import("../api/schema.zig").Api;
 const resolve_path = @import("../resolver/resolve_path.zig");
-const configureTransformOptionsForBun = @import("../javascript/jsc/config.zig").configureTransformOptionsForBun;
+const configureTransformOptionsForBun = @import("../bun.js/config.zig").configureTransformOptionsForBun;
 const bundler = @import("../bundler.zig");
 const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
 const GenerateNodeModuleBundle = @import("../bundler/generate_node_modules_bundle.zig");
diff --git a/src/cli/create_command.zig b/src/cli/create_command.zig
index 6afcdc3c0..c9439d93f 100644
--- a/src/cli/create_command.zig
+++ b/src/cli/create_command.zig
@@ -23,7 +23,7 @@ const allocators = @import("../allocators.zig");
 const sync = @import("../sync.zig");
 const Api = @import("../api/schema.zig").Api;
 const resolve_path = @import("../resolver/resolve_path.zig");
-const configureTransformOptionsForBun = @import("../javascript/jsc/config.zig").configureTransformOptionsForBun;
+const configureTransformOptionsForBun = @import("../bun.js/config.zig").configureTransformOptionsForBun;
 const Command = @import("../cli.zig").Command;
 const bundler = @import("../bundler.zig");
 const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
diff --git a/src/cli/install_completions_command.zig b/src/cli/install_completions_command.zig
index a52e8c1fb..d82169aaa 100644
--- a/src/cli/install_completions_command.zig
+++ b/src/cli/install_completions_command.zig
@@ -22,7 +22,7 @@ const allocators = @import("../allocators.zig");
 const sync = @import("../sync.zig");
 const Api = @import("../api/schema.zig").Api;
 const resolve_path = @import("../resolver/resolve_path.zig");
-const configureTransformOptionsForBun = @import("../javascript/jsc/config.zig").configureTransformOptionsForBun;
+const configureTransformOptionsForBun = @import("../bun.js/config.zig").configureTransformOptionsForBun;
 const Command = @import("../cli.zig").Command;
 const bundler = @import("../bundler.zig");
 const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
diff --git a/src/cli/run_command.zig b/src/cli/run_command.zig
index e71748892..6f9932970 100644
--- a/src/cli/run_command.zig
+++ b/src/cli/run_command.zig
@@ -23,7 +23,7 @@ const panicky = @import("../panic_handler.zig");
 const sync = @import("../sync.zig");
 const Api = @import("../api/schema.zig").Api;
 const resolve_path = @import("../resolver/resolve_path.zig");
-const configureTransformOptionsForBun = @import("../javascript/jsc/config.zig").configureTransformOptionsForBun;
+const configureTransformOptionsForBun = @import("../bun.js/config.zig").configureTransformOptionsForBun;
 const Command = @import("../cli.zig").Command;
 const bundler = @import("../bundler.zig");
 const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
diff --git a/src/cli/test_command.zig b/src/cli/test_command.zig
index cba31e5ce..50be09878 100644
--- a/src/cli/test_command.zig
+++ b/src/cli/test_command.zig
@@ -25,7 +25,7 @@ const panicky = @import("../panic_handler.zig");
 const sync = @import("../sync.zig");
 const Api = @import("../api/schema.zig").Api;
 const resolve_path = @import("../resolver/resolve_path.zig");
-const configureTransformOptionsForBun = @import("../javascript/jsc/config.zig").configureTransformOptionsForBun;
+const configureTransformOptionsForBun = @import("../bun.js/config.zig").configureTransformOptionsForBun;
 const Command = @import("../cli.zig").Command;
 const bundler = @import("../bundler.zig");
 const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
diff --git a/src/cli/upgrade_command.zig b/src/cli/upgrade_command.zig
index 4d7ae5c9b..8f94b54c4 100644
--- a/src/cli/upgrade_command.zig
+++ b/src/cli/upgrade_command.zig
@@ -22,7 +22,7 @@ const allocators = @import("../allocators.zig");
 const sync = @import("../sync.zig");
 const Api = @import("../api/schema.zig").Api;
 const resolve_path = @import("../resolver/resolve_path.zig");
-const configureTransformOptionsForBun = @import("../javascript/jsc/config.zig").configureTransformOptionsForBun;
+const configureTransformOptionsForBun = @import("../bun.js/config.zig").configureTransformOptionsForBun;
 const Command = @import("../cli.zig").Command;
 const bundler = @import("../bundler.zig");
 const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
diff --git a/src/http.zig b/src/http.zig
index 1a474a5bb..fd30aae8e 100644
--- a/src/http.zig
+++ b/src/http.zig
@@ -1452,7 +1452,7 @@ pub const RequestContext = struct {
             handler.start_timer = std.time.Timer.start() catch unreachable;
 
             Output.Source.configureThread();
-            @import("javascript/jsc/javascript_core_c_api.zig").JSCInitialize();
+            @import("bun.js/javascript_core_c_api.zig").JSCInitialize();
 
             js_ast.Stmt.Data.Store.create(bun.default_allocator);
             js_ast.Expr.Data.Store.create(bun.default_allocator);
diff --git a/src/install/install.zig b/src/install/install.zig
index b16b39813..5f890e832 100644
--- a/src/install/install.zig
+++ b/src/install/install.zig
@@ -22,7 +22,7 @@ const panicky = @import("../panic_handler.zig");
 const sync = @import("../sync.zig");
 const Api = @import("../api/schema.zig").Api;
 const Path = @import("../resolver/resolve_path.zig");
-const configureTransformOptionsForBun = @import("../javascript/jsc/config.zig").configureTransformOptionsForBun;
+const configureTransformOptionsForBun = @import("../bun.js/config.zig").configureTransformOptionsForBun;
 const Command = @import("../cli.zig").Command;
 const BunArguments = @import("../cli.zig").Arguments;
 const bundler = @import("../bundler.zig");
diff --git a/src/install/lockfile.zig b/src/install/lockfile.zig
index 63274cc43..21ee9f314 100644
--- a/src/install/lockfile.zig
+++ b/src/install/lockfile.zig
@@ -22,7 +22,7 @@ const panicky = @import("../panic_handler.zig");
 const sync = @import("../sync.zig");
 const Api = @import("../api/schema.zig").Api;
 const Path = @import("../resolver/resolve_path.zig");
-const configureTransformOptionsForBun = @import("../javascript/jsc/config.zig").configureTransformOptionsForBun;
+const configureTransformOptionsForBun = @import("../bun.js/config.zig").configureTransformOptionsForBun;
 const Command = @import("../cli.zig").Command;
 const BunArguments = @import("../cli.zig").Arguments;
 const bundler = @import("../bundler.zig");
diff --git a/src/javascript/jsc/bindings/JSSink.h b/src/javascript/jsc/bindings/JSSink.h
deleted file mode 100644
index cc4f667e0..000000000
--- a/src/javascript/jsc/bindings/JSSink.h
+++ /dev/null
@@ -1,169 +0,0 @@
-
-// AUTO-GENERATED FILE. DO NOT EDIT.
-// Generated by /Users/jarred/Code/bun/src/javascript/jsc/generate-jssink.js at 2022-06-15T10:28:21.209Z
-//
-#pragma once
-
-#include "root.h"
-
-#include "JSDOMWrapper.h"
-#include "wtf/NeverDestroyed.h"
-
-#include "Sink.h"
-
-extern "C" bool JSSink_isSink(JSC::JSGlobalObject*, JSC::EncodedJSValue);
-
-namespace WebCore {
-using namespace JSC;
-
-JSC_DECLARE_HOST_FUNCTION(functionStartDirectStream);
-class JSArrayBufferSinkConstructor final : public JSC::InternalFunction {                                                                                                     
-        public:                                                                                                                                                                     
-            using Base = JSC::InternalFunction;                                                                                                                                     
-            static JSArrayBufferSinkConstructor* create(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::Structure* structure, JSC::JSObject* prototype); 
-            static constexpr SinkID Sink = SinkID::ArrayBufferSink;
-                                                                                                                                                                                    
-            static constexpr unsigned StructureFlags = Base::StructureFlags;                                                                                                        
-            static constexpr bool needsDestruction = false;                                                                                                                         
-                                                                                                                                                                                    
-            DECLARE_EXPORT_INFO;                                                                                                                                                    
-            template<typename, JSC::SubspaceAccess mode> static JSC::GCClient::IsoSubspace* subspaceFor(JSC::VM& vm)                                                                
-            {                                                                                                                                                                       
-                if constexpr (mode == JSC::SubspaceAccess::Concurrently)                                                                                                            
-                    return nullptr;                                                                                                                                                 
-                return WebCore::subspaceForImpl<JSArrayBufferSinkConstructor, WebCore::UseCustomHeapCellType::No>(                                                                    
-                    vm,                                                                                                                                                             
-                    [](auto& spaces) { return spaces.m_clientSubspaceForJSSinkConstructor.get(); },                                                                                 
-                    [](auto& spaces, auto&& space) { spaces.m_clientSubspaceForJSSinkConstructor = WTFMove(space); },                                                               
-                    [](auto& spaces) { return spaces.m_subspaceForJSSinkConstructor.get(); },                                                                                       
-                    [](auto& spaces, auto&& space) { spaces.m_subspaceForJSSinkConstructor = WTFMove(space); });                                                                    
-            }                                                                                                                                                                       
-                                                                                                                                                                                    
-            static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)                                                          
-            {                                                                                                                                                                       
-                return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::InternalFunctionType, StructureFlags), info());                                                 
-            }                                                                                                                                                                       
-            void initializeProperties(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSObject* prototype);   
-            
-            
-            // Must be defined for each specialization class.
-            static JSC::EncodedJSValue JSC_HOST_CALL_ATTRIBUTES construct(JSC::JSGlobalObject*, JSC::CallFrame*);
-                                                                                                                                                               
-        private:                                                                                                                                                                    
-            JSArrayBufferSinkConstructor(JSC::VM& vm, JSC::Structure* structure, JSC::NativeFunction nativeFunction)                                                                  
-                : Base(vm, structure, nativeFunction, nativeFunction)                                                                                                               
-                                                                                                                                                                                    
-            {                                                                                                                                                                       
-            }                                                                                                                                                                       
-                                                                                                                                                                                    
-            void finishCreation(JSC::VM&, JSC::JSGlobalObject* globalObject, JSC::JSObject* prototype);                                                     
-        };                                                                                                                                                                          
-                                                                                                                                                                                    
-        class JSArrayBufferSink final : public JSC::JSDestructibleObject {                                                                                                              
-        public:                                                                                                                                                                     
-            using Base = JSC::JSDestructibleObject;                                                                                                                                 
-            static JSArrayBufferSink* create(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::Structure* structure, void* sinkPtr);       
-            static constexpr SinkID Sink = SinkID::ArrayBufferSink;                                          
-                                                                                                                                                                                    
-            DECLARE_EXPORT_INFO;                                                                                                                                                    
-            template<typename, JSC::SubspaceAccess mode> static JSC::GCClient::IsoSubspace* subspaceFor(JSC::VM& vm)                                                                
-            {                                                                                                                                                                       
-                if constexpr (mode == JSC::SubspaceAccess::Concurrently)                                                                                                            
-                    return nullptr;                                                                                                                                                 
-                return WebCore::subspaceForImpl<JSArrayBufferSink, WebCore::UseCustomHeapCellType::No>(                                                                                 
-                    vm,                                                                                                                                                             
-                    [](auto& spaces) { return spaces.m_clientSubspaceForJSSink.get(); },                                                                                            
-                    [](auto& spaces, auto&& space) { spaces.m_clientSubspaceForJSSink = WTFMove(space); },                                                                          
-                    [](auto& spaces) { return spaces.m_subspaceForJSSink.get(); },                                                                                                  
-                    [](auto& spaces, auto&& space) { spaces.m_subspaceForJSSink = WTFMove(space); });                                                                               
-            }                                                                                                                                                                       
-                                                                                                                                                                                    
-            static void destroy(JSC::JSCell*);                                                                                                                                      
-            static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)                                                          
-            {                                                                                                                                                                       
-                return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());                                                 
-            }                                                                                                                                                                       
-                                                                                                                                                                                    
-            ~JSArrayBufferSink();                                                                                                                                                       
-                                                                                                                                                                                    
-            void* wrapped() const { return m_sinkPtr; }                                                                                                                             
-
-            void detach() {
-                m_sinkPtr = nullptr;
-            }                       
-
-            static void analyzeHeap(JSCell*, JSC::HeapAnalyzer&);                                                                                                                   
-                                                                                                                                                                                    
-            void* m_sinkPtr;
-                                                                                                                                                                                    
-            JSArrayBufferSink(JSC::VM& vm, JSC::Structure* structure, void* sinkPtr)                                                                                                    
-                : Base(vm, structure)                                                                                                                                               
-            {                                                                                                                                                                       
-                m_sinkPtr = sinkPtr;                                                                                                                                                
-            }                                                                                                                                                                       
-                                                                                                                                                                                    
-            void finishCreation(JSC::VM&);                                                                                                                                          
-        };
-
-        class JSReadableArrayBufferSinkController final : public JSC::JSDestructibleObject {                                                                                                              
-            public:                                                                                                                                                                     
-                using Base = JSC::JSDestructibleObject;                                                                                                                                 
-                static JSReadableArrayBufferSinkController* create(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::Structure* structure, void* sinkPtr);       
-                static constexpr SinkID Sink = SinkID::ArrayBufferSink;                                          
-                                                                                                                                                                                        
-                DECLARE_EXPORT_INFO;                                                                                                                                                    
-                template<typename, JSC::SubspaceAccess mode> static JSC::GCClient::IsoSubspace* subspaceFor(JSC::VM& vm)                                                                
-                {                                                                                                                                                                       
-                    if constexpr (mode == JSC::SubspaceAccess::Concurrently)                                                                                                            
-                        return nullptr;                                                                                                                                                 
-                    return WebCore::subspaceForImpl<JSReadableArrayBufferSinkController, WebCore::UseCustomHeapCellType::No>(                                                                                 
-                        vm,                                                                                                                                                             
-                        [](auto& spaces) { return spaces.m_clientSubspaceForJSSinkController.get(); },                                                                                            
-                        [](auto& spaces, auto&& space) { spaces.m_clientSubspaceForJSSinkController = WTFMove(space); },                                                                          
-                        [](auto& spaces) { return spaces.m_subspaceForJSSinkController.get(); },                                                                                                  
-                        [](auto& spaces, auto&& space) { spaces.m_subspaceForJSSinkController = WTFMove(space); });                                                                               
-                }                                                                                                                                                                       
-                                                                                                                                                                                        
-                static void destroy(JSC::JSCell*);                                                                                                                                      
-                static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)                                                          
-                {                                                                                                                                                                       
-                    return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());                                                 
-                }                                                                                                                                                                       
-                                                                                                                                                                                        
-                ~JSReadableArrayBufferSinkController();                                                                                                                                                       
-
-
-                void* wrapped() const { return m_sinkPtr; }    
-                void detach() {
-                    m_sinkPtr = nullptr;
-                }
-
-                void start(JSC::JSGlobalObject *globalObject, JSC::JSValue readableStream, JSC::JSFunction *onPull, JSC::JSFunction *onClose);
-                DECLARE_VISIT_CHILDREN;
-                                                                                                                                                                                        
-                static void analyzeHeap(JSCell*, JSC::HeapAnalyzer&);                                                                                                                   
-                                                                                                                                                                                        
-                void* m_sinkPtr;
-                mutable WriteBarrier<JSC::JSFunction> m_onPull;
-                mutable WriteBarrier<JSC::JSFunction> m_onClose;
-                mutable JSC::Weak<JSObject> m_weakReadableStream;
-                                                                                                                                                                                        
-                JSReadableArrayBufferSinkController(JSC::VM& vm, JSC::Structure* structure, void* sinkPtr)                                                                                                    
-                    : Base(vm, structure)                                                                                                                                               
-                {                                                                                                                                                                       
-                    m_sinkPtr = sinkPtr;                                                                                                                                                
-                }                                                                                                                                                                       
-                                                                                                                                                                                        
-                void finishCreation(JSC::VM&);                                                                                                                                          
-            };
-
-JSC_DECLARE_CUSTOM_GETTER(functionArrayBufferSink__getter);
-
-
-
-        
-
-JSObject* createJSSinkPrototype(JSC::VM& vm, JSC::JSGlobalObject* globalObject, WebCore::SinkID sinkID);
-JSObject* createJSSinkControllerPrototype(JSC::VM& vm, JSC::JSGlobalObject* globalObject, WebCore::SinkID sinkID);
-
-} // namespace WebCore
diff --git a/src/js_ast.zig b/src/js_ast.zig
index 650540aa8..54b3bbbeb 100644
--- a/src/js_ast.zig
+++ b/src/js_ast.zig
@@ -4737,13 +4737,13 @@ pub fn printmem(comptime format: string, args: anytype) void {
 
 pub const Macro = struct {
     const JavaScript = @import("javascript_core");
-    const JSCBase = @import("./javascript/jsc/base.zig");
+    const JSCBase = @import("./bun.js/base.zig");
     const Resolver = @import("./resolver/resolver.zig").Resolver;
     const isPackagePath = @import("./resolver/resolver.zig").isPackagePath;
     const ResolveResult = @import("./resolver/resolver.zig").Result;
     const DotEnv = @import("./env_loader.zig");
-    const js = @import("./javascript/jsc/javascript_core_c_api.zig");
-    const Zig = @import("./javascript/jsc/bindings/exports.zig");
+    const js = @import("./bun.js/javascript_core_c_api.zig");
+    const Zig = @import("./bun.js/bindings/exports.zig");
     const Bundler = @import("./bundler.zig").Bundler;
     const MacroEntryPoint = @import("./bundler.zig").MacroEntryPoint;
     const MacroRemap = @import("./resolver/package_json.zig").MacroMap;
diff --git a/src/js_lexer.zig b/src/js_lexer.zig
index 030ddcdf7..3d382d8ed 100644
--- a/src/js_lexer.zig
+++ b/src/js_lexer.zig
@@ -699,12 +699,12 @@ fn NewLexer_(
                         } else if (is_json and lexer.code_point < 0x20) {
                             try lexer.syntaxError();
                         } else if (comptime quote == '"' or quote == '\'') {
-                            // this is only faster at the 800 KB or so mark
-                            // so, pretty good for source maps
-                            // but probably not a lot else
                             const remainder = lexer.source.contents[lexer.current..];
-                            if (remainder.len > 16_000) {
-                                lexer.current += indexOfInterestingCharacterInStringLiteral(remainder, quote) orelse remainder.len;
+                            if (remainder.len >= 4096) {
+                                lexer.current += indexOfInterestingCharacterInStringLiteral(remainder, quote) orelse {
+                                    lexer.step();
+                                    continue;
+                                };
                                 lexer.end = lexer.current -| 1;
                                 lexer.step();
                                 continue;
@@ -3001,7 +3001,7 @@ fn indexOfInterestingCharacterInStringLiteral(text_: []const u8, quote: u8) ?usi
     const backslash = @splat(strings.ascii_vector_size, @as(u8, '\\'));
     const V1x16 = strings.AsciiVectorU1;
 
-    while (strings.ascii_vector_size < text.len) {
+    while (text.len >= strings.ascii_vector_size) {
         const vec: strings.AsciiVector = text[0..strings.ascii_vector_size].*;
 
         const any_significant =
@@ -3010,11 +3010,11 @@ fn indexOfInterestingCharacterInStringLiteral(text_: []const u8, quote: u8) ?usi
             @bitCast(V1x16, quote_ == vec) |
             @bitCast(V1x16, backslash == vec);
 
-        const bitmask = @ptrCast(*const u16, &any_significant).*;
-        const first = @ctz(u16, bitmask);
-
-        if (first < strings.ascii_vector_size) {
-            return first + (text_.len - text.len);
+        if (@reduce(.Max, any_significant) > 0) {
+            const bitmask = @ptrCast(*const u16, &any_significant).*;
+            const first = @ctz(u16, bitmask);
+            std.debug.assert(first < strings.ascii_vector_size);
+            return first + (@ptrToInt(text.ptr) - @ptrToInt(text_.ptr));
         }
         text = text[strings.ascii_vector_size..];
     }
diff --git a/src/jsc.zig b/src/jsc.zig
index 56bc7256d..04608477d 100644
--- a/src/jsc.zig
+++ b/src/jsc.zig
@@ -2,44 +2,44 @@
 pub const is_bindgen = @import("std").meta.globalOption("bindgen", bool) orelse false;
 
 pub const napi = @import("./napi/napi.zig");
-pub usingnamespace @import("./javascript/jsc/bindings/exports.zig");
-pub usingnamespace @import("./javascript/jsc/bindings/bindings.zig");
-pub usingnamespace @import("./javascript/jsc/event_loop.zig");
-pub usingnamespace @import("./javascript/jsc/base.zig");
-pub const RareData = @import("./javascript/jsc/rare_data.zig");
-pub const Shimmer = @import("./javascript/jsc/bindings/shimmer.zig").Shimmer;
-pub usingnamespace @import("./javascript/jsc/javascript.zig");
-pub const C = @import("./javascript/jsc/javascript_core_c_api.zig");
-pub const WebCore = @import("./javascript/jsc/webcore.zig");
+pub usingnamespace @import("./bun.js/bindings/exports.zig");
+pub usingnamespace @import("./bun.js/bindings/bindings.zig");
+pub usingnamespace @import("./bun.js/event_loop.zig");
+pub usingnamespace @import("./bun.js/base.zig");
+pub const RareData = @import("./bun.js/rare_data.zig");
+pub const Shimmer = @import("./bun.js/bindings/shimmer.zig").Shimmer;
+pub usingnamespace @import("./bun.js/javascript.zig");
+pub const C = @import("./bun.js/javascript_core_c_api.zig");
+pub const WebCore = @import("./bun.js/webcore.zig");
 pub const Cloudflare = struct {
-    pub const HTMLRewriter = @import("./javascript/jsc/api/html_rewriter.zig").HTMLRewriter;
-    pub const ContentOptions = @import("./javascript/jsc/api/html_rewriter.zig").ContentOptions;
-    pub const Element = @import("./javascript/jsc/api/html_rewriter.zig").Element;
-    pub const Comment = @import("./javascript/jsc/api/html_rewriter.zig").Comment;
-    pub const TextChunk = @import("./javascript/jsc/api/html_rewriter.zig").TextChunk;
-    pub const DocType = @import("./javascript/jsc/api/html_rewriter.zig").DocType;
-    pub const DocEnd = @import("./javascript/jsc/api/html_rewriter.zig").DocEnd;
-    pub const EndTag = @import("./javascript/jsc/api/html_rewriter.zig").EndTag;
-    pub const AttributeIterator = @import("./javascript/jsc/api/html_rewriter.zig").AttributeIterator;
+    pub const HTMLRewriter = @import("./bun.js/api/html_rewriter.zig").HTMLRewriter;
+    pub const ContentOptions = @import("./bun.js/api/html_rewriter.zig").ContentOptions;
+    pub const Element = @import("./bun.js/api/html_rewriter.zig").Element;
+    pub const Comment = @import("./bun.js/api/html_rewriter.zig").Comment;
+    pub const TextChunk = @import("./bun.js/api/html_rewriter.zig").TextChunk;
+    pub const DocType = @import("./bun.js/api/html_rewriter.zig").DocType;
+    pub const DocEnd = @import("./bun.js/api/html_rewriter.zig").DocEnd;
+    pub const EndTag = @import("./bun.js/api/html_rewriter.zig").EndTag;
+    pub const AttributeIterator = @import("./bun.js/api/html_rewriter.zig").AttributeIterator;
 };
-pub const Jest = @import("./javascript/jsc/test/jest.zig");
+pub const Jest = @import("./bun.js/test/jest.zig");
 pub const API = struct {
-    pub const Transpiler = @import("./javascript/jsc/api/transpiler.zig");
-    pub const Server = @import("./javascript/jsc/api/server.zig").Server;
-    pub const SSLServer = @import("./javascript/jsc/api/server.zig").SSLServer;
-    pub const DebugServer = @import("./javascript/jsc/api/server.zig").DebugServer;
-    pub const DebugSSLServer = @import("./javascript/jsc/api/server.zig").DebugSSLServer;
-    pub const Bun = @import("./javascript/jsc/api/bun.zig");
-    pub const Router = @import("./javascript/jsc/api/router.zig");
-    pub const ServerConfig = @import("./javascript/jsc/api/server.zig").ServerConfig;
+    pub const Transpiler = @import("./bun.js/api/transpiler.zig");
+    pub const Server = @import("./bun.js/api/server.zig").Server;
+    pub const SSLServer = @import("./bun.js/api/server.zig").SSLServer;
+    pub const DebugServer = @import("./bun.js/api/server.zig").DebugServer;
+    pub const DebugSSLServer = @import("./bun.js/api/server.zig").DebugSSLServer;
+    pub const Bun = @import("./bun.js/api/bun.zig");
+    pub const Router = @import("./bun.js/api/router.zig");
+    pub const ServerConfig = @import("./bun.js/api/server.zig").ServerConfig;
 };
-pub const FFI = @import("./javascript/jsc/api/ffi.zig").FFI;
+pub const FFI = @import("./bun.js/api/ffi.zig").FFI;
 pub const Node = struct {
-    pub usingnamespace @import("./javascript/jsc/node/types.zig");
-    pub usingnamespace @import("./javascript/jsc/node/node_fs.zig");
-    pub usingnamespace @import("./javascript/jsc/node/node_fs_binding.zig");
-    pub const Syscall = @import("./javascript/jsc/node/syscall.zig");
-    pub const fs = @import("./javascript/jsc/node/node_fs_constant.zig");
+    pub usingnamespace @import("./bun.js/node/types.zig");
+    pub usingnamespace @import("./bun.js/node/node_fs.zig");
+    pub usingnamespace @import("./bun.js/node/node_fs_binding.zig");
+    pub const Syscall = @import("./bun.js/node/syscall.zig");
+    pub const fs = @import("./bun.js/node/node_fs_constant.zig");
 };
 pub const Maybe = Node.Maybe;
 pub inline fn markBinding() void {
diff --git a/src/main.zig b/src/main.zig
index 4fd2b8234..6a513805a 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -20,8 +20,8 @@ const C = bun.C;
 const panicky = @import("panic_handler.zig");
 const cli = @import("cli.zig");
 pub const MainPanicHandler = panicky.NewPanicHandler(std.builtin.default_panic);
-const js = @import("javascript/jsc/bindings/bindings.zig");
-const JavaScript = @import("javascript/jsc/javascript.zig");
+const js = @import("bun.js/bindings/bindings.zig");
+const JavaScript = @import("bun.js/javascript.zig");
 pub const io_mode = .blocking;
 pub const bindgen = @import("build_options").bindgen;
 const Report = @import("./report.zig");
diff --git a/src/router.zig b/src/router.zig
index 98f502bd8..2ae4b98fb 100644
--- a/src/router.zig
+++ b/src/router.zig
@@ -966,7 +966,7 @@ pub const Test = struct {
     }
 
     pub fn make(comptime testName: string, data: anytype) !Router {
-        std.testing.refAllDecls(@import("./javascript/jsc/bindings/exports.zig"));
+        std.testing.refAllDecls(@import("./bun.js/bindings/exports.zig"));
         try makeTest(testName, data);
         const JSAst = @import("./js_ast.zig");
         JSAst.Expr.Data.Store.create(default_allocator);
diff --git a/src/runtime/hmr.ts b/src/runtime/hmr.ts
index 4e62afa0f..2882744db 100644
--- a/src/runtime/hmr.ts
+++ b/src/runtime/hmr.ts
@@ -18,7 +18,7 @@ if (typeof window !== "undefined") {
     Loading,
     Loaded,
   }
-
+  var registryMap = new Map();
   type HTMLStylableElement = HTMLLinkElement | HTMLStyleElement;
   type CSSHMRInsertionPoint = {
     id: number;
@@ -1411,8 +1411,8 @@ if (typeof window !== "undefined") {
 
       const callbacksStart = performance.now();
       const origUpdaters = oldModule
-        ? oldModule.additional_updaters.slice()
-        : [];
+        ? new Set<CallableFunction>(oldModule.additional_updaters)
+        : new Set<CallableFunction>();
       try {
         switch (this.reloader) {
           case ReloadBehavior.hotReload: {
@@ -1424,7 +1424,8 @@ if (typeof window !== "undefined") {
               oldModule.previousVersion.id === oldModule.id &&
               oldModule.hasSameExports(oldModule.previousVersion);
 
-            if (oldModule) {
+            var thisMod = HMRModule.dependencies.modules[this.module_index];
+            if (oldModule && oldModule._update !== thisMod._update) {
               // ESM-based HMR has a disadvantage against CommonJS HMR
               // ES Namespace objects are not [[Configurable]]
               // That means we have to loop through all previous versions of updated modules that that have unique export names
@@ -1432,19 +1433,21 @@ if (typeof window !== "undefined") {
               // Otherwise, changes will not be reflected properly
               // However, we only need to loop through modules that add or remove exports, i.e. those are ones which have "real" exports
               if (!isOldModuleDead) {
-                HMRModule.dependencies.modules[
-                  this.module_index
-                ].additional_updaters.push(oldModule.update.bind(oldModule));
-                HMRModule.dependencies.modules[
-                  this.module_index
-                ].previousVersion = oldModule;
+                oldModule.boundUpdate ||= oldModule.update.bind(oldModule);
+
+                if (thisMod.additional_updaters)
+                  thisMod.additional_updaters.add(oldModule.boundUpdate);
+                else
+                  thisMod.additional_updaters = new Set([
+                    oldModule.boundUpdate,
+                  ]);
+
+                thisMod.previousVersion = oldModule;
               } else {
-                HMRModule.dependencies.modules[
-                  this.module_index
-                ].previousVersion = oldModule.previousVersion;
-                HMRModule.dependencies.modules[
-                  this.module_index
-                ].additional_updaters = origUpdaters;
+                if (oldModule.previousVersion)
+                  thisMod.previousVersion = oldModule.previousVersion;
+
+                thisMod.additional_updaters = origUpdaters;
               }
             }
 
@@ -1652,13 +1655,21 @@ if (typeof window !== "undefined") {
 
       return true;
     }
-
-    additional_files = [];
-    additional_updaters = [];
-    _update: (exports: Object) => void;
+    #updateFunction;
+    get _update() {
+      return this.#updateFunction;
+    }
+    set _update(value) {
+      this.#updateFunction = value;
+      var existing = registryMap.get(this.file_path);
+    }
+    boundUpdate;
     update() {
-      for (let update of this.additional_updaters) {
-        update(this.exports);
+      var updaters = registryMap.get(this.id);
+      if (updaters?.length) {
+        for (let update of updaters) {
+          update(this.exports);
+        }
       }
 
       this._update(this.exports);
diff --git a/src/typegen.zig b/src/typegen.zig
index 0f2222bff..4ddaca4a6 100644
--- a/src/typegen.zig
+++ b/src/typegen.zig
@@ -1,5 +1,5 @@
 pub const bindgen = true;
 
 pub fn main() anyerror!void {
-    return try @import("javascript/jsc/typescript.zig").main();
+    return try @import("bun.js/typescript.zig").main();
 }
diff --git a/src/work_pool.zig b/src/work_pool.zig
index a663e7186..9ddf106e9 100644
--- a/src/work_pool.zig
+++ b/src/work_pool.zig
@@ -33,6 +33,28 @@ pub fn NewWorkPool(comptime max_threads: ?usize) type {
         pub fn schedule(task: *ThreadPool.Task) void {
             get().schedule(ThreadPool.Batch.from(task));
         }
+
+        pub fn go(allocator: std.mem.Allocator, comptime Context: type, context: Context, comptime function: fn (Context) void) !void {
+            const TaskType = struct {
+                task: Task,
+                context: Context,
+                allocator: std.mem.Allocator,
+
+                pub fn callback(task: *Task) void {
+                    var this_task = @fieldParentPtr(@This(), "task", task);
+                    function(this_task.context);
+                    this_task.allocator.destroy(this_task);
+                }
+            };
+
+            var task_ = try allocator.create(TaskType);
+            task_.* = .{
+                .task = .{ .callback = TaskType.callback },
+                .context = context,
+                .allocator = allocator,
+            };
+            schedule(&task_.task);
+        }
     };
 }
 
diff --git a/integration/README.md b/test/README.md
index 6f0f047b7..292d23cf2 100644
--- a/integration/README.md
+++ b/test/README.md
@@ -70,13 +70,13 @@ These were the first tests bun started with
 
 ### Runtime tests
 
-These tests are in [./bunjs-only-snippets](./bunjs-only-snippets) and are files which are either `.test.js` or `.test.ts` files.
+These tests are in [./bun.js](./bun.js) and are files which are either `.test.js` or `.test.ts` files.
 
 These test that the runtime behaves as expected. These also test the transpiler, both because test files are transpiled and directly by running the transpiler via `Bun.Transpiler`.
 
 #### Adding a new test
 
-1. Create a new file in [./bunjs-only-snippets](./bunjs-only-snippets/) with `.test` in the name.
+1. Create a new file in [./bun.js](./bun.js/) with `.test` in the name.
 
 These test use `bun:test` as the import (though you can also import from `vitest` or jest and it will work).
 
@@ -98,7 +98,7 @@ describe("Example", () => {
 
 Run `bun wiptest ${part-of-file-name}`
 
-If you run the test in the top-level bun repo directory, it will take an extra couple seconds because `bun wiptest` will scan through all of WebKit recursively. Consider running it in the `bunjs-only-snippets` directory instead.
+If you run the test in the top-level bun repo directory, it will take an extra couple seconds because `bun wiptest` will scan through all of WebKit recursively. Consider running it in the `bun.js` directory instead.
 
 ### CLI tests
 
diff --git a/integration/apps/bun-create-next.sh b/test/apps/bun-create-next.sh
index 4f19e535d..4f19e535d 100644
--- a/integration/apps/bun-create-next.sh
+++ b/test/apps/bun-create-next.sh
diff --git a/integration/apps/bun-create-react.sh b/test/apps/bun-create-react.sh
index 2b986134c..2b986134c 100644
--- a/integration/apps/bun-create-react.sh
+++ b/test/apps/bun-create-react.sh
diff --git a/integration/apps/bun-dev-index-html.sh b/test/apps/bun-dev-index-html.sh
index eef41f78b..eef41f78b 100644
--- a/integration/apps/bun-dev-index-html.sh
+++ b/test/apps/bun-dev-index-html.sh
diff --git a/integration/apps/bun-dev.sh b/test/apps/bun-dev.sh
index f2d76d028..f2d76d028 100644
--- a/integration/apps/bun-dev.sh
+++ b/test/apps/bun-dev.sh
diff --git a/integration/apps/bun-install-lockfile-status.sh b/test/apps/bun-install-lockfile-status.sh
index b23b4fc3c..b23b4fc3c 100644
--- a/integration/apps/bun-install-lockfile-status.sh
+++ b/test/apps/bun-install-lockfile-status.sh
diff --git a/integration/apps/bun-install-utf8.sh b/test/apps/bun-install-utf8.sh
index 66783cb50..66783cb50 100644
--- a/integration/apps/bun-install-utf8.sh
+++ b/test/apps/bun-install-utf8.sh
diff --git a/integration/apps/bun-install.sh b/test/apps/bun-install.sh
index dd4083e33..dd4083e33 100644
--- a/integration/apps/bun-install.sh
+++ b/test/apps/bun-install.sh
diff --git a/integration/apps/bun-run-check-package.json b/test/apps/bun-run-check-package.json
index b6eeda046..b6eeda046 100644
--- a/integration/apps/bun-run-check-package.json
+++ b/test/apps/bun-run-check-package.json
diff --git a/integration/apps/bun-run-check.sh b/test/apps/bun-run-check.sh
index dca1db6ae..dca1db6ae 100644
--- a/integration/apps/bun-run-check.sh
+++ b/test/apps/bun-run-check.sh
diff --git a/integration/bunjs-only-snippets/atob.test.js b/test/bun.js/atob.test.js
index 4945829e1..4945829e1 100644
--- a/integration/bunjs-only-snippets/atob.test.js
+++ b/test/bun.js/atob.test.js
diff --git a/integration/bunjs-only-snippets/baz.js b/test/bun.js/baz.js
index 5837bb3bb..5837bb3bb 100644
--- a/integration/bunjs-only-snippets/baz.js
+++ b/test/bun.js/baz.js
diff --git a/test/bun.js/buffer.test.js b/test/bun.js/buffer.test.js
new file mode 100644
index 000000000..6e9a3c6b4
--- /dev/null
+++ b/test/bun.js/buffer.test.js
@@ -0,0 +1,304 @@
+// import { describe, it, expect, beforeEach, afterEach } from "bun:test";
+// import { gc } from "./gc";
+
+// beforeEach(() => gc());
+// afterEach(() => gc());
+
+// it("buffer", () => {
+//   var buf = new Buffer(20);
+//   gc();
+//   // if this fails or infinitely loops, it means there is a memory issue with the JSC::Structure object
+//   expect(Object.keys(buf).length > 0).toBe(true);
+//   gc();
+//   expect(buf.write("hello world ")).toBe(12);
+//   expect(buf.write("hello world ", "utf8")).toBe(12);
+
+//   gc();
+//   expect(buf.toString("utf8", 0, "hello world ".length)).toBe("hello world ");
+//   gc();
+//   expect(buf.toString("base64url", 0, "hello world ".length)).toBe(
+//     btoa("hello world ")
+//   );
+//   gc();
+//   expect(buf instanceof Uint8Array).toBe(true);
+//   gc();
+//   expect(buf instanceof Buffer).toBe(true);
+//   gc();
+//   expect(buf.slice() instanceof Uint8Array).toBe(true);
+//   gc();
+//   expect(buf.slice(0, 1) instanceof Buffer).toBe(true);
+//   gc();
+//   expect(buf.slice(0, 1) instanceof Uint8Array).toBe(true);
+//   gc();
+//   expect(buf.slice(0, 1) instanceof Buffer).toBe(true);
+//   gc();
+// });
+
+// it("Buffer", () => {
+//   var inputs = [
+//     "hello world",
+//     "hello world".repeat(100),
+//     `😋 Get Emoji — All Emojis to ✂️ Copy and 📋 Paste 👌`,
+//   ];
+//   var good = inputs.map((a) => new TextEncoder().encode(a));
+//   for (let i = 0; i < inputs.length; i++) {
+//     var input = inputs[i];
+//     expect(new Buffer(input).toString("utf8")).toBe(inputs[i]);
+//     gc();
+//     expect(Array.from(new Buffer(input)).join(",")).toBe(good[i].join(","));
+//     gc();
+//     expect(Buffer.byteLength(input)).toBe(good[i].length);
+//     gc();
+//     expect(Buffer.from(input).byteLength).toBe(Buffer.byteLength(input));
+//   }
+// });
+
+// it("Buffer.byteLength", () => {
+//   expect(Buffer.byteLength("😀😃😄😁😆😅😂🤣☺️😊😊😇")).toBe(
+//     new TextEncoder().encode("😀😃😄😁😆😅😂🤣☺️😊😊😇").byteLength
+//   );
+// });
+
+// it("Buffer.isBuffer", () => {
+//   expect(Buffer.isBuffer(new Buffer(1))).toBe(true);
+//   gc();
+//   expect(Buffer.isBuffer(new Buffer(0))).toBe(true);
+//   gc();
+//   expect(Buffer.isBuffer(new Uint8Array(0))).toBe(false);
+//   gc();
+//   expect(Buffer.isBuffer(new Uint8Array(1))).toBe(false);
+//   gc();
+//   var a = new Uint8Array(1);
+//   gc();
+//   expect(Buffer.isBuffer(a)).toBe(false);
+//   gc();
+//   Buffer.toBuffer(a);
+//   gc();
+//   expect(Buffer.isBuffer(a)).toBe(true);
+//   gc();
+// });
+
+// it("Buffer.toBuffer throws", () => {
+//   const checks = [
+//     [],
+//     {},
+//     "foo",
+//     new Uint16Array(),
+//     new DataView(new Uint8Array(14).buffer),
+//   ];
+//   for (let i = 0; i < checks.length; i++) {
+//     try {
+//       Buffer.toBuffer(checks[i]);
+//       expect(false).toBe(true);
+//     } catch (exception) {
+//       expect(exception.message).toBe("Expected Uint8Array");
+//     }
+//   }
+//   expect(true).toBe(true);
+// });
+
+// it("Buffer.toBuffer works", () => {
+//   var array = new Uint8Array(20);
+//   expect(array instanceof Buffer).toBe(false);
+//   var buf = Buffer.toBuffer(array);
+//   expect(array instanceof Buffer).toBe(true);
+//   // if this fails or infinitely loops, it means there is a memory issue with the JSC::Structure object
+//   expect(Object.keys(buf).length > 0).toBe(true);
+
+//   expect(buf.write("hello world ")).toBe(12);
+//   gc();
+//   expect(buf.toString("utf8", 0, "hello world ".length)).toBe("hello world ");
+//   gc();
+//   expect(buf.toString("base64url", 0, "hello world ".length)).toBe(
+//     btoa("hello world ")
+//   );
+//   gc();
+
+//   expect(buf instanceof Uint8Array).toBe(true);
+//   expect(buf instanceof Buffer).toBe(true);
+//   expect(buf.slice() instanceof Uint8Array).toBe(true);
+//   expect(buf.slice(0, 1) instanceof Buffer).toBe(true);
+//   expect(buf.slice(0, 1) instanceof Uint8Array).toBe(true);
+//   expect(buf.slice(0, 1) instanceof Buffer).toBe(true);
+//   expect(new Buffer(buf) instanceof Buffer).toBe(true);
+//   expect(new Buffer(buf.buffer) instanceof Buffer).toBe(true);
+// });
+
+// it("writeInt", () => {
+//   var buf = new Buffer(1024);
+//   var data = new DataView(buf.buffer);
+//   buf.writeInt32BE(100);
+//   expect(data.getInt32(0, false)).toBe(100);
+//   buf.writeInt32BE(100);
+//   expect(data.getInt32(0, false)).toBe(100);
+//   var childBuf = buf.subarray(0, 4);
+//   expect(data.getInt32(0, false)).toBe(100);
+//   expect(childBuf.readInt32BE(0, false)).toBe(100);
+// });
+
+// it("Buffer.from", () => {
+//   expect(Buffer.from("hello world").toString("utf8")).toBe("hello world");
+//   expect(Buffer.from("hello world", "ascii").toString("utf8")).toBe(
+//     "hello world"
+//   );
+//   expect(Buffer.from("hello world", "latin1").toString("utf8")).toBe(
+//     "hello world"
+//   );
+//   gc();
+//   expect(Buffer.from([254]).join(",")).toBe("254");
+//   expect(Buffer.from(123).join(",")).toBe(Uint8Array.from(123).join(","));
+//   expect(Buffer.from({ length: 124 }).join(",")).toBe(
+//     Uint8Array.from({ length: 124 }).join(",")
+//   );
+
+//   expect(Buffer.from(new ArrayBuffer(1024), 0, 512).join(",")).toBe(
+//     new Uint8Array(512).join(",")
+//   );
+
+//   expect(Buffer.from(new Buffer(new ArrayBuffer(1024), 0, 512)).join(",")).toBe(
+//     new Uint8Array(512).join(",")
+//   );
+//   gc();
+// });
+
+// it("Buffer.equals", () => {
+//   var a = new Uint8Array(10);
+//   a[2] = 1;
+//   var b = new Uint8Array(10);
+//   b[2] = 1;
+//   Buffer.toBuffer(a);
+//   Buffer.toBuffer(b);
+//   expect(a.equals(b)).toBe(true);
+//   b[2] = 0;
+//   expect(a.equals(b)).toBe(false);
+// });
+
+// it("Buffer.compare", () => {
+//   var a = new Uint8Array(10);
+//   a[2] = 1;
+//   var b = new Uint8Array(10);
+//   b[2] = 1;
+//   Buffer.toBuffer(a);
+//   Buffer.toBuffer(b);
+//   expect(a.compare(b)).toBe(0);
+//   b[2] = 0;
+//   expect(a.compare(b)).toBe(1);
+//   expect(b.compare(a)).toBe(-1);
+// });
+
+// it("Buffer.copy", () => {
+//   var array1 = new Uint8Array(128);
+//   array1.fill(100);
+//   Buffer.toBuffer(array1);
+//   var array2 = new Uint8Array(128);
+//   array2.fill(200);
+//   Buffer.toBuffer(array2);
+//   var array3 = new Uint8Array(128);
+//   Buffer.toBuffer(array3);
+//   gc();
+//   expect(array1.copy(array2)).toBe(128);
+//   expect(array1.join("")).toBe(array2.join(""));
+// });
+
+// it("Buffer.concat", () => {
+//   var array1 = new Uint8Array(128);
+//   array1.fill(100);
+//   var array2 = new Uint8Array(128);
+//   array2.fill(200);
+//   var array3 = new Uint8Array(128);
+//   array3.fill(300);
+//   gc();
+//   expect(Buffer.concat([array1, array2, array3]).join("")).toBe(
+//     array1.join("") + array2.join("") + array3.join("")
+//   );
+//   expect(Buffer.concat([array1, array2, array3], 222).length).toBe(222);
+//   expect(
+//     Buffer.concat([array1, array2, array3], 222).subarray(0, 128).join("")
+//   ).toBe("100".repeat(128));
+//   expect(
+//     Buffer.concat([array1, array2, array3], 222).subarray(129, 222).join("")
+//   ).toBe("200".repeat(222 - 129));
+// });
+
+// it("read", () => {
+//   var buf = new Buffer(1024);
+//   var data = new DataView(buf.buffer);
+//   function reset() {
+//     new Uint8Array(buf.buffer).fill(0);
+//   }
+//   data.setBigInt64(0, BigInt(1000), false);
+//   expect(buf.readBigInt64BE(0)).toBe(BigInt(1000));
+//   reset();
+
+//   data.setBigInt64(0, BigInt(1000), false);
+//   expect(buf.readBigInt64LE(0)).toBe(BigInt(1000));
+//   reset();
+
+//   data.setBigUint64(0, BigInt(1000), false);
+//   expect(buf.readBigUInt64BE(0)).toBe(BigInt(1000));
+//   reset();
+
+//   data.setBigUint64(0, BigInt(1000), false);
+//   expect(buf.readBigUInt64LE(0)).toBe(BigInt(1000));
+//   reset();
+
+//   data.setFloat64(0, 1000, false);
+//   expect(buf.readDoubleBE(0)).toBe(1000);
+//   reset();
+
+//   data.setFloat64(0, 1000, true);
+//   expect(buf.readDoubleLE(0)).toBe(1000);
+//   reset();
+
+//   data.setFloat32(0, 1000, false);
+//   expect(buf.readFloatBE(0)).toBe(1000);
+//   reset();
+
+//   data.setFloat32(0, 1000, true);
+//   expect(buf.readFloatLE(0)).toBe(1000);
+//   reset();
+
+//   data.setInt16(0, 1000, false);
+//   expect(buf.readInt16BE(0)).toBe(1000);
+//   reset();
+
+//   data.setInt16(0, 1000, true);
+//   expect(buf.readInt16LE(0)).toBe(1000);
+//   reset();
+
+//   data.setInt32(0, 1000, false);
+//   expect(buf.readInt32BE(0)).toBe(1000);
+//   reset();
+
+//   data.setInt32(0, 1000, true);
+//   expect(buf.readInt32LE(0)).toBe(1000);
+//   reset();
+
+//   data.setInt8(0, 100, false);
+//   expect(buf.readInt8(0)).toBe(100);
+//   reset();
+
+//   data.setUint16(0, 1000, false);
+//   expect(buf.readUInt16BE(0)).toBe(1000);
+//   reset();
+
+//   data.setUint16(0, 1000, true);
+//   expect(buf.readUInt16LE(0)).toBe(1000);
+//   reset();
+
+//   data.setUint32(0, 1000, false);
+//   expect(buf.readUInt32BE(0)).toBe(1000);
+//   reset();
+
+//   data.setUint32(0, 1000, true);
+//   expect(buf.readUInt32LE(0)).toBe(1000);
+//   reset();
+
+//   data.setUint8(0, 255, false);
+//   expect(buf.readUInt8(0)).toBe(255);
+//   reset();
+
+//   data.setUint8(0, 255, false);
+//   expect(buf.readUInt8(0)).toBe(255);
+//   reset();
+// });
diff --git a/integration/bunjs-only-snippets/bun-jsc.test.js b/test/bun.js/bun-jsc.test.js
index 975003b77..8ee0decf2 100644
--- a/integration/bunjs-only-snippets/bun-jsc.test.js
+++ b/test/bun.js/bun-jsc.test.js
@@ -20,6 +20,7 @@ import {
   totalCompileTime,
   reoptimizationRetryCount,
   drainMicrotasks,
+  startRemoteDebugger,
 } from "bun:jsc";
 
 describe("bun:jsc", () => {
@@ -91,4 +92,7 @@ describe("bun:jsc", () => {
   it("drainMicrotasks", () => {
     drainMicrotasks();
   });
+  it("startRemoteDebugger", () => {
+    startRemoteDebugger("");
+  });
 });
diff --git a/integration/bunjs-only-snippets/bun.lockb b/test/bun.js/bun.lockb
index cff7a8ddc..cff7a8ddc 100755
--- a/integration/bunjs-only-snippets/bun.lockb
+++ b/test/bun.js/bun.lockb
diff --git a/integration/bunjs-only-snippets/bundled/always-bundled-module/always-bundled-module b/test/bun.js/bundled/always-bundled-module/always-bundled-module
index f9a91ac4d..f9a91ac4d 120000
--- a/integration/bunjs-only-snippets/bundled/always-bundled-module/always-bundled-module
+++ b/test/bun.js/bundled/always-bundled-module/always-bundled-module
diff --git a/integration/bunjs-only-snippets/bundled/always-bundled-module/cjs.js b/test/bun.js/bundled/always-bundled-module/cjs.js
index 087697589..087697589 100644
--- a/integration/bunjs-only-snippets/bundled/always-bundled-module/cjs.js
+++ b/test/bun.js/bundled/always-bundled-module/cjs.js
diff --git a/integration/bunjs-only-snippets/bundled/always-bundled-module/esm.js b/test/bun.js/bundled/always-bundled-module/esm.js
index 28e702881..28e702881 100644
--- a/integration/bunjs-only-snippets/bundled/always-bundled-module/esm.js
+++ b/test/bun.js/bundled/always-bundled-module/esm.js
diff --git a/integration/bunjs-only-snippets/bundled/always-bundled-module/package.json b/test/bun.js/bundled/always-bundled-module/package.json
index 5029c1695..5029c1695 100644
--- a/integration/bunjs-only-snippets/bundled/always-bundled-module/package.json
+++ b/test/bun.js/bundled/always-bundled-module/package.json
diff --git a/integration/bunjs-only-snippets/bundled/entrypoint.ts b/test/bun.js/bundled/entrypoint.ts
index b9a17b538..b9a17b538 100644
--- a/integration/bunjs-only-snippets/bundled/entrypoint.ts
+++ b/test/bun.js/bundled/entrypoint.ts
diff --git a/integration/bunjs-only-snippets/bundled/package.json b/test/bun.js/bundled/package.json
index cce72af9c..cce72af9c 100644
--- a/integration/bunjs-only-snippets/bundled/package.json
+++ b/test/bun.js/bundled/package.json
diff --git a/integration/bunjs-only-snippets/bundled/to_bundle_node_modules/i-am-bundled/cjs.js b/test/bun.js/bundled/to_bundle_node_modules/i-am-bundled/cjs.js
index 087697589..087697589 100644
--- a/integration/bunjs-only-snippets/bundled/to_bundle_node_modules/i-am-bundled/cjs.js
+++ b/test/bun.js/bundled/to_bundle_node_modules/i-am-bundled/cjs.js
diff --git a/integration/bunjs-only-snippets/bundled/to_bundle_node_modules/i-am-bundled/esm.js b/test/bun.js/bundled/to_bundle_node_modules/i-am-bundled/esm.js
index 28e702881..28e702881 100644
--- a/integration/bunjs-only-snippets/bundled/to_bundle_node_modules/i-am-bundled/esm.js
+++ b/test/bun.js/bundled/to_bundle_node_modules/i-am-bundled/esm.js
diff --git a/integration/bunjs-only-snippets/bundled/to_bundle_node_modules/i-am-bundled/package.json b/test/bun.js/bundled/to_bundle_node_modules/i-am-bundled/package.json
index 661a80b2d..661a80b2d 100644
--- a/integration/bunjs-only-snippets/bundled/to_bundle_node_modules/i-am-bundled/package.json
+++ b/test/bun.js/bundled/to_bundle_node_modules/i-am-bundled/package.json
diff --git a/integration/bunjs-only-snippets/bundled/tsconfig.json b/test/bun.js/bundled/tsconfig.json
index 358cb5526..358cb5526 100644
--- a/integration/bunjs-only-snippets/bundled/tsconfig.json
+++ b/test/bun.js/bundled/tsconfig.json
diff --git a/integration/bunjs-only-snippets/concat.test.js b/test/bun.js/concat.test.js
index a965fdb94..a965fdb94 100644
--- a/integration/bunjs-only-snippets/concat.test.js
+++ b/test/bun.js/concat.test.js
diff --git a/integration/bunjs-only-snippets/console-log.js b/test/bun.js/console-log.js
index e8aa200ac..e8aa200ac 100644
--- a/integration/bunjs-only-snippets/console-log.js
+++ b/test/bun.js/console-log.js
diff --git a/integration/bunjs-only-snippets/crypto.test.js b/test/bun.js/crypto.test.js
index c489e11c1..c489e11c1 100644
--- a/integration/bunjs-only-snippets/crypto.test.js
+++ b/test/bun.js/crypto.test.js
diff --git a/integration/bunjs-only-snippets/dirname.test.js b/test/bun.js/dirname.test.js
index 98292dc49..98292dc49 100644
--- a/integration/bunjs-only-snippets/dirname.test.js
+++ b/test/bun.js/dirname.test.js
diff --git a/integration/bunjs-only-snippets/escapeHTML.test.js b/test/bun.js/escapeHTML.test.js
index ecfcc5e7c..ecfcc5e7c 100644
--- a/integration/bunjs-only-snippets/escapeHTML.test.js
+++ b/test/bun.js/escapeHTML.test.js
diff --git a/integration/bunjs-only-snippets/esm/first.mjs b/test/bun.js/esm/first.mjs
index 17021c623..17021c623 100644
--- a/integration/bunjs-only-snippets/esm/first.mjs
+++ b/test/bun.js/esm/first.mjs
diff --git a/integration/bunjs-only-snippets/esm/second-child.mjs b/test/bun.js/esm/second-child.mjs
index 5fb06ed45..5fb06ed45 100644
--- a/integration/bunjs-only-snippets/esm/second-child.mjs
+++ b/test/bun.js/esm/second-child.mjs
diff --git a/integration/bunjs-only-snippets/esm/second.mjs b/test/bun.js/esm/second.mjs
index 888eb11b9..888eb11b9 100644
--- a/integration/bunjs-only-snippets/esm/second.mjs
+++ b/test/bun.js/esm/second.mjs
diff --git a/integration/bunjs-only-snippets/esm/startEnd.mjs b/test/bun.js/esm/startEnd.mjs
index 8b5549802..8b5549802 100644
--- a/integration/bunjs-only-snippets/esm/startEnd.mjs
+++ b/test/bun.js/esm/startEnd.mjs
diff --git a/integration/bunjs-only-snippets/esm/third.mjs b/test/bun.js/esm/third.mjs
index f5ba5cc84..f5ba5cc84 100644
--- a/integration/bunjs-only-snippets/esm/third.mjs
+++ b/test/bun.js/esm/third.mjs
diff --git a/integration/bunjs-only-snippets/exit.js b/test/bun.js/exit.js
index fb28b1fb4..fb28b1fb4 100644
--- a/integration/bunjs-only-snippets/exit.js
+++ b/test/bun.js/exit.js
diff --git a/integration/bunjs-only-snippets/fetch.js.txt b/test/bun.js/fetch.js.txt
index 5a9b52fcf..5a9b52fcf 100644
--- a/integration/bunjs-only-snippets/fetch.js.txt
+++ b/test/bun.js/fetch.js.txt
diff --git a/integration/bunjs-only-snippets/fetch.test.js b/test/bun.js/fetch.test.js
index 9b6093afd..9b6093afd 100644
--- a/integration/bunjs-only-snippets/fetch.test.js
+++ b/test/bun.js/fetch.test.js
diff --git a/integration/bunjs-only-snippets/ffi-test.c b/test/bun.js/ffi-test.c
index cc87d0528..cc87d0528 100644
--- a/integration/bunjs-only-snippets/ffi-test.c
+++ b/test/bun.js/ffi-test.c
diff --git a/integration/bunjs-only-snippets/ffi.test.fixture.callback.c b/test/bun.js/ffi.test.fixture.callback.c
index 3a557e7d5..d48ef6753 100644
--- a/integration/bunjs-only-snippets/ffi.test.fixture.callback.c
+++ b/test/bun.js/ffi.test.fixture.callback.c
@@ -1,7 +1,7 @@
 #define IS_CALLBACK 1
 // This file is part of Bun!
 // You can find the original source:
-// https://github.com/Jarred-Sumner/bun/blob/main/src/javascript/jsc/api/FFI.h#L2
+// https://github.com/Jarred-Sumner/bun/blob/main/src/bun.js/api/FFI.h#L2
 //
 // clang-format off
 // This file is only compatible with 64 bit CPUs
diff --git a/integration/bunjs-only-snippets/ffi.test.fixture.receiver.c b/test/bun.js/ffi.test.fixture.receiver.c
index 8a75e12f9..5bb51bda5 100644
--- a/integration/bunjs-only-snippets/ffi.test.fixture.receiver.c
+++ b/test/bun.js/ffi.test.fixture.receiver.c
@@ -2,7 +2,7 @@
 #define USES_FLOAT 1
 // This file is part of Bun!
 // You can find the original source:
-// https://github.com/Jarred-Sumner/bun/blob/main/src/javascript/jsc/api/FFI.h#L2
+// https://github.com/Jarred-Sumner/bun/blob/main/src/bun.js/api/FFI.h#L2
 //
 // clang-format off
 // This file is only compatible with 64 bit CPUs
diff --git a/test/bun.js/ffi.test.js b/test/bun.js/ffi.test.js
new file mode 100644
index 000000000..db2cfb6d4
--- /dev/null
+++ b/test/bun.js/ffi.test.js
@@ -0,0 +1,543 @@
+// import { describe, it, expect } from "bun:test";
+// import { unsafe } from "bun";
+// //
+// import {
+//   native,
+//   viewSource,
+//   dlopen,
+//   CString,
+//   ptr,
+//   toBuffer,
+//   toArrayBuffer,
+//   FFIType,
+//   callback,
+//   CFunction,
+// } from "bun:ffi";
+
+// it("ffi print", async () => {
+//   await Bun.write(
+//     import.meta.dir + "/ffi.test.fixture.callback.c",
+//     viewSource(
+//       {
+//         returns: "bool",
+//         args: ["ptr"],
+//       },
+//       true
+//     )
+//   );
+//   await Bun.write(
+//     import.meta.dir + "/ffi.test.fixture.receiver.c",
+//     viewSource(
+//       {
+//         not_a_callback: {
+//           returns: "float",
+//           args: ["float"],
+//         },
+//       },
+//       false
+//     )[0]
+//   );
+//   expect(
+//     viewSource(
+//       {
+//         returns: "int8_t",
+//         args: [],
+//       },
+//       true
+//     ).length > 0
+//   ).toBe(true);
+//   expect(
+//     viewSource(
+//       {
+//         a: {
+//           returns: "int8_t",
+//           args: [],
+//         },
+//       },
+//       false
+//     ).length > 0
+//   ).toBe(true);
+// });
+
+// function getTypes(fast) {
+//   const int64_t = fast ? "i64_fast" : "int64_t";
+//   const uint64_t = fast ? "u64_fast" : "uint64_t";
+//   return {
+//     returns_true: {
+//       returns: "bool",
+//       args: [],
+//     },
+//     returns_false: {
+//       returns: "bool",
+//       args: [],
+//     },
+//     returns_42_char: {
+//       returns: "char",
+//       args: [],
+//     },
+//     returns_42_float: {
+//       returns: "float",
+//       args: [],
+//     },
+//     returns_42_double: {
+//       returns: "double",
+//       args: [],
+//     },
+//     returns_42_uint8_t: {
+//       returns: "uint8_t",
+//       args: [],
+//     },
+//     returns_neg_42_int8_t: {
+//       returns: "int8_t",
+//       args: [],
+//     },
+//     returns_42_uint16_t: {
+//       returns: "uint16_t",
+//       args: [],
+//     },
+//     returns_42_uint32_t: {
+//       returns: "uint32_t",
+//       args: [],
+//     },
+//     returns_42_uint64_t: {
+//       returns: uint64_t,
+//       args: [],
+//     },
+//     returns_neg_42_int16_t: {
+//       returns: "int16_t",
+//       args: [],
+//     },
+//     returns_neg_42_int32_t: {
+//       returns: "int32_t",
+//       args: [],
+//     },
+//     returns_neg_42_int64_t: {
+//       returns: int64_t,
+//       args: [],
+//     },
+
+//     identity_char: {
+//       returns: "char",
+//       args: ["char"],
+//     },
+//     identity_float: {
+//       returns: "float",
+//       args: ["float"],
+//     },
+//     identity_bool: {
+//       returns: "bool",
+//       args: ["bool"],
+//     },
+//     identity_double: {
+//       returns: "double",
+//       args: ["double"],
+//     },
+//     identity_int8_t: {
+//       returns: "int8_t",
+//       args: ["int8_t"],
+//     },
+//     identity_int16_t: {
+//       returns: "int16_t",
+//       args: ["int16_t"],
+//     },
+//     identity_int32_t: {
+//       returns: "int32_t",
+//       args: ["int32_t"],
+//     },
+//     identity_int64_t: {
+//       returns: int64_t,
+//       args: [int64_t],
+//     },
+//     identity_uint8_t: {
+//       returns: "uint8_t",
+//       args: ["uint8_t"],
+//     },
+//     identity_uint16_t: {
+//       returns: "uint16_t",
+//       args: ["uint16_t"],
+//     },
+//     identity_uint32_t: {
+//       returns: "uint32_t",
+//       args: ["uint32_t"],
+//     },
+//     identity_uint64_t: {
+//       returns: uint64_t,
+//       args: [uint64_t],
+//     },
+
+//     add_char: {
+//       returns: "char",
+//       args: ["char", "char"],
+//     },
+//     add_float: {
+//       returns: "float",
+//       args: ["float", "float"],
+//     },
+//     add_double: {
+//       returns: "double",
+//       args: ["double", "double"],
+//     },
+//     add_int8_t: {
+//       returns: "int8_t",
+//       args: ["int8_t", "int8_t"],
+//     },
+//     add_int16_t: {
+//       returns: "int16_t",
+//       args: ["int16_t", "int16_t"],
+//     },
+//     add_int32_t: {
+//       returns: "int32_t",
+//       args: ["int32_t", "int32_t"],
+//     },
+//     add_int64_t: {
+//       returns: int64_t,
+//       args: [int64_t, int64_t],
+//     },
+//     add_uint8_t: {
+//       returns: "uint8_t",
+//       args: ["uint8_t", "uint8_t"],
+//     },
+//     add_uint16_t: {
+//       returns: "uint16_t",
+//       args: ["uint16_t", "uint16_t"],
+//     },
+//     add_uint32_t: {
+//       returns: "uint32_t",
+//       args: ["uint32_t", "uint32_t"],
+//     },
+
+//     does_pointer_equal_42_as_int32_t: {
+//       returns: "bool",
+//       args: ["ptr"],
+//     },
+
+//     ptr_should_point_to_42_as_int32_t: {
+//       returns: "ptr",
+//       args: [],
+//     },
+//     identity_ptr: {
+//       returns: "ptr",
+//       args: ["ptr"],
+//     },
+//     add_uint64_t: {
+//       returns: uint64_t,
+//       args: [uint64_t, uint64_t],
+//     },
+
+//     cb_identity_true: {
+//       returns: "bool",
+//       args: ["ptr"],
+//     },
+//     cb_identity_false: {
+//       returns: "bool",
+//       args: ["ptr"],
+//     },
+//     cb_identity_42_char: {
+//       returns: "char",
+//       args: ["ptr"],
+//     },
+//     cb_identity_42_float: {
+//       returns: "float",
+//       args: ["ptr"],
+//     },
+//     cb_identity_42_double: {
+//       returns: "double",
+//       args: ["ptr"],
+//     },
+//     cb_identity_42_uint8_t: {
+//       returns: "uint8_t",
+//       args: ["ptr"],
+//     },
+//     cb_identity_neg_42_int8_t: {
+//       returns: "int8_t",
+//       args: ["ptr"],
+//     },
+//     cb_identity_42_uint16_t: {
+//       returns: "uint16_t",
+//       args: ["ptr"],
+//     },
+//     cb_identity_42_uint32_t: {
+//       returns: "uint32_t",
+//       args: ["ptr"],
+//     },
+//     cb_identity_42_uint64_t: {
+//       returns: uint64_t,
+//       args: ["ptr"],
+//     },
+//     cb_identity_neg_42_int16_t: {
+//       returns: "int16_t",
+//       args: ["ptr"],
+//     },
+//     cb_identity_neg_42_int32_t: {
+//       returns: "int32_t",
+//       args: ["ptr"],
+//     },
+//     cb_identity_neg_42_int64_t: {
+//       returns: int64_t,
+//       args: ["ptr"],
+//     },
+
+//     return_a_function_ptr_to_function_that_returns_true: {
+//       returns: "ptr",
+//       args: [],
+//     },
+//   };
+// }
+
+// function ffiRunner(types) {
+//   const {
+//     symbols: {
+//       returns_true,
+//       returns_false,
+//       return_a_function_ptr_to_function_that_returns_true,
+//       returns_42_char,
+//       returns_42_float,
+//       returns_42_double,
+//       returns_42_uint8_t,
+//       returns_neg_42_int8_t,
+//       returns_42_uint16_t,
+//       returns_42_uint32_t,
+//       returns_42_uint64_t,
+//       returns_neg_42_int16_t,
+//       returns_neg_42_int32_t,
+//       returns_neg_42_int64_t,
+//       identity_char,
+//       identity_float,
+//       identity_bool,
+//       identity_double,
+//       identity_int8_t,
+//       identity_int16_t,
+//       identity_int32_t,
+//       identity_int64_t,
+//       identity_uint8_t,
+//       identity_uint16_t,
+//       identity_uint32_t,
+//       identity_uint64_t,
+//       add_char,
+//       add_float,
+//       add_double,
+//       add_int8_t,
+//       add_int16_t,
+//       add_int32_t,
+//       add_int64_t,
+//       add_uint8_t,
+//       add_uint16_t,
+//       identity_ptr,
+//       add_uint32_t,
+//       add_uint64_t,
+//       does_pointer_equal_42_as_int32_t,
+//       ptr_should_point_to_42_as_int32_t,
+//       cb_identity_true,
+//       cb_identity_false,
+//       cb_identity_42_char,
+//       cb_identity_42_float,
+//       cb_identity_42_double,
+//       cb_identity_42_uint8_t,
+//       cb_identity_neg_42_int8_t,
+//       cb_identity_42_uint16_t,
+//       cb_identity_42_uint32_t,
+//       cb_identity_42_uint64_t,
+//       cb_identity_neg_42_int16_t,
+//       cb_identity_neg_42_int32_t,
+//       cb_identity_neg_42_int64_t,
+//     },
+//     close,
+//   } = dlopen("/tmp/bun-ffi-test.dylib", types);
+
+//   expect(returns_true()).toBe(true);
+
+//   expect(returns_false()).toBe(false);
+
+//   expect(returns_42_char()).toBe(42);
+//   console.log(
+//     returns_42_uint64_t().valueOf(),
+//     returns_42_uint64_t(),
+//     returns_42_uint64_t().valueOf() === returns_42_uint64_t()
+//   );
+//   expect(returns_42_uint64_t().valueOf()).toBe(42);
+
+//   expect(Math.fround(returns_42_float())).toBe(Math.fround(42.41999804973602));
+//   expect(returns_42_double()).toBe(42.42);
+//   expect(returns_42_uint8_t()).toBe(42);
+//   expect(returns_neg_42_int8_t()).toBe(-42);
+//   expect(returns_42_uint16_t()).toBe(42);
+//   expect(returns_42_uint32_t()).toBe(42);
+//   expect(returns_42_uint64_t()).toBe(42);
+//   expect(returns_neg_42_int16_t()).toBe(-42);
+//   expect(returns_neg_42_int32_t()).toBe(-42);
+//   expect(identity_int32_t(10)).toBe(10);
+//   expect(returns_neg_42_int64_t()).toBe(-42);
+
+//   expect(identity_char(10)).toBe(10);
+
+//   expect(identity_float(10.199999809265137)).toBe(10.199999809265137);
+
+//   expect(identity_bool(true)).toBe(true);
+
+//   expect(identity_bool(false)).toBe(false);
+//   expect(identity_double(10.100000000000364)).toBe(10.100000000000364);
+
+//   expect(identity_int8_t(10)).toBe(10);
+//   expect(identity_int16_t(10)).toBe(10);
+//   expect(identity_int64_t(10)).toBe(10);
+//   expect(identity_uint8_t(10)).toBe(10);
+//   expect(identity_uint16_t(10)).toBe(10);
+//   expect(identity_uint32_t(10)).toBe(10);
+//   expect(identity_uint64_t(10)).toBe(10);
+
+//   var bigArray = new BigUint64Array(8);
+//   new Uint8Array(bigArray.buffer).fill(255);
+//   var bigIntArray = new BigInt64Array(bigArray.buffer);
+//   expect(identity_uint64_t(bigArray[0])).toBe(bigArray[0]);
+//   expect(identity_uint64_t(bigArray[0] - BigInt(1))).toBe(
+//     bigArray[0] - BigInt(1)
+//   );
+
+//   expect(add_uint64_t(BigInt(-1) * bigArray[0], bigArray[0])).toBe(0);
+//   expect(add_uint64_t(BigInt(-1) * bigArray[0] + BigInt(10), bigArray[0])).toBe(
+//     10
+//   );
+//   expect(identity_uint64_t(0)).toBe(0);
+//   expect(identity_uint64_t(100)).toBe(100);
+//   expect(identity_uint64_t(BigInt(100))).toBe(100);
+//   expect(identity_int64_t(bigIntArray[0])).toBe(bigIntArray[0]);
+//   expect(identity_int64_t(bigIntArray[0] - BigInt(1))).toBe(
+//     bigIntArray[0] - BigInt(1)
+//   );
+
+//   expect(add_char(1, 1)).toBe(2);
+//   expect(add_float(2.4, 2.8)).toBe(Math.fround(5.2));
+//   expect(add_double(4.2, 0.1)).toBe(4.3);
+//   expect(add_int8_t(1, 1)).toBe(2);
+//   expect(add_int16_t(1, 1)).toBe(2);
+//   expect(add_int32_t(1, 1)).toBe(2);
+//   expect(add_int64_t(1, 1)).toBe(2);
+//   expect(add_uint8_t(1, 1)).toBe(2);
+//   expect(add_uint16_t(1, 1)).toBe(2);
+//   expect(add_uint32_t(1, 1)).toBe(2);
+
+//   const cptr = ptr_should_point_to_42_as_int32_t();
+//   expect(cptr != 0).toBe(true);
+//   expect(typeof cptr === "number").toBe(true);
+//   expect(does_pointer_equal_42_as_int32_t(cptr)).toBe(true);
+//   const buffer = toBuffer(cptr, 0, 4);
+//   expect(buffer.readInt32(0)).toBe(42);
+//   expect(new DataView(toArrayBuffer(cptr, 0, 4), 0, 4).getInt32(0, true)).toBe(
+//     42
+//   );
+//   expect(ptr(buffer)).toBe(cptr);
+//   expect(new CString(cptr, 0, 1).toString()).toBe("*");
+//   expect(identity_ptr(cptr)).toBe(cptr);
+//   const second_ptr = ptr(new Buffer(8));
+//   expect(identity_ptr(second_ptr)).toBe(second_ptr);
+
+//   var myCFunction = new CFunction({
+//     ptr: return_a_function_ptr_to_function_that_returns_true(),
+//     returns: "bool",
+//   });
+//   expect(myCFunction()).toBe(true);
+
+//   // function identityBool() {
+//   //   return true;
+//   // }
+//   // globalThis.identityBool = identityBool;
+
+//   // const first = native.callback(
+//   //   {
+//   //     returns: "bool",
+//   //   },
+//   //   identityBool
+//   // );
+//   // expect(
+//   // cb_identity_true()
+//   // ).toBe(true);
+
+//   // expect(cb_identity_true(first)).toBe(true);
+
+//   // expect(
+//   //   cb_identity_false(
+//   //     callback(
+//   //       {
+//   //         returns: "bool",
+//   //       },
+//   //       () => false
+//   //     )
+//   //   )
+//   // ).toBe(false);
+
+//   // expect(
+//   //   cb_identity_42_char(
+//   //     callback(
+//   //       {
+//   //         returns: "char",
+//   //       },
+//   //       () => 42
+//   //     )
+//   //   )
+//   // ).toBe(42);
+//   // expect(
+//   //   cb_identity_42_uint8_t(
+//   //     callback(
+//   //       {
+//   //         returns: "uint8_t",
+//   //       },
+//   //       () => 42
+//   //     )
+//   //   )
+//   // ).toBe(42);
+
+//   // cb_identity_neg_42_int8_t(
+//   //   callback(
+//   //     {
+//   //       returns: "int8_t",
+//   //     },
+//   //     () => -42
+//   //   )
+//   // ).toBe(-42);
+
+//   // cb_identity_42_uint16_t(
+//   //   callback(
+//   //     {
+//   //       returns: "uint16_t",
+//   //     },
+//   //     () => 42
+//   //   )
+//   // ).toBe(42);
+
+//   // cb_identity_42_uint32_t(
+//   //   callback(
+//   //     {
+//   //       returns: "uint32_t",
+//   //     },
+//   //     () => 42
+//   //   )
+//   // ).toBe(42);
+
+//   // cb_identity_neg_42_int16_t(
+//   //   callback(
+//   //     {
+//   //       returns: "int16_t",
+//   //     },
+//   //     () => -42
+//   //   )
+//   // ).toBe(-42);
+
+//   // cb_identity_neg_42_int32_t(
+//   //   callback(
+//   //     {
+//   //       returns: "int32_t",
+//   //     },
+//   //     () => -42
+//   //   )
+//   // ).toBe(-42);
+
+//   close();
+// }
+
+// it("run ffi fast", () => {
+//   ffiRunner(getTypes(true));
+// });
+
+// it("run ffi", () => {
+//   ffiRunner(getTypes(false));
+// });
diff --git a/integration/bunjs-only-snippets/fs-stream.js b/test/bun.js/fs-stream.js
index 4b71c95b7..4b71c95b7 100644
--- a/integration/bunjs-only-snippets/fs-stream.js
+++ b/test/bun.js/fs-stream.js
diff --git a/integration/bunjs-only-snippets/fs.test.js b/test/bun.js/fs.test.js
index 79ac60eaa..79ac60eaa 100644
--- a/integration/bunjs-only-snippets/fs.test.js
+++ b/test/bun.js/fs.test.js
diff --git a/integration/bunjs-only-snippets/gc.js b/test/bun.js/gc.js
index 9212e8b76..9212e8b76 100644
--- a/integration/bunjs-only-snippets/gc.js
+++ b/test/bun.js/gc.js
diff --git a/integration/bunjs-only-snippets/globals.test.js b/test/bun.js/globals.test.js
index b498e0e8e..b498e0e8e 100644
--- a/integration/bunjs-only-snippets/globals.test.js
+++ b/test/bun.js/globals.test.js
diff --git a/integration/bunjs-only-snippets/hash.test.js b/test/bun.js/hash.test.js
index 71ad5a229..71ad5a229 100644
--- a/integration/bunjs-only-snippets/hash.test.js
+++ b/test/bun.js/hash.test.js
diff --git a/integration/bunjs-only-snippets/html-rewriter.test.js b/test/bun.js/html-rewriter.test.js
index 29b765c2f..29b765c2f 100644
--- a/integration/bunjs-only-snippets/html-rewriter.test.js
+++ b/test/bun.js/html-rewriter.test.js
diff --git a/integration/bunjs-only-snippets/import-meta.test.js b/test/bun.js/import-meta.test.js
index 0520be3a5..0e2faa903 100644
--- a/integration/bunjs-only-snippets/import-meta.test.js
+++ b/test/bun.js/import-meta.test.js
@@ -25,11 +25,9 @@ it("import.meta.require", () => {
 });
 
 it("import.meta.dir", () => {
-  expect(dir.endsWith("/bun/integration/bunjs-only-snippets")).toBe(true);
+  expect(dir.endsWith("/bun/test/bun.js")).toBe(true);
 });
 
 it("import.meta.path", () => {
-  expect(
-    path.endsWith("/bun/integration/bunjs-only-snippets/import-meta.test.js")
-  ).toBe(true);
+  expect(path.endsWith("/bun/test/bun.js/import-meta.test.js")).toBe(true);
 });
diff --git a/integration/bunjs-only-snippets/inline.macro.js b/test/bun.js/inline.macro.js
index ff0292d0a..ff0292d0a 100644
--- a/integration/bunjs-only-snippets/inline.macro.js
+++ b/test/bun.js/inline.macro.js
diff --git a/integration/bunjs-only-snippets/inspect.test.js b/test/bun.js/inspect.test.js
index bf5021c33..bf5021c33 100644
--- a/integration/bunjs-only-snippets/inspect.test.js
+++ b/test/bun.js/inspect.test.js
diff --git a/integration/bunjs-only-snippets/macro-check.js b/test/bun.js/macro-check.js
index 0f494a4e7..0f494a4e7 100644
--- a/integration/bunjs-only-snippets/macro-check.js
+++ b/test/bun.js/macro-check.js
diff --git a/integration/bunjs-only-snippets/microtask.test.js b/test/bun.js/microtask.test.js
index 18956b1e5..18956b1e5 100644
--- a/integration/bunjs-only-snippets/microtask.test.js
+++ b/test/bun.js/microtask.test.js
diff --git a/integration/bunjs-only-snippets/mmap.test.js b/test/bun.js/mmap.test.js
index 2b15a4000..2b15a4000 100644
--- a/integration/bunjs-only-snippets/mmap.test.js
+++ b/test/bun.js/mmap.test.js
diff --git a/integration/bunjs-only-snippets/node-builtins.test.js b/test/bun.js/node-builtins.test.js
index df31c64fc..df31c64fc 100644
--- a/integration/bunjs-only-snippets/node-builtins.test.js
+++ b/test/bun.js/node-builtins.test.js
diff --git a/integration/bunjs-only-snippets/path.test.js b/test/bun.js/path.test.js
index 997368150..997368150 100644
--- a/integration/bunjs-only-snippets/path.test.js
+++ b/test/bun.js/path.test.js
diff --git a/integration/bunjs-only-snippets/performance.test.js b/test/bun.js/performance.test.js
index 5e8520638..5e8520638 100644
--- a/integration/bunjs-only-snippets/performance.test.js
+++ b/test/bun.js/performance.test.js
diff --git a/integration/bunjs-only-snippets/process-nexttick.js b/test/bun.js/process-nexttick.js
index 337977c0a..337977c0a 100644
--- a/integration/bunjs-only-snippets/process-nexttick.js
+++ b/test/bun.js/process-nexttick.js
diff --git a/integration/bunjs-only-snippets/process-nexttick.test.js b/test/bun.js/process-nexttick.test.js
index ac53399c0..ac53399c0 100644
--- a/integration/bunjs-only-snippets/process-nexttick.test.js
+++ b/test/bun.js/process-nexttick.test.js
diff --git a/integration/bunjs-only-snippets/process.test.js b/test/bun.js/process.test.js
index f82834a04..f82834a04 100644
--- a/integration/bunjs-only-snippets/process.test.js
+++ b/test/bun.js/process.test.js
diff --git a/integration/bunjs-only-snippets/readFileSync.txt b/test/bun.js/readFileSync.txt
index ddc94b988..ddc94b988 100644
--- a/integration/bunjs-only-snippets/readFileSync.txt
+++ b/test/bun.js/readFileSync.txt
diff --git a/integration/bunjs-only-snippets/readdir.js b/test/bun.js/readdir.js
index 18c111d0a..18c111d0a 100644
--- a/integration/bunjs-only-snippets/readdir.js
+++ b/test/bun.js/readdir.js
diff --git a/integration/bunjs-only-snippets/reportError.test.js b/test/bun.js/reportError.test.js
index e51f93309..e51f93309 100644
--- a/integration/bunjs-only-snippets/reportError.test.js
+++ b/test/bun.js/reportError.test.js
diff --git a/integration/bunjs-only-snippets/require-json.json b/test/bun.js/require-json.json
index 6414edc0e..6414edc0e 100644
--- a/integration/bunjs-only-snippets/require-json.json
+++ b/test/bun.js/require-json.json
diff --git a/integration/bunjs-only-snippets/resolve-typescript-file.tsx b/test/bun.js/resolve-typescript-file.tsx
index ff8b4c563..ff8b4c563 100644
--- a/integration/bunjs-only-snippets/resolve-typescript-file.tsx
+++ b/test/bun.js/resolve-typescript-file.tsx
diff --git a/integration/bunjs-only-snippets/resolve.test.js b/test/bun.js/resolve.test.js
index f86d31980..56162de4f 100644
--- a/integration/bunjs-only-snippets/resolve.test.js
+++ b/test/bun.js/resolve.test.js
@@ -12,7 +12,7 @@ it("import.meta.resolve", async () => {
   expect(
     // optional second param can be any path, including a dir
     await import.meta.resolve(
-      "./bunjs-only-snippets/resolve.test.js",
+      "./bun.js/resolve.test.js",
       join(import.meta.path, "../")
     )
   ).toBe(import.meta.path);
diff --git a/integration/bunjs-only-snippets/response.file.test.js b/test/bun.js/response.file.test.js
index 2d0b6506e..2d0b6506e 100644
--- a/integration/bunjs-only-snippets/response.file.test.js
+++ b/test/bun.js/response.file.test.js
diff --git a/integration/bunjs-only-snippets/serve.test.ts b/test/bun.js/serve.test.ts
index 8b785dd25..8b785dd25 100644
--- a/integration/bunjs-only-snippets/serve.test.ts
+++ b/test/bun.js/serve.test.ts
diff --git a/integration/bunjs-only-snippets/setInterval.test.js b/test/bun.js/setInterval.test.js
index f633998cd..f633998cd 100644
--- a/integration/bunjs-only-snippets/setInterval.test.js
+++ b/test/bun.js/setInterval.test.js
diff --git a/integration/bunjs-only-snippets/setTimeout.test.js b/test/bun.js/setTimeout.test.js
index 55f71712c..55f71712c 100644
--- a/integration/bunjs-only-snippets/setTimeout.test.js
+++ b/test/bun.js/setTimeout.test.js
diff --git a/integration/bunjs-only-snippets/shadow.test.js b/test/bun.js/shadow.test.js
index 3fffcac90..3fffcac90 100644
--- a/integration/bunjs-only-snippets/shadow.test.js
+++ b/test/bun.js/shadow.test.js
diff --git a/integration/bunjs-only-snippets/sleep.js b/test/bun.js/sleep.js
index 080597424..080597424 100644
--- a/integration/bunjs-only-snippets/sleep.js
+++ b/test/bun.js/sleep.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/SVG/code.js b/test/bun.js/solid-dom-fixtures/SVG/code.js
index 0ffded054..0ffded054 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/SVG/code.js
+++ b/test/bun.js/solid-dom-fixtures/SVG/code.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/SVG/output.bun.js b/test/bun.js/solid-dom-fixtures/SVG/output.bun.js
index 44d092f15..44d092f15 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/SVG/output.bun.js
+++ b/test/bun.js/solid-dom-fixtures/SVG/output.bun.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/SVG/output.js b/test/bun.js/solid-dom-fixtures/SVG/output.js
index edac460af..edac460af 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/SVG/output.js
+++ b/test/bun.js/solid-dom-fixtures/SVG/output.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/attributeExpressions/code.js b/test/bun.js/solid-dom-fixtures/attributeExpressions/code.js
index b64949434..b64949434 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/attributeExpressions/code.js
+++ b/test/bun.js/solid-dom-fixtures/attributeExpressions/code.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/attributeExpressions/output.bun.js b/test/bun.js/solid-dom-fixtures/attributeExpressions/output.bun.js
index 4bb3e1b39..4bb3e1b39 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/attributeExpressions/output.bun.js
+++ b/test/bun.js/solid-dom-fixtures/attributeExpressions/output.bun.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/attributeExpressions/output.js b/test/bun.js/solid-dom-fixtures/attributeExpressions/output.js
index 14f700218..14f700218 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/attributeExpressions/output.js
+++ b/test/bun.js/solid-dom-fixtures/attributeExpressions/output.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/components/code.js b/test/bun.js/solid-dom-fixtures/components/code.js
index f3bd159d6..f3bd159d6 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/components/code.js
+++ b/test/bun.js/solid-dom-fixtures/components/code.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/components/output.bun.js b/test/bun.js/solid-dom-fixtures/components/output.bun.js
index 5ab4d5614..5ab4d5614 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/components/output.bun.js
+++ b/test/bun.js/solid-dom-fixtures/components/output.bun.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/components/output.js b/test/bun.js/solid-dom-fixtures/components/output.js
index 0c49d60a3..0c49d60a3 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/components/output.js
+++ b/test/bun.js/solid-dom-fixtures/components/output.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/conditionalExpressions/code.js b/test/bun.js/solid-dom-fixtures/conditionalExpressions/code.js
index 80f1a6a4f..80f1a6a4f 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/conditionalExpressions/code.js
+++ b/test/bun.js/solid-dom-fixtures/conditionalExpressions/code.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/conditionalExpressions/output.bun.js b/test/bun.js/solid-dom-fixtures/conditionalExpressions/output.bun.js
index 36c3f649b..36c3f649b 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/conditionalExpressions/output.bun.js
+++ b/test/bun.js/solid-dom-fixtures/conditionalExpressions/output.bun.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/conditionalExpressions/output.js b/test/bun.js/solid-dom-fixtures/conditionalExpressions/output.js
index 1511f4222..1511f4222 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/conditionalExpressions/output.js
+++ b/test/bun.js/solid-dom-fixtures/conditionalExpressions/output.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/customElements/code.js b/test/bun.js/solid-dom-fixtures/customElements/code.js
index f2e2bd02d..f2e2bd02d 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/customElements/code.js
+++ b/test/bun.js/solid-dom-fixtures/customElements/code.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/customElements/output.bun.js b/test/bun.js/solid-dom-fixtures/customElements/output.bun.js
index 79c46280c..79c46280c 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/customElements/output.bun.js
+++ b/test/bun.js/solid-dom-fixtures/customElements/output.bun.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/customElements/output.js b/test/bun.js/solid-dom-fixtures/customElements/output.js
index 79274ce2c..79274ce2c 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/customElements/output.js
+++ b/test/bun.js/solid-dom-fixtures/customElements/output.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/eventExpressions/code.js b/test/bun.js/solid-dom-fixtures/eventExpressions/code.js
index 78bc5e199..78bc5e199 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/eventExpressions/code.js
+++ b/test/bun.js/solid-dom-fixtures/eventExpressions/code.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/eventExpressions/output.bun.js b/test/bun.js/solid-dom-fixtures/eventExpressions/output.bun.js
index 5d90654f9..5d90654f9 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/eventExpressions/output.bun.js
+++ b/test/bun.js/solid-dom-fixtures/eventExpressions/output.bun.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/eventExpressions/output.js b/test/bun.js/solid-dom-fixtures/eventExpressions/output.js
index c24a1f89f..c24a1f89f 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/eventExpressions/output.js
+++ b/test/bun.js/solid-dom-fixtures/eventExpressions/output.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/fragments/code.js b/test/bun.js/solid-dom-fixtures/fragments/code.js
index 0b6021e44..0b6021e44 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/fragments/code.js
+++ b/test/bun.js/solid-dom-fixtures/fragments/code.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/fragments/output.bun.js b/test/bun.js/solid-dom-fixtures/fragments/output.bun.js
index 54d980cee..54d980cee 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/fragments/output.bun.js
+++ b/test/bun.js/solid-dom-fixtures/fragments/output.bun.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/fragments/output.js b/test/bun.js/solid-dom-fixtures/fragments/output.js
index 5fe0c767c..5fe0c767c 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/fragments/output.js
+++ b/test/bun.js/solid-dom-fixtures/fragments/output.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/insertChildren/code.js b/test/bun.js/solid-dom-fixtures/insertChildren/code.js
index 41d3d017e..41d3d017e 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/insertChildren/code.js
+++ b/test/bun.js/solid-dom-fixtures/insertChildren/code.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/insertChildren/output.js b/test/bun.js/solid-dom-fixtures/insertChildren/output.js
index 9ad937742..9ad937742 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/insertChildren/output.js
+++ b/test/bun.js/solid-dom-fixtures/insertChildren/output.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/namespaceElements/code.js b/test/bun.js/solid-dom-fixtures/namespaceElements/code.js
index 7ad410329..7ad410329 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/namespaceElements/code.js
+++ b/test/bun.js/solid-dom-fixtures/namespaceElements/code.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/namespaceElements/output.js b/test/bun.js/solid-dom-fixtures/namespaceElements/output.js
index 162ffb140..162ffb140 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/namespaceElements/output.js
+++ b/test/bun.js/solid-dom-fixtures/namespaceElements/output.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/simpleElements/code.js b/test/bun.js/solid-dom-fixtures/simpleElements/code.js
index c3537ee7d..c3537ee7d 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/simpleElements/code.js
+++ b/test/bun.js/solid-dom-fixtures/simpleElements/code.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/simpleElements/output.bun.js b/test/bun.js/solid-dom-fixtures/simpleElements/output.bun.js
index 72d61c1e3..72d61c1e3 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/simpleElements/output.bun.js
+++ b/test/bun.js/solid-dom-fixtures/simpleElements/output.bun.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/simpleElements/output.js b/test/bun.js/solid-dom-fixtures/simpleElements/output.js
index 5d16f6767..5d16f6767 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/simpleElements/output.js
+++ b/test/bun.js/solid-dom-fixtures/simpleElements/output.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/textInterpolation/code.js b/test/bun.js/solid-dom-fixtures/textInterpolation/code.js
index 21698ea89..21698ea89 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/textInterpolation/code.js
+++ b/test/bun.js/solid-dom-fixtures/textInterpolation/code.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/textInterpolation/output.bun.js b/test/bun.js/solid-dom-fixtures/textInterpolation/output.bun.js
index eb4c5347a..eb4c5347a 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/textInterpolation/output.bun.js
+++ b/test/bun.js/solid-dom-fixtures/textInterpolation/output.bun.js
diff --git a/integration/bunjs-only-snippets/solid-dom-fixtures/textInterpolation/output.js b/test/bun.js/solid-dom-fixtures/textInterpolation/output.js
index b86a631fb..b86a631fb 100644
--- a/integration/bunjs-only-snippets/solid-dom-fixtures/textInterpolation/output.js
+++ b/test/bun.js/solid-dom-fixtures/textInterpolation/output.js
diff --git a/integration/bunjs-only-snippets/some-fs.js b/test/bun.js/some-fs.js
index e6b31f162..e6b31f162 100644
--- a/integration/bunjs-only-snippets/some-fs.js
+++ b/test/bun.js/some-fs.js
diff --git a/integration/bunjs-only-snippets/sql-raw.test.js b/test/bun.js/sql-raw.test.js
index ea7f72bd6..ea7f72bd6 100644
--- a/integration/bunjs-only-snippets/sql-raw.test.js
+++ b/test/bun.js/sql-raw.test.js
diff --git a/integration/bunjs-only-snippets/sqlite.test.js b/test/bun.js/sqlite.test.js
index 2250f97f0..2250f97f0 100644
--- a/integration/bunjs-only-snippets/sqlite.test.js
+++ b/test/bun.js/sqlite.test.js
diff --git a/integration/bunjs-only-snippets/streams.test.js b/test/bun.js/streams.test.js
index ccbea1d09..ccbea1d09 100644
--- a/integration/bunjs-only-snippets/streams.test.js
+++ b/test/bun.js/streams.test.js
diff --git a/integration/bunjs-only-snippets/text-encoder.test.js b/test/bun.js/text-encoder.test.js
index 5687e0222..5687e0222 100644
--- a/integration/bunjs-only-snippets/text-encoder.test.js
+++ b/test/bun.js/text-encoder.test.js
diff --git a/integration/bunjs-only-snippets/toml-fixture.toml b/test/bun.js/toml-fixture.toml
index 090563ef7..090563ef7 100644
--- a/integration/bunjs-only-snippets/toml-fixture.toml
+++ b/test/bun.js/toml-fixture.toml
diff --git a/integration/bunjs-only-snippets/toml.test.js b/test/bun.js/toml.test.js
index 44141b2d4..44141b2d4 100644
--- a/integration/bunjs-only-snippets/toml.test.js
+++ b/test/bun.js/toml.test.js
diff --git a/integration/bunjs-only-snippets/transpiler.test.js b/test/bun.js/transpiler.test.js
index f8da4c18c..f8da4c18c 100644
--- a/integration/bunjs-only-snippets/transpiler.test.js
+++ b/test/bun.js/transpiler.test.js
diff --git a/integration/bunjs-only-snippets/tsconfig.json b/test/bun.js/tsconfig.json
index 9a6c36e06..9a6c36e06 100644
--- a/integration/bunjs-only-snippets/tsconfig.json
+++ b/test/bun.js/tsconfig.json
diff --git a/integration/bunjs-only-snippets/unsafe.test.js b/test/bun.js/unsafe.test.js
index 741dc0241..741dc0241 100644
--- a/integration/bunjs-only-snippets/unsafe.test.js
+++ b/test/bun.js/unsafe.test.js
diff --git a/integration/bunjs-only-snippets/url.test.ts b/test/bun.js/url.test.ts
index 37ea2008b..37ea2008b 100644
--- a/integration/bunjs-only-snippets/url.test.ts
+++ b/test/bun.js/url.test.ts
diff --git a/integration/bunjs-only-snippets/wasm-return-1-test.zig b/test/bun.js/wasm-return-1-test.zig
index d46bdae92..d46bdae92 100644
--- a/integration/bunjs-only-snippets/wasm-return-1-test.zig
+++ b/test/bun.js/wasm-return-1-test.zig
diff --git a/integration/bunjs-only-snippets/wasm.js b/test/bun.js/wasm.js
index a4daaaffe..a4daaaffe 100644
--- a/integration/bunjs-only-snippets/wasm.js
+++ b/test/bun.js/wasm.js
diff --git a/integration/bunjs-only-snippets/wasm.test.js b/test/bun.js/wasm.test.js
index ab88d5beb..ab88d5beb 100644
--- a/integration/bunjs-only-snippets/wasm.test.js
+++ b/test/bun.js/wasm.test.js
diff --git a/integration/bunjs-only-snippets/web-globals.test.js b/test/bun.js/web-globals.test.js
index ac7c22e84..ac7c22e84 100644
--- a/integration/bunjs-only-snippets/web-globals.test.js
+++ b/test/bun.js/web-globals.test.js
diff --git a/integration/bunjs-only-snippets/websocket.test.js b/test/bun.js/websocket.test.js
index ab825fa63..ab825fa63 100644
--- a/integration/bunjs-only-snippets/websocket.test.js
+++ b/test/bun.js/websocket.test.js
diff --git a/integration/bunjs-only-snippets/writeFileSync.txt b/test/bun.js/writeFileSync.txt
index a0fe4515f..a0fe4515f 100644
--- a/integration/bunjs-only-snippets/writeFileSync.txt
+++ b/test/bun.js/writeFileSync.txt
diff --git a/integration/bunjs-only-snippets/zlib.test.js b/test/bun.js/zlib.test.js
index aecb095cc..aecb095cc 100644
--- a/integration/bunjs-only-snippets/zlib.test.js
+++ b/test/bun.js/zlib.test.js
diff --git a/integration/macro/assert.tsx b/test/macro/assert.tsx
index 8a6e4d822..8a6e4d822 100644
--- a/integration/macro/assert.tsx
+++ b/test/macro/assert.tsx
diff --git a/integration/macro/fetchSync.tsx b/test/macro/fetchSync.tsx
index ebe1566e6..ebe1566e6 100644
--- a/integration/macro/fetchSync.tsx
+++ b/test/macro/fetchSync.tsx
diff --git a/integration/macro/hello-fetch-macro.tsx b/test/macro/hello-fetch-macro.tsx
index fa0de4a9d..fa0de4a9d 100644
--- a/integration/macro/hello-fetch-macro.tsx
+++ b/test/macro/hello-fetch-macro.tsx
diff --git a/integration/macro/loadMocks.tsx b/test/macro/loadMocks.tsx
index 4b7993c6d..4b7993c6d 100644
--- a/integration/macro/loadMocks.tsx
+++ b/test/macro/loadMocks.tsx
diff --git a/integration/scripts/browser.js b/test/scripts/browser.js
index 479a55c9c..479a55c9c 100644
--- a/integration/scripts/browser.js
+++ b/test/scripts/browser.js
diff --git a/integration/scripts/bun.js b/test/scripts/bun.js
index f8e4d2fa0..f8e4d2fa0 100644
--- a/integration/scripts/bun.js
+++ b/test/scripts/bun.js
diff --git a/integration/scripts/bun.lockb b/test/scripts/bun.lockb
index 2d9937d57..2d9937d57 100755
--- a/integration/scripts/bun.lockb
+++ b/test/scripts/bun.lockb
diff --git a/integration/scripts/package-lock.json b/test/scripts/package-lock.json
index a41b9bd92..a41b9bd92 100644
--- a/integration/scripts/package-lock.json
+++ b/test/scripts/package-lock.json
diff --git a/integration/scripts/package.json b/test/scripts/package.json
index b4637138b..b4637138b 100644
--- a/integration/scripts/package.json
+++ b/test/scripts/package.json
diff --git a/integration/scripts/snippets.json b/test/scripts/snippets.json
index ebdec23d3..ebdec23d3 100644
--- a/integration/scripts/snippets.json
+++ b/test/scripts/snippets.json
diff --git a/integration/snapshots/.prettierignore b/test/snapshots/.prettierignore
index 4c43fe68f..4c43fe68f 100644
--- a/integration/snapshots/.prettierignore
+++ b/test/snapshots/.prettierignore
diff --git a/integration/snapshots/array-args-with-default-values.debug.js b/test/snapshots/array-args-with-default-values.debug.js
index 9650405c6..9650405c6 100644
--- a/integration/snapshots/array-args-with-default-values.debug.js
+++ b/test/snapshots/array-args-with-default-values.debug.js
diff --git a/integration/snapshots/array-args-with-default-values.hmr.debug.js b/test/snapshots/array-args-with-default-values.hmr.debug.js
index e219cbd9a..e219cbd9a 100644
--- a/integration/snapshots/array-args-with-default-values.hmr.debug.js
+++ b/test/snapshots/array-args-with-default-values.hmr.debug.js
diff --git a/integration/snapshots/array-args-with-default-values.hmr.js b/test/snapshots/array-args-with-default-values.hmr.js
index 3c8997b54..3c8997b54 100644
--- a/integration/snapshots/array-args-with-default-values.hmr.js
+++ b/test/snapshots/array-args-with-default-values.hmr.js
diff --git a/integration/snapshots/array-args-with-default-values.js b/test/snapshots/array-args-with-default-values.js
index 9650405c6..9650405c6 100644
--- a/integration/snapshots/array-args-with-default-values.js
+++ b/test/snapshots/array-args-with-default-values.js
diff --git a/integration/snapshots/bundled-entry-point.debug.js b/test/snapshots/bundled-entry-point.debug.js
index 51562933f..51562933f 100644
--- a/integration/snapshots/bundled-entry-point.debug.js
+++ b/test/snapshots/bundled-entry-point.debug.js
diff --git a/integration/snapshots/bundled-entry-point.hmr.debug.js b/test/snapshots/bundled-entry-point.hmr.debug.js
index 622b6b75b..622b6b75b 100644
--- a/integration/snapshots/bundled-entry-point.hmr.debug.js
+++ b/test/snapshots/bundled-entry-point.hmr.debug.js
diff --git a/integration/snapshots/bundled-entry-point.hmr.js b/test/snapshots/bundled-entry-point.hmr.js
index b4fb5e46f..b4fb5e46f 100644
--- a/integration/snapshots/bundled-entry-point.hmr.js
+++ b/test/snapshots/bundled-entry-point.hmr.js
diff --git a/integration/snapshots/bundled-entry-point.js b/test/snapshots/bundled-entry-point.js
index 51562933f..51562933f 100644
--- a/integration/snapshots/bundled-entry-point.js
+++ b/test/snapshots/bundled-entry-point.js
diff --git a/integration/snapshots/caught-require.debug.js b/test/snapshots/caught-require.debug.js
index 73608f8e3..73608f8e3 100644
--- a/integration/snapshots/caught-require.debug.js
+++ b/test/snapshots/caught-require.debug.js
diff --git a/integration/snapshots/caught-require.hmr.debug.js b/test/snapshots/caught-require.hmr.debug.js
index 5beecb99b..5beecb99b 100644
--- a/integration/snapshots/caught-require.hmr.debug.js
+++ b/test/snapshots/caught-require.hmr.debug.js
diff --git a/integration/snapshots/caught-require.hmr.js b/test/snapshots/caught-require.hmr.js
index 8a63f51a0..8a63f51a0 100644
--- a/integration/snapshots/caught-require.hmr.js
+++ b/test/snapshots/caught-require.hmr.js
diff --git a/integration/snapshots/caught-require.js b/test/snapshots/caught-require.js
index 73608f8e3..73608f8e3 100644
--- a/integration/snapshots/caught-require.js
+++ b/test/snapshots/caught-require.js
diff --git a/integration/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.debug.js b/test/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.debug.js
index 1bd6883d8..1bd6883d8 100644
--- a/integration/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.debug.js
+++ b/test/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.debug.js
diff --git a/integration/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.hmr.debug.js b/test/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.hmr.debug.js
index f685557dc..f685557dc 100644
--- a/integration/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.hmr.debug.js
+++ b/test/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.hmr.debug.js
diff --git a/integration/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.hmr.js b/test/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.hmr.js
index b74b8c2b7..b74b8c2b7 100644
--- a/integration/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.hmr.js
+++ b/test/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.hmr.js
diff --git a/integration/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.js b/test/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.js
index 1bd6883d8..1bd6883d8 100644
--- a/integration/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.js
+++ b/test/snapshots/cjs-transform-shouldnt-have-static-imports-in-cjs-function.js
diff --git a/integration/snapshots/code-simplification-neql-define.debug.js b/test/snapshots/code-simplification-neql-define.debug.js
index 6c0e684df..6c0e684df 100644
--- a/integration/snapshots/code-simplification-neql-define.debug.js
+++ b/test/snapshots/code-simplification-neql-define.debug.js
diff --git a/integration/snapshots/code-simplification-neql-define.hmr.debug.js b/test/snapshots/code-simplification-neql-define.hmr.debug.js
index 8d4f82052..8d4f82052 100644
--- a/integration/snapshots/code-simplification-neql-define.hmr.debug.js
+++ b/test/snapshots/code-simplification-neql-define.hmr.debug.js
diff --git a/integration/snapshots/code-simplification-neql-define.hmr.js b/test/snapshots/code-simplification-neql-define.hmr.js
index 6d521b01d..6d521b01d 100644
--- a/integration/snapshots/code-simplification-neql-define.hmr.js
+++ b/test/snapshots/code-simplification-neql-define.hmr.js
diff --git a/integration/snapshots/code-simplification-neql-define.js b/test/snapshots/code-simplification-neql-define.js
index 6c0e684df..6c0e684df 100644
--- a/integration/snapshots/code-simplification-neql-define.js
+++ b/test/snapshots/code-simplification-neql-define.js
diff --git a/integration/snapshots/custom-emotion-jsx/file.debug.jsx b/test/snapshots/custom-emotion-jsx/file.debug.jsx
index 466cd4697..466cd4697 100644
--- a/integration/snapshots/custom-emotion-jsx/file.debug.jsx
+++ b/test/snapshots/custom-emotion-jsx/file.debug.jsx
diff --git a/integration/snapshots/custom-emotion-jsx/file.hmr.debug.jsx b/test/snapshots/custom-emotion-jsx/file.hmr.debug.jsx
index a046f2e1c..a046f2e1c 100644
--- a/integration/snapshots/custom-emotion-jsx/file.hmr.debug.jsx
+++ b/test/snapshots/custom-emotion-jsx/file.hmr.debug.jsx
diff --git a/integration/snapshots/custom-emotion-jsx/file.hmr.jsx b/test/snapshots/custom-emotion-jsx/file.hmr.jsx
index d26b0a16d..d26b0a16d 100644
--- a/integration/snapshots/custom-emotion-jsx/file.hmr.jsx
+++ b/test/snapshots/custom-emotion-jsx/file.hmr.jsx
diff --git a/integration/snapshots/custom-emotion-jsx/file.jsx b/test/snapshots/custom-emotion-jsx/file.jsx
index 466cd4697..466cd4697 100644
--- a/integration/snapshots/custom-emotion-jsx/file.jsx
+++ b/test/snapshots/custom-emotion-jsx/file.jsx
diff --git a/integration/snapshots/export-default-module-hot.debug.js b/test/snapshots/export-default-module-hot.debug.js
index a9de546d5..a9de546d5 100644
--- a/integration/snapshots/export-default-module-hot.debug.js
+++ b/test/snapshots/export-default-module-hot.debug.js
diff --git a/integration/snapshots/export-default-module-hot.hmr.debug.js b/test/snapshots/export-default-module-hot.hmr.debug.js
index 6230c29a1..6230c29a1 100644
--- a/integration/snapshots/export-default-module-hot.hmr.debug.js
+++ b/test/snapshots/export-default-module-hot.hmr.debug.js
diff --git a/integration/snapshots/export-default-module-hot.hmr.js b/test/snapshots/export-default-module-hot.hmr.js
index 3dadccd28..3dadccd28 100644
--- a/integration/snapshots/export-default-module-hot.hmr.js
+++ b/test/snapshots/export-default-module-hot.hmr.js
diff --git a/integration/snapshots/export-default-module-hot.js b/test/snapshots/export-default-module-hot.js
index a9de546d5..a9de546d5 100644
--- a/integration/snapshots/export-default-module-hot.js
+++ b/test/snapshots/export-default-module-hot.js
diff --git a/integration/snapshots/export.debug.js b/test/snapshots/export.debug.js
index 986d3b45f..986d3b45f 100644
--- a/integration/snapshots/export.debug.js
+++ b/test/snapshots/export.debug.js
diff --git a/integration/snapshots/export.hmr.debug.js b/test/snapshots/export.hmr.debug.js
index 4bcc6ef59..4bcc6ef59 100644
--- a/integration/snapshots/export.hmr.debug.js
+++ b/test/snapshots/export.hmr.debug.js
diff --git a/integration/snapshots/export.hmr.js b/test/snapshots/export.hmr.js
index 73d6db2d4..73d6db2d4 100644
--- a/integration/snapshots/export.hmr.js
+++ b/test/snapshots/export.hmr.js
diff --git a/integration/snapshots/export.js b/test/snapshots/export.js
index 986d3b45f..986d3b45f 100644
--- a/integration/snapshots/export.js
+++ b/test/snapshots/export.js
diff --git a/integration/snapshots/forbid-in-is-correct.debug.js b/test/snapshots/forbid-in-is-correct.debug.js
index dfca92d80..dfca92d80 100644
--- a/integration/snapshots/forbid-in-is-correct.debug.js
+++ b/test/snapshots/forbid-in-is-correct.debug.js
diff --git a/integration/snapshots/forbid-in-is-correct.hmr.debug.js b/test/snapshots/forbid-in-is-correct.hmr.debug.js
index 83a447fc4..83a447fc4 100644
--- a/integration/snapshots/forbid-in-is-correct.hmr.debug.js
+++ b/test/snapshots/forbid-in-is-correct.hmr.debug.js
diff --git a/integration/snapshots/forbid-in-is-correct.hmr.js b/test/snapshots/forbid-in-is-correct.hmr.js
index ae3714d04..ae3714d04 100644
--- a/integration/snapshots/forbid-in-is-correct.hmr.js
+++ b/test/snapshots/forbid-in-is-correct.hmr.js
diff --git a/integration/snapshots/forbid-in-is-correct.js b/test/snapshots/forbid-in-is-correct.js
index dfca92d80..dfca92d80 100644
--- a/integration/snapshots/forbid-in-is-correct.js
+++ b/test/snapshots/forbid-in-is-correct.js
diff --git a/integration/snapshots/global-is-remapped-to-globalThis.debug.js b/test/snapshots/global-is-remapped-to-globalThis.debug.js
index 6cd8e2e22..6cd8e2e22 100644
--- a/integration/snapshots/global-is-remapped-to-globalThis.debug.js
+++ b/test/snapshots/global-is-remapped-to-globalThis.debug.js
diff --git a/integration/snapshots/global-is-remapped-to-globalThis.hmr.debug.js b/test/snapshots/global-is-remapped-to-globalThis.hmr.debug.js
index 1f6619161..1f6619161 100644
--- a/integration/snapshots/global-is-remapped-to-globalThis.hmr.debug.js
+++ b/test/snapshots/global-is-remapped-to-globalThis.hmr.debug.js
diff --git a/integration/snapshots/global-is-remapped-to-globalThis.hmr.js b/test/snapshots/global-is-remapped-to-globalThis.hmr.js
index a0e28b60a..a0e28b60a 100644
--- a/integration/snapshots/global-is-remapped-to-globalThis.hmr.js
+++ b/test/snapshots/global-is-remapped-to-globalThis.hmr.js
diff --git a/integration/snapshots/global-is-remapped-to-globalThis.js b/test/snapshots/global-is-remapped-to-globalThis.js
index 6cd8e2e22..6cd8e2e22 100644
--- a/integration/snapshots/global-is-remapped-to-globalThis.js
+++ b/test/snapshots/global-is-remapped-to-globalThis.js
diff --git a/integration/snapshots/jsx-entities.debug.jsx b/test/snapshots/jsx-entities.debug.jsx
index 9fd075bc6..9fd075bc6 100644
--- a/integration/snapshots/jsx-entities.debug.jsx
+++ b/test/snapshots/jsx-entities.debug.jsx
diff --git a/integration/snapshots/jsx-entities.hmr.debug.jsx b/test/snapshots/jsx-entities.hmr.debug.jsx
index 07915e50a..07915e50a 100644
--- a/integration/snapshots/jsx-entities.hmr.debug.jsx
+++ b/test/snapshots/jsx-entities.hmr.debug.jsx
diff --git a/integration/snapshots/jsx-entities.hmr.jsx b/test/snapshots/jsx-entities.hmr.jsx
index 3bad6ca8d..3bad6ca8d 100644
--- a/integration/snapshots/jsx-entities.hmr.jsx
+++ b/test/snapshots/jsx-entities.hmr.jsx
diff --git a/integration/snapshots/jsx-entities.jsx b/test/snapshots/jsx-entities.jsx
index 9fd075bc6..9fd075bc6 100644
--- a/integration/snapshots/jsx-entities.jsx
+++ b/test/snapshots/jsx-entities.jsx
diff --git a/integration/snapshots/jsx-spacing.debug.jsx b/test/snapshots/jsx-spacing.debug.jsx
index bfbcab92f..bfbcab92f 100644
--- a/integration/snapshots/jsx-spacing.debug.jsx
+++ b/test/snapshots/jsx-spacing.debug.jsx
diff --git a/integration/snapshots/jsx-spacing.hmr.debug.jsx b/test/snapshots/jsx-spacing.hmr.debug.jsx
index d9ec4e204..d9ec4e204 100644
--- a/integration/snapshots/jsx-spacing.hmr.debug.jsx
+++ b/test/snapshots/jsx-spacing.hmr.debug.jsx
diff --git a/integration/snapshots/jsx-spacing.hmr.jsx b/test/snapshots/jsx-spacing.hmr.jsx
index 59287257b..59287257b 100644
--- a/integration/snapshots/jsx-spacing.hmr.jsx
+++ b/test/snapshots/jsx-spacing.hmr.jsx
diff --git a/integration/snapshots/jsx-spacing.jsx b/test/snapshots/jsx-spacing.jsx
index bfbcab92f..bfbcab92f 100644
--- a/integration/snapshots/jsx-spacing.jsx
+++ b/test/snapshots/jsx-spacing.jsx
diff --git a/integration/snapshots/latin1-chars-in-regexp.debug.js b/test/snapshots/latin1-chars-in-regexp.debug.js
index 108874c39..108874c39 100644
--- a/integration/snapshots/latin1-chars-in-regexp.debug.js
+++ b/test/snapshots/latin1-chars-in-regexp.debug.js
diff --git a/integration/snapshots/latin1-chars-in-regexp.hmr.debug.js b/test/snapshots/latin1-chars-in-regexp.hmr.debug.js
index fee5714a2..fee5714a2 100644
--- a/integration/snapshots/latin1-chars-in-regexp.hmr.debug.js
+++ b/test/snapshots/latin1-chars-in-regexp.hmr.debug.js
diff --git a/integration/snapshots/latin1-chars-in-regexp.hmr.js b/test/snapshots/latin1-chars-in-regexp.hmr.js
index afd3b813e..afd3b813e 100644
--- a/integration/snapshots/latin1-chars-in-regexp.hmr.js
+++ b/test/snapshots/latin1-chars-in-regexp.hmr.js
diff --git a/integration/snapshots/latin1-chars-in-regexp.js b/test/snapshots/latin1-chars-in-regexp.js
index 108874c39..108874c39 100644
--- a/integration/snapshots/latin1-chars-in-regexp.js
+++ b/test/snapshots/latin1-chars-in-regexp.js
diff --git a/integration/snapshots/lodash-regexp.debug.js b/test/snapshots/lodash-regexp.debug.js
index b1566fb6d..b1566fb6d 100644
--- a/integration/snapshots/lodash-regexp.debug.js
+++ b/test/snapshots/lodash-regexp.debug.js
diff --git a/integration/snapshots/lodash-regexp.hmr.debug.js b/test/snapshots/lodash-regexp.hmr.debug.js
index 959e9e9c1..959e9e9c1 100644
--- a/integration/snapshots/lodash-regexp.hmr.debug.js
+++ b/test/snapshots/lodash-regexp.hmr.debug.js
diff --git a/integration/snapshots/lodash-regexp.hmr.js b/test/snapshots/lodash-regexp.hmr.js
index e5d6b9130..e5d6b9130 100644
--- a/integration/snapshots/lodash-regexp.hmr.js
+++ b/test/snapshots/lodash-regexp.hmr.js
diff --git a/integration/snapshots/lodash-regexp.js b/test/snapshots/lodash-regexp.js
index b1566fb6d..b1566fb6d 100644
--- a/integration/snapshots/lodash-regexp.js
+++ b/test/snapshots/lodash-regexp.js
diff --git a/integration/snapshots/multiple-imports.debug.js b/test/snapshots/multiple-imports.debug.js
index af9396b46..af9396b46 100644
--- a/integration/snapshots/multiple-imports.debug.js
+++ b/test/snapshots/multiple-imports.debug.js
diff --git a/integration/snapshots/multiple-imports.hmr.debug.js b/test/snapshots/multiple-imports.hmr.debug.js
index 5cca375b2..5cca375b2 100644
--- a/integration/snapshots/multiple-imports.hmr.debug.js
+++ b/test/snapshots/multiple-imports.hmr.debug.js
diff --git a/integration/snapshots/multiple-imports.hmr.js b/test/snapshots/multiple-imports.hmr.js
index 59d620c07..59d620c07 100644
--- a/integration/snapshots/multiple-imports.hmr.js
+++ b/test/snapshots/multiple-imports.hmr.js
diff --git a/integration/snapshots/multiple-imports.js b/test/snapshots/multiple-imports.js
index af9396b46..af9396b46 100644
--- a/integration/snapshots/multiple-imports.js
+++ b/test/snapshots/multiple-imports.js
diff --git a/integration/snapshots/multiple-var.debug.js b/test/snapshots/multiple-var.debug.js
index 56d31d53e..56d31d53e 100644
--- a/integration/snapshots/multiple-var.debug.js
+++ b/test/snapshots/multiple-var.debug.js
diff --git a/integration/snapshots/multiple-var.hmr.debug.js b/test/snapshots/multiple-var.hmr.debug.js
index a5298f462..a5298f462 100644
--- a/integration/snapshots/multiple-var.hmr.debug.js
+++ b/test/snapshots/multiple-var.hmr.debug.js
diff --git a/integration/snapshots/multiple-var.hmr.js b/test/snapshots/multiple-var.hmr.js
index 3acb5b8d3..3acb5b8d3 100644
--- a/integration/snapshots/multiple-var.hmr.js
+++ b/test/snapshots/multiple-var.hmr.js
diff --git a/integration/snapshots/multiple-var.js b/test/snapshots/multiple-var.js
index 56d31d53e..56d31d53e 100644
--- a/integration/snapshots/multiple-var.js
+++ b/test/snapshots/multiple-var.js
diff --git a/integration/snapshots/number-literal-bug.debug.js b/test/snapshots/number-literal-bug.debug.js
index fb763061d..fb763061d 100644
--- a/integration/snapshots/number-literal-bug.debug.js
+++ b/test/snapshots/number-literal-bug.debug.js
diff --git a/integration/snapshots/number-literal-bug.hmr.debug.js b/test/snapshots/number-literal-bug.hmr.debug.js
index 852aef372..852aef372 100644
--- a/integration/snapshots/number-literal-bug.hmr.debug.js
+++ b/test/snapshots/number-literal-bug.hmr.debug.js
diff --git a/integration/snapshots/number-literal-bug.hmr.js b/test/snapshots/number-literal-bug.hmr.js
index cdb63994d..cdb63994d 100644
--- a/integration/snapshots/number-literal-bug.hmr.js
+++ b/test/snapshots/number-literal-bug.hmr.js
diff --git a/integration/snapshots/number-literal-bug.js b/test/snapshots/number-literal-bug.js
index fb763061d..fb763061d 100644
--- a/integration/snapshots/number-literal-bug.js
+++ b/test/snapshots/number-literal-bug.js
diff --git a/integration/snapshots/optional-chain-with-function.debug.js b/test/snapshots/optional-chain-with-function.debug.js
index 4b53bb5ed..4b53bb5ed 100644
--- a/integration/snapshots/optional-chain-with-function.debug.js
+++ b/test/snapshots/optional-chain-with-function.debug.js
diff --git a/integration/snapshots/optional-chain-with-function.hmr.debug.js b/test/snapshots/optional-chain-with-function.hmr.debug.js
index e7f97cb3f..e7f97cb3f 100644
--- a/integration/snapshots/optional-chain-with-function.hmr.debug.js
+++ b/test/snapshots/optional-chain-with-function.hmr.debug.js
diff --git a/integration/snapshots/optional-chain-with-function.hmr.js b/test/snapshots/optional-chain-with-function.hmr.js
index e9a89a827..e9a89a827 100644
--- a/integration/snapshots/optional-chain-with-function.hmr.js
+++ b/test/snapshots/optional-chain-with-function.hmr.js
diff --git a/integration/snapshots/optional-chain-with-function.js b/test/snapshots/optional-chain-with-function.js
index 4b53bb5ed..4b53bb5ed 100644
--- a/integration/snapshots/optional-chain-with-function.js
+++ b/test/snapshots/optional-chain-with-function.js
diff --git a/integration/snapshots/package-json-exports/index.debug.js b/test/snapshots/package-json-exports/index.debug.js
index 3d41a7985..3d41a7985 100644
--- a/integration/snapshots/package-json-exports/index.debug.js
+++ b/test/snapshots/package-json-exports/index.debug.js
diff --git a/integration/snapshots/package-json-exports/index.hmr.debug.js b/test/snapshots/package-json-exports/index.hmr.debug.js
index e6cdaefba..e6cdaefba 100644
--- a/integration/snapshots/package-json-exports/index.hmr.debug.js
+++ b/test/snapshots/package-json-exports/index.hmr.debug.js
diff --git a/integration/snapshots/package-json-exports/index.hmr.js b/test/snapshots/package-json-exports/index.hmr.js
index 69efa5194..69efa5194 100644
--- a/integration/snapshots/package-json-exports/index.hmr.js
+++ b/test/snapshots/package-json-exports/index.hmr.js
diff --git a/integration/snapshots/package-json-exports/index.js b/test/snapshots/package-json-exports/index.js
index 3d41a7985..3d41a7985 100644
--- a/integration/snapshots/package-json-exports/index.js
+++ b/test/snapshots/package-json-exports/index.js
diff --git a/integration/snapshots/package-json-utf8.debug.js b/test/snapshots/package-json-utf8.debug.js
index 8845090f0..8845090f0 100644
--- a/integration/snapshots/package-json-utf8.debug.js
+++ b/test/snapshots/package-json-utf8.debug.js
diff --git a/integration/snapshots/package-json-utf8.hmr.debug.js b/test/snapshots/package-json-utf8.hmr.debug.js
index fe11070c2..fe11070c2 100644
--- a/integration/snapshots/package-json-utf8.hmr.debug.js
+++ b/test/snapshots/package-json-utf8.hmr.debug.js
diff --git a/integration/snapshots/package-json-utf8.hmr.js b/test/snapshots/package-json-utf8.hmr.js
index 5676d6477..5676d6477 100644
--- a/integration/snapshots/package-json-utf8.hmr.js
+++ b/test/snapshots/package-json-utf8.hmr.js
diff --git a/integration/snapshots/package-json-utf8.js b/test/snapshots/package-json-utf8.js
index 8845090f0..8845090f0 100644
--- a/integration/snapshots/package-json-utf8.js
+++ b/test/snapshots/package-json-utf8.js
diff --git a/integration/snapshots/react-context-value-func.debug.tsx b/test/snapshots/react-context-value-func.debug.tsx
index 71b5e5f60..71b5e5f60 100644
--- a/integration/snapshots/react-context-value-func.debug.tsx
+++ b/test/snapshots/react-context-value-func.debug.tsx
diff --git a/integration/snapshots/react-context-value-func.hmr.debug.tsx b/test/snapshots/react-context-value-func.hmr.debug.tsx
index d17a8fa88..d17a8fa88 100644
--- a/integration/snapshots/react-context-value-func.hmr.debug.tsx
+++ b/test/snapshots/react-context-value-func.hmr.debug.tsx
diff --git a/integration/snapshots/react-context-value-func.hmr.tsx b/test/snapshots/react-context-value-func.hmr.tsx
index 0c751a7a9..0c751a7a9 100644
--- a/integration/snapshots/react-context-value-func.hmr.tsx
+++ b/test/snapshots/react-context-value-func.hmr.tsx
diff --git a/integration/snapshots/react-context-value-func.tsx b/test/snapshots/react-context-value-func.tsx
index 71b5e5f60..71b5e5f60 100644
--- a/integration/snapshots/react-context-value-func.tsx
+++ b/test/snapshots/react-context-value-func.tsx
diff --git a/integration/snapshots/spread_with_key.debug.tsx b/test/snapshots/spread_with_key.debug.tsx
index e096a76c8..e096a76c8 100644
--- a/integration/snapshots/spread_with_key.debug.tsx
+++ b/test/snapshots/spread_with_key.debug.tsx
diff --git a/integration/snapshots/spread_with_key.hmr.debug.tsx b/test/snapshots/spread_with_key.hmr.debug.tsx
index 0123867ee..0123867ee 100644
--- a/integration/snapshots/spread_with_key.hmr.debug.tsx
+++ b/test/snapshots/spread_with_key.hmr.debug.tsx
diff --git a/integration/snapshots/spread_with_key.hmr.tsx b/test/snapshots/spread_with_key.hmr.tsx
index 37cb57b34..37cb57b34 100644
--- a/integration/snapshots/spread_with_key.hmr.tsx
+++ b/test/snapshots/spread_with_key.hmr.tsx
diff --git a/integration/snapshots/spread_with_key.tsx b/test/snapshots/spread_with_key.tsx
index e096a76c8..e096a76c8 100644
--- a/integration/snapshots/spread_with_key.tsx
+++ b/test/snapshots/spread_with_key.tsx
diff --git a/integration/snapshots/string-escapes.debug.js b/test/snapshots/string-escapes.debug.js
index 9084bc362..9084bc362 100644
--- a/integration/snapshots/string-escapes.debug.js
+++ b/test/snapshots/string-escapes.debug.js
diff --git a/integration/snapshots/string-escapes.hmr.debug.js b/test/snapshots/string-escapes.hmr.debug.js
index a247fc16d..a247fc16d 100644
--- a/integration/snapshots/string-escapes.hmr.debug.js
+++ b/test/snapshots/string-escapes.hmr.debug.js
diff --git a/integration/snapshots/string-escapes.hmr.js b/test/snapshots/string-escapes.hmr.js
index 5847bdf97..5847bdf97 100644
--- a/integration/snapshots/string-escapes.hmr.js
+++ b/test/snapshots/string-escapes.hmr.js
diff --git a/integration/snapshots/string-escapes.js b/test/snapshots/string-escapes.js
index 9084bc362..9084bc362 100644
--- a/integration/snapshots/string-escapes.js
+++ b/test/snapshots/string-escapes.js
diff --git a/integration/snapshots/styled-components-output.hmr.js b/test/snapshots/styled-components-output.hmr.js
index 1bf09ed2d..1bf09ed2d 100644
--- a/integration/snapshots/styled-components-output.hmr.js
+++ b/test/snapshots/styled-components-output.hmr.js
diff --git a/integration/snapshots/styledcomponents-output.debug.js b/test/snapshots/styledcomponents-output.debug.js
index f3a59d365..f3a59d365 100644
--- a/integration/snapshots/styledcomponents-output.debug.js
+++ b/test/snapshots/styledcomponents-output.debug.js
diff --git a/integration/snapshots/styledcomponents-output.hmr.debug.js b/test/snapshots/styledcomponents-output.hmr.debug.js
index 027d5f35b..027d5f35b 100644
--- a/integration/snapshots/styledcomponents-output.hmr.debug.js
+++ b/test/snapshots/styledcomponents-output.hmr.debug.js
diff --git a/integration/snapshots/styledcomponents-output.hmr.js b/test/snapshots/styledcomponents-output.hmr.js
index b39adb87c..b39adb87c 100644
--- a/integration/snapshots/styledcomponents-output.hmr.js
+++ b/test/snapshots/styledcomponents-output.hmr.js
diff --git a/integration/snapshots/styledcomponents-output.js b/test/snapshots/styledcomponents-output.js
index f3a59d365..f3a59d365 100644
--- a/integration/snapshots/styledcomponents-output.js
+++ b/test/snapshots/styledcomponents-output.js
diff --git a/integration/snapshots/template-literal.debug.js b/test/snapshots/template-literal.debug.js
index 2c0d55e8e..2c0d55e8e 100644
--- a/integration/snapshots/template-literal.debug.js
+++ b/test/snapshots/template-literal.debug.js
diff --git a/integration/snapshots/template-literal.hmr.debug.js b/test/snapshots/template-literal.hmr.debug.js
index b5a8ac52b..b5a8ac52b 100644
--- a/integration/snapshots/template-literal.hmr.debug.js
+++ b/test/snapshots/template-literal.hmr.debug.js
diff --git a/integration/snapshots/template-literal.hmr.js b/test/snapshots/template-literal.hmr.js
index 0baee2be1..0baee2be1 100644
--- a/integration/snapshots/template-literal.hmr.js
+++ b/test/snapshots/template-literal.hmr.js
diff --git a/integration/snapshots/template-literal.js b/test/snapshots/template-literal.js
index 2c0d55e8e..2c0d55e8e 100644
--- a/integration/snapshots/template-literal.js
+++ b/test/snapshots/template-literal.js
diff --git a/integration/snapshots/ts-fallback-rewrite-works.debug.js b/test/snapshots/ts-fallback-rewrite-works.debug.js
index 4b0789922..4b0789922 100644
--- a/integration/snapshots/ts-fallback-rewrite-works.debug.js
+++ b/test/snapshots/ts-fallback-rewrite-works.debug.js
diff --git a/integration/snapshots/ts-fallback-rewrite-works.hmr.debug.js b/test/snapshots/ts-fallback-rewrite-works.hmr.debug.js
index 1d59ba0d5..1d59ba0d5 100644
--- a/integration/snapshots/ts-fallback-rewrite-works.hmr.debug.js
+++ b/test/snapshots/ts-fallback-rewrite-works.hmr.debug.js
diff --git a/integration/snapshots/ts-fallback-rewrite-works.hmr.js b/test/snapshots/ts-fallback-rewrite-works.hmr.js
index 09f26c952..09f26c952 100644
--- a/integration/snapshots/ts-fallback-rewrite-works.hmr.js
+++ b/test/snapshots/ts-fallback-rewrite-works.hmr.js
diff --git a/integration/snapshots/ts-fallback-rewrite-works.js b/test/snapshots/ts-fallback-rewrite-works.js
index 4b0789922..4b0789922 100644
--- a/integration/snapshots/ts-fallback-rewrite-works.js
+++ b/test/snapshots/ts-fallback-rewrite-works.js
diff --git a/integration/snapshots/tsx-fallback-rewrite-works.debug.js b/test/snapshots/tsx-fallback-rewrite-works.debug.js
index 5de13ced2..5de13ced2 100644
--- a/integration/snapshots/tsx-fallback-rewrite-works.debug.js
+++ b/test/snapshots/tsx-fallback-rewrite-works.debug.js
diff --git a/integration/snapshots/tsx-fallback-rewrite-works.hmr.debug.js b/test/snapshots/tsx-fallback-rewrite-works.hmr.debug.js
index ea15fc922..ea15fc922 100644
--- a/integration/snapshots/tsx-fallback-rewrite-works.hmr.debug.js
+++ b/test/snapshots/tsx-fallback-rewrite-works.hmr.debug.js
diff --git a/integration/snapshots/tsx-fallback-rewrite-works.hmr.js b/test/snapshots/tsx-fallback-rewrite-works.hmr.js
index b33df25c4..b33df25c4 100644
--- a/integration/snapshots/tsx-fallback-rewrite-works.hmr.js
+++ b/test/snapshots/tsx-fallback-rewrite-works.hmr.js
diff --git a/integration/snapshots/tsx-fallback-rewrite-works.js b/test/snapshots/tsx-fallback-rewrite-works.js
index 5de13ced2..5de13ced2 100644
--- a/integration/snapshots/tsx-fallback-rewrite-works.js
+++ b/test/snapshots/tsx-fallback-rewrite-works.js
diff --git a/integration/snapshots/type-only-imports.debug.ts b/test/snapshots/type-only-imports.debug.ts
index 0a1eb4249..0a1eb4249 100644
--- a/integration/snapshots/type-only-imports.debug.ts
+++ b/test/snapshots/type-only-imports.debug.ts
diff --git a/integration/snapshots/type-only-imports.hmr.debug.ts b/test/snapshots/type-only-imports.hmr.debug.ts
index ff8f4864b..ff8f4864b 100644
--- a/integration/snapshots/type-only-imports.hmr.debug.ts
+++ b/test/snapshots/type-only-imports.hmr.debug.ts
diff --git a/integration/snapshots/type-only-imports.hmr.ts b/test/snapshots/type-only-imports.hmr.ts
index f732881b7..f732881b7 100644
--- a/integration/snapshots/type-only-imports.hmr.ts
+++ b/test/snapshots/type-only-imports.hmr.ts
diff --git a/integration/snapshots/type-only-imports.ts b/test/snapshots/type-only-imports.ts
index 0a1eb4249..0a1eb4249 100644
--- a/integration/snapshots/type-only-imports.ts
+++ b/test/snapshots/type-only-imports.ts
diff --git a/integration/snapshots/unicode-identifiers.debug.js b/test/snapshots/unicode-identifiers.debug.js
index 85b76376e..85b76376e 100644
--- a/integration/snapshots/unicode-identifiers.debug.js
+++ b/test/snapshots/unicode-identifiers.debug.js
diff --git a/integration/snapshots/unicode-identifiers.hmr.debug.js b/test/snapshots/unicode-identifiers.hmr.debug.js
index 53fbb30d5..53fbb30d5 100644
--- a/integration/snapshots/unicode-identifiers.hmr.debug.js
+++ b/test/snapshots/unicode-identifiers.hmr.debug.js
diff --git a/integration/snapshots/unicode-identifiers.hmr.js b/test/snapshots/unicode-identifiers.hmr.js
index be84e436e..be84e436e 100644
--- a/integration/snapshots/unicode-identifiers.hmr.js
+++ b/test/snapshots/unicode-identifiers.hmr.js
diff --git a/integration/snapshots/unicode-identifiers.js b/test/snapshots/unicode-identifiers.js
index 85b76376e..85b76376e 100644
--- a/integration/snapshots/unicode-identifiers.js
+++ b/test/snapshots/unicode-identifiers.js
diff --git a/integration/snapshots/void-shouldnt-delete-call-expressions.debug.js b/test/snapshots/void-shouldnt-delete-call-expressions.debug.js
index 5620ead56..5620ead56 100644
--- a/integration/snapshots/void-shouldnt-delete-call-expressions.debug.js
+++ b/test/snapshots/void-shouldnt-delete-call-expressions.debug.js
diff --git a/integration/snapshots/void-shouldnt-delete-call-expressions.hmr.debug.js b/test/snapshots/void-shouldnt-delete-call-expressions.hmr.debug.js
index bbb0a451c..bbb0a451c 100644
--- a/integration/snapshots/void-shouldnt-delete-call-expressions.hmr.debug.js
+++ b/test/snapshots/void-shouldnt-delete-call-expressions.hmr.debug.js
diff --git a/integration/snapshots/void-shouldnt-delete-call-expressions.hmr.js b/test/snapshots/void-shouldnt-delete-call-expressions.hmr.js
index f2a1dbf18..f2a1dbf18 100644
--- a/integration/snapshots/void-shouldnt-delete-call-expressions.hmr.js
+++ b/test/snapshots/void-shouldnt-delete-call-expressions.hmr.js
diff --git a/integration/snapshots/void-shouldnt-delete-call-expressions.js b/test/snapshots/void-shouldnt-delete-call-expressions.js
index 5620ead56..5620ead56 100644
--- a/integration/snapshots/void-shouldnt-delete-call-expressions.js
+++ b/test/snapshots/void-shouldnt-delete-call-expressions.js
diff --git a/integration/snippets/_auth.js b/test/snippets/_auth.js
index 407090812..407090812 100644
--- a/integration/snippets/_auth.js
+++ b/test/snippets/_auth.js
diff --git a/integration/snippets/_bacon.js b/test/snippets/_bacon.js
index c07ffb9be..c07ffb9be 100644
--- a/integration/snippets/_bacon.js
+++ b/test/snippets/_bacon.js
diff --git a/integration/snippets/_login.js b/test/snippets/_login.js
index b2fc2ef65..b2fc2ef65 100644
--- a/integration/snippets/_login.js
+++ b/test/snippets/_login.js
diff --git a/integration/snippets/array-args-with-default-values.js b/test/snippets/array-args-with-default-values.js
index f733a1bfa..f733a1bfa 100644
--- a/integration/snippets/array-args-with-default-values.js
+++ b/test/snippets/array-args-with-default-values.js
diff --git a/integration/snippets/bun.lockb b/test/snippets/bun.lockb
index 127db7b6d..127db7b6d 100755
--- a/integration/snippets/bun.lockb
+++ b/test/snippets/bun.lockb
diff --git a/integration/snippets/bundled-entry-point.js b/test/snippets/bundled-entry-point.js
index a996f8632..a996f8632 100644
--- a/integration/snippets/bundled-entry-point.js
+++ b/test/snippets/bundled-entry-point.js
diff --git a/integration/snippets/caught-require.js b/test/snippets/caught-require.js
index 6111d2b10..6111d2b10 100644
--- a/integration/snippets/caught-require.js
+++ b/test/snippets/caught-require.js
diff --git a/integration/snippets/cjs-transform-shouldnt-have-static-imports-in-cjs-function.js b/test/snippets/cjs-transform-shouldnt-have-static-imports-in-cjs-function.js
index 1ba6c059d..1ba6c059d 100644
--- a/integration/snippets/cjs-transform-shouldnt-have-static-imports-in-cjs-function.js
+++ b/test/snippets/cjs-transform-shouldnt-have-static-imports-in-cjs-function.js
diff --git a/integration/snippets/code-simplification-neql-define.js b/test/snippets/code-simplification-neql-define.js
index ed5c5c395..ed5c5c395 100644
--- a/integration/snippets/code-simplification-neql-define.js
+++ b/test/snippets/code-simplification-neql-define.js
diff --git a/integration/snippets/custom-emotion-jsx/file.jsx b/test/snippets/custom-emotion-jsx/file.jsx
index c00cb0543..c00cb0543 100644
--- a/integration/snippets/custom-emotion-jsx/file.jsx
+++ b/test/snippets/custom-emotion-jsx/file.jsx
diff --git a/integration/snippets/custom-emotion-jsx/tsconfig.json b/test/snippets/custom-emotion-jsx/tsconfig.json
index 7bb0f58a0..7bb0f58a0 100644
--- a/integration/snippets/custom-emotion-jsx/tsconfig.json
+++ b/test/snippets/custom-emotion-jsx/tsconfig.json
diff --git a/integration/snippets/export-default-module-hot.js b/test/snippets/export-default-module-hot.js
index aee4e2468..aee4e2468 100644
--- a/integration/snippets/export-default-module-hot.js
+++ b/test/snippets/export-default-module-hot.js
diff --git a/integration/snippets/export.js b/test/snippets/export.js
index fe0abfa53..fe0abfa53 100644
--- a/integration/snippets/export.js
+++ b/test/snippets/export.js
diff --git a/integration/snippets/forbid-in-is-correct.js b/test/snippets/forbid-in-is-correct.js
index cdd62bffb..cdd62bffb 100644
--- a/integration/snippets/forbid-in-is-correct.js
+++ b/test/snippets/forbid-in-is-correct.js
diff --git a/integration/snippets/global-is-remapped-to-globalThis.js b/test/snippets/global-is-remapped-to-globalThis.js
index 06b887925..06b887925 100644
--- a/integration/snippets/global-is-remapped-to-globalThis.js
+++ b/test/snippets/global-is-remapped-to-globalThis.js
diff --git a/integration/snippets/jsx-entities.jsx b/test/snippets/jsx-entities.jsx
index adabace2c..adabace2c 100644
--- a/integration/snippets/jsx-entities.jsx
+++ b/test/snippets/jsx-entities.jsx
diff --git a/integration/snippets/jsx-spacing.js b/test/snippets/jsx-spacing.js
index 9b9f28a33..9b9f28a33 100644
--- a/integration/snippets/jsx-spacing.js
+++ b/test/snippets/jsx-spacing.js
diff --git a/integration/snippets/jsx-spacing.jsx b/test/snippets/jsx-spacing.jsx
index b6d13f97a..b6d13f97a 100644
--- a/integration/snippets/jsx-spacing.jsx
+++ b/test/snippets/jsx-spacing.jsx
diff --git a/integration/snippets/jsx-top-level.tsx b/test/snippets/jsx-top-level.tsx
index 2b49b5959..2b49b5959 100644
--- a/integration/snippets/jsx-top-level.tsx
+++ b/test/snippets/jsx-top-level.tsx
diff --git a/integration/snippets/latin1-chars-in-regexp.js b/test/snippets/latin1-chars-in-regexp.js
index e4d613f5e..e4d613f5e 100644
--- a/integration/snippets/latin1-chars-in-regexp.js
+++ b/test/snippets/latin1-chars-in-regexp.js
diff --git a/integration/snippets/lodash-regexp.js b/test/snippets/lodash-regexp.js
index bc683e535..bc683e535 100644
--- a/integration/snippets/lodash-regexp.js
+++ b/test/snippets/lodash-regexp.js
diff --git a/integration/snippets/multiple-imports.js b/test/snippets/multiple-imports.js
index 320d0105e..320d0105e 100644
--- a/integration/snippets/multiple-imports.js
+++ b/test/snippets/multiple-imports.js
diff --git a/integration/snippets/multiple-var.js b/test/snippets/multiple-var.js
index 527634a00..527634a00 100644
--- a/integration/snippets/multiple-var.js
+++ b/test/snippets/multiple-var.js
diff --git a/integration/snippets/number-literal-bug.js b/test/snippets/number-literal-bug.js
index cb6990348..cb6990348 100644
--- a/integration/snippets/number-literal-bug.js
+++ b/test/snippets/number-literal-bug.js
diff --git a/integration/snippets/optional-chain-with-function.js b/test/snippets/optional-chain-with-function.js
index 82ad51d46..82ad51d46 100644
--- a/integration/snippets/optional-chain-with-function.js
+++ b/test/snippets/optional-chain-with-function.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/exact/package.json b/test/snippets/package-json-exports/_node_modules_copy/exact/im-exact.js
index e69de29bb..e69de29bb 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/exact/package.json
+++ b/test/snippets/package-json-exports/_node_modules_copy/exact/im-exact.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/node/index.js b/test/snippets/package-json-exports/_node_modules_copy/exact/package.json
index e69de29bb..e69de29bb 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/node/index.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/exact/package.json
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/browser/dir/file.js b/test/snippets/package-json-exports/_node_modules_copy/inexact/browser/dir/file.js
index 26ab53d5b..26ab53d5b 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/browser/dir/file.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/browser/dir/file.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/browser/dir/foo.js b/test/snippets/package-json-exports/_node_modules_copy/inexact/browser/dir/foo.js
index e54d9d4d6..e54d9d4d6 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/browser/dir/foo.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/browser/dir/foo.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/browser/foo.js b/test/snippets/package-json-exports/_node_modules_copy/inexact/browser/foo.js
index e54d9d4d6..e54d9d4d6 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/browser/foo.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/browser/foo.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/browser/index.js b/test/snippets/package-json-exports/_node_modules_copy/inexact/browser/index.js
index e54d9d4d6..e54d9d4d6 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/browser/index.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/browser/index.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/default/dir/file.js b/test/snippets/package-json-exports/_node_modules_copy/inexact/default/dir/file.js
index 826077c96..826077c96 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/default/dir/file.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/default/dir/file.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/default/dir/foo.js b/test/snippets/package-json-exports/_node_modules_copy/inexact/default/dir/foo.js
index 826077c96..826077c96 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/default/dir/foo.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/default/dir/foo.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/default/foo.js b/test/snippets/package-json-exports/_node_modules_copy/inexact/default/foo.js
index 8fb5eac0c..8fb5eac0c 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/default/foo.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/default/foo.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/default/index.js b/test/snippets/package-json-exports/_node_modules_copy/inexact/default/index.js
index 826077c96..826077c96 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/default/index.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/default/index.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/node/dir/file.js b/test/snippets/package-json-exports/_node_modules_copy/inexact/node/dir/file.js
index 301a88090..301a88090 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/node/dir/file.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/node/dir/file.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/node/dir/foo.js b/test/snippets/package-json-exports/_node_modules_copy/inexact/node/dir/foo.js
index 301a88090..301a88090 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/node/dir/foo.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/node/dir/foo.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/node/foo.js b/test/snippets/package-json-exports/_node_modules_copy/inexact/node/foo.js
index b9504cdf9..b9504cdf9 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/node/foo.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/node/foo.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/index.js b/test/snippets/package-json-exports/_node_modules_copy/inexact/node/index.js
index e69de29bb..e69de29bb 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/index.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/node/index.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/inexact/package.json b/test/snippets/package-json-exports/_node_modules_copy/inexact/package.json
index 1c9b5185d..1c9b5185d 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/inexact/package.json
+++ b/test/snippets/package-json-exports/_node_modules_copy/inexact/package.json
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/dir/file.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/dir/file.js
index 26ab53d5b..26ab53d5b 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/dir/file.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/dir/file.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/dir/foo.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/dir/foo.js
index e54d9d4d6..e54d9d4d6 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/dir/foo.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/dir/foo.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/foo.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/foo.js
index e54d9d4d6..e54d9d4d6 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/foo.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/foo.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/index.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/index.js
index e54d9d4d6..e54d9d4d6 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/index.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/index.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/js-file.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/js-file.js
index ff519c58f..ff519c58f 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/js-file.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/js-file.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/js-file.ts b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/js-file.ts
index 26ab53d5b..26ab53d5b 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/js-file.ts
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/browser/js-file.ts
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/dir/file.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/dir/file.js
index 826077c96..826077c96 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/dir/file.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/dir/file.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/dir/foo.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/dir/foo.js
index 826077c96..826077c96 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/dir/foo.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/dir/foo.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/foo.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/foo.js
index 8fb5eac0c..8fb5eac0c 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/foo.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/foo.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/index.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/index.js
index 826077c96..826077c96 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/index.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/default/index.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/dir/file.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/dir/file.js
index 301a88090..301a88090 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/dir/file.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/dir/file.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/dir/foo.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/dir/foo.js
index 301a88090..301a88090 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/dir/foo.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/dir/foo.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/foo.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/foo.js
index b9504cdf9..b9504cdf9 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/foo.js
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/foo.js
diff --git a/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/index.js b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/index.js
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/node/index.js
diff --git a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/package.json b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/package.json
index baeb185d9..baeb185d9 100644
--- a/integration/snippets/package-json-exports/_node_modules_copy/js-only-exports/package.json
+++ b/test/snippets/package-json-exports/_node_modules_copy/js-only-exports/package.json
diff --git a/integration/snippets/package-json-exports/index.js b/test/snippets/package-json-exports/index.js
index d1946c53f..d1946c53f 100644
--- a/integration/snippets/package-json-exports/index.js
+++ b/test/snippets/package-json-exports/index.js
diff --git a/integration/snippets/package-json-exports/package.json b/test/snippets/package-json-exports/package.json
index 233a02208..233a02208 100644
--- a/integration/snippets/package-json-exports/package.json
+++ b/test/snippets/package-json-exports/package.json
diff --git a/integration/snippets/package-json-utf8.js b/test/snippets/package-json-utf8.js
index a51fbb886..a51fbb886 100644
--- a/integration/snippets/package-json-utf8.js
+++ b/test/snippets/package-json-utf8.js
diff --git a/integration/snippets/package.json b/test/snippets/package.json
index 07b349f86..07b349f86 100644
--- a/integration/snippets/package.json
+++ b/test/snippets/package.json
diff --git a/integration/snippets/public/index.html b/test/snippets/public/index.html
index 225c98d52..225c98d52 100644
--- a/integration/snippets/public/index.html
+++ b/test/snippets/public/index.html
diff --git a/integration/snippets/react-context-value-func.tsx b/test/snippets/react-context-value-func.tsx
index 5f38a5d1c..5f38a5d1c 100644
--- a/integration/snippets/react-context-value-func.tsx
+++ b/test/snippets/react-context-value-func.tsx
diff --git a/integration/snippets/segfault.js b/test/snippets/segfault.js
index 59b030b4d..59b030b4d 100644
--- a/integration/snippets/segfault.js
+++ b/test/snippets/segfault.js
diff --git a/integration/snippets/spread_with_key.tsx b/test/snippets/spread_with_key.tsx
index 9c26ea5ba..9c26ea5ba 100644
--- a/integration/snippets/spread_with_key.tsx
+++ b/test/snippets/spread_with_key.tsx
diff --git a/integration/snippets/string-escapes.js b/test/snippets/string-escapes.js
index 436140939..436140939 100644
--- a/integration/snippets/string-escapes.js
+++ b/test/snippets/string-escapes.js
diff --git a/integration/snippets/styledcomponents-output.js b/test/snippets/styledcomponents-output.js
index a79b5e24d..a79b5e24d 100644
--- a/integration/snippets/styledcomponents-output.js
+++ b/test/snippets/styledcomponents-output.js
diff --git a/integration/snippets/template-literal.js b/test/snippets/template-literal.js
index ff4e08a4d..ff4e08a4d 100644
--- a/integration/snippets/template-literal.js
+++ b/test/snippets/template-literal.js
diff --git a/integration/snippets/ts-fallback-rewrite-works.ts b/test/snippets/ts-fallback-rewrite-works.ts
index 8e6dabcdb..8e6dabcdb 100644
--- a/integration/snippets/ts-fallback-rewrite-works.ts
+++ b/test/snippets/ts-fallback-rewrite-works.ts
diff --git a/integration/snippets/tsx-fallback-rewrite-works.tsx b/test/snippets/tsx-fallback-rewrite-works.tsx
index b18619914..b18619914 100644
--- a/integration/snippets/tsx-fallback-rewrite-works.tsx
+++ b/test/snippets/tsx-fallback-rewrite-works.tsx
diff --git a/integration/snippets/type-only-imports.ts b/test/snippets/type-only-imports.ts
index 447f86793..447f86793 100644
--- a/integration/snippets/type-only-imports.ts
+++ b/test/snippets/type-only-imports.ts
diff --git a/integration/snippets/unicode-identifiers.js b/test/snippets/unicode-identifiers.js
index 5b602f49b..5b602f49b 100644
--- a/integration/snippets/unicode-identifiers.js
+++ b/test/snippets/unicode-identifiers.js
diff --git a/integration/snippets/utf8-package-json.json b/test/snippets/utf8-package-json.json
index aae7ce7b2..aae7ce7b2 100644
--- a/integration/snippets/utf8-package-json.json
+++ b/test/snippets/utf8-package-json.json
diff --git a/integration/snippets/void-shouldnt-delete-call-expressions.js b/test/snippets/void-shouldnt-delete-call-expressions.js
index 380fb591b..380fb591b 100644
--- a/integration/snippets/void-shouldnt-delete-call-expressions.js
+++ b/test/snippets/void-shouldnt-delete-call-expressions.js
diff --git a/integration/snippets/zero.js b/test/snippets/zero.js
index 38f521ff1..38f521ff1 100644
--- a/integration/snippets/zero.js
+++ b/test/snippets/zero.js