diff --git a/.buildkite/bootstrap.yml b/.buildkite/bootstrap.yml
index 1fef8b6cc0..b0b84616b3 100644
--- a/.buildkite/bootstrap.yml
+++ b/.buildkite/bootstrap.yml
@@ -10,9 +10,10 @@ steps:
     blocked_state: "running"
 
   - label: ":pipeline:"
-    command: "buildkite-agent pipeline upload .buildkite/ci.yml"
     agents:
-      queue: "build-linux"
+      queue: "build-darwin"
+    command:
+      - ".buildkite/scripts/prepare-build.sh"
 
   - if: "build.branch == 'main' && !build.pull_request.repository.fork"
     label: ":github:"
diff --git a/.buildkite/ci.yml b/.buildkite/ci.yml
index e586d3ec53..b7aa6f29b2 100644
--- a/.buildkite/ci.yml
+++ b/.buildkite/ci.yml
@@ -25,16 +25,8 @@ steps:
           queue: "build-darwin"
           os: "darwin"
           arch: "aarch64"
-        artifact_paths:
-          - "build/bun-deps/**/*"
-        env:
-          CPU_TARGET: "native"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
-          BUN_DEPS_CACHE_DIR: "$$HOME/.cache/bun-deps"
         command:
-          - "./scripts/all-dependencies.sh"
+          - "./.buildkite/scripts/build-deps.sh"
 
       - key: "darwin-aarch64-build-zig"
         label: ":darwin: aarch64 - build-zig"
@@ -42,15 +34,8 @@ steps:
           queue: "build-darwin"
           os: "darwin"
           arch: "aarch64"
-        artifact_paths:
-          - "build/bun-zig.o"
-        env:
-          CPU_TARGET: "native"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/build-bun-zig.sh darwin aarch64"
+          - "./.buildkite/scripts/build-zig.sh darwin aarch64"
 
       - key: "darwin-aarch64-build-cpp"
         label: ":darwin: aarch64 - build-cpp"
@@ -58,37 +43,8 @@ steps:
           queue: "build-darwin"
           os: "darwin"
           arch: "aarch64"
-        artifact_paths:
-          - "build/bun-cpp-objects.a"
-        env:
-          CPU_TARGET: "native"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/build-bun-cpp.sh"
-
-      - key: "darwin-aarch64-build-bun-nolto"
-        label: ":darwin: aarch64 - build-bun (no-lto)"
-        if: "build.branch != 'main'"
-        depends_on:
-          - "darwin-aarch64-build-deps"
-          - "darwin-aarch64-build-zig"
-          - "darwin-aarch64-build-cpp"
-        agents:
-          queue: "build-darwin"
-          os: "darwin"
-          arch: "aarch64"
-        artifact_paths:
-          - "bun-darwin-aarch64-nolto.zip"
-          - "bun-darwin-aarch64-nolto-profile.zip"
-        env:
-          CPU_TARGET: "native"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
-        command:
-          - "./scripts/buildkite-link-bun.sh --tag darwin-aarch64 --fast"
+          - "./.buildkite/scripts/build-cpp.sh"
 
       - key: "darwin-aarch64-build-bun"
         label: ":darwin: aarch64 - build-bun"
@@ -100,16 +56,8 @@ steps:
           queue: "build-darwin"
           os: "darwin"
           arch: "aarch64"
-        artifact_paths:
-          - "bun-darwin-aarch64.zip"
-          - "bun-darwin-aarch64-profile.zip"
-        env:
-          CPU_TARGET: "native"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/buildkite-link-bun.sh --tag darwin-aarch64"
+          - "./.buildkite/scripts/build-bun.sh"
 
       - key: "darwin-aarch64-test-macos-14"
         label: ":darwin: 14 aarch64 - test-bun"
@@ -129,77 +77,20 @@ steps:
               limit: 3
             - signal: SIGTERM
               limit: 3
-
         depends_on:
-          - "darwin-aarch64-build-bun-nolto"
+          - "darwin-aarch64-build-bun"
         agents:
           queue: "test-darwin"
           os: "darwin"
           arch: "aarch64"
           release: "14"
         command:
-          - "./scripts/runner.node.mjs --step darwin-aarch64-build-bun-nolto"
+          - "./scripts/runner.node.mjs --step darwin-aarch64-build-bun"
 
       - key: "darwin-aarch64-test-macos-13"
         label: ":darwin: 13 aarch64 - test-bun"
         if: "build.branch != 'main'"
         parallelism: 3
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "darwin-aarch64-build-bun-nolto"
-        agents:
-          queue: "test-darwin"
-          os: "darwin"
-          arch: "aarch64"
-          release: "13"
-        command:
-          - "./scripts/runner.node.mjs --step darwin-aarch64-build-bun-nolto"
-
-      - key: "darwin-aarch64-test-macos-14-smoke"
-        label: ":darwin: 14 aarch64 - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "darwin-aarch64-build-bun"
-        agents:
-          queue: "test-darwin"
-          os: "darwin"
-          arch: "aarch64"
-          release: "14"
-        command:
-          - "./scripts/runner.node.mjs --step darwin-aarch64-build-bun --smoke 0.05"
-
-      - key: "darwin-aarch64-test-macos-13-smoke"
-        label: ":darwin: 13 aarch64 - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
         soft_fail:
           - exit_status: 2
         retry:
@@ -222,7 +113,7 @@ steps:
           arch: "aarch64"
           release: "13"
         command:
-          - "./scripts/runner.node.mjs --step darwin-aarch64-build-bun --smoke 0.05"
+          - "./scripts/runner.node.mjs --step darwin-aarch64-build-bun"
 
   # macOS x64
   - key: "darwin-x64"
@@ -234,16 +125,8 @@ steps:
           queue: "build-darwin"
           os: "darwin"
           arch: "x64"
-        artifact_paths:
-          - "build/bun-deps/**/*"
-        env:
-          CPU_TARGET: "haswell"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
-          BUN_DEPS_CACHE_DIR: "$$HOME/.cache/bun-deps"
         command:
-          - "./scripts/all-dependencies.sh"
+          - "./.buildkite/scripts/build-deps.sh"
 
       - key: "darwin-x64-build-zig"
         label: ":darwin: x64 - build-zig"
@@ -251,15 +134,8 @@ steps:
           queue: "build-darwin"
           os: "darwin"
           arch: "aarch64"
-        artifact_paths:
-          - "build/bun-zig.o"
-        env:
-          CPU_TARGET: "haswell"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/build-bun-zig.sh darwin x64"
+          - "./.buildkite/scripts/build-zig.sh darwin x64"
 
       - key: "darwin-x64-build-cpp"
         label: ":darwin: x64 - build-cpp"
@@ -267,37 +143,8 @@ steps:
           queue: "build-darwin"
           os: "darwin"
           arch: "x64"
-        artifact_paths:
-          - "build/bun-cpp-objects.a"
-        env:
-          CPU_TARGET: "haswell"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/build-bun-cpp.sh"
-
-      - key: "darwin-x64-build-bun-nolto"
-        label: ":darwin: x64 - build-bun (no-lto)"
-        if: "build.branch != 'main'"
-        depends_on:
-          - "darwin-x64-build-deps"
-          - "darwin-x64-build-zig"
-          - "darwin-x64-build-cpp"
-        agents:
-          queue: "build-darwin"
-          os: "darwin"
-          arch: "x64"
-        artifact_paths:
-          - "bun-darwin-x64-nolto.zip"
-          - "bun-darwin-x64-nolto-profile.zip"
-        env:
-          CPU_TARGET: "haswell"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
-        command:
-          - "./scripts/buildkite-link-bun.sh --tag darwin-x64 --fast"
+          - "./.buildkite/scripts/build-cpp.sh"
 
       - key: "darwin-x64-build-bun"
         label: ":darwin: x64 - build-bun"
@@ -309,77 +156,13 @@ steps:
           queue: "build-darwin"
           os: "darwin"
           arch: "x64"
-        artifact_paths:
-          - "bun-darwin-x64.zip"
-          - "bun-darwin-x64-profile.zip"
-        env:
-          CPU_TARGET: "haswell"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/buildkite-link-bun.sh --tag darwin-x64"
+          - "./.buildkite/scripts/build-bun.sh"
 
       - key: "darwin-x64-test-macos-14"
         label: ":darwin: 14 x64 - test-bun"
         if: "build.branch != 'main'"
-        parallelism: 3
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "darwin-x64-build-bun-nolto"
-        agents:
-          queue: "test-darwin"
-          os: "darwin"
-          arch: "x64"
-          release: "14"
-        command:
-          - "./scripts/runner.node.mjs --step darwin-x64-build-bun-nolto"
-
-      - key: "darwin-x64-test-macos-13"
-        label: ":darwin: 13 x64 - test-bun"
-        if: "build.branch != 'main'"
-        parallelism: 3
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "darwin-x64-build-bun-nolto"
-        agents:
-          queue: "test-darwin"
-          os: "darwin"
-          arch: "x64"
-          release: "13"
-        command:
-          - "./scripts/runner.node.mjs --step darwin-x64-build-bun-nolto"
-
-      - key: "darwin-x64-test-macos-14-smoke"
-        label: ":darwin: 14 x64 - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
+        parallelism: 2
         soft_fail:
           - exit_status: 2
         retry:
@@ -402,12 +185,12 @@ steps:
           arch: "x64"
           release: "14"
         command:
-          - "./scripts/runner.node.mjs --step darwin-x64-build-bun --smoke 0.05"
+          - "./scripts/runner.node.mjs --step darwin-x64-build-bun"
 
-      - key: "darwin-x64-test-macos-13-smoke"
-        label: ":darwin: 13 x64 - test-bun (smoke)"
+      - key: "darwin-x64-test-macos-13"
+        label: ":darwin: 13 x64 - test-bun"
         if: "build.branch != 'main'"
-        parallelism: 1
+        parallelism: 2
         soft_fail:
           - exit_status: 2
         retry:
@@ -423,14 +206,14 @@ steps:
             - signal: SIGTERM
               limit: 3
         depends_on:
-          - "darwin-x64-build-bun-nolto"
+          - "darwin-x64-build-bun"
         agents:
           queue: "test-darwin"
           os: "darwin"
           arch: "x64"
           release: "13"
         command:
-          - "./scripts/runner.node.mjs --step darwin-x64-build-bun --smoke 0.05"
+          - "./scripts/runner.node.mjs --step darwin-x64-build-bun"
 
   # Linux aarch64
   - key: "linux-aarch64"
@@ -442,16 +225,8 @@ steps:
           queue: "build-linux"
           os: "linux"
           arch: "aarch64"
-        artifact_paths:
-          - "build/bun-deps/**/*"
-        env:
-          CPU_TARGET: "native"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
-          BUN_DEPS_CACHE_DIR: "$$HOME/.cache/bun-deps"
         command:
-          - "./scripts/all-dependencies.sh"
+          - "./.buildkite/scripts/build-deps.sh"
 
       - key: "linux-aarch64-build-zig"
         label: ":linux: aarch64 - build-zig"
@@ -459,15 +234,8 @@ steps:
           queue: "build-darwin"
           os: "darwin"
           arch: "aarch64"
-        artifact_paths:
-          - "build/bun-zig.o"
-        env:
-          CPU_TARGET: "native"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/build-bun-zig.sh linux aarch64"
+          - "./.buildkite/scripts/build-zig.sh linux aarch64"
 
       - key: "linux-aarch64-build-cpp"
         label: ":linux: aarch64 - build-cpp"
@@ -475,37 +243,8 @@ steps:
           queue: "build-linux"
           os: "linux"
           arch: "aarch64"
-        artifact_paths:
-          - "build/bun-cpp-objects.a"
-        env:
-          CPU_TARGET: "native"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/build-bun-cpp.sh"
-
-      - key: "linux-aarch64-build-bun-nolto"
-        label: ":linux: aarch64 - build-bun (no-lto)"
-        if: "build.branch != 'main'"
-        depends_on:
-          - "linux-aarch64-build-deps"
-          - "linux-aarch64-build-zig"
-          - "linux-aarch64-build-cpp"
-        agents:
-          queue: "build-linux"
-          os: "linux"
-          arch: "aarch64"
-        artifact_paths:
-          - "bun-linux-aarch64-nolto.zip"
-          - "bun-linux-aarch64-nolto-profile.zip"
-        env:
-          CPU_TARGET: "native"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
-        command:
-          - "./scripts/buildkite-link-bun.sh --tag linux-aarch64 --fast"
+          - "./.buildkite/scripts/build-cpp.sh"
 
       - key: "linux-aarch64-build-bun"
         label: ":linux: aarch64 - build-bun"
@@ -517,16 +256,8 @@ steps:
           queue: "build-linux"
           os: "linux"
           arch: "aarch64"
-        artifact_paths:
-          - "bun-linux-aarch64.zip"
-          - "bun-linux-aarch64-profile.zip"
-        env:
-          CPU_TARGET: "native"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/buildkite-link-bun.sh --tag linux-aarch64"
+          - "./.buildkite/scripts/build-bun.sh"
 
       - key: "linux-aarch64-test-debian-12"
         label: ":debian: 12 aarch64 - test-bun"
@@ -547,7 +278,7 @@ steps:
             - signal: SIGTERM
               limit: 3
         depends_on:
-          - "linux-aarch64-build-bun-nolto"
+          - "linux-aarch64-build-bun"
         agents:
           robobun: "true"
           os: "linux"
@@ -555,7 +286,7 @@ steps:
           distro: "debian"
           release: "12"
         command:
-          - "./scripts/runner.node.mjs --step linux-aarch64-build-bun-nolto"
+          - "./scripts/runner.node.mjs --step linux-aarch64-build-bun"
 
       - key: "linux-aarch64-test-ubuntu-2204"
         label: ":ubuntu: 22.04 aarch64 - test-bun"
@@ -576,7 +307,7 @@ steps:
             - signal: SIGTERM
               limit: 3
         depends_on:
-          - "linux-aarch64-build-bun-nolto"
+          - "linux-aarch64-build-bun"
         agents:
           robobun: "true"
           os: "linux"
@@ -584,99 +315,12 @@ steps:
           distro: "ubuntu"
           release: "22.04"
         command:
-          - "./scripts/runner.node.mjs --step linux-aarch64-build-bun-nolto"
+          - "./scripts/runner.node.mjs --step linux-aarch64-build-bun"
 
       - key: "linux-aarch64-test-ubuntu-2004"
         label: ":ubuntu: 20.04 aarch64 - test-bun"
         if: "build.branch != 'main'"
         parallelism: 5
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "linux-aarch64-build-bun-nolto"
-        agents:
-          robobun: "true"
-          os: "linux"
-          arch: "aarch64"
-          distro: "ubuntu"
-          release: "20.04"
-        command:
-          - "./scripts/runner.node.mjs --step linux-aarch64-build-bun-nolto"
-
-      - key: "linux-aarch64-test-debian-12-smoke"
-        label: ":debian: 12 aarch64 - test-bun-smoke"
-        if: "build.branch != 'main'"
-        parallelism: 1
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "linux-aarch64-build-bun"
-        agents:
-          robobun: "true"
-          os: "linux"
-          arch: "aarch64"
-          distro: "debian"
-          release: "12"
-        command:
-          - "./scripts/runner.node.mjs --step linux-aarch64-build-bun --smoke 0.05"
-
-      - key: "linux-aarch64-test-ubuntu-2204-smoke"
-        label: ":ubuntu: 22.04 aarch64 - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "linux-aarch64-build-bun"
-        agents:
-          robobun: "true"
-          os: "linux"
-          arch: "aarch64"
-          distro: "ubuntu"
-          release: "22.04"
-        command:
-          - "./scripts/runner.node.mjs --step linux-aarch64-build-bun --smoke 0.05"
-
-      - key: "linux-aarch64-test-ubuntu-2004-smoke"
-        label: ":ubuntu: 20.04 aarch64 - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
         soft_fail:
           - exit_status: 2
         retry:
@@ -700,7 +344,7 @@ steps:
           distro: "ubuntu"
           release: "20.04"
         command:
-          - "./scripts/runner.node.mjs --step linux-aarch64-build-bun --smoke 0.05"
+          - "./scripts/runner.node.mjs --step linux-aarch64-build-bun"
 
   # Linux x64
   - key: "linux-x64"
@@ -712,16 +356,8 @@ steps:
           queue: "build-linux"
           os: "linux"
           arch: "x64"
-        artifact_paths:
-          - "build/bun-deps/**/*"
-        env:
-          CPU_TARGET: "haswell"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
-          BUN_DEPS_CACHE_DIR: "$$HOME/.cache/bun-deps"
         command:
-          - "./scripts/all-dependencies.sh"
+          - "./.buildkite/scripts/build-deps.sh"
 
       - key: "linux-x64-build-zig"
         label: ":linux: x64 - build-zig"
@@ -729,15 +365,8 @@ steps:
           queue: "build-darwin"
           os: "darwin"
           arch: "aarch64"
-        artifact_paths:
-          - "build/bun-zig.o"
-        env:
-          CPU_TARGET: "haswell"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/build-bun-zig.sh linux x64"
+          - "./.buildkite/scripts/build-zig.sh linux x64"
 
       - key: "linux-x64-build-cpp"
         label: ":linux: x64 - build-cpp"
@@ -745,37 +374,8 @@ steps:
           queue: "build-linux"
           os: "linux"
           arch: "x64"
-        artifact_paths:
-          - "build/bun-cpp-objects.a"
-        env:
-          CPU_TARGET: "haswell"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/build-bun-cpp.sh"
-
-      - key: "linux-x64-build-bun-nolto"
-        label: ":linux: x64 - build-bun (no-lto)"
-        if: "build.branch != 'main'"
-        depends_on:
-          - "linux-x64-build-deps"
-          - "linux-x64-build-zig"
-          - "linux-x64-build-cpp"
-        agents:
-          queue: "build-linux"
-          os: "linux"
-          arch: "x64"
-        artifact_paths:
-          - "bun-linux-x64-nolto.zip"
-          - "bun-linux-x64-nolto-profile.zip"
-        env:
-          CPU_TARGET: "haswell"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
-        command:
-          - "./scripts/buildkite-link-bun.sh --tag linux-x64 --fast"
+          - "./.buildkite/scripts/build-cpp.sh"
 
       - key: "linux-x64-build-bun"
         label: ":linux: x64 - build-bun"
@@ -787,16 +387,8 @@ steps:
           queue: "build-linux"
           os: "linux"
           arch: "x64"
-        artifact_paths:
-          - "bun-linux-x64.zip"
-          - "bun-linux-x64-profile.zip"
-        env:
-          CPU_TARGET: "haswell"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/buildkite-link-bun.sh --tag linux-x64"
+          - "./.buildkite/scripts/build-bun.sh"
 
       - key: "linux-x64-test-debian-12"
         label: ":debian: 12 x64 - test-bun"
@@ -817,7 +409,7 @@ steps:
             - signal: SIGTERM
               limit: 3
         depends_on:
-          - "linux-x64-build-bun-nolto"
+          - "linux-x64-build-bun"
         agents:
           robobun: "true"
           os: "linux"
@@ -825,7 +417,7 @@ steps:
           distro: "debian"
           release: "12"
         command:
-          - "./scripts/runner.node.mjs --step linux-x64-build-bun-nolto"
+          - "./scripts/runner.node.mjs --step linux-x64-build-bun"
 
       - key: "linux-x64-test-ubuntu-2204"
         label: ":ubuntu: 22.04 x64 - test-bun"
@@ -846,7 +438,7 @@ steps:
             - signal: SIGTERM
               limit: 3
         depends_on:
-          - "linux-x64-build-bun-nolto"
+          - "linux-x64-build-bun"
         agents:
           robobun: "true"
           os: "linux"
@@ -854,99 +446,12 @@ steps:
           distro: "ubuntu"
           release: "22.04"
         command:
-          - "./scripts/runner.node.mjs --step linux-x64-build-bun-nolto"
+          - "./scripts/runner.node.mjs --step linux-x64-build-bun"
 
       - key: "linux-x64-test-ubuntu-2004"
         label: ":ubuntu: 20.04 x64 - test-bun"
         if: "build.branch != 'main'"
         parallelism: 5
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "linux-x64-build-bun-nolto"
-        agents:
-          robobun: "true"
-          os: "linux"
-          arch: "x64"
-          distro: "ubuntu"
-          release: "20.04"
-        command:
-          - "./scripts/runner.node.mjs --step linux-x64-build-bun-nolto"
-
-      - key: "linux-x64-test-debian-12-smoke"
-        label: ":debian: 12 x64 - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "linux-x64-build-bun"
-        agents:
-          robobun: "true"
-          os: "linux"
-          arch: "x64"
-          distro: "debian"
-          release: "12"
-        command:
-          - "./scripts/runner.node.mjs --step linux-x64-build-bun --smoke 0.05"
-
-      - key: "linux-x64-test-ubuntu-2204-smoke"
-        label: ":ubuntu: 22.04 x64 - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "linux-x64-build-bun"
-        agents:
-          robobun: "true"
-          os: "linux"
-          arch: "x64"
-          distro: "ubuntu"
-          release: "22.04"
-        command:
-          - "./scripts/runner.node.mjs --step linux-x64-build-bun --smoke 0.05"
-
-      - key: "linux-x64-test-ubuntu-2004-smoke"
-        label: ":ubuntu: 20.04 x64 - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
         soft_fail:
           - exit_status: 2
         retry:
@@ -970,7 +475,7 @@ steps:
           distro: "ubuntu"
           release: "20.04"
         command:
-          - "./scripts/runner.node.mjs --step linux-x64-build-bun --smoke 0.05"
+          - "./scripts/runner.node.mjs --step linux-x64-build-bun"
 
   # Linux x64-baseline
   - key: "linux-x64-baseline"
@@ -982,16 +487,8 @@ steps:
           queue: "build-linux"
           os: "linux"
           arch: "x64"
-        artifact_paths:
-          - "build/bun-deps/**/*"
-        env:
-          CPU_TARGET: "nehalem"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
-          BUN_DEPS_CACHE_DIR: "$$HOME/.cache/bun-deps"
         command:
-          - "./scripts/all-dependencies.sh"
+          - "./.buildkite/scripts/build-deps.sh"
 
       - key: "linux-x64-baseline-build-zig"
         label: ":linux: x64-baseline - build-zig"
@@ -999,15 +496,8 @@ steps:
           queue: "build-darwin"
           os: "darwin"
           arch: "aarch64"
-        artifact_paths:
-          - "build/bun-zig.o"
-        env:
-          CPU_TARGET: "nehalem"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/build-bun-zig.sh linux x64"
+          - "./.buildkite/scripts/build-zig.sh linux x64"
 
       - key: "linux-x64-baseline-build-cpp"
         label: ":linux: x64-baseline - build-cpp"
@@ -1015,37 +505,8 @@ steps:
           queue: "build-linux"
           os: "linux"
           arch: "x64"
-        artifact_paths:
-          - "build/bun-cpp-objects.a"
-        env:
-          CPU_TARGET: "nehalem"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/build-bun-cpp.sh"
-
-      - key: "linux-x64-baseline-build-bun-nolto"
-        label: ":linux: x64-baseline - build-bun (no-lto)"
-        if: "build.branch != 'main'"
-        depends_on:
-          - "linux-x64-baseline-build-deps"
-          - "linux-x64-baseline-build-zig"
-          - "linux-x64-baseline-build-cpp"
-        agents:
-          queue: "build-linux"
-          os: "linux"
-          arch: "x64"
-        artifact_paths:
-          - "bun-linux-x64-baseline-nolto.zip"
-          - "bun-linux-x64-baseline-nolto-profile.zip"
-        env:
-          CPU_TARGET: "nehalem"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
-        command:
-          - "./scripts/buildkite-link-bun.sh --tag linux-x64-baseline --fast"
+          - "./.buildkite/scripts/build-cpp.sh"
 
       - key: "linux-x64-baseline-build-bun"
         label: ":linux: x64-baseline - build-bun"
@@ -1057,16 +518,8 @@ steps:
           queue: "build-linux"
           os: "linux"
           arch: "x64"
-        artifact_paths:
-          - "bun-linux-x64-baseline.zip"
-          - "bun-linux-x64-baseline-profile.zip"
-        env:
-          CPU_TARGET: "nehalem"
-          CCACHE_DIR: "$$HOME/.cache/ccache"
-          SCCACHE_DIR: "$$HOME/.cache/sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME/.cache/zig-cache"
         command:
-          - "./scripts/buildkite-link-bun.sh --tag linux-x64-baseline"
+          - "./.buildkite/scripts/build-bun.sh"
 
       - key: "linux-x64-baseline-test-debian-12"
         label: ":debian: 12 x64-baseline - test-bun"
@@ -1087,7 +540,7 @@ steps:
             - signal: SIGTERM
               limit: 3
         depends_on:
-          - "linux-x64-baseline-build-bun-nolto"
+          - "linux-x64-baseline-build-bun"
         agents:
           robobun: "true"
           os: "linux"
@@ -1095,7 +548,7 @@ steps:
           distro: "debian"
           release: "12"
         command:
-          - "./scripts/runner.node.mjs --step linux-x64-baseline-build-bun-nolto"
+          - "./scripts/runner.node.mjs --step linux-x64-baseline-build-bun"
 
       - key: "linux-x64-baseline-test-ubuntu-2204"
         label: ":ubuntu: 22.04 x64-baseline - test-bun"
@@ -1116,7 +569,7 @@ steps:
             - signal: SIGTERM
               limit: 3
         depends_on:
-          - "linux-x64-baseline-build-bun-nolto"
+          - "linux-x64-baseline-build-bun"
         agents:
           robobun: "true"
           os: "linux"
@@ -1124,99 +577,12 @@ steps:
           distro: "ubuntu"
           release: "22.04"
         command:
-          - "./scripts/runner.node.mjs --step linux-x64-baseline-build-bun-nolto"
+          - "./scripts/runner.node.mjs --step linux-x64-baseline-build-bun"
 
       - key: "linux-x64-baseline-test-ubuntu-2004"
         label: ":ubuntu: 20.04 x64-baseline - test-bun"
         if: "build.branch != 'main'"
         parallelism: 5
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "linux-x64-baseline-build-bun-nolto"
-        agents:
-          robobun: "true"
-          os: "linux"
-          arch: "x64"
-          distro: "ubuntu"
-          release: "20.04"
-        command:
-          - "./scripts/runner.node.mjs --step linux-x64-baseline-build-bun-nolto"
-
-      - key: "linux-x64-baseline-test-debian-12-smoke"
-        label: ":debian: 12 x64-baseline - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "linux-x64-baseline-build-bun"
-        agents:
-          robobun: "true"
-          os: "linux"
-          arch: "x64"
-          distro: "debian"
-          release: "12"
-        command:
-          - "./scripts/runner.node.mjs --step linux-x64-baseline-build-bun --smoke 0.05"
-
-      - key: "linux-x64-baseline-test-ubuntu-2204-smoke"
-        label: ":ubuntu: 22.04 x64-baseline - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
-        soft_fail:
-          - exit_status: 2
-        retry:
-          automatic:
-            - exit_status: 1
-              limit: 1
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "linux-x64-baseline-build-bun"
-        agents:
-          robobun: "true"
-          os: "linux"
-          arch: "x64"
-          distro: "ubuntu"
-          release: "22.04"
-        command:
-          - "./scripts/runner.node.mjs --step linux-x64-baseline-build-bun --smoke 0.05"
-
-      - key: "linux-x64-baseline-test-ubuntu-2004-smoke"
-        label: ":ubuntu: 20.04 x64-baseline - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
         soft_fail:
           - exit_status: 2
         retry:
@@ -1240,7 +606,7 @@ steps:
           distro: "ubuntu"
           release: "20.04"
         command:
-          - "./scripts/runner.node.mjs --step linux-x64-baseline-build-bun --smoke 0.05"
+          - "./scripts/runner.node.mjs --step linux-x64-baseline-build-bun"
 
   # Windows x64
   - key: "windows-x64"
@@ -1255,9 +621,9 @@ steps:
         artifact_paths:
           - "build\\bun-deps\\*.lib"
         env:
-          CPU_TARGET: "haswell"
           SCCACHE_DIR: "$$HOME\\.cache\\sccache"
           ZIG_LOCAL_CACHE_DIR: "$$HOME\\.cache\\zig-cache"
+          SCCACHE_IGNORE_SERVER_IO_ERROR: "1"
         command:
           - ".\\scripts\\all-dependencies.ps1"
 
@@ -1267,14 +633,8 @@ steps:
           queue: "build-darwin"
           os: "darwin" # cross-compile on Linux or Darwin
           arch: "aarch64"
-        artifact_paths:
-          - "build/bun-zig.o"
-        env:
-          CPU_TARGET: "haswell"
-          SCCACHE_DIR: "$$HOME\\.cache\\sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME\\.cache\\zig-cache"
         command:
-          - "./scripts/build-bun-zig.sh windows x64"
+          - "./.buildkite/scripts/build-zig.sh windows x64"
 
       - key: "windows-x64-build-cpp"
         label: ":windows: x64 - build-cpp"
@@ -1283,31 +643,11 @@ steps:
           os: "windows"
           arch: "x64"
         artifact_paths:
-          - "build\\bun-cpp-objects.a"
+          # HACK: See scripts/build-bun-cpp.ps1
+          # - "build\\bun-cpp-objects.a"
+          - "build\\bun-cpp-objects.a.*"
         command:
-          - ".\\scripts\\build-bun-cpp.ps1 -Fast $$True"
-
-      - key: "windows-x64-build-bun-nolto"
-        label: ":windows: x64 - build-bun (no-lto)"
-        if: "build.branch != 'main'"
-        depends_on:
-          - "windows-x64-build-deps"
-          - "windows-x64-build-zig"
-          - "windows-x64-build-cpp"
-        agents:
-          queue: "build-windows"
-          os: "windows"
-          arch: "x64"
-        artifact_paths:
-          - "bun-windows-x64-nolto.zip"
-          - "bun-windows-x64-nolto-profile.zip"
-          - "features.json"
-        env:
-          CPU_TARGET: "haswell"
-          SCCACHE_DIR: "$$HOME\\.cache\\sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME\\.cache\\zig-cache"
-        command:
-          - ".\\scripts\\buildkite-link-bun.ps1 -Fast $$True"
+          - ".\\scripts\\build-bun-cpp.ps1"
 
       - key: "windows-x64-build-bun"
         label: ":windows: x64 - build-bun"
@@ -1324,9 +664,9 @@ steps:
           - "bun-windows-x64-profile.zip"
           - "features.json"
         env:
-          CPU_TARGET: "haswell"
           SCCACHE_DIR: "$$HOME\\.cache\\sccache"
           ZIG_LOCAL_CACHE_DIR: "$$HOME\\.cache\\zig-cache"
+          SCCACHE_IGNORE_SERVER_IO_ERROR: "1"
         command:
           - ".\\scripts\\buildkite-link-bun.ps1"
 
@@ -1334,31 +674,6 @@ steps:
         label: ":windows: x64 - test-bun"
         if: "build.branch != 'main'"
         parallelism: 10
-        soft_fail:
-          - exit_status: 1
-        retry:
-          automatic:
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "windows-x64-build-bun-nolto"
-        agents:
-          robobun: "true"
-          os: "windows"
-          arch: "x64"
-        command:
-          - "node .\\scripts\\runner.node.mjs --step windows-x64-build-bun-nolto"
-
-      - key: "windows-x64-test-bun-smoke"
-        label: ":windows: x64 - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
         soft_fail:
           - exit_status: 1
         retry:
@@ -1378,7 +693,7 @@ steps:
           os: "windows"
           arch: "x64"
         command:
-          - "node .\\scripts\\runner.node.mjs --step windows-x64-build-bun --smoke 0.05"
+          - "node .\\scripts\\runner.node.mjs --step windows-x64-build-bun"
 
   # Windows x64-baseline
   - key: "windows-x64-baseline"
@@ -1393,9 +708,10 @@ steps:
         artifact_paths:
           - "build\\bun-deps\\*.lib"
         env:
-          CPU_TARGET: "nehalem"
           SCCACHE_DIR: "$$HOME\\.cache\\sccache"
           ZIG_LOCAL_CACHE_DIR: "$$HOME\\.cache\\zig-cache"
+          SCCACHE_IGNORE_SERVER_IO_ERROR: "1"
+          USE_BASELINE_BUILD: "1"
         command:
           - ".\\scripts\\all-dependencies.ps1"
 
@@ -1405,14 +721,8 @@ steps:
           queue: "build-darwin"
           os: "darwin" # cross-compile on Linux or Darwin
           arch: "aarch64"
-        artifact_paths:
-          - "build/bun-zig.o"
-        env:
-          CPU_TARGET: "nehalem"
-          SCCACHE_DIR: "$$HOME\\.cache\\sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME\\.cache\\zig-cache"
         command:
-          - "./scripts/build-bun-zig.sh windows x64"
+          - "./.buildkite/scripts/build-zig.sh windows x64"
 
       - key: "windows-x64-baseline-build-cpp"
         label: ":windows: x64-baseline - build-cpp"
@@ -1421,35 +731,16 @@ steps:
           os: "windows"
           arch: "x64"
         artifact_paths:
-          - "build\\bun-cpp-objects.a"
+          # HACK: See scripts/build-bun-cpp.ps1
+          # - "build\\bun-cpp-objects.a"
+          - "build\\bun-cpp-objects.a.*"
         env:
-          CPU_TARGET: "nehalem"
           SCCACHE_DIR: "$$HOME\\.cache\\sccache"
           ZIG_LOCAL_CACHE_DIR: "$$HOME\\.cache\\zig-cache"
+          SCCACHE_IGNORE_SERVER_IO_ERROR: "1"
+          USE_BASELINE_BUILD: "1"
         command:
-          - ".\\scripts\\build-bun-cpp.ps1 -Baseline $$True"
-
-      - key: "windows-x64-baseline-build-bun-nolto"
-        label: ":windows: x64-baseline - build-bun (no-lto)"
-        if: "build.branch != 'main'"
-        depends_on:
-          - "windows-x64-baseline-build-deps"
-          - "windows-x64-baseline-build-zig"
-          - "windows-x64-baseline-build-cpp"
-        agents:
-          queue: "build-windows"
-          os: "windows"
-          arch: "x64"
-        artifact_paths:
-          - "bun-windows-x64-baseline-nolto.zip"
-          - "bun-windows-x64-baseline-nolto-profile.zip"
-          - "features.json"
-        env:
-          CPU_TARGET: "nehalem"
-          SCCACHE_DIR: "$$HOME\\.cache\\sccache"
-          ZIG_LOCAL_CACHE_DIR: "$$HOME\\.cache\\zig-cache"
-        command:
-          - ".\\scripts\\buildkite-link-bun.ps1 -Baseline $$True -Fast $$True"
+          - ".\\scripts\\build-bun-cpp.ps1"
 
       - key: "windows-x64-baseline-build-bun"
         label: ":windows: x64-baseline - build-bun"
@@ -1466,9 +757,10 @@ steps:
           - "bun-windows-x64-baseline-profile.zip"
           - "features.json"
         env:
-          CPU_TARGET: "nehalem"
           SCCACHE_DIR: "$$HOME\\.cache\\sccache"
           ZIG_LOCAL_CACHE_DIR: "$$HOME\\.cache\\zig-cache"
+          SCCACHE_IGNORE_SERVER_IO_ERROR: "1"
+          USE_BASELINE_BUILD: "1"
         command:
           - ".\\scripts\\buildkite-link-bun.ps1 -Baseline $$True"
 
@@ -1476,31 +768,6 @@ steps:
         label: ":windows: x64-baseline - test-bun"
         if: "build.branch != 'main'"
         parallelism: 10
-        soft_fail:
-          - exit_status: 1
-        retry:
-          automatic:
-            - exit_status: -1
-              limit: 3
-            - exit_status: 255
-              limit: 3
-            - signal_reason: agent_stop
-              limit: 3
-            - signal: SIGTERM
-              limit: 3
-        depends_on:
-          - "windows-x64-baseline-build-bun-nolto"
-        agents:
-          robobun: "true"
-          os: "windows"
-          arch: "x64"
-        command:
-          - "node .\\scripts\\runner.node.mjs --step windows-x64-baseline-build-bun-nolto"
-
-      - key: "windows-x64-baseline-test-bun-smoke"
-        label: ":windows: x64-baseline - test-bun (smoke)"
-        if: "build.branch != 'main'"
-        parallelism: 1
         soft_fail:
           - exit_status: 1
         retry:
@@ -1520,4 +787,4 @@ steps:
           os: "windows"
           arch: "x64"
         command:
-          - "node .\\scripts\\runner.node.mjs --step windows-x64-baseline-build-bun --smoke 0.05"
+          - "node .\\scripts\\runner.node.mjs --step windows-x64-baseline-build-bun"
diff --git a/.buildkite/scripts/build-bun.sh b/.buildkite/scripts/build-bun.sh
new file mode 100755
index 0000000000..59363a39fd
--- /dev/null
+++ b/.buildkite/scripts/build-bun.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+set -eo pipefail
+source "$(dirname "$0")/env.sh"
+
+function run_command() {
+  set -x
+  "$@"
+  { set +x; } 2>/dev/null
+}
+
+cwd="$(pwd)"
+
+mkdir -p build
+source "$(dirname "$0")/download-artifact.sh" "build/bun-deps/**" --step "$BUILDKITE_GROUP_KEY-build-deps"
+source "$(dirname "$0")/download-artifact.sh" "build/bun-zig.o" --step "$BUILDKITE_GROUP_KEY-build-zig"
+source "$(dirname "$0")/download-artifact.sh" "build/bun-cpp-objects.a" --step "$BUILDKITE_GROUP_KEY-build-cpp" --split
+cd build
+
+run_command cmake .. "${CMAKE_FLAGS[@]}" \
+  -GNinja \
+  -DBUN_LINK_ONLY="1" \
+  -DNO_CONFIGURE_DEPENDS="1" \
+  -DBUN_ZIG_OBJ_DIR="$cwd/build" \
+  -DBUN_CPP_ARCHIVE="$cwd/build/bun-cpp-objects.a" \
+  -DBUN_DEPS_OUT_DIR="$cwd/build/bun-deps" \
+  -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
+  -DCPU_TARGET="$CPU_TARGET" \
+  -DUSE_LTO="$USE_LTO" \
+  -DUSE_DEBUG_JSC="$USE_DEBUG_JSC" \
+  -DCANARY="$CANARY" \
+  -DGIT_SHA="$GIT_SHA"
+run_command ninja -v -j "$CPUS"
+run_command ls
+
+tag="bun-$BUILDKITE_GROUP_KEY"
+if [ "$USE_LTO" == "OFF" ]; then
+  # Remove OS check when LTO is enabled on macOS again
+  if [[ "$tag" == *"darwin"* ]]; then
+    tag="$tag-nolto"
+  fi
+fi
+
+for name in bun bun-profile; do
+  dir="$tag"
+  if [ "$name" == "bun-profile" ]; then
+    dir="$tag-profile"
+  fi
+  run_command chmod +x "$name"
+  run_command "./$name" --revision
+  run_command mkdir -p "$dir"
+  run_command mv "$name" "$dir/$name"
+  run_command zip -r "$dir.zip" "$dir"
+  source "$cwd/.buildkite/scripts/upload-artifact.sh" "$dir.zip"
+done
diff --git a/.buildkite/scripts/build-cpp.sh b/.buildkite/scripts/build-cpp.sh
new file mode 100755
index 0000000000..f307918189
--- /dev/null
+++ b/.buildkite/scripts/build-cpp.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -eo pipefail
+source "$(dirname "$0")/env.sh"
+source "$(realpath $(dirname "$0")/../../scripts/update-submodules.sh)"
+{ set +x; } 2>/dev/null
+
+function run_command() {
+  set -x
+  "$@"
+  { set +x; } 2>/dev/null
+}
+
+mkdir -p build
+cd build
+mkdir -p tmp_modules tmp_functions js codegen
+
+run_command cmake .. "${CMAKE_FLAGS[@]}" \
+  -GNinja \
+  -DBUN_CPP_ONLY="1" \
+  -DNO_CONFIGURE_DEPENDS="1" \
+  -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
+  -DCPU_TARGET="$CPU_TARGET" \
+  -DUSE_LTO="$USE_LTO" \
+  -DUSE_DEBUG_JSC="$USE_DEBUG_JSC" \
+  -DCANARY="$CANARY" \
+  -DGIT_SHA="$GIT_SHA"
+
+chmod +x compile-cpp-only.sh
+source compile-cpp-only.sh -v -j "$CPUS"
+{ set +x; } 2>/dev/null
+
+cd ..
+source "$(dirname "$0")/upload-artifact.sh" "build/bun-cpp-objects.a" --split
diff --git a/.buildkite/scripts/build-deps.ps1 b/.buildkite/scripts/build-deps.ps1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.buildkite/scripts/build-deps.sh b/.buildkite/scripts/build-deps.sh
new file mode 100755
index 0000000000..e736fb43ff
--- /dev/null
+++ b/.buildkite/scripts/build-deps.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -eo pipefail
+source "$(dirname "$0")/env.sh"
+source "$(realpath $(dirname "$0")/../../scripts/all-dependencies.sh)"
+
+artifacts=(
+  libcrypto.a libssl.a libdecrepit.a
+  libcares.a
+  libarchive.a
+  liblolhtml.a
+  libmimalloc.a libmimalloc.o
+  libtcc.a
+  libz.a
+  libzstd.a
+  libdeflate.a
+  liblshpack.a
+)
+
+for artifact in "${artifacts[@]}"; do
+  source "$(dirname "$0")/upload-artifact.sh" "build/bun-deps/$artifact"
+done
diff --git a/.buildkite/scripts/build-old-js.sh b/.buildkite/scripts/build-old-js.sh
new file mode 100755
index 0000000000..92484aebe1
--- /dev/null
+++ b/.buildkite/scripts/build-old-js.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -eo pipefail
+source "$(dirname "$0")/env.sh"
+
+function assert_bun() {
+  if ! command -v bun &>/dev/null; then
+    echo "error: bun is not installed" 1>&2
+    exit 1
+  fi
+}
+
+function assert_make() {
+  if ! command -v make &>/dev/null; then
+    echo "error: make is not installed" 1>&2
+    exit 1
+  fi
+}
+
+function run_command() {
+  set -x
+  "$@"
+  { set +x; } 2>/dev/null
+}
+
+function build_node_fallbacks() {
+  local cwd="src/node-fallbacks"
+  run_command bun install --cwd "$cwd" --frozen-lockfile
+  run_command bun run --cwd "$cwd" build
+}
+
+function build_old_js() {
+  run_command bun install --frozen-lockfile
+  run_command make runtime_js fallback_decoder bun_error
+}
+
+assert_bun
+assert_make
+build_node_fallbacks
+build_old_js
diff --git a/.buildkite/scripts/build-zig.sh b/.buildkite/scripts/build-zig.sh
new file mode 100755
index 0000000000..e7a2614556
--- /dev/null
+++ b/.buildkite/scripts/build-zig.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+set -eo pipefail
+source "$(dirname "$0")/env.sh"
+
+function assert_target() {
+  local arch="${2-$(uname -m)}"
+  case "$(echo "$arch" | tr '[:upper:]' '[:lower:]')" in
+    x64 | x86_64 | amd64)
+      export ZIG_ARCH="x86_64"
+      if [[ "$BUILDKITE_STEP_KEY" == *"baseline"* ]]; then
+        export ZIG_CPU_TARGET="nehalem"
+      else
+        export ZIG_CPU_TARGET="haswell"
+      fi
+      ;;
+    aarch64 | arm64)
+      export ZIG_ARCH="aarch64"
+      export ZIG_CPU_TARGET="native"
+      ;;
+    *)
+      echo "error: Unsupported architecture: $arch" 1>&2
+      exit 1
+      ;;
+  esac
+  local os="${1-$(uname -s)}"
+  case "$(echo "$os" | tr '[:upper:]' '[:lower:]')" in
+    linux)
+      export ZIG_TARGET="$ZIG_ARCH-linux-gnu" ;;
+    darwin)
+      export ZIG_TARGET="$ZIG_ARCH-macos-none" ;;
+    windows)
+      export ZIG_TARGET="$ZIG_ARCH-windows-msvc" ;;
+    *)
+      echo "error: Unsupported operating system: $os" 1>&2
+      exit 1
+      ;;
+  esac
+}
+
+function run_command() {
+  set -x
+  "$@"
+  { set +x; } 2>/dev/null
+}
+
+assert_target "$@"
+
+# Since the zig build depends on files from the zig submodule,
+# make sure to update the submodule before building.
+run_command git submodule update --init --recursive --progress --depth=1 --checkout src/deps/zig
+
+# TODO: Move these to be part of the CMake build
+source "$(dirname "$0")/build-old-js.sh"
+
+cwd="$(pwd)"
+mkdir -p build
+cd build
+
+run_command cmake .. "${CMAKE_FLAGS[@]}" \
+  -GNinja \
+  -DNO_CONFIGURE_DEPENDS="1" \
+  -DNO_CODEGEN="0" \
+  -DWEBKIT_DIR="omit" \
+  -DBUN_ZIG_OBJ_DIR="$cwd/build" \
+  -DZIG_LIB_DIR="$cwd/src/deps/zig/lib" \
+  -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
+  -DARCH="$ZIG_ARCH" \
+  -DCPU_TARGET="$ZIG_CPU_TARGET" \
+  -DZIG_TARGET="$ZIG_TARGET" \
+  -DUSE_LTO="$USE_LTO" \
+  -DUSE_DEBUG_JSC="$USE_DEBUG_JSC" \
+  -DCANARY="$CANARY" \
+  -DGIT_SHA="$GIT_SHA"
+
+export ONLY_ZIG="1"
+run_command ninja "$cwd/build/bun-zig.o" -v -j "$CPUS"
+
+cd ..
+source "$(dirname "$0")/upload-artifact.sh" "build/bun-zig.o"
diff --git a/.buildkite/scripts/download-artifact.ps1 b/.buildkite/scripts/download-artifact.ps1
new file mode 100755
index 0000000000..0504474077
--- /dev/null
+++ b/.buildkite/scripts/download-artifact.ps1
@@ -0,0 +1,47 @@
+param (
+  [Parameter(Mandatory=$true)]
+  [string[]] $Paths,
+  [switch] $Split
+)
+
+$ErrorActionPreference = "Stop"
+
+function Assert-Buildkite-Agent() {
+  if (-not (Get-Command "buildkite-agent" -ErrorAction SilentlyContinue)) {
+    Write-Error "Cannot find buildkite-agent, please install it: https://buildkite.com/docs/agent/v3/install"
+    exit 1
+  }
+}
+
+function Assert-Join-File() {
+  if (-not (Get-Command "Join-File" -ErrorAction SilentlyContinue)) {
+    Write-Error "Cannot find Join-File, please install it: https://www.powershellgallery.com/packages/FileSplitter/1.3"
+    exit 1
+  }
+}
+
+function Download-Buildkite-Artifact() {
+  param (
+    [Parameter(Mandatory=$true)]
+    [string] $Path,
+  )
+  if ($Split) {
+    & buildkite-agent artifact download "$Path.*" --debug --debug-http
+    Join-File -Path "$(Resolve-Path .)\$Path" -Verbose -DeletePartFiles
+  } else {
+    & buildkite-agent artifact download "$Path" --debug --debug-http
+  }
+  if (-not (Test-Path $Path)) {
+    Write-Error "Could not find artifact: $Path"
+    exit 1
+  }
+}
+
+Assert-Buildkite-Agent
+if ($Split) {
+  Assert-Join-File
+}
+
+foreach ($Path in $Paths) {
+  Download-Buildkite-Artifact $Path
+}
diff --git a/.buildkite/scripts/download-artifact.sh b/.buildkite/scripts/download-artifact.sh
new file mode 100755
index 0000000000..5907561853
--- /dev/null
+++ b/.buildkite/scripts/download-artifact.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -eo pipefail
+
+function assert_buildkite_agent() {
+  if ! command -v buildkite-agent &> /dev/null; then
+    echo "error: Cannot find buildkite-agent, please install it:"
+    echo "https://buildkite.com/docs/agent/v3/install"
+    exit 1
+  fi
+}
+
+function download_buildkite_artifact() {
+  local path="$1"; shift
+  local split="0"
+  local args=()
+  while true; do
+    if [ -z "$1" ]; then
+      break
+    fi
+    case "$1" in
+      --split) split="1"; shift ;;
+      *) args+=("$1"); shift ;;
+    esac
+  done
+  if [ "$split" == "1" ]; then
+    run_command buildkite-agent artifact download "$path.*" . "${args[@]}"
+    run_command cat $path.?? > "$path"
+    run_command rm -f $path.??
+  else
+    run_command buildkite-agent artifact download "$path" . "${args[@]}"
+  fi
+  if [[ "$path" != *"*"* ]] && [ ! -f "$path" ]; then
+    echo "error: Could not find artifact: $path"
+    exit 1
+  fi
+}
+
+function run_command() {
+  set -x
+  "$@"
+  { set +x; } 2>/dev/null
+}
+
+assert_buildkite_agent
+download_buildkite_artifact "$@"
diff --git a/.buildkite/scripts/env.sh b/.buildkite/scripts/env.sh
new file mode 100755
index 0000000000..b09f799bf6
--- /dev/null
+++ b/.buildkite/scripts/env.sh
@@ -0,0 +1,119 @@
+#!/bin/bash
+
+set -eo pipefail
+
+function assert_os() {
+  local os="$(uname -s)"
+  case "$os" in
+    Linux)
+      echo "linux" ;;
+    Darwin)
+      echo "darwin" ;;
+    *)
+      echo "error: Unsupported operating system: $os" 1>&2
+      exit 1
+      ;;
+  esac
+}
+
+function assert_arch() {
+  local arch="$(uname -m)"
+  case "$arch" in
+    aarch64 | arm64)
+      echo "aarch64" ;;
+    x86_64 | amd64)
+      echo "x64" ;;
+    *)
+      echo "error: Unknown architecture: $arch" 1>&2
+      exit 1
+      ;;
+  esac
+}
+
+function assert_build() {
+  if [ -z "$BUILDKITE_REPO" ]; then
+    echo "error: Cannot find repository for this build"
+    exit 1
+  fi
+  if [ -z "$BUILDKITE_COMMIT" ]; then
+    echo "error: Cannot find commit for this build"
+    exit 1
+  fi
+  if [ -z "$BUILDKITE_STEP_KEY" ]; then
+    echo "error: Cannot find step key for this build"
+    exit 1
+  fi
+  if [ -n "$BUILDKITE_GROUP_KEY" ] && [[ "$BUILDKITE_STEP_KEY" != "$BUILDKITE_GROUP_KEY"* ]]; then
+    echo "error: Build step '$BUILDKITE_STEP_KEY' does not start with group key '$BUILDKITE_GROUP_KEY'"
+    exit 1
+  fi
+  # Skip os and arch checks for Zig, since it's cross-compiled on macOS
+  if [[ "$BUILDKITE_STEP_KEY" != *"zig"* ]]; then
+    local os="$(assert_os)"
+    if [[ "$BUILDKITE_STEP_KEY" != *"$os"* ]]; then
+      echo "error: Build step '$BUILDKITE_STEP_KEY' does not match operating system '$os'"
+      exit 1
+    fi
+    local arch="$(assert_arch)"
+    if [[ "$BUILDKITE_STEP_KEY" != *"$arch"* ]]; then
+      echo "error: Build step '$BUILDKITE_STEP_KEY' does not match architecture '$arch'"
+      exit 1
+    fi
+  fi
+}
+
+function assert_buildkite_agent() {
+  if ! command -v buildkite-agent &> /dev/null; then
+    echo "error: Cannot find buildkite-agent, please install it:"
+    echo "https://buildkite.com/docs/agent/v3/install"
+    exit 1
+  fi
+}
+
+function export_environment() {
+  source "$(realpath $(dirname "$0")/../../scripts/env.sh)"
+  source "$(realpath $(dirname "$0")/../../scripts/update-submodules.sh)"
+  { set +x; } 2>/dev/null
+  export GIT_SHA="$BUILDKITE_COMMIT"
+  export CCACHE_DIR="$HOME/.cache/ccache/$BUILDKITE_STEP_KEY"
+  export SCCACHE_DIR="$HOME/.cache/sccache/$BUILDKITE_STEP_KEY"
+  export ZIG_LOCAL_CACHE_DIR="$HOME/.cache/zig-cache/$BUILDKITE_STEP_KEY"
+  export BUN_DEPS_CACHE_DIR="$HOME/.cache/bun-deps/$BUILDKITE_STEP_KEY"
+  if [ "$(assert_arch)" == "aarch64" ]; then
+    export CPU_TARGET="native"
+  elif [[ "$BUILDKITE_STEP_KEY" == *"baseline"* ]]; then
+    export CPU_TARGET="nehalem"
+  else
+    export CPU_TARGET="haswell"
+  fi
+  if [[ "$BUILDKITE_STEP_KEY" == *"nolto"* ]]; then
+    export USE_LTO="OFF"
+  else
+    export USE_LTO="ON"
+  fi
+  if $(buildkite-agent meta-data exists release &> /dev/null); then
+    export CMAKE_BUILD_TYPE="$(buildkite-agent meta-data get release)"
+  else
+    export CMAKE_BUILD_TYPE="Release"
+  fi
+  if $(buildkite-agent meta-data exists canary &> /dev/null); then
+    export CANARY="$(buildkite-agent meta-data get canary)"
+  else
+    export CANARY="1"
+  fi
+  if $(buildkite-agent meta-data exists assertions &> /dev/null); then
+    export USE_DEBUG_JSC="$(buildkite-agent meta-data get assertions)"
+  else
+    export USE_DEBUG_JSC="OFF"
+  fi
+  if [ "$BUILDKITE_CLEAN_CHECKOUT" == "true" ]; then
+    rm -rf "$CCACHE_DIR"
+    rm -rf "$SCCACHE_DIR"
+    rm -rf "$ZIG_LOCAL_CACHE_DIR"
+    rm -rf "$BUN_DEPS_CACHE_DIR"
+  fi
+}
+
+assert_build
+assert_buildkite_agent
+export_environment
diff --git a/.buildkite/scripts/prepare-build.sh b/.buildkite/scripts/prepare-build.sh
new file mode 100755
index 0000000000..1c245d9618
--- /dev/null
+++ b/.buildkite/scripts/prepare-build.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+set -eo pipefail
+
+function assert_build() {
+  if [ -z "$BUILDKITE_REPO" ]; then
+    echo "error: Cannot find repository for this build"
+    exit 1
+  fi
+  if [ -z "$BUILDKITE_COMMIT" ]; then
+    echo "error: Cannot find commit for this build"
+    exit 1
+  fi
+}
+
+function assert_buildkite_agent() {
+  if ! command -v buildkite-agent &> /dev/null; then
+    echo "error: Cannot find buildkite-agent, please install it:"
+    echo "https://buildkite.com/docs/agent/v3/install"
+    exit 1
+  fi
+}
+
+function assert_jq() {
+  assert_command "jq" "jq" "https://stedolan.github.io/jq/"
+}
+
+function assert_curl() {
+  assert_command "curl" "curl" "https://curl.se/download.html"
+}
+
+function assert_command() {
+  local command="$1"
+  local package="$2"
+  local help_url="$3"
+  if ! command -v "$command" &> /dev/null; then
+    echo "warning: $command is not installed, installing..."
+    if command -v brew &> /dev/null; then
+      HOMEBREW_NO_AUTO_UPDATE=1 brew install "$package"
+    else
+      echo "error: Cannot install $command, please install it"
+      if [ -n "$help_url" ]; then
+        echo ""
+        echo "hint: See $help_url for help"
+      fi
+      exit 1
+    fi
+  fi
+}
+
+function assert_release() {
+  if [ "$RELEASE" == "1" ]; then
+    run_command buildkite-agent meta-data set canary "0"
+  fi
+}
+
+function assert_canary() {
+  local canary="$(buildkite-agent meta-data get canary 2>/dev/null)"
+  if [ -z "$canary" ]; then
+    local repo=$(echo "$BUILDKITE_REPO" | sed -E 's#https://github.com/([^/]+)/([^/]+).git#\1/\2#g')
+    local tag="$(curl -sL "https://api.github.com/repos/$repo/releases/latest" | jq -r ".tag_name")"
+    if [ "$tag" == "null" ]; then
+      canary="1"
+    else
+      local revision=$(curl -sL "https://api.github.com/repos/$repo/compare/$tag...$BUILDKITE_COMMIT" | jq -r ".ahead_by")
+      if [ "$revision" == "null" ]; then
+        canary="1"
+      else
+        canary="$revision"
+      fi
+    fi
+    run_command buildkite-agent meta-data set canary "$canary"
+  fi
+}
+
+function upload_buildkite_pipeline() {
+  local path="$1"
+  if [ ! -f "$path" ]; then
+    echo "error: Cannot find pipeline: $path"
+    exit 1
+  fi
+  run_command buildkite-agent pipeline upload "$path"
+}
+
+function run_command() {
+  set -x
+  "$@"
+  { set +x; } 2>/dev/null
+}
+
+assert_build
+assert_buildkite_agent
+assert_jq
+assert_curl
+assert_release
+assert_canary
+upload_buildkite_pipeline ".buildkite/ci.yml"
diff --git a/.buildkite/scripts/upload-artifact.ps1 b/.buildkite/scripts/upload-artifact.ps1
new file mode 100755
index 0000000000..b7d79a410b
--- /dev/null
+++ b/.buildkite/scripts/upload-artifact.ps1
@@ -0,0 +1,47 @@
+param (
+  [Parameter(Mandatory=$true)]
+  [string[]] $Paths,
+  [switch] $Split
+)
+
+$ErrorActionPreference = "Stop"
+
+function Assert-Buildkite-Agent() {
+  if (-not (Get-Command "buildkite-agent" -ErrorAction SilentlyContinue)) {
+    Write-Error "Cannot find buildkite-agent, please install it: https://buildkite.com/docs/agent/v3/install"
+    exit 1
+  }
+}
+
+function Assert-Split-File() {
+  if (-not (Get-Command "Split-File" -ErrorAction SilentlyContinue)) {
+    Write-Error "Cannot find Split-File, please install it: https://www.powershellgallery.com/packages/FileSplitter/1.3"
+    exit 1
+  }
+}
+
+function Upload-Buildkite-Artifact() {
+  param (
+    [Parameter(Mandatory=$true)]
+    [string] $Path,
+  )
+  if (-not (Test-Path $Path)) {
+    Write-Error "Could not find artifact: $Path"
+    exit 1
+  }
+  if ($Split) {
+    Remove-Item -Path "$Path.*" -Force
+    Split-File -Path (Resolve-Path $Path) -PartSizeBytes "50MB" -Verbose
+    $Path = "$Path.*"
+  }
+  & buildkite-agent artifact upload "$Path" --debug --debug-http
+}
+
+Assert-Buildkite-Agent
+if ($Split) {
+  Assert-Split-File
+}
+
+foreach ($Path in $Paths) {
+  Upload-Buildkite-Artifact $Path
+}
diff --git a/.buildkite/scripts/upload-artifact.sh b/.buildkite/scripts/upload-artifact.sh
new file mode 100755
index 0000000000..0284a93c79
--- /dev/null
+++ b/.buildkite/scripts/upload-artifact.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+set -eo pipefail
+
+function assert_buildkite_agent() {
+  if ! command -v buildkite-agent &> /dev/null; then
+    echo "error: Cannot find buildkite-agent, please install it:"
+    echo "https://buildkite.com/docs/agent/v3/install"
+    exit 1
+  fi
+}
+
+function assert_split() {
+  if ! command -v split &> /dev/null; then
+    echo "error: Cannot find split, please install it:"
+    echo "https://www.gnu.org/software/coreutils/split"
+    exit 1
+  fi
+}
+
+function upload_buildkite_artifact() {
+  local path="$1"; shift
+  local split="0"
+  local args=()
+  while true; do
+    if [ -z "$1" ]; then
+      break
+    fi
+    case "$1" in
+      --split) split="1"; shift ;;
+      *) args+=("$1"); shift ;;
+    esac
+  done
+  if [ ! -f "$path" ]; then
+    echo "error: Could not find artifact: $path"
+    exit 1
+  fi
+  if [ "$split" == "1" ]; then
+    run_command rm -f "$path."*
+    run_command split -b 50MB -d "$path" "$path."
+    run_command buildkite-agent artifact upload "$path.*" "${args[@]}"
+  else
+    run_command buildkite-agent artifact upload "$path" "${args[@]}"
+  fi
+}
+
+function run_command() {
+  set -x
+  "$@"
+  { set +x; } 2>/dev/null
+}
+
+assert_buildkite_agent
+upload_buildkite_artifact "$@"
diff --git a/.buildkite/scripts/upload-release.sh b/.buildkite/scripts/upload-release.sh
index c1576bd620..7ea85aec55 100755
--- a/.buildkite/scripts/upload-release.sh
+++ b/.buildkite/scripts/upload-release.sh
@@ -3,7 +3,15 @@
 set -eo pipefail
 
 function assert_main() {
-  if [[ "$BUILDKITE_PULL_REQUEST_REPO" && "$BUILDKITE_REPO" != "$BUILDKITE_PULL_REQUEST_REPO" ]]; then
+  if [ -z "$BUILDKITE_REPO" ]; then
+    echo "error: Cannot find repository for this build"
+    exit 1
+  fi
+  if [ -z "$BUILDKITE_COMMIT" ]; then
+    echo "error: Cannot find commit for this build"
+    exit 1
+  fi
+  if [ -n "$BUILDKITE_PULL_REQUEST_REPO" ] && [ "$BUILDKITE_REPO" != "$BUILDKITE_PULL_REQUEST_REPO" ]; then
     echo "error: Cannot upload release from a fork"
     exit 1
   fi
@@ -25,70 +33,168 @@ function assert_buildkite_agent() {
   fi
 }
 
-function assert_gh() {
-  if ! command -v gh &> /dev/null; then
-    echo "warning: gh is not installed, installing..."
+function assert_github() {
+  assert_command "gh" "gh" "https://github.com/cli/cli#installation"
+  assert_buildkite_secret "GITHUB_TOKEN"
+  # gh expects the token in $GH_TOKEN
+  export GH_TOKEN="$GITHUB_TOKEN"
+}
+
+function assert_aws() {
+  assert_command "aws" "awscli" "https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html"
+  for secret in AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_ENDPOINT AWS_BUCKET; do
+    assert_buildkite_secret "$secret"
+  done
+}
+
+function assert_sentry() {
+  assert_command "sentry-cli" "getsentry/tools/sentry-cli" "https://docs.sentry.io/cli/installation/"
+  for secret in SENTRY_AUTH_TOKEN SENTRY_ORG SENTRY_PROJECT; do
+    assert_buildkite_secret "$secret"
+  done
+}
+
+function run_command() {
+  set -x
+  "$@"
+  { set +x; } 2>/dev/null
+}
+
+function assert_command() {
+  local command="$1"
+  local package="$2"
+  local help_url="$3"
+  if ! command -v "$command" &> /dev/null; then
+    echo "warning: $command is not installed, installing..."
     if command -v brew &> /dev/null; then
-      brew install gh
+      HOMEBREW_NO_AUTO_UPDATE=1 run_command brew install "$package"
     else
-      echo "error: Cannot install gh, please install it:"
-      echo "https://github.com/cli/cli#installation"
+      echo "error: Cannot install $command, please install it"
+      if [ -n "$help_url" ]; then
+        echo ""
+        echo "hint: See $help_url for help"
+      fi
       exit 1
     fi
   fi
 }
 
-function assert_gh_token() {
-  local token=$(buildkite-agent secret get GITHUB_TOKEN)
-  if [ -z "$token" ]; then
-    echo "error: Cannot find GITHUB_TOKEN secret"
+function assert_buildkite_secret() {
+  local key="$1"
+  local value=$(buildkite-agent secret get "$key")
+  if [ -z "$value" ]; then
+    echo "error: Cannot find $key secret"
     echo ""
-    echo "hint: Create a secret named GITHUB_TOKEN with a GitHub access token:"
+    echo "hint: Create a secret named $key with a value:"
     echo "https://buildkite.com/docs/pipelines/buildkite-secrets"
     exit 1
   fi
-  export GH_TOKEN="$token"
+  export "$key"="$value"
 }
 
-function download_artifact() {
-  local name=$1
-  buildkite-agent artifact download "$name" .
-  if [ ! -f "$name" ]; then
+function release_tag() {
+  local version="$1"
+  if [ "$version" == "canary" ]; then
+    echo "canary"
+  else
+    echo "bun-v$version"
+  fi
+}
+
+function create_sentry_release() {
+  local version="$1"
+  local release="$version"
+  if [ "$version" == "canary" ]; then
+    release="$BUILDKITE_COMMIT-canary"
+  fi
+  run_command sentry-cli releases new "$release" --finalize
+  run_command sentry-cli releases set-commits "$release" --auto --ignore-missing
+  if [ "$version" == "canary" ]; then
+    run_command sentry-cli deploys new --env="canary" --release="$release"
+  fi
+}
+
+function download_buildkite_artifact() {
+  local name="$1"
+  local dir="$2"
+  if [ -z "$dir" ]; then
+    dir="."
+  fi
+  run_command buildkite-agent artifact download "$name" "$dir"
+  if [ ! -f "$dir/$name" ]; then
     echo "error: Cannot find Buildkite artifact: $name"
     exit 1
   fi
 }
 
-function upload_assets() {
-  local tag=$1
-  local files=${@:2}
-  gh release upload "$tag" $files --clobber --repo "$BUILDKITE_REPO"
+function upload_github_asset() {
+  local version="$1"
+  local tag="$(release_tag "$version")"
+  local file="$2"
+  run_command gh release upload "$tag" "$file" --clobber --repo "$BUILDKITE_REPO"
+  if [ "$tag" == "canary" ]; then
+    run_command gh release edit "$tag" --repo "$BUILDKITE_REPO" \
+      --notes "This canary release of Bun corresponds to the commit: $BUILDKITE_COMMIT"
+  fi
 }
 
-assert_main
-assert_buildkite_agent
-assert_gh
-assert_gh_token
+function update_github_release() {
+  local version="$1"
+  local tag="$(release_tag "$version")"
+  if [ "$tag" == "canary" ]; then
+    run_command gh release edit "$tag" --repo "$BUILDKITE_REPO" \
+      --notes "This release of Bun corresponds to the commit: $BUILDKITE_COMMIT"
+  fi
+}
 
-declare artifacts=(
-  bun-darwin-aarch64.zip
-  bun-darwin-aarch64-profile.zip
-  bun-darwin-x64.zip
-  bun-darwin-x64-profile.zip
-  bun-linux-aarch64.zip
-  bun-linux-aarch64-profile.zip
-  bun-linux-x64.zip
-  bun-linux-x64-profile.zip
-  bun-linux-x64-baseline.zip
-  bun-linux-x64-baseline-profile.zip
-  bun-windows-x64.zip
-  bun-windows-x64-profile.zip
-  bun-windows-x64-baseline.zip
-  bun-windows-x64-baseline-profile.zip
-)
+function upload_s3_file() {
+  local folder="$1"
+  local file="$2"
+  run_command aws --endpoint-url="$AWS_ENDPOINT" s3 cp "$file" "s3://$AWS_BUCKET/$folder/$file"
+}
 
-for artifact in "${artifacts[@]}"; do
-  download_artifact $artifact
-done
+function create_release() {
+  assert_main
+  assert_buildkite_agent
+  assert_github
+  assert_aws
+  assert_sentry
 
-upload_assets "canary" "${artifacts[@]}"
+  local tag="$1" # 'canary' or 'x.y.z'
+  local artifacts=(
+    bun-darwin-aarch64.zip
+    bun-darwin-aarch64-profile.zip
+    bun-darwin-x64.zip
+    bun-darwin-x64-profile.zip
+    bun-linux-aarch64.zip
+    bun-linux-aarch64-profile.zip
+    bun-linux-x64.zip
+    bun-linux-x64-profile.zip
+    bun-linux-x64-baseline.zip
+    bun-linux-x64-baseline-profile.zip
+    bun-windows-x64.zip
+    bun-windows-x64-profile.zip
+    bun-windows-x64-baseline.zip
+    bun-windows-x64-baseline-profile.zip
+  )
+
+  for name in "${artifacts[@]}"; do
+    download_buildkite_artifact "$name"
+    upload_s3_file "releases/$BUILDKITE_COMMIT" "$name"
+    upload_s3_file "releases/$tag" "$name"
+    upload_github_asset "$tag" "$name"
+  done
+  update_github_release "$tag"
+  create_sentry_release "$tag"
+}
+
+function assert_canary() {
+  local canary="$(buildkite-agent meta-data get canary 2>/dev/null)"
+  if [ -z "$canary" ] || [ "$canary" == "0" ]; then
+    echo "warn: Skipping release because this is not a canary build"
+    exit 0
+  fi
+}
+
+assert_canary
+create_release "canary"
diff --git a/.github/workflows/build-darwin.yml b/.github/workflows/build-darwin.yml
deleted file mode 100644
index c59226d131..0000000000
--- a/.github/workflows/build-darwin.yml
+++ /dev/null
@@ -1,316 +0,0 @@
-name: Build Darwin
-
-permissions:
-  contents: read
-  actions: write
-
-on:
-  workflow_call:
-    inputs:
-      runs-on:
-        type: string
-        default: macos-12-large
-      tag:
-        type: string
-        required: true
-      arch:
-        type: string
-        required: true
-      cpu:
-        type: string
-        required: true
-      assertions:
-        type: boolean
-      canary:
-        type: boolean
-      no-cache:
-        type: boolean
-
-env:
-  LLVM_VERSION: 16
-  BUN_VERSION: 1.1.8
-  LC_CTYPE: "en_US.UTF-8"
-  LC_ALL: "en_US.UTF-8"
-  BUN_ENABLE_LTO: "1"
-
-jobs:
-  build-submodules:
-    name: Build Submodules
-    runs-on: ${{ inputs.runs-on }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          sparse-checkout: |
-            .gitmodules
-            src/deps
-            scripts
-      - name: Hash Submodules
-        id: hash
-        run: |
-          print_versions() {
-            git submodule | grep -v WebKit
-            echo "LLVM_VERSION=${{ env.LLVM_VERSION }}"
-            cat $(echo scripts/build*.sh scripts/all-dependencies.sh | tr " " "\n" | sort)
-          }
-          echo "hash=$(print_versions | shasum)" >> $GITHUB_OUTPUT
-      - if: ${{ !inputs.no-cache }}
-        name: Restore Cache
-        id: cache
-        uses: actions/cache/restore@v4
-        with:
-          path: ${{ runner.temp }}/bun-deps
-          key: bun-${{ inputs.tag }}-deps-${{ steps.hash.outputs.hash }}
-      # TODO: Figure out how to cache homebrew dependencies
-      - if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
-        name: Install Dependencies
-        env:
-          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
-          HOMEBREW_NO_AUTO_UPDATE: 1
-          HOMEBREW_NO_INSTALL_CLEANUP: 1
-        run: |
-          brew install \
-            llvm@${{ env.LLVM_VERSION }} \
-            ccache \
-            rust \
-            pkg-config \
-            coreutils \
-            libtool \
-            cmake \
-            libiconv \
-            automake \
-            openssl@1.1 \
-            ninja \
-            golang \
-            gnu-sed --force --overwrite
-          echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
-          echo "$(brew --prefix coreutils)/libexec/gnubin" >> $GITHUB_PATH
-          echo "$(brew --prefix llvm@$LLVM_VERSION)/bin" >> $GITHUB_PATH
-          brew link --overwrite llvm@$LLVM_VERSION
-      - if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
-        name: Clone Submodules
-        run: |
-          ./scripts/update-submodules.sh
-      - name: Build Submodules
-        if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
-        env:
-          CPU_TARGET: ${{ inputs.cpu }}
-          BUN_DEPS_OUT_DIR: ${{ runner.temp }}/bun-deps
-        run: |
-          mkdir -p $BUN_DEPS_OUT_DIR
-          ./scripts/all-dependencies.sh
-      - name: Save Cache
-        if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ runner.temp }}/bun-deps
-          key: ${{ steps.cache.outputs.cache-primary-key }}
-      - name: Upload bun-${{ inputs.tag }}-deps
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-deps
-          path: ${{ runner.temp }}/bun-deps
-          if-no-files-found: error
-  build-cpp:
-    name: Build C++
-    runs-on: ${{ inputs.runs-on }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      # TODO: Figure out how to cache homebrew dependencies
-      - name: Install Dependencies
-        env:
-          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
-          HOMEBREW_NO_AUTO_UPDATE: 1
-          HOMEBREW_NO_INSTALL_CLEANUP: 1
-        run: |
-          brew install \
-            llvm@${{ env.LLVM_VERSION }} \
-            ccache \
-            rust \
-            pkg-config \
-            coreutils \
-            libtool \
-            cmake \
-            libiconv \
-            automake \
-            openssl@1.1 \
-            ninja \
-            golang \
-            gnu-sed --force --overwrite
-          echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
-          echo "$(brew --prefix coreutils)/libexec/gnubin" >> $GITHUB_PATH
-          echo "$(brew --prefix llvm@$LLVM_VERSION)/bin" >> $GITHUB_PATH
-          brew link --overwrite llvm@$LLVM_VERSION
-      - name: Setup Bun
-        uses: ./.github/actions/setup-bun
-        with:
-          bun-version: ${{ env.BUN_VERSION }}
-      - if: ${{ !inputs.no-cache }}
-        name: Restore Cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ runner.temp }}/ccache
-          key: bun-${{ inputs.tag }}-cpp-${{ hashFiles('Dockerfile', 'Makefile', 'CMakeLists.txt', 'build.zig', 'scripts/**', 'src/**', 'packages/bun-usockets/src/**', 'packages/bun-uws/src/**') }}
-          restore-keys: |
-            bun-${{ inputs.tag }}-cpp-
-      - name: Compile
-        env:
-          CPU_TARGET: ${{ inputs.cpu }}
-          SOURCE_DIR: ${{ github.workspace }}
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{ runner.temp }}/bun-deps
-          CCACHE_DIR: ${{ runner.temp }}/ccache
-        run: |
-          mkdir -p $OBJ_DIR
-          cd $OBJ_DIR
-          cmake -S $SOURCE_DIR -B $OBJ_DIR \
-            -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DUSE_LTO=ON \
-            -DBUN_CPP_ONLY=1 \
-            -DNO_CONFIGURE_DEPENDS=1
-          chmod +x compile-cpp-only.sh
-          ./compile-cpp-only.sh -v
-      - name: Upload bun-${{ inputs.tag }}-cpp
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-cpp
-          path: ${{ runner.temp }}/bun-cpp-obj/bun-cpp-objects.a
-          if-no-files-found: error
-  build-zig:
-    name: Build Zig
-    uses: ./.github/workflows/build-zig.yml
-    with:
-      os: darwin
-      only-zig: true
-      tag: ${{ inputs.tag }}
-      arch: ${{ inputs.arch }}
-      cpu: ${{ inputs.cpu }}
-      assertions: ${{ inputs.assertions }}
-      canary: ${{ inputs.canary }}
-      no-cache: ${{ inputs.no-cache }}
-  link:
-    name: Link
-    runs-on: ${{ inputs.runs-on }}
-    needs:
-      - build-submodules
-      - build-cpp
-      - build-zig
-    steps:
-      - uses: actions/checkout@v4
-      # TODO: Figure out how to cache homebrew dependencies
-      - name: Install Dependencies
-        env:
-          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
-          HOMEBREW_NO_AUTO_UPDATE: 1
-          HOMEBREW_NO_INSTALL_CLEANUP: 1
-        run: |
-          brew install \
-            llvm@${{ env.LLVM_VERSION }} \
-            ccache \
-            rust \
-            pkg-config \
-            coreutils \
-            libtool \
-            cmake \
-            libiconv \
-            automake \
-            openssl@1.1 \
-            ninja \
-            golang \
-            gnu-sed --force --overwrite
-          echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
-          echo "$(brew --prefix coreutils)/libexec/gnubin" >> $GITHUB_PATH
-          echo "$(brew --prefix llvm@$LLVM_VERSION)/bin" >> $GITHUB_PATH
-          brew link --overwrite llvm@$LLVM_VERSION
-      - name: Setup Bun
-        uses: ./.github/actions/setup-bun
-        with:
-          bun-version: ${{ env.BUN_VERSION }}
-      - name: Download bun-${{ inputs.tag }}-deps
-        uses: actions/download-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-deps
-          path: ${{ runner.temp }}/bun-deps
-      - name: Download bun-${{ inputs.tag }}-cpp
-        uses: actions/download-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-cpp
-          path: ${{ runner.temp }}/bun-cpp-obj
-      - name: Download bun-${{ inputs.tag }}-zig
-        uses: actions/download-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-zig
-          path: ${{ runner.temp }}/release
-      - if: ${{ !inputs.no-cache }}
-        name: Restore Cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ runner.temp }}/ccache
-          key: bun-${{ inputs.tag }}-cpp-${{ hashFiles('Dockerfile', 'Makefile', 'CMakeLists.txt', 'build.zig', 'scripts/**', 'src/**', 'packages/bun-usockets/src/**', 'packages/bun-uws/src/**') }}
-          restore-keys: |
-            bun-${{ inputs.tag }}-cpp-
-      - name: Link
-        env:
-          CPU_TARGET: ${{ inputs.cpu }}
-          CCACHE_DIR: ${{ runner.temp }}/ccache
-        run: |
-          SRC_DIR=$PWD
-          mkdir ${{ runner.temp }}/link-build
-          cd ${{ runner.temp }}/link-build
-          cmake $SRC_DIR \
-            -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DUSE_LTO=ON \
-            -DBUN_LINK_ONLY=1 \
-            -DBUN_ZIG_OBJ_DIR="${{ runner.temp }}/release" \
-            -DBUN_CPP_ARCHIVE="${{ runner.temp }}/bun-cpp-obj/bun-cpp-objects.a" \
-            -DBUN_DEPS_OUT_DIR="${{ runner.temp }}/bun-deps" \
-            -DNO_CONFIGURE_DEPENDS=1
-          ninja -v
-      - name: Prepare
-        run: |
-          cd ${{ runner.temp }}/link-build
-          chmod +x bun-profile bun
-          mkdir -p bun-${{ inputs.tag }}-profile/ bun-${{ inputs.tag }}/
-          mv bun-profile bun-${{ inputs.tag }}-profile/bun-profile
-          if [ -f bun.dSYM ]; then
-            mv bun.dSYM bun-${{ inputs.tag }}-profile/bun.dSYM
-          fi
-          mv bun bun-${{ inputs.tag }}/bun
-          zip -r bun-${{ inputs.tag }}-profile.zip bun-${{ inputs.tag }}-profile
-          zip -r bun-${{ inputs.tag }}.zip bun-${{ inputs.tag }}
-      - name: Upload bun-${{ inputs.tag }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}
-          path: ${{ runner.temp }}/link-build/bun-${{ inputs.tag }}.zip
-          if-no-files-found: error
-      - name: Upload bun-${{ inputs.tag }}-profile
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-profile
-          path: ${{ runner.temp }}/link-build/bun-${{ inputs.tag }}-profile.zip
-          if-no-files-found: error
-  on-failure:
-    if: ${{ github.repository_owner == 'oven-sh' && failure() }}
-    name: On Failure
-    needs: link
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send Message
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          nodetail: true
-          color: "#FF0000"
-          title: ""
-          description: |
-            ### ❌ [${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }})
-
-            @${{ github.actor }}, the build for bun-${{ inputs.tag }} failed.
-
-            **[View logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})**
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
deleted file mode 100644
index c1bde9271c..0000000000
--- a/.github/workflows/build-linux.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: Build Linux
-
-permissions:
-  contents: read
-  actions: write
-
-on:
-  workflow_call:
-    inputs:
-      runs-on:
-        type: string
-        required: true
-      tag:
-        type: string
-        required: true
-      arch:
-        type: string
-        required: true
-      cpu:
-        type: string
-        required: true
-      assertions:
-        type: boolean
-      zig-optimize:
-        type: string
-      canary:
-        type: boolean
-      no-cache:
-        type: boolean
-
-jobs:
-  build:
-    name: Build Linux
-    uses: ./.github/workflows/build-zig.yml
-    with:
-      os: linux
-      only-zig: false
-      runs-on: ${{ inputs.runs-on }}
-      tag: ${{ inputs.tag }}
-      arch: ${{ inputs.arch }}
-      cpu: ${{ inputs.cpu }}
-      assertions: ${{ inputs.assertions }}
-      zig-optimize: ${{ inputs.zig-optimize }}
-      canary: ${{ inputs.canary }}
-      no-cache: ${{ inputs.no-cache }}
-  on-failure:
-    if: ${{ github.repository_owner == 'oven-sh' && failure() }}
-    name: On Failure
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send Message
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          nodetail: true
-          color: "#FF0000"
-          title: ""
-          description: |
-            ### ❌ [${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }})
-
-            @${{ github.actor }}, the build for bun-${{ inputs.tag }} failed.
-
-            **[View logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})**
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
deleted file mode 100644
index 3585a77f6b..0000000000
--- a/.github/workflows/build-windows.yml
+++ /dev/null
@@ -1,348 +0,0 @@
-name: Build Windows
-
-permissions:
-  contents: read
-  actions: write
-
-on:
-  workflow_call:
-    inputs:
-      runs-on:
-        type: string
-        default: windows
-      tag:
-        type: string
-        required: true
-      arch:
-        type: string
-        required: true
-      cpu:
-        type: string
-        required: true
-      assertions:
-        type: boolean
-      canary:
-        type: boolean
-      no-cache:
-        type: boolean
-      bun-version:
-        type: string
-        default: 1.1.7
-
-env:
-  # Must specify exact version of LLVM for Windows
-  LLVM_VERSION: 18.1.8
-  BUN_VERSION: ${{ inputs.bun-version }}
-  BUN_GARBAGE_COLLECTOR_LEVEL: 1
-  BUN_FEATURE_FLAG_INTERNAL_FOR_TESTING: 1
-  CI: true
-  USE_LTO: 1
-
-jobs:
-  build-submodules:
-    name: Build Submodules
-    runs-on: ${{ inputs.runs-on }}
-    steps:
-      - name: Install Scoop
-        run: |
-          Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
-          Invoke-RestMethod -Uri https://get.scoop.sh | Invoke-Expression
-          Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
-      - name: Setup Git
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          sparse-checkout: |
-            .gitmodules
-            src/deps
-            scripts
-      - name: Hash Submodules
-        id: hash
-        run: |
-          $data = "$(& {
-            git submodule | Where-Object { $_ -notmatch 'WebKit' }
-            echo "LLVM_VERSION=${{ env.LLVM_VERSION }}"
-            Get-Content -Path (Get-ChildItem -Path 'scripts/build*.ps1', 'scripts/all-dependencies.ps1', 'scripts/env.ps1' | Sort-Object -Property Name).FullName | Out-String
-            echo 1
-          })"
-          $hash = ( -join ((New-Object -TypeName System.Security.Cryptography.SHA1CryptoServiceProvider).ComputeHash([System.Text.Encoding]::UTF8.GetBytes($data)) | ForEach-Object { $_.ToString("x2") } )).Substring(0, 10)
-          echo "hash=${hash}" >> $env:GITHUB_OUTPUT
-      - if: ${{ !inputs.no-cache }}
-        name: Restore Cache
-        id: cache
-        uses: actions/cache/restore@v4
-        with:
-          path: bun-deps
-          key: bun-${{ inputs.tag }}-deps-${{ steps.hash.outputs.hash }}
-      - if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
-        name: Install LLVM and Ninja
-        run: |
-          scoop install ninja
-          scoop install llvm@${{ env.LLVM_VERSION }}
-          scoop install nasm@2.16.01
-      - if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
-        name: Clone Submodules
-        run: |
-          .\scripts\update-submodules.ps1
-      - if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
-        name: Build Dependencies
-        env:
-          CPU_TARGET: ${{ inputs.cpu }}
-          CCACHE_DIR: ccache
-          USE_LTO: 1
-        run: |
-          .\scripts\env.ps1 ${{ contains(inputs.tag, '-baseline') && '-Baseline' || '' }}
-          $env:BUN_DEPS_OUT_DIR = (mkdir -Force "./bun-deps")
-          .\scripts\all-dependencies.ps1
-      - name: Save Cache
-        if: ${{ inputs.no-cache || !steps.cache.outputs.cache-hit }}
-        uses: actions/cache/save@v4
-        with:
-          path: bun-deps
-          key: ${{ steps.cache.outputs.cache-primary-key }}
-      - name: Upload bun-${{ inputs.tag }}-deps
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-deps
-          path: bun-deps
-          if-no-files-found: error
-  codegen:
-    name: Codegen
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup Git
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup Bun
-        uses: ./.github/actions/setup-bun
-        with:
-          bun-version: ${{ inputs.bun-version }}
-      - name: Codegen
-        run: |
-          ./scripts/cross-compile-codegen.sh win32 x64
-      - if: ${{ inputs.canary }}
-        name: Calculate Revision
-        run: |
-          echo "canary_revision=$(GITHUB_TOKEN="${{ github.token }}"
-          bash ./scripts/calculate-canary-revision.sh --raw)" > build-codegen-win32-x64/.canary_revision
-      - name: Upload bun-${{ inputs.tag }}-codegen
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-codegen
-          path: build-codegen-win32-x64
-          if-no-files-found: error
-  build-cpp:
-    name: Build C++
-    needs: codegen
-    runs-on: ${{ inputs.runs-on }}
-    steps:
-      - name: Install Scoop
-        run: |
-          Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
-          Invoke-RestMethod -Uri https://get.scoop.sh | Invoke-Expression
-          Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
-      - name: Setup Git
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: Install LLVM and Ninja
-        run: |
-          scoop install ninja
-          scoop install llvm@${{ env.LLVM_VERSION }}
-      - name: Setup Bun
-        uses: ./.github/actions/setup-bun
-        with:
-          bun-version: ${{ inputs.bun-version }}
-      - if: ${{ !inputs.no-cache }}
-        name: Restore Cache
-        uses: actions/cache@v4
-        with:
-          path: ccache
-          key: bun-${{ inputs.tag }}-cpp-${{ hashFiles('Dockerfile', 'Makefile', 'CMakeLists.txt', 'build.zig', 'scripts/**', 'src/**', 'packages/bun-usockets/src/**', 'packages/bun-uws/src/**') }}
-          restore-keys: |
-            bun-${{ inputs.tag }}-cpp-
-      - name: Download bun-${{ inputs.tag }}-codegen
-        uses: actions/download-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-codegen
-          path: build
-      - name: Compile
-        env:
-          CPU_TARGET: ${{ inputs.cpu }}
-          CCACHE_DIR: ccache
-          USE_LTO: 1
-        run: |
-          # $CANARY_REVISION = if (Test-Path build/.canary_revision) { Get-Content build/.canary_revision } else { "0" }
-          $CANARY_REVISION = 0
-          .\scripts\env.ps1 ${{ contains(inputs.tag, '-baseline') && '-Baseline' || '' }}
-          .\scripts\update-submodules.ps1
-          .\scripts\build-libuv.ps1 -CloneOnly $True
-          cd build
-          cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release `
-            -DNO_CODEGEN=1 `
-            -DUSE_LTO=1 `
-            -DNO_CONFIGURE_DEPENDS=1 `
-            "-DCANARY=${CANARY_REVISION}" `
-            -DBUN_CPP_ONLY=1 ${{ contains(inputs.tag, '-baseline') && '-DUSE_BASELINE_BUILD=1' || '' }}
-          if ($LASTEXITCODE -ne 0) { throw "CMake configuration failed" }
-          .\compile-cpp-only.ps1 -v
-          if ($LASTEXITCODE -ne 0) { throw "C++ compilation failed" }
-      - name: Upload bun-${{ inputs.tag }}-cpp
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-cpp
-          path: build/bun-cpp-objects.a
-          if-no-files-found: error
-  build-zig:
-    name: Build Zig
-    uses: ./.github/workflows/build-zig.yml
-    with:
-      os: windows
-      zig-optimize: ReleaseSafe
-      only-zig: true
-      tag: ${{ inputs.tag }}
-      arch: ${{ inputs.arch }}
-      cpu: ${{ inputs.cpu }}
-      assertions: ${{ inputs.assertions }}
-      canary: ${{ inputs.canary }}
-      no-cache: ${{ inputs.no-cache }}
-  link:
-    name: Link
-    runs-on: ${{ inputs.runs-on }}
-    needs:
-      - build-submodules
-      - build-cpp
-      - build-zig
-      - codegen
-    steps:
-      - name: Install Scoop
-        run: |
-          Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
-          Invoke-RestMethod -Uri https://get.scoop.sh | Invoke-Expression
-          Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
-      - name: Setup Git
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: Install Ninja
-        run: |
-          scoop install ninja
-          scoop install llvm@${{ env.LLVM_VERSION }}
-      - name: Setup Bun
-        uses: ./.github/actions/setup-bun
-        with:
-          bun-version: ${{ inputs.bun-version }}
-      - name: Download bun-${{ inputs.tag }}-deps
-        uses: actions/download-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-deps
-          path: bun-deps
-      - name: Download bun-${{ inputs.tag }}-cpp
-        uses: actions/download-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-cpp
-          path: bun-cpp
-      - name: Download bun-${{ inputs.tag }}-zig
-        uses: actions/download-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-zig
-          path: bun-zig
-      - name: Download bun-${{ inputs.tag }}-codegen
-        uses: actions/download-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-codegen
-          path: build
-      - if: ${{ !inputs.no-cache }}
-        name: Restore Cache
-        uses: actions/cache@v4
-        with:
-          path: ccache
-          key: bun-${{ inputs.tag }}-cpp-${{ hashFiles('Dockerfile', 'Makefile', 'CMakeLists.txt', 'build.zig', 'scripts/**', 'src/**', 'packages/bun-usockets/src/**', 'packages/bun-uws/src/**') }}
-          restore-keys: |
-            bun-${{ inputs.tag }}-cpp-
-      - name: Link
-        env:
-          CPU_TARGET: ${{ inputs.cpu }}
-          CCACHE_DIR: ccache
-        run: |
-          .\scripts\update-submodules.ps1
-          .\scripts\env.ps1 ${{ contains(inputs.tag, '-baseline') && '-Baseline' || '' }}
-          Set-Location build
-          # $CANARY_REVISION = if (Test-Path build/.canary_revision) { Get-Content build/.canary_revision } else { "0" }
-          $CANARY_REVISION = 0
-          cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release `
-            -DNO_CODEGEN=1 `
-            -DNO_CONFIGURE_DEPENDS=1 `
-            "-DCANARY=${CANARY_REVISION}" `
-            -DBUN_LINK_ONLY=1 `
-            -DUSE_LTO=1 `
-            "-DBUN_DEPS_OUT_DIR=$(Resolve-Path ../bun-deps)" `
-            "-DBUN_CPP_ARCHIVE=$(Resolve-Path ../bun-cpp/bun-cpp-objects.a)" `
-            "-DBUN_ZIG_OBJ_DIR=$(Resolve-Path ../bun-zig)" `
-            ${{ contains(inputs.tag, '-baseline') && '-DUSE_BASELINE_BUILD=1' || '' }}
-          if ($LASTEXITCODE -ne 0) { throw "CMake configuration failed" }
-          ninja -v
-          if ($LASTEXITCODE -ne 0) { throw "Link failed!" }
-      - name: Prepare
-        run: |
-          $Dist = mkdir -Force "bun-${{ inputs.tag }}"
-          cp -r build\bun.exe "$Dist\bun.exe"
-          Compress-Archive -Force "$Dist" "${Dist}.zip"
-          $Dist = "$Dist-profile"
-          MkDir -Force "$Dist"
-          cp -r build\bun.exe "$Dist\bun.exe"
-          cp -r build\bun.pdb "$Dist\bun.pdb"
-          Compress-Archive -Force "$Dist" "$Dist.zip"
-          .\build\bun.exe --print "JSON.stringify(require('bun:internal-for-testing').crash_handler.getFeatureData())" > .\features.json
-      - name: Upload bun-${{ inputs.tag }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}
-          path: bun-${{ inputs.tag }}.zip
-          if-no-files-found: error
-      - name: Upload bun-${{ inputs.tag }}-profile
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-profile
-          path: bun-${{ inputs.tag }}-profile.zip
-          if-no-files-found: error
-      - name: Upload bun-feature-data
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-feature-data
-          path: features.json
-          if-no-files-found: error
-          overwrite: true
-  on-failure:
-    if: ${{ github.repository_owner == 'oven-sh' && failure() }}
-    name: On Failure
-    needs: link
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send Message
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          nodetail: true
-          color: "#FF0000"
-          title: ""
-          description: |
-            ### ❌ [${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }})
-
-            @${{ github.actor }}, the build for bun-${{ inputs.tag }} failed.
-
-            **[View logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})**
diff --git a/.github/workflows/build-zig.yml b/.github/workflows/build-zig.yml
deleted file mode 100644
index 097fe082e7..0000000000
--- a/.github/workflows/build-zig.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-name: Build Zig
-
-permissions:
-  contents: read
-  actions: write
-
-on:
-  workflow_call:
-    inputs:
-      runs-on:
-        type: string
-        default: ${{ github.repository_owner != 'oven-sh' && 'ubuntu-latest' || inputs.only-zig && 'namespace-profile-bun-ci-linux-x64' || inputs.arch == 'x64' && 'namespace-profile-bun-ci-linux-x64' || 'namespace-profile-bun-ci-linux-aarch64' }}
-      tag:
-        type: string
-        required: true
-      os:
-        type: string
-        required: true
-      arch:
-        type: string
-        required: true
-      cpu:
-        type: string
-        required: true
-      assertions:
-        type: boolean
-        default: false
-      zig-optimize:
-        type: string # 'ReleaseSafe' or 'ReleaseFast'
-        default: ReleaseFast
-      canary:
-        type: boolean
-        default: ${{ github.ref == 'refs/heads/main' }}
-      only-zig:
-        type: boolean
-        default: true
-      no-cache:
-        type: boolean
-        default: false
-
-jobs:
-  build-zig:
-    name: ${{ inputs.only-zig && 'Build Zig' || 'Build & Link' }}
-    runs-on: ${{ inputs.runs-on }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Calculate Cache Key
-        id: cache
-        run: |
-          echo "key=${{ hashFiles('Dockerfile', 'Makefile', 'CMakeLists.txt', 'build.zig', 'scripts/**', 'src/**', 'packages/bun-usockets/src/**', 'packages/bun-uws/src/**') }}" >> $GITHUB_OUTPUT
-      - if: ${{ !inputs.no-cache }}
-        name: Restore Cache
-        uses: actions/cache@v4
-        with:
-          key: bun-${{ inputs.tag }}-docker-${{ steps.cache.outputs.key }}
-          restore-keys: |
-            bun-${{ inputs.tag }}-docker-
-          path: |
-            ${{ runner.temp }}/dockercache
-      - name: Setup Docker
-        uses: docker/setup-buildx-action@v3
-        with:
-          install: true
-          platforms: |
-            linux/${{ runner.arch == 'X64' && 'amd64' || 'arm64' }}
-      - name: Build
-        uses: docker/build-push-action@v5
-        with:
-          push: false
-          target: ${{ inputs.only-zig && 'build_release_obj' || 'artifact' }}
-          cache-from: |
-            type=local,src=${{ runner.temp }}/dockercache
-          cache-to: |
-            type=local,dest=${{ runner.temp }}/dockercache,mode=max
-          outputs: |
-            type=local,dest=${{ runner.temp }}/release
-          platforms: |
-            linux/${{ runner.arch == 'X64' && 'amd64' || 'arm64' }}
-          build-args: |
-            GIT_SHA=${{ github.event.workflow_run.head_sha || github.sha }}
-            TRIPLET=${{ inputs.os == 'darwin' && format('{0}-macos-none', inputs.arch == 'x64' && 'x86_64' || 'aarch64') || inputs.os == 'windows' && format('{0}-windows-msvc', inputs.arch == 'x64' && 'x86_64' || 'aarch64') || format('{0}-linux-gnu', inputs.arch == 'x64' && 'x86_64' || 'aarch64') }}
-            ARCH=${{ inputs.arch == 'x64' && 'x86_64' || 'aarch64' }}
-            BUILDARCH=${{ inputs.arch == 'x64' && 'amd64' || 'arm64' }}
-            BUILD_MACHINE_ARCH=${{ inputs.arch == 'x64' && 'x86_64' || 'aarch64' }}
-            CPU_TARGET=${{ inputs.arch == 'x64' && inputs.cpu || 'native' }}
-            ASSERTIONS=${{ inputs.assertions && 'ON' || 'OFF' }}
-            ZIG_OPTIMIZE=${{ inputs.zig-optimize }}
-            CANARY=${{ inputs.canary && '1' || '0' }}
-      - if: ${{ inputs.only-zig }}
-        name: Upload bun-${{ inputs.tag }}-zig
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-zig
-          path: ${{ runner.temp }}/release/bun-zig.o
-          if-no-files-found: error
-      - if: ${{ !inputs.only-zig }}
-        name: Prepare
-        run: |
-          cd ${{ runner.temp }}/release
-          chmod +x bun-profile bun
-          mkdir bun-${{ inputs.tag }}-profile
-          mkdir bun-${{ inputs.tag }}
-          strip bun
-          mv bun-profile bun-${{ inputs.tag }}-profile/bun-profile
-          mv bun bun-${{ inputs.tag }}/bun
-          zip -r bun-${{ inputs.tag }}-profile.zip bun-${{ inputs.tag }}-profile
-          zip -r bun-${{ inputs.tag }}.zip bun-${{ inputs.tag }}
-      - if: ${{ !inputs.only-zig }}
-        name: Upload bun-${{ inputs.tag }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}
-          path: ${{ runner.temp }}/release/bun-${{ inputs.tag }}.zip
-          if-no-files-found: error
-      - if: ${{ !inputs.only-zig }}
-        name: Upload bun-${{ inputs.tag }}-profile
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-profile
-          path: ${{ runner.temp }}/release/bun-${{ inputs.tag }}-profile.zip
-          if-no-files-found: error
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index e7acf37682..0000000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,245 +0,0 @@
-name: CI
-
-permissions:
-  contents: read
-  actions: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'workflow_dispatch' && inputs.run-id  || github.ref }}
-  cancel-in-progress: true
-
-on:
-  workflow_dispatch:
-    inputs:
-      run-id:
-        type: string
-        description: The workflow ID to download artifacts (skips the build step)
-  pull_request:
-    paths-ignore:
-      - .vscode/**/*
-      - docs/**/*
-      - examples/**/*
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - .vscode/**/*
-      - docs/**/*
-      - examples/**/*
-
-jobs:
-  format:
-    if: ${{ !inputs.run-id }}
-    name: Format
-    uses: ./.github/workflows/run-format.yml
-    secrets: inherit
-    with:
-      zig-version: 0.13.0
-    permissions:
-      contents: write
-  lint:
-    if: ${{ !inputs.run-id }}
-    name: Lint
-    uses: ./.github/workflows/run-lint.yml
-    secrets: inherit
-  linux-x64:
-    if: ${{ !inputs.run-id }}
-    name: Build linux-x64
-    uses: ./.github/workflows/build-linux.yml
-    secrets: inherit
-    with:
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-linux-x64' || 'ubuntu-latest' }}
-      tag: linux-x64
-      arch: x64
-      cpu: haswell
-      canary: true
-      no-cache: true
-  linux-x64-baseline:
-    if: ${{ !inputs.run-id }}
-    name: Build linux-x64-baseline
-    uses: ./.github/workflows/build-linux.yml
-    secrets: inherit
-    with:
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-linux-x64' || 'ubuntu-latest' }}
-      tag: linux-x64-baseline
-      arch: x64
-      cpu: nehalem
-      canary: true
-      no-cache: true
-  linux-aarch64:
-    if: ${{ !inputs.run-id && github.repository_owner == 'oven-sh' }}
-    name: Build linux-aarch64
-    uses: ./.github/workflows/build-linux.yml
-    secrets: inherit
-    with:
-      runs-on: namespace-profile-bun-ci-linux-aarch64
-      tag: linux-aarch64
-      arch: aarch64
-      cpu: native
-      canary: true
-      no-cache: true
-  darwin-x64:
-    if: ${{ !inputs.run-id }}
-    name: Build darwin-x64
-    uses: ./.github/workflows/build-darwin.yml
-    secrets: inherit
-    with:
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }}
-      tag: darwin-x64
-      arch: x64
-      cpu: haswell
-      canary: true
-  darwin-x64-baseline:
-    if: ${{ !inputs.run-id }}
-    name: Build darwin-x64-baseline
-    uses: ./.github/workflows/build-darwin.yml
-    secrets: inherit
-    with:
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }}
-      tag: darwin-x64-baseline
-      arch: x64
-      cpu: nehalem
-      canary: true
-  darwin-aarch64:
-    if: ${{ !inputs.run-id }}
-    name: Build darwin-aarch64
-    uses: ./.github/workflows/build-darwin.yml
-    secrets: inherit
-    with:
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-12' }}
-      tag: darwin-aarch64
-      arch: aarch64
-      cpu: native
-      canary: true
-  windows-x64:
-    if: ${{ !inputs.run-id }}
-    name: Build windows-x64
-    uses: ./.github/workflows/build-windows.yml
-    secrets: inherit
-    with:
-      runs-on: windows
-      tag: windows-x64
-      arch: x64
-      cpu: haswell
-      canary: true
-  windows-x64-baseline:
-    if: ${{ !inputs.run-id }}
-    name: Build windows-x64-baseline
-    uses: ./.github/workflows/build-windows.yml
-    secrets: inherit
-    with:
-      runs-on: windows
-      tag: windows-x64-baseline
-      arch: x64
-      cpu: nehalem
-      canary: true
-  linux-x64-test:
-    if: ${{ inputs.run-id || github.event_name == 'pull_request' }}
-    name: Test linux-x64
-    needs: linux-x64
-    uses: ./.github/workflows/run-test.yml
-    secrets: inherit
-    with:
-      run-id: ${{ inputs.run-id }}
-      pr-number: ${{ github.event.number }}
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-linux-x64' || 'ubuntu-latest' }}
-      tag: linux-x64
-  linux-x64-baseline-test:
-    if: ${{ inputs.run-id || github.event_name == 'pull_request' }}
-    name: Test linux-x64-baseline
-    needs: linux-x64-baseline
-    uses: ./.github/workflows/run-test.yml
-    secrets: inherit
-    with:
-      run-id: ${{ inputs.run-id }}
-      pr-number: ${{ github.event.number }}
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-linux-x64' || 'ubuntu-latest' }}
-      tag: linux-x64-baseline
-  linux-aarch64-test:
-    if: ${{ inputs.run-id || github.event_name == 'pull_request' && github.repository_owner == 'oven-sh'}}
-    name: Test linux-aarch64
-    needs: linux-aarch64
-    uses: ./.github/workflows/run-test.yml
-    secrets: inherit
-    with:
-      run-id: ${{ inputs.run-id }}
-      pr-number: ${{ github.event.number }}
-      runs-on: namespace-profile-bun-ci-linux-aarch64
-      tag: linux-aarch64
-  darwin-x64-test:
-    if: ${{ inputs.run-id || github.event_name == 'pull_request' }}
-    name: Test darwin-x64
-    needs: darwin-x64
-    uses: ./.github/workflows/run-test.yml
-    secrets: inherit
-    with:
-      run-id: ${{ inputs.run-id }}
-      pr-number: ${{ github.event.number }}
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }}
-      tag: darwin-x64
-  darwin-x64-baseline-test:
-    if: ${{ inputs.run-id || github.event_name == 'pull_request' }}
-    name: Test darwin-x64-baseline
-    needs: darwin-x64-baseline
-    uses: ./.github/workflows/run-test.yml
-    secrets: inherit
-    with:
-      run-id: ${{ inputs.run-id }}
-      pr-number: ${{ github.event.number }}
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }}
-      tag: darwin-x64-baseline
-  darwin-aarch64-test:
-    if: ${{ inputs.run-id || github.event_name == 'pull_request' }}
-    name: Test darwin-aarch64
-    needs: darwin-aarch64
-    uses: ./.github/workflows/run-test.yml
-    secrets: inherit
-    with:
-      run-id: ${{ inputs.run-id }}
-      pr-number: ${{ github.event.number }}
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-12' }}
-      tag: darwin-aarch64
-  windows-x64-test:
-    if: ${{ inputs.run-id || github.event_name == 'pull_request' }}
-    name: Test windows-x64
-    needs: windows-x64
-    uses: ./.github/workflows/run-test.yml
-    secrets: inherit
-    with:
-      run-id: ${{ inputs.run-id }}
-      pr-number: ${{ github.event.number }}
-      runs-on: windows
-      tag: windows-x64
-  windows-x64-baseline-test:
-    if: ${{ inputs.run-id || github.event_name == 'pull_request' }}
-    name: Test windows-x64-baseline
-    needs: windows-x64-baseline
-    uses: ./.github/workflows/run-test.yml
-    secrets: inherit
-    with:
-      run-id: ${{ inputs.run-id }}
-      pr-number: ${{ github.event.number }}
-      runs-on: windows
-      tag: windows-x64-baseline
-  cleanup:
-    if: ${{ always() }}
-    name: Cleanup
-    needs:
-      - linux-x64
-      - linux-x64-baseline
-      - linux-aarch64
-      - darwin-x64
-      - darwin-x64-baseline
-      - darwin-aarch64
-      - windows-x64
-      - windows-x64-baseline
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cleanup Artifacts
-        uses: geekyeggo/delete-artifact@v5
-        with:
-          name: |
-            bun-*-cpp
-            bun-*-zig
-            bun-*-deps
-            bun-*-codegen
diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml
deleted file mode 100644
index 3c798e8fcc..0000000000
--- a/.github/workflows/comment.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: Comment
-
-permissions:
-  actions: read
-  pull-requests: write
-
-on:
-  workflow_run:
-    workflows:
-      - CI
-    types:
-      - completed
-
-jobs:
-  comment:
-    if: ${{ github.repository_owner == 'oven-sh' }}
-    name: Comment
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download Tests
-        uses: actions/download-artifact@v4
-        with:
-          path: bun
-          pattern: bun-*-tests
-          github-token: ${{ github.token }}
-          run-id: ${{ github.event.workflow_run.id }}
-      - name: Setup Environment
-        id: env
-        shell: bash
-        run: |
-          echo "pr-number=$(<bun/bun-linux-x64-tests/pr-number.txt)" >> $GITHUB_OUTPUT
-      - name: Generate Comment
-        run: |
-          cat bun/bun-*-tests/comment.md > comment.md
-          if [ -s comment.md ]; then
-            echo -e "❌ @${{ github.actor }}, your commit has failing tests :(\n\n$(cat comment.md)" > comment.md
-          else
-            echo -e "✅ @${{ github.actor }}, all tests passed!" > comment.md
-          fi
-          echo -e "\n**[View logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }})**" >> comment.md
-          echo -e "<!-- generated-comment workflow=${{ github.workflow }} -->" >> comment.md
-      - name: Find Comment
-        id: comment
-        uses: peter-evans/find-comment@v3
-        with:
-          issue-number: ${{ steps.env.outputs.pr-number }}
-          comment-author: github-actions[bot]
-          body-includes: <!-- generated-comment workflow=${{ github.workflow }} -->
-      - name: Write Comment
-        uses: peter-evans/create-or-update-comment@v4
-        with:
-          comment-id: ${{ steps.comment.outputs.comment-id }}
-          issue-number: ${{ steps.env.outputs.pr-number }}
-          body-path: comment.md
-          edit-mode: replace
diff --git a/.github/workflows/create-release-build.yml b/.github/workflows/create-release-build.yml
deleted file mode 100644
index e9aa5796fe..0000000000
--- a/.github/workflows/create-release-build.yml
+++ /dev/null
@@ -1,183 +0,0 @@
-name: Create Release Build
-run-name: Compile Bun v${{ inputs.version }} by ${{ github.actor }}
-
-concurrency:
-  group: release
-  cancel-in-progress: true
-
-permissions:
-  contents: write
-  actions: write
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        type: string
-        required: true
-        description: "Release version. Example: 1.1.4. Exclude the 'v' prefix."
-      tag:
-        type: string
-        required: true
-        description: "GitHub tag to use"
-      clobber:
-        type: boolean
-        required: false
-        default: false
-        description: "Overwrite existing release artifacts?"
-  release:
-    types:
-      - created
-
-jobs:
-  notify-start:
-    if: ${{ github.repository_owner == 'oven-sh' }}
-    name: Notify Start
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send Message
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_PUBLIC }}
-          nodetail: true
-          color: "#1F6FEB"
-          title: "Bun v${{ inputs.version }} is compiling"
-          description: |
-            ### @${{ github.actor }} started compiling Bun v${{inputs.version}}
-      - name: Send Message
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.BUN_DISCORD_GITHUB_CHANNEL_WEBHOOK }}
-          nodetail: true
-          color: "#1F6FEB"
-          title: "Bun v${{ inputs.version }} is compiling"
-          description: |
-            ### @${{ github.actor }} started compiling Bun v${{inputs.version}}
-
-            **[View logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})**
-  linux-x64:
-    name: Build linux-x64
-    uses: ./.github/workflows/build-linux.yml
-    secrets: inherit
-    with:
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-linux-x64' || 'ubuntu-latest' }}
-      tag: linux-x64
-      arch: x64
-      cpu: haswell
-      canary: false
-  linux-x64-baseline:
-    name: Build linux-x64-baseline
-    uses: ./.github/workflows/build-linux.yml
-    secrets: inherit
-    with:
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-linux-x64' || 'ubuntu-latest' }}
-      tag: linux-x64-baseline
-      arch: x64
-      cpu: nehalem
-      canary: false
-  linux-aarch64:
-    name: Build linux-aarch64
-    uses: ./.github/workflows/build-linux.yml
-    secrets: inherit
-    with:
-      runs-on: namespace-profile-bun-ci-linux-aarch64
-      tag: linux-aarch64
-      arch: aarch64
-      cpu: native
-      canary: false
-  darwin-x64:
-    name: Build darwin-x64
-    uses: ./.github/workflows/build-darwin.yml
-    secrets: inherit
-    with:
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }}
-      tag: darwin-x64
-      arch: x64
-      cpu: haswell
-      canary: false
-  darwin-x64-baseline:
-    name: Build darwin-x64-baseline
-    uses: ./.github/workflows/build-darwin.yml
-    secrets: inherit
-    with:
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }}
-      tag: darwin-x64-baseline
-      arch: x64
-      cpu: nehalem
-      canary: false
-  darwin-aarch64:
-    name: Build darwin-aarch64
-    uses: ./.github/workflows/build-darwin.yml
-    secrets: inherit
-    with:
-      runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-12' }}
-      tag: darwin-aarch64
-      arch: aarch64
-      cpu: native
-      canary: false
-  windows-x64:
-    name: Build windows-x64
-    uses: ./.github/workflows/build-windows.yml
-    secrets: inherit
-    with:
-      runs-on: windows
-      tag: windows-x64
-      arch: x64
-      cpu: haswell
-      canary: false
-  windows-x64-baseline:
-    name: Build windows-x64-baseline
-    uses: ./.github/workflows/build-windows.yml
-    secrets: inherit
-    with:
-      runs-on: windows
-      tag: windows-x64-baseline
-      arch: x64
-      cpu: nehalem
-      canary: false
-
-  upload-artifacts:
-    needs:
-      - linux-x64
-      - linux-x64-baseline
-      - linux-aarch64
-      - darwin-x64
-      - darwin-x64-baseline
-      - darwin-aarch64
-      - windows-x64
-      - windows-x64-baseline
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: bun-releases
-          pattern: bun-*
-          merge-multiple: true
-          github-token: ${{ github.token }}
-      - name: Check for Artifacts
-        run: |
-          if [ ! -d "bun-releases" ] || [ -z "$(ls -A bun-releases)" ]; then
-            echo "Error: No artifacts were downloaded or 'bun-releases' directory does not exist."
-            exit 1  # Fail the job if the condition is met
-          else
-            echo "Artifacts downloaded successfully."
-          fi
-      - name: Send Message
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          nodetail: true
-          color: "#FF0000"
-          title: "Bun v${{ inputs.version }} release artifacts uploaded"
-      - name: "Upload Artifacts"
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          # Unzip one level deep each artifact
-          cd bun-releases
-          for f in *.zip; do
-            unzip -o $f
-          done
-          cd ..
-          gh release upload --repo=${{ github.repository }} ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.event.release.id }} ${{ inputs.clobber && '--clobber' || '' }} bun-releases/*.zip
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2e0e90fac1..cbe6b3e93a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,3 +1,6 @@
+# TODO: Move this to bash scripts intead of Github Actions
+# so it can be run from Buildkite, see: .buildkite/scripts/release.sh
+
 name: Release
 concurrency: release
 
@@ -63,7 +66,7 @@ jobs:
       - name: Setup Bun
         uses: ./.github/actions/setup-bun
         with:
-          bun-version: "1.0.21"
+          bun-version: "1.1.20"
       - name: Install Dependencies
         run: bun install
       - name: Sign Release
@@ -88,7 +91,7 @@ jobs:
       - name: Setup Bun
         uses: ./.github/actions/setup-bun
         with:
-          bun-version: "1.0.21"
+          bun-version: "1.1.20"
       - name: Install Dependencies
         run: bun install
       - name: Release
@@ -117,7 +120,7 @@ jobs:
         if: ${{ env.BUN_VERSION != 'canary' }}
         uses: ./.github/actions/setup-bun
         with:
-          bun-version: "1.0.21"
+          bun-version: "1.1.20"
       - name: Setup Bun
         if: ${{ env.BUN_VERSION == 'canary' }}
         uses: ./.github/actions/setup-bun
@@ -259,7 +262,7 @@ jobs:
       - name: Setup Bun
         uses: ./.github/actions/setup-bun
         with:
-          bun-version: "1.0.21"
+          bun-version: "1.1.20"
       - name: Install Dependencies
         run: bun install
       - name: Release
@@ -270,6 +273,24 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
           AWS_ENDPOINT: ${{ secrets.AWS_ENDPOINT }}
           AWS_BUCKET: bun
+
+  notify-sentry:
+    name: Notify Sentry
+    runs-on: ubuntu-latest
+    needs: s3
+    steps:
+      - name: Notify Sentry
+        uses: getsentry/action-release@v1.7.0
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+        with:
+          ignore_missing: true
+          ignore_empty: true
+          version: ${{ env.BUN_VERSION }}
+          environment: production
+
   bump:
     name: "Bump version"
     runs-on: ubuntu-latest
diff --git a/.github/workflows/run-format.yml b/.github/workflows/run-format.yml
index 2a947cc5a2..4d03ce22e8 100644
--- a/.github/workflows/run-format.yml
+++ b/.github/workflows/run-format.yml
@@ -29,9 +29,9 @@ jobs:
       - name: Setup Bun
         uses: ./.github/actions/setup-bun
         with:
-          bun-version: "1.1.18"
+          bun-version: "1.1.20"
       - name: Setup Zig
-        uses: goto-bus-stop/setup-zig@c7b6cdd3adba8f8b96984640ff172c37c93f73ee
+        uses: mlugg/setup-zig@v1
         with:
           version: ${{ inputs.zig-version }}
       - name: Install Dependencies
diff --git a/.github/workflows/run-lint-cpp.yml b/.github/workflows/run-lint-cpp.yml
index 12abea144b..7aae7eaacb 100644
--- a/.github/workflows/run-lint-cpp.yml
+++ b/.github/workflows/run-lint-cpp.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   lint-cpp:
     name: Lint C++
-    runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-xlarge' || 'macos-12' }}
+    runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-xlarge' || 'macos-13' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
deleted file mode 100644
index 6efe322a54..0000000000
--- a/.github/workflows/run-test.yml
+++ /dev/null
@@ -1,224 +0,0 @@
-name: Test
-
-permissions:
-  contents: read
-  actions: read
-
-on:
-  workflow_call:
-    inputs:
-      runs-on:
-        type: string
-        required: true
-      tag:
-        type: string
-        required: true
-      pr-number:
-        type: string
-        required: true
-      run-id:
-        type: string
-        default: ${{ github.run_id }}
-
-jobs:
-  test:
-    name: Tests
-    runs-on: ${{ inputs.runs-on }}
-    steps:
-      - if: ${{ runner.os == 'Windows' }}
-        name: Setup Git
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          sparse-checkout: |
-            package.json
-            bun.lockb
-            test
-            packages/bun-internal-test
-            packages/bun-types
-      - name: Setup Environment
-        shell: bash
-        run: |
-          echo "${{ inputs.pr-number }}" > pr-number.txt
-      - name: Download Bun
-        uses: actions/download-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}
-          path: bun
-          github-token: ${{ github.token }}
-          run-id: ${{ inputs.run-id || github.run_id }}
-      - name: Download pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 8
-      - if: ${{ runner.os != 'Windows' }}
-        name: Setup Bun
-        shell: bash
-        run: |
-          unzip bun/bun-*.zip
-          cd bun-*
-          pwd >> $GITHUB_PATH
-      - if: ${{ runner.os == 'Windows' }}
-        name: Setup Cygwin
-        uses: secondlife/setup-cygwin@v3
-        with:
-          packages: bash
-      - if: ${{ runner.os == 'Windows' }}
-        name: Setup Bun (Windows)
-        run: |
-          unzip bun/bun-*.zip
-          cd bun-*
-          pwd >> $env:GITHUB_PATH
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Install Dependencies
-        timeout-minutes: 5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          bun install
-      - name: Install Dependencies (test)
-        timeout-minutes: 5
-        run: |
-          bun install --cwd test
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Install Dependencies (runner)
-        timeout-minutes: 5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          bun install --cwd packages/bun-internal-test
-      - name: Run Tests
-        id: test
-        timeout-minutes: 90
-        shell: bash
-        env:
-          IS_BUN_CI: 1
-          TMPDIR: ${{ runner.temp }}
-          BUN_TAG: ${{ inputs.tag }}
-          BUN_FEATURE_FLAG_INTERNAL_FOR_TESTING: "true"
-          SMTP_SENDGRID_SENDER: ${{ secrets.SMTP_SENDGRID_SENDER }}
-          TLS_MONGODB_DATABASE_URL: ${{ secrets.TLS_MONGODB_DATABASE_URL }}
-          TLS_POSTGRES_DATABASE_URL: ${{ secrets.TLS_POSTGRES_DATABASE_URL }}
-          TEST_INFO_STRIPE: ${{ secrets.TEST_INFO_STRIPE }}
-          TEST_INFO_AZURE_SERVICE_BUS: ${{ secrets.TEST_INFO_AZURE_SERVICE_BUS }}
-          SHELLOPTS: igncr
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          node packages/bun-internal-test/src/runner.node.mjs $(which bun)
-      - if: ${{ always() }}
-        name: Upload Results
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-tests
-          path: |
-            test-report.*
-            comment.md
-            pr-number.txt
-          if-no-files-found: error
-          overwrite: true
-      - if: ${{ always() && steps.test.outputs.failing_tests != '' && github.event.pull_request && github.repository_owner == 'oven-sh' }}
-        name: Send Message
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          nodetail: true
-          color: "#FF0000"
-          title: ""
-          description: |
-            ### ❌ [${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }})
-
-            @${{ github.actor }}, there are ${{ steps.test.outputs.failing_tests_count || 'some' }} failing tests on bun-${{ inputs.tag }}.
-
-            ${{ steps.test.outputs.failing_tests }}
-
-            **[View logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})**
-      - name: Fail
-        if: ${{ failure() || always() && steps.test.outputs.failing_tests != '' }}
-        run: |
-          echo "There are ${{ steps.test.outputs.failing_tests_count || 'some' }} failing tests on bun-${{ inputs.tag }}."
-          exit 1
-  test-node:
-    name: Node.js Tests
-    # TODO: enable when we start paying attention to the results. In the meantime, this causes CI to queue jobs wasting developer time.
-    if: 0
-    runs-on: ${{ inputs.runs-on }}
-    steps:
-      - if: ${{ runner.os == 'Windows' }}
-        name: Setup Git
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          sparse-checkout: |
-            test/node.js
-      - name: Setup Environment
-        shell: bash
-        run: |
-          echo "${{ inputs.pr-number }}" > pr-number.txt
-      - name: Download Bun
-        uses: actions/download-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}
-          path: bun
-          github-token: ${{ github.token }}
-          run-id: ${{ inputs.run-id || github.run_id }}
-      - if: ${{ runner.os != 'Windows' }}
-        name: Setup Bun
-        shell: bash
-        run: |
-          unzip bun/bun-*.zip
-          cd bun-*
-          pwd >> $GITHUB_PATH
-      - if: ${{ runner.os == 'Windows' }}
-        name: Setup Cygwin
-        uses: secondlife/setup-cygwin@v3
-        with:
-          packages: bash
-      - if: ${{ runner.os == 'Windows' }}
-        name: Setup Bun (Windows)
-        run: |
-          unzip bun/bun-*.zip
-          cd bun-*
-          pwd >> $env:GITHUB_PATH
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Checkout Tests
-        shell: bash
-        working-directory: test/node.js
-        run: |
-          node runner.mjs --pull
-      - name: Install Dependencies
-        timeout-minutes: 5
-        shell: bash
-        working-directory: test/node.js
-        run: |
-          bun install
-      - name: Run Tests
-        timeout-minutes: 10 # Increase when more tests are added
-        shell: bash
-        working-directory: test/node.js
-        env:
-          TMPDIR: ${{ runner.temp }}
-          BUN_GARBAGE_COLLECTOR_LEVEL: "0"
-          BUN_FEATURE_FLAG_INTERNAL_FOR_TESTING: "true"
-        run: |
-          node runner.mjs
-      - name: Upload Results
-        uses: actions/upload-artifact@v4
-        with:
-          name: bun-${{ inputs.tag }}-node-tests
-          path: |
-            test/node.js/summary/*.json
-          if-no-files-found: error
-          overwrite: true
diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml
deleted file mode 100644
index 232c449e1d..0000000000
--- a/.github/workflows/upload.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-name: Upload Artifacts
-run-name: Canary release ${{github.sha}} upload
-
-permissions:
-  contents: write
-
-on:
-  workflow_run:
-    workflows:
-      - CI
-    types:
-      - completed
-    branches:
-      - main
-
-jobs:
-  upload:
-    if: ${{ github.repository_owner == 'oven-sh' }}
-    name: Upload Artifacts
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: bun
-          pattern: bun-*
-          merge-multiple: true
-          github-token: ${{ github.token }}
-          run-id: ${{ github.event.workflow_run.id }}
-      - name: Check for Artifacts
-        run: |
-          if [ ! -d "bun" ] || [ -z "$(ls -A bun)" ]; then
-            echo "Error: No artifacts were downloaded or 'bun' directory does not exist."
-            exit 1  # Fail the job if the condition is met
-          else
-            echo "Artifacts downloaded successfully."
-          fi
-      - name: Upload to GitHub Releases
-        uses: ncipollo/release-action@v1
-        with:
-          tag: canary
-          name: Canary (${{ github.sha }})
-          prerelease: true
-          body: This canary release of Bun corresponds to the commit [${{ github.sha }}]
-          allowUpdates: true
-          replacesArtifacts: true
-          generateReleaseNotes: true
-          artifactErrorsFailBuild: true
-          artifacts: bun/**/bun-*.zip
-          token: ${{ github.token }}
-      - name: Upload to S3 (using SHA)
-        uses: shallwefootball/s3-upload-action@4350529f410221787ccf424e50133cbc1b52704e
-        with:
-          endpoint: ${{ secrets.AWS_ENDPOINT }}
-          aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
-          aws_bucket: ${{ secrets.AWS_BUCKET }}
-          source_dir: bun
-          destination_dir: releases/${{ github.event.workflow_run.head_sha || github.sha }}-canary
-      - name: Upload to S3 (using tag)
-        uses: shallwefootball/s3-upload-action@4350529f410221787ccf424e50133cbc1b52704e
-        with:
-          endpoint: ${{ secrets.AWS_ENDPOINT }}
-          aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
-          aws_bucket: ${{ secrets.AWS_BUCKET }}
-          source_dir: bun
-          destination_dir: releases/canary
-      - name: Announce on Discord
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.BUN_DISCORD_GITHUB_CHANNEL_WEBHOOK }}
-          nodetail: true
-          color: "#1F6FEB"
-          title: "New Bun Canary available"
-          url: https://github.com/oven-sh/bun/commit/${{ github.sha }}
-          description: |
-            A new canary build of Bun has been automatically uploaded. To upgrade, run:
-            ```sh
-            bun upgrade --canary
-            # bun upgrade --stable <- to downgrade
-            ```
diff --git a/.gitignore b/.gitignore
index 849c532b2b..a0c4419668 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,3 +145,4 @@ zig-cache
 zig-out
 test/node.js/upstream
 .zig-cache
+scripts/env.local
diff --git a/.gitmodules b/.gitmodules
index 98845d5097..c5069240a4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,3 +82,7 @@ url = https://github.com/oven-sh/zig
 depth = 1
 shallow = true
 fetchRecurseSubmodules = false
+[submodule "src/deps/libdeflate"]
+path = src/deps/libdeflate
+url = https://github.com/ebiggers/libdeflate
+ignore = "dirty"
diff --git a/.lldbinit b/.lldbinit
new file mode 100644
index 0000000000..2d527f4e63
--- /dev/null
+++ b/.lldbinit
@@ -0,0 +1,2 @@
+command script import src/deps/zig/tools/lldb_pretty_printers.py
+command script import src/bun.js/WebKit/Tools/lldb/lldb_webkit.py
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 625ed0cf8d..5326a6f15f 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -17,6 +17,7 @@
       "cwd": "${workspaceFolder}/test",
       "env": {
         "FORCE_COLOR": "1",
+        "BUN_DEBUG_QUIET_LOGS": "1",
         "BUN_GARBAGE_COLLECTOR_LEVEL": "1",
       },
       "console": "internalConsole",
@@ -145,14 +146,13 @@
       "request": "launch",
       "name": "bun run [file]",
       "program": "${workspaceFolder}/build/bun-debug",
-      "args": ["run", "${file}"],
+      "args": ["run", "${fileBasename}"],
       "cwd": "${fileDirname}",
       "env": {
         "FORCE_COLOR": "0",
         "BUN_DEBUG_QUIET_LOGS": "1",
         "BUN_DEBUG_EventLoop": "1",
         "BUN_GARBAGE_COLLECTOR_LEVEL": "2",
-        "BUN_DEBUG_ALL": "1",
       },
       "console": "internalConsole",
     },
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 91939e9e58..1701cb55df 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -42,8 +42,11 @@
     "editor.defaultFormatter": "ziglang.vscode-zig",
   },
 
-  // C++
+  // lldb
+  "lldb.launch.initCommands": ["command source ${workspaceFolder}/.lldbinit"],
   "lldb.verboseLogging": false,
+
+  // C++
   "cmake.configureOnOpen": false,
   "C_Cpp.errorSquiggles": "enabled",
   "[cpp]": {
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35d7367489..f85c2c72a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_policy(SET CMP0091 NEW)
 cmake_policy(SET CMP0067 NEW)
 
 set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
-set(Bun_VERSION "1.1.20")
-set(WEBKIT_TAG b49be549da59347762aa83f849a65158d2a0d724)
+set(Bun_VERSION "1.1.22")
+set(WEBKIT_TAG f9a0fda2d2b2fd001a00bfcf8e7917a56b382516)
 
 set(BUN_WORKDIR "${CMAKE_CURRENT_BINARY_DIR}")
 message(STATUS "Configuring Bun ${Bun_VERSION} in ${BUN_WORKDIR}")
@@ -22,6 +22,7 @@ set(REPORTED_NODEJS_VERSION "22.3.0")
 # If we do not set this, it will crash at startup on the first memory allocation.
 if(NOT WIN32 AND NOT APPLE)
     set(CMAKE_CXX_EXTENSIONS ON)
+    set(CMAKE_POSITION_INDEPENDENT_CODE FALSE)
 endif()
 
 # --- Build Type ---
@@ -71,7 +72,7 @@ endif()
 
 # --- MacOS SDK ---
 if(APPLE AND DEFINED ENV{CI})
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0")
 endif()
 
 if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
@@ -115,7 +116,7 @@ endif()
 # we do some extra work afterwards to double-check, and we will rerun BUN_FIND_LLVM if the compiler did not match.
 #
 # If the user passes -DLLVM_PREFIX, most of this logic is skipped, but we still warn if invalid.
-if(WIN32)
+if(WIN32 OR APPLE)
     set(LLVM_VERSION 18)
 else()
     set(LLVM_VERSION 16)
@@ -153,11 +154,12 @@ macro(BUN_FIND_LLVM)
         PATHS ENV PATH ${PLATFORM_LLVM_SEARCH_PATHS}
         DOC "Path to LLVM ${LLVM_VERSION}'s llvm-strip binary"
     )
+
     find_program(
         STRIP
         NAMES strip
         PATHS ENV PATH ${PLATFORM_LLVM_SEARCH_PATHS}
-        DOC "Path to LLVM ${LLVM_VERSION}'s llvm-strip binary"
+        DOC "Path to strip binary"
     )
     find_program(
         DSYMUTIL
@@ -308,6 +310,7 @@ endif()
 # -- Build Flags --
 option(USE_STATIC_SQLITE "Statically link SQLite?" ${DEFAULT_ON_UNLESS_APPLE})
 option(USE_CUSTOM_ZLIB "Use Bun's recommended version of zlib" ON)
+option(USE_CUSTOM_LIBDEFLATE "Use Bun's recommended version of libdeflate" ON)
 option(USE_CUSTOM_BORINGSSL "Use Bun's recommended version of BoringSSL" ON)
 option(USE_CUSTOM_LIBARCHIVE "Use Bun's recommended version of libarchive" ON)
 option(USE_CUSTOM_MIMALLOC "Use Bun's recommended version of Mimalloc" ON)
@@ -329,6 +332,11 @@ option(USE_STATIC_LIBATOMIC "Statically link libatomic, requires the presence of
 
 option(USE_LTO "Enable Link-Time Optimization" ${DEFAULT_LTO})
 
+if(APPLE AND USE_LTO)
+    set(USE_LTO OFF)
+    message(WARNING "Link-Time Optimization is not supported on macOS because it requires -fuse-ld=lld and lld causes many segfaults on macOS (likely related to stack size)")
+endif()
+
 if(WIN32 AND USE_LTO)
     set(CMAKE_LINKER_TYPE LLD)
     set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)
@@ -645,16 +653,6 @@ file(GLOB BUN_CPP ${CONFIGURE_DEPENDS}
 )
 list(APPEND BUN_RAW_SOURCES ${BUN_CPP})
 
-# -- Brotli --
-set(BROTLI_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/deps/brotli")
-file(GLOB BROTLI_FILES ${CONFIGURE_DEPENDS}
-    "${BROTLI_SRC}/common/*.c"
-    "${BROTLI_SRC}/enc/*.c"
-    "${BROTLI_SRC}/dec/*.c"
-)
-list(APPEND BUN_RAW_SOURCES ${BROTLI_FILES})
-include_directories("${BUN_DEPS_DIR}/brotli/include")
-
 # -- uSockets --
 set(USOCKETS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/packages/bun-usockets/src")
 file(GLOB USOCKETS_FILES ${CONFIGURE_DEPENDS}
@@ -902,6 +900,7 @@ if(NOT BUN_LINK_ONLY AND NOT BUN_CPP_ONLY)
         "${ZIG_COMPILER}" "build" "obj"
         "--zig-lib-dir" "${ZIG_LIB_DIR}"
         "--prefix" "${BUN_ZIG_OBJ_DIR}"
+        "--verbose"
         "-Dgenerated-code=${BUN_WORKDIR}/codegen"
         "-freference-trace=10"
         "-Dversion=${Bun_VERSION}"
@@ -1001,8 +1000,20 @@ add_compile_definitions(
 )
 
 if(NOT ASSERT_ENABLED)
+    if(APPLE)
+        add_compile_definitions("_LIBCXX_ENABLE_ASSERTIONS=0")
+        add_compile_definitions("_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_NONE")
+    endif()
+
     add_compile_definitions("NDEBUG=1")
 else()
+    if(APPLE)
+        add_compile_definitions("_LIBCXX_ENABLE_ASSERTIONS=1")
+        add_compile_definitions("_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG")
+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        add_compile_definitions("_GLIBCXX_ASSERTIONS=1")
+    endif()
+
     add_compile_definitions("ASSERT_ENABLED=1")
 endif()
 
@@ -1088,7 +1099,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
 
     if(NOT WIN32)
         if(USE_LTO)
-            list(APPEND LTO_FLAG "-flto=full" "-emit-llvm")
+            list(APPEND LTO_FLAG "-flto=full" "-emit-llvm" "-fwhole-program-vtables" "-fforce-emit-vtables")
         endif()
 
         # Leave -Werror=unused off in release builds so we avoid errors from being used in ASSERT
@@ -1177,21 +1188,25 @@ if(WIN32)
     # set_property(TARGET ${bun} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
     set_property(TARGET ${bun} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded")
 
-    target_compile_options(${bun} PUBLIC "/EHsc" "/GR-")
+    target_compile_options(${bun} PUBLIC "/EHsc" "/GR-" -Xclang -fno-c++-static-destructors)
 
     target_link_options(${bun} PUBLIC "/STACK:0x1200000,0x100000" "/DEF:${BUN_SRC}/symbols.def" "/errorlimit:0")
 else()
     target_compile_options(${bun} PUBLIC
-        -fPIC
         -mtune=${CPU_TARGET}
         -fconstexpr-steps=2542484
         -fconstexpr-depth=54
         -fno-exceptions
+        -fno-asynchronous-unwind-tables
+        -fno-unwind-tables
+        -fno-c++-static-destructors
         -fvisibility=hidden
         -fvisibility-inlines-hidden
         -fno-rtti
         -fno-omit-frame-pointer
         -mno-omit-leaf-frame-pointer
+        -fno-pic
+        -fno-pie
         -faddrsig
     )
 endif()
@@ -1208,10 +1223,11 @@ endif()
 
 if(UNIX AND NOT APPLE)
     target_link_options(${bun} PUBLIC
-        "-fuse-ld=lld"
-        "-static-libstdc++"
-        "-static-libgcc"
-        "-Wl,-z,now"
+        -fuse-ld=lld-${LLVM_VERSION}
+        -fno-pic
+        -static-libstdc++
+        -static-libgcc
+        "-Wl,-no-pie"
         "-Wl,-icf=safe"
         "-Wl,--as-needed"
         "-Wl,--gc-sections"
@@ -1241,6 +1257,8 @@ if(UNIX AND NOT APPLE)
         "-rdynamic"
         "-Wl,--dynamic-list=${BUN_SRC}/symbols.dyn"
         "-Wl,--version-script=${BUN_SRC}/linker.lds"
+        -Wl,-z,lazy
+        -Wl,-z,norelro
     )
 
     target_link_libraries(${bun} PRIVATE "c")
@@ -1274,11 +1292,12 @@ endif()
 
 # --- Stripped Binary "bun"
 if(CMAKE_BUILD_TYPE STREQUAL "Release" AND NOT WIN32 AND NOT ASSERT_ENABLED)
-    if(CI AND APPLE)
+    # if(CI AND APPLE)
+    if(APPLE)
         add_custom_command(
             TARGET ${bun}
             POST_BUILD
-            COMMAND ${DSYMUTIL} -z -o ${BUN_WORKDIR}/${bun}.dSYM ${BUN_WORKDIR}/${bun}
+            COMMAND ${DSYMUTIL} -o ${BUN_WORKDIR}/${bun}.dSYM ${BUN_WORKDIR}/${bun}
             COMMENT "Generating .dSYM"
         )
     endif()
@@ -1352,6 +1371,19 @@ else()
     target_link_libraries(${bun} PRIVATE LibArchive::LibArchive)
 endif()
 
+if(USE_CUSTOM_LIBDEFLATE)
+    include_directories(${BUN_DEPS_DIR}/libdeflate)
+
+    if(WIN32)
+        target_link_libraries(${bun} PRIVATE "${BUN_DEPS_OUT_DIR}/deflate.lib")
+    else()
+        target_link_libraries(${bun} PRIVATE "${BUN_DEPS_OUT_DIR}/libdeflate.a")
+    endif()
+else()
+    find_package(LibDeflate REQUIRED)
+    target_link_libraries(${bun} PRIVATE LibDeflate::LibDeflate)
+endif()
+
 if(USE_CUSTOM_MIMALLOC)
     include_directories(${BUN_DEPS_DIR}/mimalloc/include)
 
@@ -1463,6 +1495,24 @@ else()
     target_compile_definitions(${bun} PRIVATE "LAZY_LOAD_SQLITE=1")
 endif()
 
+# -- Brotli --
+set(BROTLI_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/deps/brotli")
+file(GLOB BROTLI_FILES ${CONFIGURE_DEPENDS}
+    "${BROTLI_SRC}/common/*.c"
+    "${BROTLI_SRC}/enc/*.c"
+    "${BROTLI_SRC}/dec/*.c"
+)
+add_library(brotli STATIC ${BROTLI_FILES})
+target_include_directories(brotli PRIVATE "${BROTLI_SRC}/include")
+target_compile_definitions(brotli PRIVATE "BROTLI_STATIC")
+
+if(WIN32)
+    target_compile_options(brotli PRIVATE /MT /U_DLL)
+endif()
+
+target_link_libraries(${bun} PRIVATE brotli)
+include_directories("${BUN_DEPS_DIR}/brotli/include")
+
 if(USE_CUSTOM_LSHPACK)
     include_directories(${BUN_DEPS_DIR}/ls-hpack)
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4f3439f503..86d148847d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,6 +5,7 @@ If you are using Windows, please refer to [this guide](/docs/project/building-wi
 {% details summary="For Ubuntu users" %}
 TL;DR: Ubuntu 22.04 is suggested.
 Bun currently requires `glibc >=2.32` in development which means if you're on Ubuntu 20.04 (glibc == 2.31), you may likely meet `error: undefined symbol: __libc_single_threaded `. You need to take extra configurations. Also, according to this [issue](https://github.com/llvm/llvm-project/issues/97314), LLVM 16 is no longer maintained on Ubuntu 24.04 (noble). And instead, you might want `brew` to install LLVM 16 for your Ubuntu 24.04.
+{% /details %}
 
 ## Install Dependencies
 
diff --git a/Dockerfile b/Dockerfile
index 843f8f0ef5..7b707f03e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,10 +54,6 @@ ENV BUILDARCH=${BUILDARCH}
 ENV BUN_DEPS_OUT_DIR=${BUN_DEPS_OUT_DIR}
 ENV BUN_ENABLE_LTO 1
 
-ENV CXX=clang++-${LLVM_VERSION}
-ENV CC=clang-${LLVM_VERSION}
-ENV AR=/usr/bin/llvm-ar-${LLVM_VERSION}
-ENV LD=lld-${LLVM_VERSION}
 ENV LC_CTYPE=en_US.UTF-8
 ENV LC_ALL=en_US.UTF-8
 
@@ -94,6 +90,8 @@ RUN install_packages \
   clangd-${LLVM_VERSION} \
   libc++-${LLVM_VERSION}-dev \
   libc++abi-${LLVM_VERSION}-dev \
+  llvm-${LLVM_VERSION}-runtime \
+  llvm-${LLVM_VERSION}-dev \
   make \
   cmake \
   ninja-build \
@@ -120,6 +118,15 @@ RUN install_packages \
   && ln -sf /usr/bin/lldb-${LLVM_VERSION} /usr/bin/lldb \
   && ln -sf /usr/bin/clangd-${LLVM_VERSION} /usr/bin/clangd \
   && ln -sf /usr/bin/llvm-ar-${LLVM_VERSION} /usr/bin/llvm-ar \
+  && ln -sf /usr/bin/ld.lld /usr/bin/ld \
+  && ln -sf /usr/bin/llvm-ranlib-${LLVM_VERSION} /usr/bin/ranlib \
+  && ln -sf /usr/bin/clang /usr/bin/cc \
+  && ln -sf /usr/bin/clang /usr/bin/c89 \
+  && ln -sf /usr/bin/clang /usr/bin/c99 \
+  && ln -sf /usr/bin/clang++ /usr/bin/c++ \
+  && ln -sf /usr/bin/clang++ /usr/bin/g++ \
+  && ln -sf /usr/bin/llvm-ar /usr/bin/ar \
+  && ln -sf /usr/bin/clang /usr/bin/gcc \
   && arch="$(dpkg --print-architecture)" \
   && case "${arch##*-}" in \
   amd64) variant="x64";; \
@@ -132,6 +139,7 @@ RUN install_packages \
   && ln -s /usr/bin/bun /usr/bin/bunx \
   && rm -rf bun-linux-${variant} bun-linux-${variant}.zip \
   && mkdir -p ${BUN_DIR} ${BUN_DEPS_OUT_DIR}
+
 # && if [ -n "${SCCACHE_BUCKET}" ]; then \
 #   echo "Setting up sccache" \
 #   && wget https://github.com/mozilla/sccache/releases/download/v0.5.4/sccache-v0.5.4-${BUILD_MACHINE_ARCH}-unknown-linux-musl.tar.gz \
@@ -168,13 +176,14 @@ ENV CCACHE_DIR=${CCACHE_DIR}
 
 COPY Makefile ${BUN_DIR}/Makefile
 COPY src/deps/c-ares ${BUN_DIR}/src/deps/c-ares
+COPY scripts ${BUN_DIR}/scripts
 
 WORKDIR $BUN_DIR
 
 RUN --mount=type=cache,target=${CCACHE_DIR} \
   cd $BUN_DIR \
-  && make c-ares \
-  && rm -rf ${BUN_DIR}/src/deps/c-ares ${BUN_DIR}/Makefile
+  && bash ./scripts/build-cares.sh \
+  && rm -rf ${BUN_DIR}/src/deps/c-ares ${BUN_DIR}/Makefile ${BUN_DIR}/scripts
 
 FROM bun-base as lolhtml
 
@@ -205,13 +214,14 @@ ENV CPU_TARGET=${CPU_TARGET}
 
 COPY Makefile ${BUN_DIR}/Makefile
 COPY src/deps/mimalloc ${BUN_DIR}/src/deps/mimalloc
+COPY scripts ${BUN_DIR}/scripts
 
 ARG CCACHE_DIR=/ccache
 ENV CCACHE_DIR=${CCACHE_DIR}
 
 RUN --mount=type=cache,target=${CCACHE_DIR} \
   cd ${BUN_DIR} \
-  && make mimalloc \
+  && bash ./scripts/build-mimalloc.sh \
   && rm -rf src/deps/mimalloc Makefile
 
 FROM bun-base as mimalloc-debug
@@ -241,14 +251,38 @@ ARG CCACHE_DIR=/ccache
 ENV CCACHE_DIR=${CCACHE_DIR}
 
 COPY Makefile ${BUN_DIR}/Makefile
+COPY CMakeLists.txt ${BUN_DIR}/CMakeLists.txt
+COPY scripts ${BUN_DIR}/scripts
 COPY src/deps/zlib ${BUN_DIR}/src/deps/zlib
+COPY package.json bun.lockb Makefile .gitmodules ${BUN_DIR}/
 
 WORKDIR $BUN_DIR
 
 RUN --mount=type=cache,target=${CCACHE_DIR} \
   cd $BUN_DIR \
-  && make zlib \
-  && rm -rf src/deps/zlib Makefile
+  && bash ./scripts/build-zlib.sh && rm -rf src/deps/zlib scripts
+
+
+FROM bun-base as libdeflate
+
+ARG BUN_DIR
+ARG CPU_TARGET
+ENV CPU_TARGET=${CPU_TARGET}
+ARG CCACHE_DIR=/ccache
+ENV CCACHE_DIR=${CCACHE_DIR}
+
+COPY Makefile ${BUN_DIR}/Makefile
+COPY CMakeLists.txt ${BUN_DIR}/CMakeLists.txt
+COPY scripts ${BUN_DIR}/scripts
+COPY src/deps/libdeflate ${BUN_DIR}/src/deps/libdeflate
+COPY package.json bun.lockb Makefile .gitmodules ${BUN_DIR}/
+
+WORKDIR $BUN_DIR
+
+RUN --mount=type=cache,target=${CCACHE_DIR} \
+  cd $BUN_DIR \
+  && bash ./scripts/build-libdeflate.sh && rm -rf src/deps/libdeflate scripts
+
 
 FROM bun-base as libarchive
 
@@ -287,6 +321,7 @@ ARG CPU_TARGET
 ENV CPU_TARGET=${CPU_TARGET}
 
 COPY Makefile ${BUN_DIR}/Makefile
+COPY scripts ${BUN_DIR}/scripts
 COPY src/deps/boringssl ${BUN_DIR}/src/deps/boringssl
 
 WORKDIR $BUN_DIR
@@ -296,7 +331,7 @@ ENV CCACHE_DIR=${CCACHE_DIR}
 
 RUN --mount=type=cache,target=${CCACHE_DIR} \
   cd ${BUN_DIR} \
-  && make boringssl \
+  && bash ./scripts/build-boringssl.sh \
   && rm -rf src/deps/boringssl Makefile
 
 
@@ -312,12 +347,14 @@ ENV CCACHE_DIR=${CCACHE_DIR}
 
 COPY Makefile ${BUN_DIR}/Makefile
 COPY src/deps/zstd ${BUN_DIR}/src/deps/zstd
+COPY scripts ${BUN_DIR}/scripts
 
 WORKDIR $BUN_DIR
 
 RUN --mount=type=cache,target=${CCACHE_DIR} \
   cd $BUN_DIR \
-  && make zstd
+  && bash ./scripts/build-zstd.sh \
+  && rm -rf src/deps/zstd scripts
 
 FROM bun-base as ls-hpack
 
@@ -331,12 +368,14 @@ ENV CCACHE_DIR=${CCACHE_DIR}
 
 COPY Makefile ${BUN_DIR}/Makefile
 COPY src/deps/ls-hpack ${BUN_DIR}/src/deps/ls-hpack
+COPY scripts ${BUN_DIR}/scripts
 
 WORKDIR $BUN_DIR
 
 RUN --mount=type=cache,target=${CCACHE_DIR} \
   cd $BUN_DIR \
-  && make lshpack
+  && bash ./scripts/build-lshpack.sh \
+  && rm -rf src/deps/ls-hpack scripts
 
 FROM bun-base-with-zig as bun-identifier-cache
 
@@ -394,6 +433,9 @@ COPY src ${BUN_DIR}/src
 COPY CMakeLists.txt ${BUN_DIR}/CMakeLists.txt
 COPY src/deps/boringssl/include ${BUN_DIR}/src/deps/boringssl/include
 
+# for uWebSockets
+COPY src/deps/libdeflate ${BUN_DIR}/src/deps/libdeflate
+
 ARG CCACHE_DIR=/ccache
 ENV CCACHE_DIR=${CCACHE_DIR}
 
@@ -492,11 +534,13 @@ RUN mkdir -p build bun-webkit
 
 # lol
 COPY src/bun.js/bindings/sqlite/sqlite3.c ${BUN_DIR}/src/bun.js/bindings/sqlite/sqlite3.c
+COPY src/deps/brotli ${BUN_DIR}/src/deps/brotli
 
 COPY src/symbols.dyn src/linker.lds ${BUN_DIR}/src/
 
 COPY CMakeLists.txt ${BUN_DIR}/CMakeLists.txt
 COPY --from=zlib ${BUN_DEPS_OUT_DIR}/* ${BUN_DEPS_OUT_DIR}/
+COPY --from=libdeflate ${BUN_DEPS_OUT_DIR}/* ${BUN_DEPS_OUT_DIR}/
 COPY --from=libarchive ${BUN_DEPS_OUT_DIR}/* ${BUN_DEPS_OUT_DIR}/
 COPY --from=boringssl ${BUN_DEPS_OUT_DIR}/* ${BUN_DEPS_OUT_DIR}/
 COPY --from=lolhtml ${BUN_DEPS_OUT_DIR}/* ${BUN_DEPS_OUT_DIR}/
@@ -506,7 +550,8 @@ COPY --from=tinycc ${BUN_DEPS_OUT_DIR}/* ${BUN_DEPS_OUT_DIR}/
 COPY --from=c-ares ${BUN_DEPS_OUT_DIR}/* ${BUN_DEPS_OUT_DIR}/
 COPY --from=ls-hpack ${BUN_DEPS_OUT_DIR}/* ${BUN_DEPS_OUT_DIR}/
 COPY --from=bun-compile-zig-obj /tmp/bun-zig.o ${BUN_DIR}/build/bun-zig.o
-COPY --from=bun-cpp-objects ${BUN_DIR}/build/bun-cpp-objects.a ${BUN_DIR}/build/bun-cpp-objects.a
+COPY --from=bun-cpp-objects ${BUN_DIR}/build/*.a ${BUN_DIR}/build/
+COPY --from=bun-cpp-objects ${BUN_DIR}/build/*.o ${BUN_DIR}/build/ 
 COPY --from=bun-cpp-objects ${BUN_DIR}/bun-webkit/lib ${BUN_DIR}/bun-webkit/lib
 
 WORKDIR $BUN_DIR/build
diff --git a/LATEST b/LATEST
index 0ee9c5d6a3..a2a8e42b09 100644
--- a/LATEST
+++ b/LATEST
@@ -1 +1 @@
-1.1.20
\ No newline at end of file
+1.1.21
\ No newline at end of file
diff --git a/LICENSE.md b/LICENSE.md
index 719bf08d76..4cc901b7bc 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -34,6 +34,8 @@ Bun statically links these libraries:
 | [`c-ares`](https://github.com/c-ares/c-ares) | MIT licensed |
 | [`libicu`](https://github.com/unicode-org/icu) 72 | [license here](https://github.com/unicode-org/icu/blob/main/icu4c/LICENSE) |
 | [`libbase64`](https://github.com/aklomp/base64/blob/master/LICENSE) | BSD 2-Clause |
+| [`libuv`](https://github.com/libuv/libuv) (on Windows) | MIT |
+| [`libdeflate`](https://github.com/ebiggers/libdeflate) | MIT |
 | A fork of [`uWebsockets`](https://github.com/jarred-sumner/uwebsockets) | Apache 2.0 licensed |
 | Parts of [Tigerbeetle's IO code](https://github.com/tigerbeetle/tigerbeetle/blob/532c8b70b9142c17e07737ab6d3da68d7500cbca/src/io/windows.zig#L1) | Apache 2.0 licensed |
 
diff --git a/Makefile b/Makefile
index db8d717ec9..c997d7da7b 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ ifeq ($(ARCH_NAME_RAW),arm64)
 ARCH_NAME = aarch64
 DOCKER_BUILDARCH = arm64
 BREW_PREFIX_PATH = /opt/homebrew
-DEFAULT_MIN_MACOS_VERSION = 11.0
+DEFAULT_MIN_MACOS_VERSION = 13.0
 MARCH_NATIVE = -mtune=$(CPU_TARGET)
 ifeq ($(OS_NAME),linux)
 MARCH_NATIVE = -march=armv8-a+crc -mtune=ampere1
@@ -157,7 +157,12 @@ CMAKE_FLAGS_WITHOUT_RELEASE = -DCMAKE_C_COMPILER=$(CC) \
 	-DCMAKE_OSX_DEPLOYMENT_TARGET=$(MIN_MACOS_VERSION) \
 	$(CMAKE_CXX_COMPILER_LAUNCHER_FLAG) \
 	-DCMAKE_AR=$(AR) \
-    -DCMAKE_RANLIB=$(which llvm-16-ranlib 2>/dev/null || which llvm-ranlib 2>/dev/null)
+	-DCMAKE_RANLIB=$(which llvm-16-ranlib 2>/dev/null || which llvm-ranlib 2>/dev/null) \
+	-DCMAKE_CXX_STANDARD=20 \
+	-DCMAKE_C_STANDARD=17 \
+	-DCMAKE_CXX_STANDARD_REQUIRED=ON \
+	-DCMAKE_C_STANDARD_REQUIRED=ON \
+	-DCMAKE_CXX_EXTENSIONS=ON 
 
 
 
@@ -184,8 +189,8 @@ endif
 
 OPTIMIZATION_LEVEL=-O3 $(MARCH_NATIVE)
 DEBUG_OPTIMIZATION_LEVEL= -O1 $(MARCH_NATIVE) -gdwarf-4
-CFLAGS_WITHOUT_MARCH = $(MACOS_MIN_FLAG) $(OPTIMIZATION_LEVEL) -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden
-BUN_CFLAGS = $(MACOS_MIN_FLAG) $(MARCH_NATIVE)  $(OPTIMIZATION_LEVEL) -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden
+CFLAGS_WITHOUT_MARCH = $(MACOS_MIN_FLAG) $(OPTIMIZATION_LEVEL) -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pie -fno-pic
+BUN_CFLAGS = $(MACOS_MIN_FLAG) $(MARCH_NATIVE)  $(OPTIMIZATION_LEVEL) -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden  -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pie -fno-pic
 BUN_TMP_DIR := /tmp/make-bun
 CFLAGS=$(CFLAGS_WITHOUT_MARCH) $(MARCH_NATIVE)
 
diff --git a/bench/gzip/bun.js b/bench/gzip/bun.js
index 1c5cdcaddd..6b69ae1fbb 100644
--- a/bench/gzip/bun.js
+++ b/bench/gzip/bun.js
@@ -1,20 +1,43 @@
-import { run, bench } from "mitata";
+import { run, bench, group } from "mitata";
 import { gzipSync, gunzipSync } from "bun";
 
-const data = new TextEncoder().encode("Hello World!".repeat(9999));
+const data = await Bun.file(require.resolve("@babel/standalone/babel.min.js")).arrayBuffer();
 
 const compressed = gzipSync(data);
 
-bench(`roundtrip - "Hello World!".repeat(9999))`, () => {
-  gunzipSync(gzipSync(data));
+const libraries = ["zlib"];
+if (Bun.semver.satisfies(Bun.version.replaceAll("-debug", ""), ">=1.1.21")) {
+  libraries.push("libdeflate");
+}
+const options = { library: undefined };
+const benchFn = (name, fn) => {
+  if (libraries.length > 1) {
+    group(name, () => {
+      for (const library of libraries) {
+        bench(library, () => {
+          options.library = library;
+          fn();
+        });
+      }
+    });
+  } else {
+    options.library = libraries[0];
+    bench(name, () => {
+      fn();
+    });
+  }
+};
+
+benchFn(`roundtrip - @babel/standalone/babel.min.js`, () => {
+  gunzipSync(gzipSync(data, options), options);
 });
 
-bench(`gzipSync("Hello World!".repeat(9999)))`, () => {
-  gzipSync(data);
+benchFn(`gzipSync(@babel/standalone/babel.min.js`, () => {
+  gzipSync(data, options);
 });
 
-bench(`gunzipSync("Hello World!".repeat(9999)))`, () => {
-  gunzipSync(compressed);
+benchFn(`gunzipSync(@babel/standalone/babel.min.js`, () => {
+  gunzipSync(compressed, options);
 });
 
 await run();
diff --git a/bench/gzip/bun.lockb b/bench/gzip/bun.lockb
new file mode 100755
index 0000000000..96feac4287
Binary files /dev/null and b/bench/gzip/bun.lockb differ
diff --git a/bench/gzip/node.mjs b/bench/gzip/node.mjs
index 0d6ea51249..d7a1abade7 100644
--- a/bench/gzip/node.mjs
+++ b/bench/gzip/node.mjs
@@ -1,19 +1,22 @@
 import { run, bench } from "mitata";
 import { gzipSync, gunzipSync } from "zlib";
+import { createRequire } from "module";
+import { readFileSync } from "fs";
 
-const data = new TextEncoder().encode("Hello World!".repeat(9999));
+const require = createRequire(import.meta.url);
+const data = readFileSync(require.resolve("@babel/standalone/babel.min.js"));
 
 const compressed = gzipSync(data);
 
-bench(`roundtrip - "Hello World!".repeat(9999))`, () => {
+bench(`roundtrip - @babel/standalone/babel.min.js)`, () => {
   gunzipSync(gzipSync(data));
 });
 
-bench(`gzipSync("Hello World!".repeat(9999)))`, () => {
+bench(`gzipSync(@babel/standalone/babel.min.js))`, () => {
   gzipSync(data);
 });
 
-bench(`gunzipSync("Hello World!".repeat(9999)))`, () => {
+bench(`gunzipSync(@babel/standalone/babel.min.js))`, () => {
   gunzipSync(compressed);
 });
 
diff --git a/bench/gzip/package.json b/bench/gzip/package.json
index f5c377686b..49e6c3a890 100644
--- a/bench/gzip/package.json
+++ b/bench/gzip/package.json
@@ -7,5 +7,8 @@
     "bench:node": "$NODE node.mjs",
     "bench:deno": "$DENO run -A --unstable deno.js",
     "bench": "bun run bench:bun && bun run bench:node && bun run bench:deno"
+  },
+  "dependencies": {
+    "@babel/standalone": "7.24.10"
   }
 }
diff --git a/bench/sqlite/better-sqlite3.mjs b/bench/sqlite/better-sqlite3.mjs
new file mode 100644
index 0000000000..9bf25105b9
--- /dev/null
+++ b/bench/sqlite/better-sqlite3.mjs
@@ -0,0 +1,31 @@
+import { run, bench } from "mitata";
+import { createRequire } from "module";
+
+const require = createRequire(import.meta.url);
+const db = require("better-sqlite3")("./src/northwind.sqlite");
+
+{
+  const sql = db.prepare(`SELECT * FROM "Order"`);
+
+  bench('SELECT * FROM "Order"', () => {
+    sql.all();
+  });
+}
+
+{
+  const sql = db.prepare(`SELECT * FROM "Product"`);
+
+  bench('SELECT * FROM "Product"', () => {
+    sql.all();
+  });
+}
+
+{
+  const sql = db.prepare(`SELECT * FROM "OrderDetail"`);
+
+  bench('SELECT * FROM "OrderDetail"', () => {
+    sql.all();
+  });
+}
+
+await run();
diff --git a/bench/sqlite/node.mjs b/bench/sqlite/node.mjs
index 9bf25105b9..7602a87612 100644
--- a/bench/sqlite/node.mjs
+++ b/bench/sqlite/node.mjs
@@ -1,8 +1,9 @@
+// Run `node --experimental-sqlite bench/sqlite/node.mjs` to run the script.
+// You will need `--experimental-sqlite` flag to run this script and node v22.5.0 or higher.
 import { run, bench } from "mitata";
-import { createRequire } from "module";
+import { DatabaseSync as Database } from "node:sqlite";
 
-const require = createRequire(import.meta.url);
-const db = require("better-sqlite3")("./src/northwind.sqlite");
+const db = new Database("./src/northwind.sqlite");
 
 {
   const sql = db.prepare(`SELECT * FROM "Order"`);
diff --git a/build.zig b/build.zig
index d6cae3fc03..cdf321c248 100644
--- a/build.zig
+++ b/build.zig
@@ -49,6 +49,7 @@ const BunBuildOptions = struct {
     reported_nodejs_version: Version,
 
     generated_code_dir: []const u8,
+    no_llvm: bool,
 
     cached_options_module: ?*Module = null,
     windows_shim: ?WindowsShim = null,
@@ -181,6 +182,8 @@ pub fn build(b: *Build) !void {
 
     const obj_format = b.option(ObjectFormat, "obj_format", "Output file for object files") orelse .obj;
 
+    const no_llvm = b.option(bool, "no_llvm", "Experiment with Zig self hosted backends. No stability guaranteed") orelse false;
+
     var build_options = BunBuildOptions{
         .target = target,
         .optimize = optimize,
@@ -189,6 +192,7 @@ pub fn build(b: *Build) !void {
         .arch = arch,
 
         .generated_code_dir = generated_code_dir,
+        .no_llvm = no_llvm,
 
         .version = try Version.parse(bun_version),
         .canary_revision = canary: {
@@ -320,6 +324,7 @@ pub inline fn addMultiCheck(
                 .version = root_build_options.version,
                 .reported_nodejs_version = root_build_options.reported_nodejs_version,
                 .generated_code_dir = root_build_options.generated_code_dir,
+                .no_llvm = root_build_options.no_llvm,
             };
 
             var obj = addBunObject(b, &options);
@@ -338,10 +343,15 @@ pub fn addBunObject(b: *Build, opts: *BunBuildOptions) *Compile {
         },
         .target = opts.target,
         .optimize = opts.optimize,
+        .use_llvm = !opts.no_llvm,
+        .use_lld = if (opts.os == .mac) false else !opts.no_llvm,
+
+        // https://github.com/ziglang/zig/issues/17430
         .pic = true,
+
+        .omit_frame_pointer = false,
         .strip = false, // stripped at the end
     });
-
     obj.bundle_compiler_rt = false;
     obj.formatted_panics = true;
     obj.root_module.omit_frame_pointer = false;
@@ -359,9 +369,10 @@ pub fn addBunObject(b: *Build, opts: *BunBuildOptions) *Compile {
     }
 
     if (opts.os == .linux) {
-        obj.link_emit_relocs = true;
-        obj.link_eh_frame_hdr = true;
+        obj.link_emit_relocs = false;
+        obj.link_eh_frame_hdr = false;
         obj.link_function_sections = true;
+        obj.link_data_sections = true;
 
         if (opts.optimize == .Debug) {
             obj.root_module.valgrind = true;
diff --git a/bun.lockb b/bun.lockb
index 7981e9c2c9..0e38e94cfc 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/docs/api/fetch.md b/docs/api/fetch.md
new file mode 100644
index 0000000000..e02f064e18
--- /dev/null
+++ b/docs/api/fetch.md
@@ -0,0 +1,308 @@
+Bun implements the WHATWG `fetch` standard, with some extensions to meet the needs of server-side JavaScript.
+
+Bun also implements `node:http`, but `fetch` is generally recommended instead.
+
+## Sending an HTTP request
+
+To send an HTTP request, use `fetch`
+
+```ts
+const response = await fetch("http://example.com");
+
+console.log(response.status); // => 200
+
+const text = await response.text(); // or response.json(), response.formData(), etc.
+```
+
+`fetch` also works with HTTPS URLs.
+
+```ts
+const response = await fetch("https://example.com");
+```
+
+You can also pass `fetch` a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request) object.
+
+```ts
+const request = new Request("http://example.com", {
+  method: "POST",
+  body: "Hello, world!",
+});
+
+const response = await fetch(request);
+```
+
+### Sending a POST request
+
+To send a POST request, pass an object with the `method` property set to `"POST"`.
+
+```ts
+const response = await fetch("http://example.com", {
+  method: "POST",
+  body: "Hello, world!",
+});
+```
+
+`body` can be a string, a `FormData` object, an `ArrayBuffer`, a `Blob`, and more. See the [MDN documentation](https://developer.mozilla.org/en-US/docs/Web/API/Body/body) for more information.
+
+### Proxying requests
+
+To proxy a request, pass an object with the `proxy` property set to a URL.
+
+```ts
+const response = await fetch("http://example.com", {
+  proxy: "http://proxy.com",
+});
+```
+
+### Custom headers
+
+To set custom headers, pass an object with the `headers` property set to an object.
+
+```ts
+const response = await fetch("http://example.com", {
+  headers: {
+    "X-Custom-Header": "value",
+  },
+});
+```
+
+You can also set headers using the [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers) object.
+
+```ts
+const headers = new Headers();
+headers.append("X-Custom-Header", "value");
+
+const response = await fetch("http://example.com", {
+  headers,
+});
+```
+
+### Response bodies
+
+To read the response body, use one of the following methods:
+
+- `response.text(): Promise<string>`: Returns a promise that resolves with the response body as a string.
+- `response.json(): Promise<any>`: Returns a promise that resolves with the response body as a JSON object.
+- `response.formData(): Promise<FormData>`: Returns a promise that resolves with the response body as a `FormData` object.
+- `response.bytes(): Promise<Uint8Array>`: Returns a promise that resolves with the response body as a `Uint8Array`.
+- `response.arrayBuffer(): Promise<ArrayBuffer>`: Returns a promise that resolves with the response body as an `ArrayBuffer`.
+- `response.blob(): Promise<Blob>`: Returns a promise that resolves with the response body as a `Blob`.
+
+#### Streaming response bodies
+
+You can use async iterators to stream the response body.
+
+```ts
+const response = await fetch("http://example.com");
+
+for await (const chunk of response.body) {
+  console.log(chunk);
+}
+```
+
+You can also more directly access the `ReadableStream` object.
+
+```ts
+const response = await fetch("http://example.com");
+
+const stream = response.body;
+
+const reader = stream.getReader();
+const { value, done } = await reader.read();
+```
+
+### Fetching a URL with a timeout
+
+To fetch a URL with a timeout, use `AbortSignal.timeout`:
+
+```ts
+const response = await fetch("http://example.com", {
+  signal: AbortSignal.timeout(1000),
+});
+```
+
+#### Canceling a request
+
+To cancel a request, use an `AbortController`:
+
+```ts
+const controller = new AbortController();
+
+const response = await fetch("http://example.com", {
+  signal: controller.signal,
+});
+
+controller.abort();
+```
+
+### Unix domain sockets
+
+To fetch a URL using a Unix domain socket, use the `unix: string` option:
+
+```ts
+const response = await fetch("https://hostname/a/path", {
+  unix: "/var/run/path/to/unix.sock",
+  method: "POST",
+  body: JSON.stringify({ message: "Hello from Bun!" }),
+  headers: {
+    "Content-Type": "application/json",
+  },
+});
+```
+
+### TLS
+
+To use a client certificate, use the `tls` option:
+
+```ts
+await fetch("https://example.com", {
+  tls: {
+    key: Bun.file("/path/to/key.pem"),
+    cert: Bun.file("/path/to/cert.pem"),
+    // ca: [Bun.file("/path/to/ca.pem")],
+  },
+});
+```
+
+#### Custom TLS Validation
+
+To customize the TLS validation, use the `checkServerIdentity` option in `tls`
+
+```ts
+await fetch("https://example.com", {
+  tls: {
+    checkServerIdentity: (hostname, peerCertificate) => {
+      // Return an error if the certificate is invalid
+    },
+  },
+});
+```
+
+This is similar to how it works in Node's `net` module.
+
+## Debugging
+
+To help with debugging, you can pass `verbose: true` to `fetch`:
+
+```ts
+const response = await fetch("http://example.com", {
+  verbose: true,
+});
+```
+
+This will print the request and response headers to your terminal:
+
+```sh
+[fetch] > HTTP/1.1 GET http://example.com/
+[fetch] > Connection: keep-alive
+[fetch] > User-Agent: Bun/1.1.21
+[fetch] > Accept: */*
+[fetch] > Host: example.com
+[fetch] > Accept-Encoding: gzip, deflate, br
+
+[fetch] < 200 OK
+[fetch] < Content-Encoding: gzip
+[fetch] < Age: 201555
+[fetch] < Cache-Control: max-age=604800
+[fetch] < Content-Type: text/html; charset=UTF-8
+[fetch] < Date: Sun, 21 Jul 2024 02:41:14 GMT
+[fetch] < Etag: "3147526947+gzip"
+[fetch] < Expires: Sun, 28 Jul 2024 02:41:14 GMT
+[fetch] < Last-Modified: Thu, 17 Oct 2019 07:18:26 GMT
+[fetch] < Server: ECAcc (sac/254F)
+[fetch] < Vary: Accept-Encoding
+[fetch] < X-Cache: HIT
+[fetch] < Content-Length: 648
+```
+
+Note: `verbose: boolean` is not part of the Web standard `fetch` API and is specific to Bun.
+
+## Performance
+
+Before an HTTP request can be sent, the DNS lookup must be performed. This can take a significant amount of time, especially if the DNS server is slow or the network connection is poor.
+
+After the DNS lookup, the TCP socket must be connected and the TLS handshake might need to be performed. This can also take a significant amount of time.
+
+After the request completes, consuming the response body can also take a significant amount of time and memory.
+
+At every step of the way, Bun provides APIs to help you optimize the performance of your application.
+
+### DNS prefetching
+
+To prefetch a DNS entry, you can use the `dns.prefetch` API. This API is useful when you know you'll need to connect to a host soon and want to avoid the initial DNS lookup.
+
+```ts
+import { dns } from "bun";
+
+dns.prefetch("bun.sh", 443);
+```
+
+#### DNS caching
+
+By default, Bun caches and deduplicates DNS queries in-memory for up to 30 seconds. You can see the cache stats by calling `dns.getCacheStats()`:
+
+To learn more about DNS caching in Bun, see the [DNS caching](/docs/api/dns) documentation.
+
+### Preconnect to a host
+
+To preconnect to a host, you can use the `fetch.preconnect` API. This API is useful when you know you'll need to connect to a host soon and want to start the initial DNS lookup, TCP socket connection, and TLS handshake early.
+
+```ts
+import { fetch } from "bun";
+
+fetch.preconnect("https://bun.sh");
+```
+
+Note: calling `fetch` immediately after `fetch.preconnect` will not make your request faster. Preconnecting only helps if you know you'll need to connect to a host soon, but you're not ready to make the request yet.
+
+#### Preconnect at startup
+
+To preconnect to a host at startup, you can pass `--fetch-preconnect`:
+
+```sh
+$ bun --fetch-preconnect https://bun.sh ./my-script.ts
+```
+
+This is sort of like `<link rel="preconnect">` in HTML.
+
+This feature is not implemented on Windows yet. If you're interested in using this feature on Windows, please file an issue and we can implement support for it on Windows.
+
+### Connection pooling & HTTP keep-alive
+
+Bun automatically reuses connections to the same host. This is known as connection pooling. This can significantly reduce the time it takes to establish a connection. You don't need to do anything to enable this; it's automatic.
+
+#### Simultaneous connection limit
+
+By default, Bun limits the maximum number of simultaneous `fetch` requests to 256. We do this for several reasons:
+
+- It improves overall system stability. Operating systems have an upper limit on the number of simultaneous open TCP sockets, usually in the low thousands. Nearing this limit causes your entire computer to behave strangely. Applications hang and crash.
+- It encourages HTTP Keep-Alive connection reuse. For short-lived HTTP requests, the slowest step is often the initial connection setup. Reusing connections can save a lot of time.
+
+When the limit is exceeded, the requests are queued and sent as soon as the next request ends.
+
+You can increase the maximum number of simultaneous connections via the `BUN_CONFIG_MAX_HTTP_REQUESTS` environment variable:
+
+```sh
+$ BUN_CONFIG_MAX_HTTP_REQUESTS=512 bun ./my-script.ts
+```
+
+The max value for this limit is currently set to 65,336. The maximum port number is 65,535, so it's quite difficult for any one computer to exceed this limit.
+
+### Response buffering
+
+Bun goes to great lengths to optimize the performance of reading the response body. The fastest way to read the response body is to use one of these methods:
+
+- `response.text(): Promise<string>`
+- `response.json(): Promise<any>`
+- `response.formData(): Promise<FormData>`
+- `response.bytes(): Promise<Uint8Array>`
+- `response.arrayBuffer(): Promise<ArrayBuffer>`
+- `response.blob(): Promise<Blob>`
+
+You can also use `Bun.write` to write the response body to a file on disk:
+
+```ts
+import { write } from "bun";
+
+await write("output.txt", response);
+```
diff --git a/docs/nav.ts b/docs/nav.ts
index 41da0c4281..93331f983f 100644
--- a/docs/nav.ts
+++ b/docs/nav.ts
@@ -287,8 +287,11 @@ export default {
 
     divider("API"),
     page("api/http", "HTTP server", {
-      description: `Bun implements Web-standard fetch, plus a Bun-native API for building fast HTTP servers.`,
+      description: `Bun implements a fast HTTP server built on Request/Response objects, along with supporting node:http APIs.`,
     }), // "`Bun.serve`"),
+    page("api/fetch", "HTTP client", {
+      description: `Bun implements Web-standard fetch with some Bun-native extensions.`,
+    }), // "fetch"),
     page("api/websockets", "WebSockets", {
       description: `Bun supports server-side WebSockets with on-the-fly compression, TLS support, and a Bun-native pubsub API.`,
     }), // "`Bun.serve`"),
diff --git a/docs/runtime/nodejs-apis.md b/docs/runtime/nodejs-apis.md
index 36407cdf6e..91a8b61a20 100644
--- a/docs/runtime/nodejs-apis.md
+++ b/docs/runtime/nodejs-apis.md
@@ -153,7 +153,7 @@ Some methods are not optimized yet.
 
 ### [`node:util`](https://nodejs.org/api/util.html)
 
-🟡 Missing `MIMEParams` `MIMEType` `aborted` `debug` `getSystemErrorMap` `getSystemErrorName` `transferableAbortController` `transferableAbortSignal` `stripVTControlCharacters`
+🟡 Missing `MIMEParams` `MIMEType` `aborted` `debug` `getSystemErrorMap` `transferableAbortController` `transferableAbortSignal` `stripVTControlCharacters`
 
 ### [`node:v8`](https://nodejs.org/api/v8.html)
 
diff --git a/docs/runtime/web-apis.md b/docs/runtime/web-apis.md
index 98c822274f..4280aa4078 100644
--- a/docs/runtime/web-apis.md
+++ b/docs/runtime/web-apis.md
@@ -7,22 +7,36 @@ The following Web APIs are partially or completely supported.
 ---
 
 - HTTP
-- [`fetch`](https://developer.mozilla.org/en-US/docs/Web/API/fetch) [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response) [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request) [`Headers`](https://developer.mozilla.org/en-US/docs/Web/API/Headers) [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController) [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal)
+- [`fetch`](https://developer.mozilla.org/en-US/docs/Web/API/fetch)
+  [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response)
+  [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
+  [`Headers`](https://developer.mozilla.org/en-US/docs/Web/API/Headers)
+  [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController)
+  [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal)
 
 ---
 
 - URLs
-- [`URL`](https://developer.mozilla.org/en-US/docs/Web/API/URL) [`URLSearchParams`](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams)
+- [`URL`](https://developer.mozilla.org/en-US/docs/Web/API/URL)
+  [`URLSearchParams`](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams)
 
 ---
 
 - Web Workers
-- [`Worker`](https://developer.mozilla.org/en-US/docs/Web/API/Worker) [`self.postMessage`](https://developer.mozilla.org/en-US/docs/Web/API/DedicatedWorkerGlobalScope/postMessage) [`structuredClone`](https://developer.mozilla.org/en-US/docs/Web/API/structuredClone) [`MessagePort`](https://developer.mozilla.org/en-US/docs/Web/API/MessagePort) [`MessageChannel`](https://developer.mozilla.org/en-US/docs/Web/API/MessageChannel), [`BroadcastChannel`](https://developer.mozilla.org/en-US/docs/Web/API/BroadcastChannel).
+- [`Worker`](https://developer.mozilla.org/en-US/docs/Web/API/Worker)
+  [`self.postMessage`](https://developer.mozilla.org/en-US/docs/Web/API/DedicatedWorkerGlobalScope/postMessage)
+  [`structuredClone`](https://developer.mozilla.org/en-US/docs/Web/API/structuredClone)
+  [`MessagePort`](https://developer.mozilla.org/en-US/docs/Web/API/MessagePort)
+  [`MessageChannel`](https://developer.mozilla.org/en-US/docs/Web/API/MessageChannel), [`BroadcastChannel`](https://developer.mozilla.org/en-US/docs/Web/API/BroadcastChannel).
 
 ---
 
 - Streams
-- [`ReadableStream`](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream) [`WritableStream`](https://developer.mozilla.org/en-US/docs/Web/API/WritableStream) [`TransformStream`](https://developer.mozilla.org/en-US/docs/Web/API/TransformStream) [`ByteLengthQueuingStrategy`](https://developer.mozilla.org/en-US/docs/Web/API/ByteLengthQueuingStrategy) [`CountQueuingStrategy`](https://developer.mozilla.org/en-US/docs/Web/API/CountQueuingStrategy) and associated classes
+- [`ReadableStream`](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream)
+  [`WritableStream`](https://developer.mozilla.org/en-US/docs/Web/API/WritableStream)
+  [`TransformStream`](https://developer.mozilla.org/en-US/docs/Web/API/TransformStream)
+  [`ByteLengthQueuingStrategy`](https://developer.mozilla.org/en-US/docs/Web/API/ByteLengthQueuingStrategy)
+  [`CountQueuingStrategy`](https://developer.mozilla.org/en-US/docs/Web/API/CountQueuingStrategy) and associated classes
 
 ---
 
@@ -37,7 +51,10 @@ The following Web APIs are partially or completely supported.
 ---
 
 - Encoding and decoding
-- [`atob`](https://developer.mozilla.org/en-US/docs/Web/API/atob) [`btoa`](https://developer.mozilla.org/en-US/docs/Web/API/btoa) [`TextEncoder`](https://developer.mozilla.org/en-US/docs/Web/API/TextEncoder) [`TextDecoder`](https://developer.mozilla.org/en-US/docs/Web/API/TextDecoder)
+- [`atob`](https://developer.mozilla.org/en-US/docs/Web/API/atob)
+  [`btoa`](https://developer.mozilla.org/en-US/docs/Web/API/btoa)
+  [`TextEncoder`](https://developer.mozilla.org/en-US/docs/Web/API/TextEncoder)
+  [`TextDecoder`](https://developer.mozilla.org/en-US/docs/Web/API/TextDecoder)
 
 ---
 
@@ -47,7 +64,8 @@ The following Web APIs are partially or completely supported.
 ---
 
 - Timeouts
-- [`setTimeout`](https://developer.mozilla.org/en-US/docs/Web/API/setTimeout) [`clearTimeout`](https://developer.mozilla.org/en-US/docs/Web/API/clearTimeout)
+- [`setTimeout`](https://developer.mozilla.org/en-US/docs/Web/API/setTimeout)
+  [`clearTimeout`](https://developer.mozilla.org/en-US/docs/Web/API/clearTimeout)
 
 ---
 
@@ -57,14 +75,16 @@ The following Web APIs are partially or completely supported.
 ---
 
 - Crypto
-- [`crypto`](https://developer.mozilla.org/en-US/docs/Web/API/Crypto) [`SubtleCrypto`](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto)
+- [`crypto`](https://developer.mozilla.org/en-US/docs/Web/API/Crypto)
+  [`SubtleCrypto`](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto)
   [`CryptoKey`](https://developer.mozilla.org/en-US/docs/Web/API/CryptoKey)
 
 ---
 
 - Debugging
 
-- [`console`](https://developer.mozilla.org/en-US/docs/Web/API/console) [`performance`](https://developer.mozilla.org/en-US/docs/Web/API/Performance)
+- [`console`](https://developer.mozilla.org/en-US/docs/Web/API/console)
+  [`performance`](https://developer.mozilla.org/en-US/docs/Web/API/Performance)
 
 ---
 
@@ -79,7 +99,9 @@ The following Web APIs are partially or completely supported.
 ---
 
 - User interaction
-- [`alert`](https://developer.mozilla.org/en-US/docs/Web/API/Window/alert) [`confirm`](https://developer.mozilla.org/en-US/docs/Web/API/Window/confirm) [`prompt`](https://developer.mozilla.org/en-US/docs/Web/API/Window/prompt) (intended for interactive CLIs)
+- [`alert`](https://developer.mozilla.org/en-US/docs/Web/API/Window/alert)
+  [`confirm`](https://developer.mozilla.org/en-US/docs/Web/API/Window/confirm)
+  [`prompt`](https://developer.mozilla.org/en-US/docs/Web/API/Window/prompt) (intended for interactive CLIs)
 
 <!-- - Blocking. Prints the alert message to terminal and awaits `[ENTER]` before proceeding. -->
 <!-- - Blocking. Prints confirmation message and awaits `[y/N]` input from user. Returns `true` if user entered `y` or `Y`, `false` otherwise.
@@ -94,7 +116,10 @@ The following Web APIs are partially or completely supported.
 
 - Events
 - [`EventTarget`](https://developer.mozilla.org/en-US/docs/Web/API/EventTarget)
-  [`Event`](https://developer.mozilla.org/en-US/docs/Web/API/Event) [`ErrorEvent`](https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent) [`CloseEvent`](https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent) [`MessageEvent`](https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent)
+  [`Event`](https://developer.mozilla.org/en-US/docs/Web/API/Event)
+  [`ErrorEvent`](https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent)
+  [`CloseEvent`](https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent)
+  [`MessageEvent`](https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent)
 
 ---
 
diff --git a/misctools/fetch.zig b/misctools/fetch.zig
index 7c91b6d9ec..5d0b9f1e52 100644
--- a/misctools/fetch.zig
+++ b/misctools/fetch.zig
@@ -195,7 +195,6 @@ pub fn main() anyerror!void {
             args.headers_buf,
             response_body_string,
             args.body,
-            0,
             HTTP.FetchRedirect.follow,
         ),
     };
diff --git a/misctools/http_bench.zig b/misctools/http_bench.zig
index b736eab9d3..3cd147d2ea 100644
--- a/misctools/http_bench.zig
+++ b/misctools/http_bench.zig
@@ -31,7 +31,6 @@ const params = [_]clap.Param(clap.Help){
     clap.parseParam("-b, --body <STR>           HTTP request body as a string") catch unreachable,
     clap.parseParam("-f, --file <STR>           File path to load as body") catch unreachable,
     clap.parseParam("-n, --count <INT>          How many runs? Default 10") catch unreachable,
-    clap.parseParam("-t, --timeout <INT>        Max duration per request") catch unreachable,
     clap.parseParam("-r, --retry <INT>          Max retry count") catch unreachable,
     clap.parseParam("--no-gzip                  Disable gzip") catch unreachable,
     clap.parseParam("--no-deflate               Disable deflate") catch unreachable,
@@ -75,7 +74,6 @@ pub const Arguments = struct {
     body: string = "",
     turbo: bool = false,
     count: usize = 10,
-    timeout: usize = 0,
     repeat: usize = 0,
     concurrency: u16 = 32,
 
@@ -165,10 +163,6 @@ pub const Arguments = struct {
             // .keep_alive = !args.flag("--no-keep-alive"),
             .concurrency = std.fmt.parseInt(u16, args.option("--max-concurrency") orelse "32", 10) catch 32,
             .turbo = args.flag("--turbo"),
-            .timeout = std.fmt.parseInt(usize, args.option("--timeout") orelse "0", 10) catch |err| {
-                Output.prettyErrorln("<r><red>{s}<r> parsing timeout", .{@errorName(err)});
-                Global.exit(1);
-            },
             .count = std.fmt.parseInt(usize, args.option("--count") orelse "10", 10) catch |err| {
                 Output.prettyErrorln("<r><red>{s}<r> parsing count", .{@errorName(err)});
                 Global.exit(1);
@@ -225,7 +219,6 @@ pub fn main() anyerror!void {
                     args.headers_buf,
                     response_body,
                     "",
-                    args.timeout,
                 ),
             };
             ctx.http.client.verbose = args.verbose;
diff --git a/package.json b/package.json
index ffa7856496..a29995d963 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "workspaces": [
     "./packages/bun-types"
   ],
-  "dependencies": {
+  "devDependencies": {
     "@vscode/debugadapter": "^1.65.0",
     "esbuild": "^0.21.4",
     "eslint": "^9.4.0",
@@ -15,9 +15,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "source-map-js": "^1.2.0",
-    "typescript": "^5.4.5"
-  },
-  "devDependencies": {
+    "typescript": "^5.4.5",
     "@types/bun": "^1.1.3",
     "@types/react": "^18.3.3",
     "@typescript-eslint/eslint-plugin": "^7.11.0",
diff --git a/packages/bun-types/bun.d.ts b/packages/bun-types/bun.d.ts
index 7dc3808ce3..4a88ba74d2 100644
--- a/packages/bun-types/bun.d.ts
+++ b/packages/bun-types/bun.d.ts
@@ -1455,7 +1455,7 @@ declare module "bun" {
      * ```js
      * const {imports, exports} = transpiler.scan(`
      * import {foo} from "baz";
-     * const hello = "hi!";
+     * export const hello = "hi!";
      * `);
      *
      * console.log(imports); // ["baz"]
@@ -3100,6 +3100,10 @@ declare module "bun" {
    */
   function openInEditor(path: string, options?: EditorOptions): void;
 
+  const fetch: typeof globalThis.fetch & {
+    preconnect(url: string): void;
+  };
+
   interface EditorOptions {
     editor?: "vscode" | "subl";
     line?: number;
@@ -3477,6 +3481,13 @@ declare module "bun" {
      * Filtered data consists mostly of small values with a somewhat random distribution.
      */
     strategy?: number;
+
+    library?: "zlib";
+  }
+
+  interface LibdeflateCompressionOptions {
+    level?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;
+    library?: "libdeflate";
   }
 
   /**
@@ -3485,26 +3496,38 @@ declare module "bun" {
    * @param options Compression options to use
    * @returns The output buffer with the compressed data
    */
-  function deflateSync(data: Uint8Array | string | ArrayBuffer, options?: ZlibCompressionOptions): Uint8Array;
+  function deflateSync(
+    data: Uint8Array | string | ArrayBuffer,
+    options?: ZlibCompressionOptions | LibdeflateCompressionOptions,
+  ): Uint8Array;
   /**
    * Compresses a chunk of data with `zlib` GZIP algorithm.
    * @param data The buffer of data to compress
    * @param options Compression options to use
    * @returns The output buffer with the compressed data
    */
-  function gzipSync(data: Uint8Array | string | ArrayBuffer, options?: ZlibCompressionOptions): Uint8Array;
+  function gzipSync(
+    data: Uint8Array | string | ArrayBuffer,
+    options?: ZlibCompressionOptions | LibdeflateCompressionOptions,
+  ): Uint8Array;
   /**
    * Decompresses a chunk of data with `zlib` INFLATE algorithm.
    * @param data The buffer of data to decompress
    * @returns The output buffer with the decompressed data
    */
-  function inflateSync(data: Uint8Array | string | ArrayBuffer): Uint8Array;
+  function inflateSync(
+    data: Uint8Array | string | ArrayBuffer,
+    options?: ZlibCompressionOptions | LibdeflateCompressionOptions,
+  ): Uint8Array;
   /**
    * Decompresses a chunk of data with `zlib` GUNZIP algorithm.
    * @param data The buffer of data to decompress
    * @returns The output buffer with the decompressed data
    */
-  function gunzipSync(data: Uint8Array | string | ArrayBuffer): Uint8Array;
+  function gunzipSync(
+    data: Uint8Array | string | ArrayBuffer,
+    options?: ZlibCompressionOptions | LibdeflateCompressionOptions,
+  ): Uint8Array;
 
   type Target =
     /**
@@ -3824,7 +3847,7 @@ declare module "bun" {
    */
   const isMainThread: boolean;
 
-  interface Socket<Data = undefined> {
+  interface Socket<Data = undefined> extends Disposable {
     /**
      * Write `data` to the socket
      *
@@ -4106,7 +4129,7 @@ declare module "bun" {
     setMaxSendFragment(size: number): boolean;
   }
 
-  interface SocketListener<Data = undefined> {
+  interface SocketListener<Data = undefined> extends Disposable {
     stop(closeActiveConnections?: boolean): void;
     ref(): void;
     unref(): void;
diff --git a/packages/bun-types/globals.d.ts b/packages/bun-types/globals.d.ts
index 60f2c4090f..3e5a252fa3 100644
--- a/packages/bun-types/globals.d.ts
+++ b/packages/bun-types/globals.d.ts
@@ -907,26 +907,42 @@ declare global {
     new (): ShadowRealm;
   };
 
-  /**
-   * Send a HTTP(s) request
-   *
-   * @param request Request object
-   * @param init A structured value that contains settings for the fetch() request.
-   *
-   * @returns A promise that resolves to {@link Response} object.
-   */
+  interface Fetch {
+    /**
+     * Send a HTTP(s) request
+     *
+     * @param request Request object
+     * @param init A structured value that contains settings for the fetch() request.
+     *
+     * @returns A promise that resolves to {@link Response} object.
+     */
+    (request: Request, init?: RequestInit): Promise<Response>;
 
-  // tslint:disable-next-line:unified-signatures
-  function fetch(request: Request, init?: RequestInit): Promise<Response>;
-  /**
-   * Send a HTTP(s) request
-   *
-   * @param url URL string
-   * @param init A structured value that contains settings for the fetch() request.
-   *
-   * @returns A promise that resolves to {@link Response} object.
-   */
-  function fetch(url: string | URL | Request, init?: FetchRequestInit): Promise<Response>;
+    /**
+     * Send a HTTP(s) request
+     *
+     * @param url URL string
+     * @param init A structured value that contains settings for the fetch() request.
+     *
+     * @returns A promise that resolves to {@link Response} object.
+     */
+    (url: string | URL | Request, init?: FetchRequestInit): Promise<Response>;
+
+    (input: string | URL | globalThis.Request, init?: RequestInit): Promise<Response>;
+
+    /**
+     * Start the DNS resolution, TCP connection, and TLS handshake for a request
+     * before the request is actually sent.
+     *
+     * This can reduce the latency of a request when you know there's some
+     * long-running task that will delay the request starting.
+     *
+     * This is a bun-specific API and is not part of the Fetch API specification.
+     */
+    preconnect(url: string | URL): void;
+  }
+
+  var fetch: Fetch;
 
   function queueMicrotask(callback: (...args: any[]) => void): void;
   /**
diff --git a/packages/bun-uws/capi/Makefile b/packages/bun-uws/capi/Makefile
deleted file mode 100644
index 583eceba0d..0000000000
--- a/packages/bun-uws/capi/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-CAPI_EXAMPLE_FILES := HelloWorld HelloWorldAsync ServerName UpgradeSync UpgradeAsync EchoServer Broadcast BroadcastEchoServer
-RUST_EXAMPLE_FILES := RustHelloWorld
-LIBRARY_NAME := libuwebsockets
-
-default:
-	$(MAKE) capi
-	$(CXX) -O3 -flto -I ../src -I ../uSockets/src examples/HelloWorld.c *.o -lz -luv -lssl -lcrypto -lstdc++ ../uSockets/uSockets.a -o HelloWorld
-
-capi:
-	$(MAKE) clean
-	cd ../uSockets && $(CC) -pthread -DUWS_WITH_PROXY -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -std=c11 -Isrc -flto -fPIC -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
-	cd ../uSockets && $(CXX) -std=c++17 -flto -fPIC -O3 -c src/crypto/*.cpp 
-	cd ../uSockets && $(AR) rvs uSockets.a *.o
-
-	$(CXX) -DUWS_WITH_PROXY -c -O3 -std=c++17 -lz -luv -flto -fPIC -I ../src -I ../uSockets/src $(LIBRARY_NAME).cpp
-	$(AR) rvs $(LIBRARY_NAME).a $(LIBRARY_NAME).o ../uSockets/uSockets.a
-shared:
-	$(MAKE) clean
-
-	cd ../uSockets && $(CC) -pthread -DUWS_WITH_PROXY  -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -std=c11 -Isrc -flto -fPIC -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
-	cd ../uSockets && $(CXX) -std=c++17 -flto -fPIC -O3 -c src/crypto/*.cpp 
-	cd ../uSockets && $(AR) rvs uSockets.a *.o
-
-	$(CXX) -DUWS_WITH_PROXY  -c -O3 -std=c++17 -lz -luv -flto -fPIC -I ../src -I ../uSockets/src $(LIBRARY_NAME).cpp 
-	$(CXX) -shared -o $(LIBRARY_NAME).so  $(LIBRARY_NAME).o ../uSockets/uSockets.a -fPIC  -lz -luv -lssl -lcrypto
-misc:
-	mkdir -p ../misc && openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -passout pass:1234 -keyout ../misc/key.pem -out ../misc/cert.pem
-rust:
-	$(MAKE) capi
-	rustc -C link-arg=$(LIBRARY_NAME).a -C link-args="-lstdc++ -luv" -C opt-level=3 -C lto -L all=. examples/RustHelloWorld.rs -o RustHelloWorld
-
-clean:
-	rm -f *.o $(CAPI_EXAMPLE_FILES) $(RUST_EXAMPLE_FILES) $(LIBRARY_NAME).a $(LIBRARY_NAME).so
-
-all:
-	for FILE in $(CAPI_EXAMPLE_FILES); do  $(CXX) -O3 -flto -I ../src -I ../uSockets/src examples/$$FILE.c *.o -luv -lstdc++ ../uSockets/uSockets.a -o $$FILE & done; \
-	wait
-	
diff --git a/packages/bun-uws/capi/examples/Broadcast.c b/packages/bun-uws/capi/examples/Broadcast.c
deleted file mode 100644
index ef1b091018..0000000000
--- a/packages/bun-uws/capi/examples/Broadcast.c
+++ /dev/null
@@ -1,157 +0,0 @@
-#include "../libuwebsockets.h"
-#include <stdio.h>
-#include <malloc.h>
-#include <time.h>
-#include <string.h>
-#include <stdarg.h>
-#define SSL 1
-
-
-//Timer close helper
-void uws_timer_close(struct us_timer_t *timer)
-{
-    struct us_timer_t *t = (struct us_timer_t *)timer;
-    struct timer_handler_data *data;
-    memcpy(&data, us_timer_ext(t), sizeof(struct timer_handler_data *));
-    free(data);
-    us_timer_close(t, 0);
-}
-//Timer create helper
-struct us_timer_t *uws_create_timer(int ms, int repeat_ms, void (*handler)(void *data), void *data)
-{
-    struct us_loop_t *loop = uws_get_loop();
-    struct us_timer_t *delayTimer = us_create_timer(loop, 0, sizeof(void *));
-
-    struct timer_handler_data
-    {
-        void *data;
-        void (*handler)(void *data);
-        bool repeat;
-    };
-
-    struct timer_handler_data *timer_data = (struct timer_handler_data *)malloc(sizeof(timer_handler_data));
-    timer_data->data = data;
-    timer_data->handler = handler;
-    timer_data->repeat = repeat_ms > 0;
-    memcpy(us_timer_ext(delayTimer), &timer_data, sizeof(struct timer_handler_data *));
-
-    us_timer_set(
-        delayTimer, [](struct us_timer_t *t)
-        {
-            /* We wrote the pointer to the timer's extension */
-            struct timer_handler_data *data;
-            memcpy(&data, us_timer_ext(t), sizeof(struct timer_handler_data *));
-
-            data->handler(data->data);
-
-            if (!data->repeat)
-            {
-                free(data);
-                us_timer_close(t, 0);
-            }
-        },
-        ms, repeat_ms);
-
-    return (struct us_timer_t *)delayTimer;
-}
-
-/* This is a simple WebSocket "sync" upgrade example.
- * You may compile it with "WITH_OPENSSL=1 make" or with "make" */
-
-/* ws->getUserData returns one of these */
-struct PerSocketData {
-    /* Fill with user data */
-};
-
-int buffer_size(const char* format, ...) {
-    va_list args;
-    va_start(args, format);
-    int result = vsnprintf(NULL, 0, format, args);
-    va_end(args);
-    return result + 1; // safe byte for \0
-}
-
-void listen_handler(struct us_listen_socket_t *listen_socket, uws_app_listen_config_t config,  void* user_data)
-{
-    if (listen_socket){
-        printf("Listening on port wss://localhost:%d\n", config.port);
-    }
-}
-
-void open_handler(uws_websocket_t* ws){
-
-     /* Open event here, you may access uws_ws_get_user_data(WS) which points to a PerSocketData struct */
-    uws_ws_subscribe(SSL, ws, "broadcast", 9);
-}
-
-void message_handler(uws_websocket_t* ws, const char* message, size_t length, uws_opcode_t opcode){
-}
-
-void close_handler(uws_websocket_t* ws, int code, const char* message, size_t length){
-    /* You may access uws_ws_get_user_data(ws) here, but sending or
-     * doing any kind of I/O with the socket is not valid. */
-}
-
-void drain_handler(uws_websocket_t* ws){
-    /* Check uws_ws_get_buffered_amount(ws) here */
-}
-
-void ping_handler(uws_websocket_t* ws, const char* message, size_t length){
-    /* You don't need to handle this one, we automatically respond to pings as per standard */
-}
-
-void pong_handler(uws_websocket_t* ws, const char* message, size_t length){
-
-    /* You don't need to handle this one either */
-}
-
-void on_timer_interval(void* data){
-
-    // broadcast the unix time as millis
-
-    uws_app_t * app = (uws_app_t *)data;
-    struct timespec ts;
-    timespec_get(&ts, TIME_UTC);
-
-    int64_t millis = ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
-
-    
-    char* message = (char*)malloc((size_t)buffer_size("%ld", millis));
-    size_t message_length = sprintf(message, "%ld", millis);
-
-    uws_publish(SSL, app, "broadcast", 9, message, message_length, uws_opcode_t::TEXT, false);
-    free(message);
-}
-
-int main()
-{
-
-
-    uws_app_t *app = uws_create_app(SSL, (struct us_socket_context_options_t){
-        /* There are example certificates in uWebSockets.js repo */
-	    .key_file_name = "../misc/key.pem",
-	    .cert_file_name = "../misc/cert.pem",
-	    .passphrase = "1234"
-    });
-
-	uws_ws(SSL, app, "/*", (uws_socket_behavior_t){
-		.compression = uws_compress_options_t::SHARED_COMPRESSOR,
-        .maxPayloadLength = 16 * 1024,
-        .idleTimeout = 12,
-        .maxBackpressure = 1 * 1024 * 1024,
-		.upgrade = NULL,
-        .open = open_handler,
-        .message = message_handler,
-        .drain = drain_handler,
-        .ping = ping_handler,
-        .pong = pong_handler,
-        .close = close_handler,
-	});
-
-    uws_app_listen(SSL, app, 9001, listen_handler, NULL);
-
-    // broadcast the unix time as millis every 8 millis
-    uws_create_timer(8, 8, on_timer_interval,  app);
-
-	uws_app_run(SSL, app);
-}
\ No newline at end of file
diff --git a/packages/bun-uws/capi/examples/BroadcastEchoServer.c b/packages/bun-uws/capi/examples/BroadcastEchoServer.c
deleted file mode 100644
index 65e04449bb..0000000000
--- a/packages/bun-uws/capi/examples/BroadcastEchoServer.c
+++ /dev/null
@@ -1,175 +0,0 @@
-#include "../libuwebsockets.h"
-#include <stdio.h>
-#include <malloc.h>
-#include <time.h>
-#include <string.h>
-#include <stdarg.h>
-
-#define SSL 1
-
-
-/* This is a simple WebSocket "sync" upgrade example.
- * You may compile it with "WITH_OPENSSL=1 make" or with "make" */
-
-typedef struct
-{
-    size_t length;
-    char *name;
-} topic_t;
-
-/* ws->getUserData returns one of these */
-struct PerSocketData
-{
-    /* Fill with user data */
-    topic_t **topics;
-    int topics_quantity;
-    int nr;
-};
-
-uws_app_t *app;
-
-int buffer_size(const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    int result = vsnprintf(NULL, 0, format, args);
-    va_end(args);
-    return result + 1; // safe byte for \0
-}
-
-void listen_handler(struct us_listen_socket_t *listen_socket, uws_app_listen_config_t config, void* user_data)
-{
-    if (listen_socket)
-    {
-        printf("Listening on port wss://localhost:%d\n", config.port);
-    }
-}
-
-void upgrade_handler(uws_res_t *response, uws_req_t *request, uws_socket_context_t *context)
-{
-
-    /* You may read from req only here, and COPY whatever you need into your PerSocketData.
-     * PerSocketData is valid from .open to .close event, accessed with uws_ws_get_user_data(ws).
-     * HttpRequest (req) is ONLY valid in this very callback, so any data you will need later
-     * has to be COPIED into PerSocketData here. */
-
-    /* Immediately upgrading without doing anything "async" before, is simple */
-
-    struct PerSocketData *data = (struct PerSocketData *)malloc(sizeof(struct PerSocketData));
-    data->topics = (topic_t **)calloc(32, sizeof(topic_t *));
-    data->topics_quantity = 32;
-    data->nr = 0;
-
-    const char *ws_key = NULL;
-    const char *ws_protocol = NULL;
-    const char *ws_extensions = NULL;
-    
-    size_t ws_key_length = uws_req_get_header(request, "sec-websocket-key", 17, &ws_key);
-    size_t ws_protocol_length = uws_req_get_header(request, "sec-websocket-protocol", 22, &ws_protocol);
-    size_t ws_extensions_length = uws_req_get_header(request, "sec-websocket-extensions", 24, &ws_extensions);
-
-    uws_res_upgrade(SSL,
-                    response,
-                    (void *)data,
-                    ws_key,
-                    ws_key_length,
-                    ws_protocol,
-                    ws_protocol_length,
-                    ws_extensions,
-                    ws_extensions_length,
-                    context);
-}
-
-void open_handler(uws_websocket_t *ws)
-{
-
-    /* Open event here, you may access  uws_ws_get_user_data(ws) which points to a PerSocketData struct */
-    struct PerSocketData *data = (struct PerSocketData *)uws_ws_get_user_data(SSL, ws);
-    for (int i = 0; i < data->topics_quantity; i++)
-    {
-
-        char *topic = (char *)malloc((size_t)buffer_size("%ld-%d", (uintptr_t)ws, i));
-        size_t topic_length = sprintf(topic, "%ld-%d", (uintptr_t)ws, i);
-
-        topic_t *new_topic = (topic_t*) malloc(sizeof(topic_t));
-        new_topic->length = topic_length;
-        new_topic->name = topic;
-        data->topics[i] = new_topic;
-        uws_ws_subscribe(SSL, ws, topic, topic_length);
-    }
-}
-
-void message_handler(uws_websocket_t *ws, const char *message, size_t length, uws_opcode_t opcode)
-{
-    struct PerSocketData *data = (struct PerSocketData *)uws_ws_get_user_data(SSL, ws);
-    topic_t *topic = data->topics[(size_t)(++data->nr % data->topics_quantity)];
-    uws_publish(SSL, app, topic->name, topic->length, message, length, opcode, false);
-
-    topic = data->topics[(size_t)(++data->nr % data->topics_quantity)];
-    uws_ws_publish(SSL, ws, topic->name, topic->length, message, length);
-}
-
-void close_handler(uws_websocket_t *ws, int code, const char *message, size_t length)
-{
-    /* You may access uws_ws_get_user_data(ws) here, but sending or
-     * doing any kind of I/O with the socket is not valid. */
-    struct PerSocketData *data = (struct PerSocketData *)uws_ws_get_user_data(SSL, ws);
-    if (data)
-    {
-        for (int i = 0; i < data->topics_quantity; i++)
-        {
-
-            topic_t* topic = data->topics[i];
-            free(topic->name);
-            free(topic);
-        }
-        free(data->topics);
-        free(data);
-    }
-}
-
-void drain_handler(uws_websocket_t *ws)
-{
-    /* Check uws_ws_get_buffered_amount(ws) here */
-}
-
-void ping_handler(uws_websocket_t *ws, const char *message, size_t length)
-{
-    /* You don't need to handle this one, we automatically respond to pings as per standard */
-}
-
-void pong_handler(uws_websocket_t *ws, const char *message, size_t length)
-{
-
-    /* You don't need to handle this one either */
-}
-
-int main()
-{
-
-
-    uws_app_t *app = uws_create_app(SSL, (struct us_socket_context_options_t){
-        /* There are example certificates in uWebSockets.js repo */
-	    .key_file_name = "../misc/key.pem",
-	    .cert_file_name = "../misc/cert.pem",
-	    .passphrase = "1234"
-    });
-
-    uws_ws(SSL, app, "/*", (uws_socket_behavior_t){
-                          .compression = uws_compress_options_t::SHARED_COMPRESSOR,
-                          .maxPayloadLength = 16 * 1024,
-                          .idleTimeout = 12,
-                          .maxBackpressure = 1 * 1024 * 1024,
-                          .upgrade = upgrade_handler,
-                          .open = open_handler,
-                          .message = message_handler,
-                          .drain = drain_handler,
-                          .ping = ping_handler,
-                          .pong = pong_handler,
-                          .close = close_handler,
-                      });
-
-    uws_app_listen(SSL, app, 9001, listen_handler, NULL);
-
-    uws_app_run(SSL, app);
-}
\ No newline at end of file
diff --git a/packages/bun-uws/capi/examples/EchoServer.c b/packages/bun-uws/capi/examples/EchoServer.c
deleted file mode 100644
index adcf1edb5a..0000000000
--- a/packages/bun-uws/capi/examples/EchoServer.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "../libuwebsockets.h"
-#include <stdio.h>
-#include <malloc.h>
-
-#define SSL 1
-
-
-/* This is a simple WebSocket "sync" upgrade example.
- * You may compile it with "WITH_OPENSSL=1 make" or with "make" */
-
-/* ws->getUserData returns one of these */
-struct PerSocketData {
-    /* Fill with user data */
-};
-
-void listen_handler(struct us_listen_socket_t *listen_socket, uws_app_listen_config_t config, void* user_data)
-{
-    if (listen_socket){
-        printf("Listening on port wss://localhost:%d\n", config.port);
-    }
-}
-
-void open_handler(uws_websocket_t* ws){
-
-     /* Open event here, you may access uws_ws_get_user_data(WS) which points to a PerSocketData struct */
-}
-
-void message_handler(uws_websocket_t* ws, const char* message, size_t length, uws_opcode_t opcode){
-    uws_ws_send(SSL, ws, message, length, opcode);
-}
-
-void close_handler(uws_websocket_t* ws, int code, const char* message, size_t length){
-
-    /* You may access uws_ws_get_user_data(ws) here, but sending or
-     * doing any kind of I/O with the socket is not valid. */
-}
-
-void drain_handler(uws_websocket_t* ws){
-    /* Check uws_ws_get_buffered_amount(ws) here */
-}
-
-void ping_handler(uws_websocket_t* ws, const char* message, size_t length){
-    /* You don't need to handle this one, we automatically respond to pings as per standard */
-}
-
-void pong_handler(uws_websocket_t* ws, const char* message, size_t length){
-
-    /* You don't need to handle this one either */
-}
-
-
-int main()
-{
-
-
-    uws_app_t *app = uws_create_app(SSL, (struct us_socket_context_options_t){
-        /* There are example certificates in uWebSockets.js repo */
-	    .key_file_name = "../misc/key.pem",
-	    .cert_file_name = "../misc/cert.pem",
-	    .passphrase = "1234"
-    });
-
-	uws_ws(SSL, app, "/*", (uws_socket_behavior_t){
-		.compression = uws_compress_options_t::SHARED_COMPRESSOR,
-        .maxPayloadLength = 16 * 1024,
-        .idleTimeout = 12,
-        .maxBackpressure = 1 * 1024 * 1024,
-		.upgrade = NULL,
-        .open = open_handler,
-        .message = message_handler,
-        .drain = drain_handler,
-        .ping = ping_handler,
-        .pong = pong_handler,
-        .close = close_handler,
-	});
-
-    uws_app_listen(SSL,app, 9001, listen_handler, NULL);
-    
-
-	uws_app_run(SSL, app);
-}
\ No newline at end of file
diff --git a/packages/bun-uws/capi/examples/HelloWorld.c b/packages/bun-uws/capi/examples/HelloWorld.c
deleted file mode 100644
index 613ba59347..0000000000
--- a/packages/bun-uws/capi/examples/HelloWorld.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "../libuwebsockets.h"
-#include "libusockets.h"
-#include <stdio.h>
-
-#define SSL 1
-
-void get_handler(uws_res_t *res, uws_req_t *req, void *user_data)
-{
-    uws_res_end(SSL, res, "Hello CAPI!", 11, false);
-}
-
-void listen_handler(struct us_listen_socket_t *listen_socket, uws_app_listen_config_t config, void *user_data)
-{
-    if (listen_socket)
-    {
-        printf("Listening on port https://localhost:%d now\n", config.port);
-    }
-}
-
-int main()
-{
-    /* Overly simple hello world app */
-
-    uws_app_t *app = uws_create_app(SSL, (struct us_socket_context_options_t){
-        /* There are example certificates in uWebSockets.js repo */
-	    .key_file_name = "../misc/key.pem",
-	    .cert_file_name = "../misc/cert.pem",
-	    .passphrase = "1234"
-    });
-    uws_app_get(SSL, app, "/*", get_handler, NULL);
-    uws_app_listen(SSL, app, 3000, listen_handler, NULL);
-    uws_app_run(SSL, app);
-}
diff --git a/packages/bun-uws/capi/examples/HelloWorldAsync.c b/packages/bun-uws/capi/examples/HelloWorldAsync.c
deleted file mode 100644
index e22dd44c1b..0000000000
--- a/packages/bun-uws/capi/examples/HelloWorldAsync.c
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "../libuwebsockets.h"
-#include "libusockets.h"
-
-#include <stdio.h>
-#include <malloc.h>
-#include <string.h>
-
-#define SSL 0
-
-typedef struct {
-    uws_res_t* res;
-    bool aborted;
-} async_request_t;
-
-//Timer close helper
-void uws_timer_close(struct us_timer_t *timer)
-{
-    struct us_timer_t *t = (struct us_timer_t *)timer;
-    struct timer_handler_data *data;
-    memcpy(&data, us_timer_ext(t), sizeof(struct timer_handler_data *));
-    free(data);
-    us_timer_close(t, 0);
-}
-//Timer create helper
-struct us_timer_t *uws_create_timer(int ms, int repeat_ms, void (*handler)(void *data), void *data)
-{
-    struct us_loop_t *loop = uws_get_loop();
-    struct us_timer_t *delayTimer = us_create_timer(loop, 0, sizeof(void *));
-
-    struct timer_handler_data
-    {
-        void *data;
-        void (*handler)(void *data);
-        bool repeat;
-    };
-
-    struct timer_handler_data *timer_data = (struct timer_handler_data *)malloc(sizeof(timer_handler_data));
-    timer_data->data = data;
-    timer_data->handler = handler;
-    timer_data->repeat = repeat_ms > 0;
-    memcpy(us_timer_ext(delayTimer), &timer_data, sizeof(struct timer_handler_data *));
-
-    us_timer_set(
-        delayTimer, [](struct us_timer_t *t)
-        {
-            /* We wrote the pointer to the timer's extension */
-            struct timer_handler_data *data;
-            memcpy(&data, us_timer_ext(t), sizeof(struct timer_handler_data *));
-
-            data->handler(data->data);
-
-            if (!data->repeat)
-            {
-                free(data);
-                us_timer_close(t, 0);
-            }
-        },
-        ms, repeat_ms);
-
-    return (struct us_timer_t *)delayTimer;
-}
-
-void on_res_aborted(uws_res_t *response, void* data){
-    async_request_t* request_data =  (async_request_t*)data;
-    /* We don't implement any kind of cancellation here,
-     * so simply flag us as aborted */
-    request_data->aborted = true;
-}
-
-void on_res_corked(uws_res_t *response, void* data){
-    uws_res_end(SSL, response, "Hello CAPI!", 11, false);
-}
-void on_timer_done(void *data){
-    async_request_t* request_data = (async_request_t*)data;
-    /* Were'nt we aborted before our async task finished? Okay, send a message! */
-    if(!request_data->aborted){
-
-        uws_res_cork(SSL, request_data->res,on_res_corked, request_data);
-    }
-}
-
-void get_handler(uws_res_t *res, uws_req_t *req,  void* user_data)
-{
-
-    /* We have to attach an abort handler for us to be aware
-     * of disconnections while we perform async tasks */
-    async_request_t* request_data = (async_request_t*) malloc(sizeof(async_request_t));
-    request_data->res = res;
-    request_data->aborted = false;
-
-    uws_res_on_aborted(SSL, res, on_res_aborted, request_data);
-
-   /* Simulate checking auth for 5 seconds. This looks like crap, never write
-    * code that utilize us_timer_t like this; they are high-cost and should
-    * not be created and destroyed more than rarely!
-    * Either way, here we go!*/
-    uws_create_timer(1, 0, on_timer_done, request_data);
-}
-
-
-void listen_handler(struct us_listen_socket_t *listen_socket, uws_app_listen_config_t config,  void* user_data)
-{
-    if (listen_socket)
-    {
-        printf("Listening on port https://localhost:%d now\n", config.port);
-    }
-}
-
-int main()
-{
-  	/* Overly simple hello world app with async response */
-
-
-    uws_app_t *app = uws_create_app(SSL, (struct us_socket_context_options_t){
-        /* There are example certificates in uWebSockets.js repo */
-	    .key_file_name = "../misc/key.pem",
-	    .cert_file_name = "../misc/cert.pem",
-	    .passphrase = "1234"
-    });
-    uws_app_get(SSL, app, "/*", get_handler, NULL);
-    uws_app_listen(SSL, app, 3000, listen_handler, NULL);
-    uws_app_run(SSL, app);
-}
diff --git a/packages/bun-uws/capi/examples/RustHelloWorld.rs b/packages/bun-uws/capi/examples/RustHelloWorld.rs
deleted file mode 100644
index b122d810ba..0000000000
--- a/packages/bun-uws/capi/examples/RustHelloWorld.rs
+++ /dev/null
@@ -1,309 +0,0 @@
-/* automatically generated by rust-bindgen 0.59.2 */
-use std::convert::TryInto;
-use std::ffi::CString;
-
-pub type SizeT = ::std::os::raw::c_ulong;
-pub type WcharT = ::std::os::raw::c_uint;
-#[repr(C)]
-#[repr(align(16))]
-#[derive(Debug, Copy, Clone)]
-pub struct max_align_t {
-    pub __clang_max_align_nonce1: ::std::os::raw::c_longlong,
-    pub __bindgen_padding_0: u64,
-    pub __clang_max_align_nonce2: u128,
-}
-#[test]
-fn bindgen_test_layout_max_align_t() {
-    assert_eq!(
-        ::std::mem::size_of::<max_align_t>(),
-        32usize,
-        concat!("Size of: ", stringify!(max_align_t))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<max_align_t>(),
-        16usize,
-        concat!("Alignment of ", stringify!(max_align_t))
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce1 as *const _ as usize
-        },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(max_align_t),
-            "::",
-            stringify!(__clang_max_align_nonce1)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce2 as *const _ as usize
-        },
-        16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(max_align_t),
-            "::",
-            stringify!(__clang_max_align_nonce2)
-        )
-    );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct uws_app_s {
-    _unused: [u8; 0],
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct uws_req_s {
-    _unused: [u8; 0],
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct uws_res_s {
-    _unused: [u8; 0],
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct uws_app_listen_config_s {
-    port: ::std::os::raw::c_int,
-    host: *const ::std::os::raw::c_char,
-    options: ::std::os::raw::c_int,
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct us_socket_context_options_s {
-    key_file_name: *const ::std::os::raw::c_char,
-    cert_file_name: *const ::std::os::raw::c_char,
-    passphrase: *const ::std::os::raw::c_char,
-    dh_params_file_name: *const ::std::os::raw::c_char,
-    ca_file_name: *const ::std::os::raw::c_char,
-    ssl_prefer_low_memory_usage: ::std::os::raw::c_int,
-}
-
-pub type UwsAppListenConfigT = uws_app_listen_config_s;
-pub type UsSocketContextOptionsT = us_socket_context_options_s;
-pub struct UsSocketContextOptions<'a> {
-    key_file_name: &'a str,
-    cert_file_name: &'a str,
-    passphrase: &'a str,
-    dh_params_file_name: &'a str,
-    ca_file_name: &'a str,
-    ssl_prefer_low_memory_usage: i32,
-}
-pub type UwsAppT = uws_app_s;
-pub type UwsReqT = uws_req_s;
-pub type UwsResT = uws_res_s;
-extern "C" {
-    pub fn uws_create_app(
-        ssl: ::std::os::raw::c_int,
-        options: UsSocketContextOptionsT,
-    ) -> *mut UwsAppT;
-    pub fn uws_app_get(
-        ssl: ::std::os::raw::c_int,
-        app: *mut UwsAppT,
-        pattern: *const ::std::os::raw::c_char,
-        handler: ::std::option::Option<
-            unsafe extern "C" fn(
-                res: *mut UwsResT,
-                req: *mut UwsReqT,
-                user_data: *mut ::std::os::raw::c_void,
-            ),
-        >,
-        user_data: *mut ::std::os::raw::c_void,
-    );
-    pub fn uws_app_run(ssl: ::std::os::raw::c_int, app: *mut UwsAppT);
-
-    pub fn uws_app_listen(
-        ssl: ::std::os::raw::c_int,
-        app: *mut UwsAppT,
-        port: ::std::os::raw::c_int,
-        handler: ::std::option::Option<
-            unsafe extern "C" fn(
-                listen_socket: *mut ::std::os::raw::c_void,
-                config: UwsAppListenConfigT,
-                user_data: *mut ::std::os::raw::c_void,
-            ),
-        >,
-        user_data: *mut ::std::os::raw::c_void,
-    );
-    pub fn uws_res_end(
-        ssl: ::std::os::raw::c_int,
-        res: *mut UwsResT,
-        data: *const ::std::os::raw::c_char,
-        length: SizeT,
-        close_connection: bool,
-    );
-}
-
-pub struct AppResponse<const SSL: i32> {
-    native: *mut UwsResT,
-}
-pub struct AppRequest {
-    native: *mut UwsReqT,
-}
-impl AppRequest {
-    pub fn new(native: *mut UwsReqT) -> AppRequest {
-        AppRequest { native: native }
-    }
-}
-impl<const SSL: i32> AppResponse<SSL> {
-    pub fn new(native: *mut UwsResT) -> AppResponse<SSL> {
-        AppResponse::<SSL> { native: native }
-    }
-    fn end(self, message: &str) -> AppResponse<SSL> {
-        unsafe {
-            let c_message =
-                ::std::ffi::CString::new(message).expect("Failed to create message CString");
-            //This will now const fold :/ performance impact needs refactor
-            uws_res_end(
-                SSL,
-                self.native,
-                c_message.as_ptr(),
-                message.len().try_into().unwrap(),
-                false,
-            );
-        }
-        self
-    }
-}
-
-pub type UwsMethodHandler<const SSL: i32> = fn(res: AppResponse<SSL>, req: AppRequest);
-pub type UwsListenHandler =
-    fn(listen_socket: *mut ::std::os::raw::c_void, config: UwsAppListenConfigT);
-
-pub struct TemplateApp<const SSL: i32> {
-    native: *mut UwsAppT,
-}
-
-extern "C" fn uws_generic_listen_handler(
-    listen_socket: *mut ::std::os::raw::c_void,
-    config: UwsAppListenConfigT,
-    user_data: *mut ::std::os::raw::c_void,
-) {
-    unsafe {
-        let callback = &mut *(user_data as *mut UwsListenHandler);
-        callback(listen_socket, config);
-    }
-}
-
-extern "C" fn uws_generic_method_handler(
-    res: *mut UwsResT,
-    req: *mut UwsReqT,
-    user_data: *mut ::std::os::raw::c_void,
-) {
-    unsafe {
-        let response = AppResponse::<0>::new(res);
-        let request = AppRequest::new(req);
-        let callback = &mut *(user_data as *mut UwsMethodHandler<0>);
-        callback(response, request);
-    }
-}
-extern "C" fn uws_ssl_generic_method_handler(
-    res: *mut UwsResT,
-    req: *mut UwsReqT,
-    user_data: *mut ::std::os::raw::c_void,
-) {
-    unsafe {
-        let response = AppResponse::<1>::new(res);
-        let request = AppRequest::new(req);
-        let callback = &mut *(user_data as *mut UwsMethodHandler<1>);
-        callback(response, request);
-    }
-}
-
-impl<const SSL: i32> TemplateApp<SSL> {
-    pub fn new(config: UsSocketContextOptions) -> TemplateApp<SSL> {
-        unsafe {
-            let key_file_name_s =
-                CString::new(config.key_file_name).expect("Failed to create key_file_name CString");
-            let cert_file_name_s = CString::new(config.cert_file_name)
-                .expect("Failed to create cert_file_name CString");
-            let passphrase_s =
-                CString::new(config.passphrase).expect("Failed to create passphrase CString");
-            let dh_params_file_name_s = CString::new(config.dh_params_file_name)
-                .expect("Failed to create dh_params_file_name CString");
-            let ca_file_name_s =
-                CString::new(config.ca_file_name).expect("Failed to create ca_file_name CString");
-
-            let native_options = UsSocketContextOptionsT {
-                key_file_name: key_file_name_s.as_ptr(),
-                cert_file_name: cert_file_name_s.as_ptr(),
-                passphrase: passphrase_s.as_ptr(),
-                dh_params_file_name: dh_params_file_name_s.as_ptr(),
-                ca_file_name: ca_file_name_s.as_ptr(),
-                ssl_prefer_low_memory_usage: config.ssl_prefer_low_memory_usage,
-            };
-            TemplateApp::<SSL> {
-                native: uws_create_app(SSL, native_options),
-            }
-        }
-    }
-    pub fn get(self, route: &str, mut handler: UwsMethodHandler<SSL>) -> TemplateApp<SSL> {
-        unsafe {
-            let c_route = ::std::ffi::CString::new(route).expect("Failed to create route CString");
-            if SSL == 1 {
-                uws_app_get(
-                    SSL,
-                    self.native,
-                    c_route.as_ptr(),
-                    std::option::Option::Some(uws_ssl_generic_method_handler),
-                    &mut handler as *mut _ as *mut ::std::os::raw::c_void,
-                );
-            } else {
-                uws_app_get(
-                    SSL,
-                    self.native,
-                    c_route.as_ptr(),
-                    std::option::Option::Some(uws_generic_method_handler),
-                    &mut handler as *mut _ as *mut ::std::os::raw::c_void,
-                );
-            }
-        }
-        self
-    }
-
-    pub fn listen(self, port: i32, mut handler: UwsListenHandler) -> TemplateApp<SSL> {
-        unsafe {
-            uws_app_listen(
-                SSL,
-                self.native,
-                port,
-                ::std::option::Option::Some(uws_generic_listen_handler),
-                &mut handler as *mut _ as *mut ::std::os::raw::c_void,
-            );
-        }
-        self
-    }
-
-    pub fn run(self) -> TemplateApp<SSL> {
-        unsafe {
-            uws_app_run(SSL, self.native);
-        }
-        self
-    }
-}
-pub type App = TemplateApp<0>;
-pub type SSLApp = TemplateApp<1>;
-
-fn main() {
-    let config = UsSocketContextOptions {
-        key_file_name: "../misc/key.pem",
-        cert_file_name: "../misc/cert.pem",
-        passphrase: "1234",
-        ca_file_name: "",
-        dh_params_file_name: "",
-        ssl_prefer_low_memory_usage: 0,
-    };
-
-    SSLApp::new(config)
-        .get("/", |res, _req| {
-            res.end("Hello Rust!");
-        })
-        .listen(3000, |_listen_socket, config| {
-            println!("Listening on port https://127.0.0.1:{}", config.port);
-        })
-        .run();
-}
diff --git a/packages/bun-uws/capi/examples/ServerName.c b/packages/bun-uws/capi/examples/ServerName.c
deleted file mode 100644
index 1415823b29..0000000000
--- a/packages/bun-uws/capi/examples/ServerName.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "../libuwebsockets.h"
-#include <stdio.h>
-#include <string.h>
-#define SSL 1
-
-
-struct us_listen_socket_t *globalListenSocket;
-uws_app_t *app;
-void get_handler(uws_res_t *res, uws_req_t *req, void* user_data)
-{
-	
-    uws_res_end(SSL, res, "Hello CAPI!", 11, false);
-}
-
-void exit_handler(uws_res_t *res, uws_req_t *req, void* user_data)
-{
-	uws_res_end(SSL, res, "Shutting down!",14, false);
-    /* We use this to check graceful closedown */
-    us_listen_socket_close(false, globalListenSocket);
-}
-
-void missing_server_name_handler(const char *hostname,  void* user_data){
-	printf("We are missing server name: <%s>\n", hostname);
-	
-	/* Assume it is localhost, so add it */
-	uws_add_server_name(SSL, app, "localhost");
-}
-
-void listen_handler(struct us_listen_socket_t *listen_socket, uws_app_listen_config_t config, void* user_data)
-{
-    if (listen_socket){
-        printf("Listening on port https://localhost:%d\n", config.port);
-		globalListenSocket = listen_socket;
-    }else{
-		printf("Failed to listen on port https://localhost:%d\n", config.port);
-	}
-	
-}
-
-int main()
-{
-  	/* Overly simple hello world app (SNI)*/
-
-    app = uws_create_app(SSL, (struct us_socket_context_options_t){
-        /* There are example certificates in uWebSockets.js repo */
-	    .key_file_name = "../misc/key.pem",
-	    .cert_file_name = "../misc/cert.pem",
-	    .passphrase = "1234"
-    });    
-	uws_missing_server_name(SSL, app, missing_server_name_handler, NULL);
-	uws_app_get(SSL, app, "/*", get_handler, NULL);
-	uws_app_get(SSL, app, "/exit", exit_handler, NULL);
-    uws_app_listen(SSL, app, 3000, listen_handler, NULL);
-    
-	/* Let's add a wildcard SNI to begin with */
-	uws_add_server_name(SSL, app, "*.google.*");
-
-	uws_app_run(SSL, app);
-}
\ No newline at end of file
diff --git a/packages/bun-uws/capi/examples/UpgradeAsync.c b/packages/bun-uws/capi/examples/UpgradeAsync.c
deleted file mode 100644
index 8c6e735420..0000000000
--- a/packages/bun-uws/capi/examples/UpgradeAsync.c
+++ /dev/null
@@ -1,255 +0,0 @@
-#include "../libuwebsockets.h"
-#include "libusockets.h"
-#include <stdio.h>
-#include <malloc.h>
-#include <string.h>
-/* This is a simple WebSocket "sync" upgrade example.
- * You may compile it with "WITH_OPENSSL=1 make" or with "make" */
-
-#define SSL 1
-
-typedef struct
-{
-    char *value;
-    size_t length;
-} header_t;
-struct PerSocketData
-{
-    /* Define your user data */
-    int something;
-};
-
-struct UpgradeData
-{
-    header_t *secWebSocketKey;
-    header_t *secWebSocketProtocol;
-    header_t *secWebSocketExtensions;
-    uws_socket_context_t *context;
-    uws_res_t *response;
-    bool aborted;
-};
-
-header_t *create_header(size_t length, const char* value)
-{
-    header_t *header = (header_t *)malloc(sizeof(header_t));
-    if(length > 0){
-        header->value = (char *)calloc(sizeof(char), length);
-        header->length = length;
-        memcpy(header->value, value, length);
-    }else{
-        header->value = NULL;
-        header->length = 0;
-    }
-    return header;
-}
-void free_header(header_t *header)
-{
-
-    free(header->value);
-    free(header);
-}
-void listen_handler(struct us_listen_socket_t *listen_socket, uws_app_listen_config_t config, void *user_data)
-{
-    if (listen_socket)
-    {
-        printf("Listening on port wss://localhost:%d\n", config.port);
-    }
-}
-//Timer close helper
-void uws_timer_close(struct us_timer_t *timer)
-{
-    struct us_timer_t *t = (struct us_timer_t *)timer;
-    struct timer_handler_data *data;
-    memcpy(&data, us_timer_ext(t), sizeof(struct timer_handler_data *));
-    free(data);
-    us_timer_close(t, 0);
-}
-//Timer create helper
-struct us_timer_t *uws_create_timer(int ms, int repeat_ms, void (*handler)(void *data), void *data)
-{
-    struct us_loop_t *loop = uws_get_loop();
-    struct us_timer_t *delayTimer = us_create_timer(loop, 0, sizeof(void *));
-
-    struct timer_handler_data
-    {
-        void *data;
-        void (*handler)(void *data);
-        bool repeat;
-    };
-
-    struct timer_handler_data *timer_data = (struct timer_handler_data *)malloc(sizeof(timer_handler_data));
-    timer_data->data = data;
-    timer_data->handler = handler;
-    timer_data->repeat = repeat_ms > 0;
-    memcpy(us_timer_ext(delayTimer), &timer_data, sizeof(struct timer_handler_data *));
-
-    us_timer_set(
-        delayTimer, [](struct us_timer_t *t)
-        {
-            /* We wrote the pointer to the timer's extension */
-            struct timer_handler_data *data;
-            memcpy(&data, us_timer_ext(t), sizeof(struct timer_handler_data *));
-
-            data->handler(data->data);
-
-            if (!data->repeat)
-            {
-                free(data);
-                us_timer_close(t, 0);
-            }
-        },
-        ms, repeat_ms);
-
-    return (struct us_timer_t *)delayTimer;
-}
-void on_timer_done(void *data)
-{
-
-    struct UpgradeData *upgrade_data = (struct UpgradeData *)data;
-
-    /* Were'nt we aborted before our async task finished? Okay, upgrade then! */
-    if (!upgrade_data->aborted)
-    {
-        struct PerSocketData *socket_data = (struct PerSocketData *)malloc(sizeof(struct PerSocketData));
-        socket_data->something = 15;
-        printf("Async task done, upgrading to WebSocket now!\n");
-
-        uws_res_upgrade(SSL, 
-                        upgrade_data->response,
-                        (void *)socket_data,
-                        upgrade_data->secWebSocketKey->value,
-                        upgrade_data->secWebSocketKey->length,
-                        upgrade_data->secWebSocketProtocol->value,
-                        upgrade_data->secWebSocketProtocol->length,
-                        upgrade_data->secWebSocketExtensions->value,
-                        upgrade_data->secWebSocketExtensions->length,
-                        upgrade_data->context);
-    }
-    else
-    {
-        printf("Async task done, but the HTTP socket was closed. Skipping upgrade to WebSocket!\n");
-    }
-    free_header(upgrade_data->secWebSocketKey);
-    free_header(upgrade_data->secWebSocketProtocol);
-    free_header(upgrade_data->secWebSocketExtensions);
-    free(upgrade_data);
-}
-
-void on_res_aborted(uws_res_t *response, void *data)
-{
-    struct UpgradeData *upgrade_data = (struct UpgradeData *)data;
-    /* We don't implement any kind of cancellation here,
-     * so simply flag us as aborted */
-    upgrade_data->aborted = true;
-}
-void upgrade_handler(uws_res_t *response, uws_req_t *request, uws_socket_context_t *context)
-{
-
-    /* HttpRequest (req) is only valid in this very callback, so we must COPY the headers
-     * we need later on while upgrading to WebSocket. You must not access req after first return.
-     * Here we create a heap allocated struct holding everything we will need later on. */
-
-    struct UpgradeData *data = (struct UpgradeData *)malloc(sizeof(struct UpgradeData));
-    data->aborted = false;
-    data->context = context;
-    data->response = response;
-    
-    const char *ws_key = NULL;
-    const char *ws_protocol = NULL;
-    const char *ws_extensions = NULL;
-    
-    size_t ws_key_length = uws_req_get_header(request, "sec-websocket-key", 17, &ws_key);
-    size_t ws_protocol_length = uws_req_get_header(request, "sec-websocket-protocol", 22, &ws_protocol);
-    size_t ws_extensions_length = uws_req_get_header(request, "sec-websocket-extensions", 24, &ws_extensions);
-
-    
-    data->secWebSocketKey = create_header(ws_key_length, ws_key);
-    data->secWebSocketProtocol = create_header(ws_protocol_length, ws_protocol);
-    data->secWebSocketExtensions = create_header(ws_extensions_length, ws_extensions);
-
-    /* We have to attach an abort handler for us to be aware
-     * of disconnections while we perform async tasks */
-
-    uws_res_on_aborted(SSL, response, on_res_aborted, data);
-
-    /* Simulate checking auth for 5 seconds. This looks like crap, never write
-    * code that utilize us_timer_t like this; they are high-cost and should
-    * not be created and destroyed more than rarely!
-    * Either way, here we go!*/
-    uws_create_timer(5000, 0, on_timer_done, data);
-}
-
-void open_handler(uws_websocket_t *ws)
-{
-
-    /* Open event here, you may access uws_ws_get_user_data(ws) which points to a PerSocketData struct.
-    * Here we simply validate that indeed, something == 15 as set in upgrade handler. */
-
-    struct PerSocketData *data = (struct PerSocketData *)uws_ws_get_user_data(SSL, ws);
-    data->something = 15;
-    printf("Something is: %d\n", data->something);
-}
-
-void message_handler(uws_websocket_t *ws, const char *message, size_t length, uws_opcode_t opcode)
-{
-
-    /* We simply echo whatever data we get */
-    uws_ws_send(SSL, ws, message, length, opcode);
-}
-
-void close_handler(uws_websocket_t *ws, int code, const char *message, size_t length)
-{
-
-    /* You may access uws_ws_get_user_data(ws) here, but sending or
-     * doing any kind of I/O with the socket is not valid. */
-    struct PerSocketData *data = (struct PerSocketData *)uws_ws_get_user_data(SSL, ws);
-    if (data)
-    {
-        free(data);
-    }
-}
-
-void drain_handler(uws_websocket_t *ws)
-{
-    /* Check uws_ws_get_buffered_amount(ws) here */
-}
-
-void ping_handler(uws_websocket_t *ws, const char *message, size_t length)
-{
-    /* You don't need to handle this one, we automatically respond to pings as per standard */
-}
-
-void pong_handler(uws_websocket_t *ws, const char *message, size_t length)
-{
-
-    /* You don't need to handle this one either */
-}
-
-int main()
-{
-
-    uws_app_t *app = uws_create_app(SSL, (struct us_socket_context_options_t){
-        /* There are example certificates in uWebSockets.js repo */
-	    .key_file_name = "../misc/key.pem",
-	    .cert_file_name = "../misc/cert.pem",
-	    .passphrase = "1234"
-    });
-
-    uws_ws(SSL, app, "/*", (uws_socket_behavior_t){
-                          .compression = uws_compress_options_t::SHARED_COMPRESSOR,
-                          .maxPayloadLength = 16 * 1024,
-                          .idleTimeout = 12,
-                          .maxBackpressure = 1 * 1024 * 1024,
-                          .upgrade = upgrade_handler,
-                          .open = open_handler,
-                          .message = message_handler,
-                          .drain = drain_handler,
-                          .ping = ping_handler,
-                          .pong = pong_handler,
-                          .close = close_handler,
-                      });
-
-    uws_app_listen(SSL, app, 9001, listen_handler, NULL);
-
-    uws_app_run(SSL, app);
-}
\ No newline at end of file
diff --git a/packages/bun-uws/capi/examples/UpgradeSync.c b/packages/bun-uws/capi/examples/UpgradeSync.c
deleted file mode 100644
index 83252b5e8c..0000000000
--- a/packages/bun-uws/capi/examples/UpgradeSync.c
+++ /dev/null
@@ -1,117 +0,0 @@
-#include "../libuwebsockets.h"
-#include <stdio.h>
-#include <malloc.h>
-
-#define SSL 1
-
-/* This is a simple WebSocket "sync" upgrade example.
- * You may compile it with "WITH_OPENSSL=1 make" or with "make" */
-
-/* uws_ws_get_user_data(ws) returns one of these */
-
-struct PerSocketData
-{
-    /* Define your user data */
-    int something;
-};
-
-void listen_handler(struct us_listen_socket_t *listen_socket, uws_app_listen_config_t config, void *user_data)
-{
-    if (listen_socket)
-    {
-        printf("Listening on port wss://localhost:%d\n", config.port);
-    }
-}
-
-void upgrade_handler(uws_res_t *response, uws_req_t *request, uws_socket_context_t *context)
-{
-
-    /* You may read from req only here, and COPY whatever you need into your PerSocketData.
-     * PerSocketData is valid from .open to .close event, accessed with uws_ws_get_user_data(ws).
-     * HttpRequest (req) is ONLY valid in this very callback, so any data you will need later
-     * has to be COPIED into PerSocketData here. */
-
-    /* Immediately upgrading without doing anything "async" before, is simple */
-
-    struct PerSocketData *data = (struct PerSocketData *)malloc(sizeof(struct PerSocketData));
-    data->something = 15;
-
-    const char *ws_key = NULL;
-    const char *ws_protocol = NULL;
-    const char *ws_extensions = NULL;
-    
-    size_t ws_key_length = uws_req_get_header(request, "sec-websocket-key", 17, &ws_key);
-    size_t ws_protocol_length = uws_req_get_header(request, "sec-websocket-protocol", 22, &ws_protocol);
-    size_t ws_extensions_length = uws_req_get_header(request, "sec-websocket-extensions", 24, &ws_extensions);
-
-    uws_res_upgrade(SSL,
-                    response,
-                    (void *)data,
-                    ws_key,
-                    ws_key_length,
-                    ws_protocol,
-                    ws_protocol_length,
-                    ws_extensions,
-                    ws_extensions_length,
-                    context);
-}
-
-void open_handler(uws_websocket_t *ws)
-{
-
-    /* Open event here, you may access uws_ws_get_user_data(ws) which points to a PerSocketData struct.
-    * Here we simply validate that indeed, something == 15 as set in upgrade handler. */
-
-    struct PerSocketData *data = (struct PerSocketData *)uws_ws_get_user_data(SSL, ws);
-    data->something = 15;
-    printf("Something is: %d\n", data->something);
-}
-
-void message_handler(uws_websocket_t *ws, const char *message, size_t length, uws_opcode_t opcode)
-{
-    /* We simply echo whatever data we get */
-    uws_ws_send(SSL, ws, message, length, opcode);
-}
-
-void close_handler(uws_websocket_t *ws, int code, const char *message, size_t length)
-{
-
-    /* You may access uws_ws_get_user_data(ws) here, but sending or
-     * doing any kind of I/O with the socket is not valid. */
-    struct PerSocketData *data = (struct PerSocketData *)uws_ws_get_user_data(SSL, ws);
-    if (data)
-        free(data);
-}
-
-void drain_handler(uws_websocket_t *ws)
-{
-    /* Check uws_ws_get_buffered_amount(ws) here */
-}
-
-void ping_handler(uws_websocket_t *ws, const char *message, size_t length)
-{
-    /* You don't need to handle this one, we automatically respond to pings as per standard */
-}
-
-void pong_handler(uws_websocket_t *ws, const char *message, size_t length)
-{
-
-    /* You don't need to handle this one either */
-}
-
-int main()
-{
-
-    uws_app_t *app = uws_create_app(SSL, (struct us_socket_context_options_t){
-        /* There are example certificates in uWebSockets.js repo */
-	    .key_file_name = "../misc/key.pem",
-	    .cert_file_name = "../misc/cert.pem",
-	    .passphrase = "1234"
-    });
-
-    uws_ws(SSL, app, "/*", (uws_socket_behavior_t){.compression = uws_compress_options_t::SHARED_COMPRESSOR, .maxPayloadLength = 16 * 1024, .idleTimeout = 12, .maxBackpressure = 1 * 1024 * 1024, .upgrade = upgrade_handler, .open = open_handler, .message = message_handler, .drain = drain_handler, .ping = ping_handler, .pong = pong_handler, .close = close_handler});
-
-    uws_app_listen(SSL, app, 9001, listen_handler, NULL);
-
-    uws_app_run(SSL, app);
-}
\ No newline at end of file
diff --git a/packages/bun-uws/capi/libuwebsockets.cpp b/packages/bun-uws/capi/libuwebsockets.cpp
deleted file mode 100644
index 5ca58a5d0b..0000000000
--- a/packages/bun-uws/capi/libuwebsockets.cpp
+++ /dev/null
@@ -1,1349 +0,0 @@
-/*
- * Copyright 2022 Ciro Spaciari
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-// clang-format off
-#include "libuwebsockets.h"
-#include <string_view>
-#include "App.h"
-#include "ClientApp.h"
-#include <optional>
-extern "C"
-{
-
-    uws_app_t *uws_create_app(int ssl, struct us_bun_socket_context_options_t options)
-    {
-        if (ssl)
-        {
-            uWS::SocketContextOptions sco;
-            memcpy(&sco, &options, sizeof(uWS::SocketContextOptions));
-
-            return (uws_app_t *)new uWS::SSLApp(sco);
-        }
-
-        return (uws_app_t *)new uWS::App();
-    }
-
-    void uws_app_get(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->get(pattern, nullptr);
-                return;
-            }
-            uwsApp->get(pattern, [handler, user_data](auto *res, auto *req)
-                        { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->get(pattern, nullptr);
-                return;
-            }
-            uwsApp->get(pattern, [handler, user_data](auto *res, auto *req)
-                        { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-    }
-    void uws_app_post(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data)
-    {
-
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->post(pattern, nullptr);
-                return;
-            }
-            uwsApp->post(pattern, [handler, user_data](auto *res, auto *req)
-                         { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->post(pattern, nullptr);
-                return;
-            }
-            uwsApp->post(pattern, [handler, user_data](auto *res, auto *req)
-                         { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-    }
-    void uws_app_options(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->options(pattern, nullptr);
-                return;
-            }
-            uwsApp->options(pattern, [handler, user_data](auto *res, auto *req)
-                            { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->options(pattern, nullptr);
-                return;
-            }
-            uwsApp->options(pattern, [handler, user_data](auto *res, auto *req)
-                            { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-    }
-    void uws_app_delete(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->del(pattern, nullptr);
-                return;
-            }
-            uwsApp->del(pattern, [handler, user_data](auto *res, auto *req)
-                        { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->del(pattern, nullptr);
-                return;
-            }
-            uwsApp->del(pattern, [handler, user_data](auto *res, auto *req)
-                        { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-    }
-    void uws_app_patch(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->patch(pattern, nullptr);
-                return;
-            }
-            uwsApp->patch(pattern, [handler, user_data](auto *res, auto *req)
-                          { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->patch(pattern, nullptr);
-                return;
-            }
-            uwsApp->patch(pattern, [handler, user_data](auto *res, auto *req)
-                          { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-    }
-    void uws_app_put(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->put(pattern, nullptr);
-                return;
-            }
-            uwsApp->put(pattern, [handler, user_data](auto *res, auto *req)
-                        { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->put(pattern, nullptr);
-                return;
-            }
-            uwsApp->put(pattern, [handler, user_data](auto *res, auto *req)
-                        { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-    }
-    void uws_app_head(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->head(pattern, nullptr);
-                return;
-            }
-            uwsApp->head(pattern, [handler, user_data](auto *res, auto *req)
-                         { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->head(pattern, nullptr);
-                return;
-            }
-            uwsApp->head(pattern, [handler, user_data](auto *res, auto *req)
-                         { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-    }
-    void uws_app_connect(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->connect(pattern, nullptr);
-                return;
-            }
-            uwsApp->connect(pattern, [handler, user_data](auto *res, auto *req)
-                            { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->connect(pattern, nullptr);
-                return;
-            }
-            uwsApp->connect(pattern, [handler, user_data](auto *res, auto *req)
-                            { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-    }
-
-    void uws_app_trace(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->trace(pattern, nullptr);
-                return;
-            }
-            uwsApp->trace(pattern, [handler, user_data](auto *res, auto *req)
-                          { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->trace(pattern, nullptr);
-                return;
-            }
-            uwsApp->trace(pattern, [handler, user_data](auto *res, auto *req)
-                          { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-    }
-    void uws_app_any(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->any(pattern, nullptr);
-                return;
-            }
-            uwsApp->any(pattern, [handler, user_data](auto *res, auto *req)
-                        { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            if (handler == nullptr)
-            {
-                uwsApp->any(pattern, nullptr);
-                return;
-            }
-            uwsApp->any(pattern, [handler, user_data](auto *res, auto *req)
-                        { handler((uws_res_t *)res, (uws_req_t *)req, user_data); });
-        }
-    }
-
-    void uws_app_run(int ssl, uws_app_t *app)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            uwsApp->run();
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            uwsApp->run();
-        }
-    }
-
-    void uws_app_listen(int ssl, uws_app_t *app, int port, uws_listen_handler handler, void *user_data)
-    {
-        uws_app_listen_config_t config;
-        config.port = port;
-        config.host = nullptr;
-        config.options = 0;
-
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            uwsApp->listen(port, [handler, config, user_data](struct us_listen_socket_t *listen_socket)
-                           { handler((struct us_listen_socket_t *)listen_socket, config, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-
-            uwsApp->listen(port, [handler, config, user_data](struct us_listen_socket_t *listen_socket)
-                           { handler((struct us_listen_socket_t *)listen_socket, config, user_data); });
-        }
-    }
-
-    void uws_app_listen_with_config(int ssl, uws_app_t *app, uws_app_listen_config_t config, uws_listen_handler handler, void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            uwsApp->listen(config.host, config.port, config.options, [handler, config, user_data](struct us_listen_socket_t *listen_socket)
-                           { handler((struct us_listen_socket_t *)listen_socket, config, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            uwsApp->listen(config.host, config.port, config.options, [handler, config, user_data](struct us_listen_socket_t *listen_socket)
-                           { handler((struct us_listen_socket_t *)listen_socket, config, user_data); });
-        }
-    }
-
-    /* callback, path to unix domain socket */
-    void uws_app_listen_domain(int ssl, uws_app_t *app, const char *domain, size_t domain_length, uws_listen_domain_handler handler, void *user_data)
-    {
-
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            uwsApp->listen([handler, domain, domain_length, user_data](struct us_listen_socket_t *listen_socket)
-                           { handler((struct us_listen_socket_t *)listen_socket, domain, domain_length, 0, user_data); },
-                           std::string(domain, domain_length));
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-
-            uwsApp->listen([handler, domain, domain_length, user_data](struct us_listen_socket_t *listen_socket)
-                           { handler((struct us_listen_socket_t *)listen_socket, domain, domain_length, 0, user_data); },
-                           std::string(domain, domain_length));
-        }
-    }
-
-    /* callback, path to unix domain socket */
-    void uws_app_listen_domain_with_options(int ssl, uws_app_t *app, const char *domain, size_t domain_length, int options, uws_listen_domain_handler handler, void *user_data)
-    {
-
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            uwsApp->listen(
-                options, [handler, domain, domain_length, options, user_data](struct us_listen_socket_t *listen_socket)
-                { handler((struct us_listen_socket_t *)listen_socket, domain, domain_length, options, user_data); },
-                std::string(domain, domain_length));
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-
-            uwsApp->listen(
-                options, [handler, domain, domain_length, options, user_data](struct us_listen_socket_t *listen_socket)
-                { handler((struct us_listen_socket_t *)listen_socket, domain, domain_length, options, user_data); },
-                std::string(domain, domain_length));
-        }
-    }
-    void uws_app_domain(int ssl, uws_app_t *app, const char *server_name)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            uwsApp->domain(server_name);
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            uwsApp->domain(server_name);
-        }
-    }
-    void uws_app_destroy(int ssl, uws_app_t *app)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            delete uwsApp;
-        }
-        else
-        {
-
-            uWS::App *uwsApp = (uWS::App *)app;
-            delete uwsApp;
-        }
-    }
-
-    bool uws_constructor_failed(int ssl, uws_app_t *app)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            if (!uwsApp)
-                return true;
-            return uwsApp->constructorFailed();
-        }
-        uWS::App *uwsApp = (uWS::App *)app;
-        if (!uwsApp)
-            return true;
-        return uwsApp->constructorFailed();
-    }
-
-    unsigned int uws_num_subscribers(int ssl, uws_app_t *app, const char *topic, size_t topic_length)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            return uwsApp->numSubscribers(std::string_view(topic, topic_length));
-        }
-        uWS::App *uwsApp = (uWS::App *)app;
-        return uwsApp->numSubscribers(std::string_view(topic, topic_length));
-    }
-    bool uws_publish(int ssl, uws_app_t *app, const char *topic, size_t topic_length, const char *message, size_t message_length, uws_opcode_t opcode, bool compress)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            return uwsApp->publish(std::string_view(topic, topic_length), std::string_view(message, message_length), (uWS::OpCode)(unsigned char)opcode, compress);
-        }
-        uWS::App *uwsApp = (uWS::App *)app;
-        return uwsApp->publish(std::string_view(topic, topic_length), std::string_view(message, message_length), (uWS::OpCode)(unsigned char)opcode, compress);
-    }
-    void *uws_get_native_handle(int ssl, uws_app_t *app)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            return uwsApp->getNativeHandle();
-        }
-        uWS::App *uwsApp = (uWS::App *)app;
-        return uwsApp->getNativeHandle();
-    }
-    void uws_remove_server_name(int ssl, uws_app_t *app, const char *hostname_pattern, size_t hostname_pattern_length)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            uwsApp->removeServerName(std::string(hostname_pattern, hostname_pattern_length));
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            uwsApp->removeServerName(std::string(hostname_pattern, hostname_pattern_length));
-        }
-    }
-    void uws_add_server_name(int ssl, uws_app_t *app, const char *hostname_pattern, size_t hostname_pattern_length)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            uwsApp->addServerName(std::string(hostname_pattern, hostname_pattern_length));
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            uwsApp->addServerName(std::string(hostname_pattern, hostname_pattern_length));
-        }
-    }
-    void uws_add_server_name_with_options(int ssl, uws_app_t *app, const char *hostname_pattern, size_t hostname_pattern_length, struct us_bun_socket_context_options_t options)
-    {
-        uWS::SocketContextOptions sco;
-        memcpy(&sco, &options, sizeof(uWS::SocketContextOptions));
-
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            uwsApp->addServerName(std::string(hostname_pattern, hostname_pattern_length), sco);
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            uwsApp->addServerName(std::string(hostname_pattern, hostname_pattern_length), sco);
-        }
-    }
-
-    void uws_missing_server_name(int ssl, uws_app_t *app, uws_missing_server_handler handler, void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            uwsApp->missingServerName([handler, user_data](auto hostname)
-                                      { handler(hostname, strlen(hostname), user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-            uwsApp->missingServerName([handler, user_data](auto hostname)
-                                      { handler(hostname, strlen(hostname), user_data); });
-        }
-    }
-    void uws_filter(int ssl, uws_app_t *app, uws_filter_handler handler, void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-            uwsApp->filter([handler, user_data](auto res, auto i)
-                           { handler((uws_res_t *)res, i, user_data); });
-        }
-        else
-        {
-            uWS::App *uwsApp = (uWS::App *)app;
-
-            uwsApp->filter([handler, user_data](auto res, auto i)
-                           { handler((uws_res_t *)res, i, user_data); });
-        }
-    }
-
-    void uws_ws(int ssl, uws_app_t *app, const char *pattern, uws_socket_behavior_t behavior, void *user_data)
-    {
-        if (ssl)
-        {
-            auto generic_handler = uWS::SSLApp::WebSocketBehavior<void *>{
-                .compression = (uWS::CompressOptions)(uint64_t)behavior.compression,
-                .maxPayloadLength = behavior.maxPayloadLength,
-                .idleTimeout = behavior.idleTimeout,
-                .maxBackpressure = behavior.maxBackpressure,
-                .closeOnBackpressureLimit = behavior.closeOnBackpressureLimit,
-                .resetIdleTimeoutOnSend = behavior.resetIdleTimeoutOnSend,
-                .sendPingsAutomatically = behavior.sendPingsAutomatically,
-                .maxLifetime = behavior.maxLifetime,
-            };
-
-            if (behavior.upgrade)
-                generic_handler.upgrade = [behavior, user_data](auto *res, auto *req, auto *context)
-                {
-                    behavior.upgrade((uws_res_t *)res, (uws_req_t *)req, (uws_socket_context_t *)context, user_data);
-                };
-            if (behavior.open)
-                generic_handler.open = [behavior, user_data](auto *ws)
-                {
-                    behavior.open((uws_websocket_t *)ws, user_data);
-                };
-            if (behavior.message)
-                generic_handler.message = [behavior, user_data](auto *ws, auto message, auto opcode)
-                {
-                    behavior.message((uws_websocket_t *)ws, message.data(), message.length(), (uws_opcode_t)opcode, user_data);
-                };
-            if (behavior.drain)
-                generic_handler.drain = [behavior, user_data](auto *ws)
-                {
-                    behavior.drain((uws_websocket_t *)ws, user_data);
-                };
-            if (behavior.ping)
-                generic_handler.ping = [behavior, user_data](auto *ws, auto message)
-                {
-                    behavior.ping((uws_websocket_t *)ws, message.data(), message.length(), user_data);
-                };
-            if (behavior.pong)
-                generic_handler.pong = [behavior, user_data](auto *ws, auto message)
-                {
-                    behavior.pong((uws_websocket_t *)ws, message.data(), message.length(), user_data);
-                };
-            if (behavior.close)
-                generic_handler.close = [behavior, user_data](auto *ws, int code, auto message)
-                {
-                    behavior.close((uws_websocket_t *)ws, code, message.data(), message.length(), user_data);
-                };
-            if (behavior.subscription)
-                generic_handler.subscription = [behavior, user_data](auto *ws, auto topic, int subscribers, int old_subscribers)
-                {
-                    behavior.subscription((uws_websocket_t *)ws, topic.data(), topic.length(), subscribers, old_subscribers, user_data);
-                };
-            uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
-
-            uwsApp->ws<void *>(pattern, std::move(generic_handler));
-        }
-        else
-        {
-            auto generic_handler = uWS::App::WebSocketBehavior<void *>{
-                .compression = (uWS::CompressOptions)(uint64_t)behavior.compression,
-                .maxPayloadLength = behavior.maxPayloadLength,
-                .idleTimeout = behavior.idleTimeout,
-                .maxBackpressure = behavior.maxBackpressure,
-                .closeOnBackpressureLimit = behavior.closeOnBackpressureLimit,
-                .resetIdleTimeoutOnSend = behavior.resetIdleTimeoutOnSend,
-                .sendPingsAutomatically = behavior.sendPingsAutomatically,
-                .maxLifetime = behavior.maxLifetime,
-            };
-
-            if (behavior.upgrade)
-                generic_handler.upgrade = [behavior, user_data](auto *res, auto *req, auto *context)
-                {
-                    behavior.upgrade((uws_res_t *)res, (uws_req_t *)req, (uws_socket_context_t *)context, user_data);
-                };
-            if (behavior.open)
-                generic_handler.open = [behavior, user_data](auto *ws)
-                {
-                    behavior.open((uws_websocket_t *)ws, user_data);
-                };
-            if (behavior.message)
-                generic_handler.message = [behavior, user_data](auto *ws, auto message, auto opcode)
-                {
-                    behavior.message((uws_websocket_t *)ws, message.data(), message.length(), (uws_opcode_t)opcode, user_data);
-                };
-            if (behavior.drain)
-                generic_handler.drain = [behavior, user_data](auto *ws)
-                {
-                    behavior.drain((uws_websocket_t *)ws, user_data);
-                };
-            if (behavior.ping)
-                generic_handler.ping = [behavior, user_data](auto *ws, auto message)
-                {
-                    behavior.ping((uws_websocket_t *)ws, message.data(), message.length(), user_data);
-                };
-            if (behavior.pong)
-                generic_handler.pong = [behavior, user_data](auto *ws, auto message)
-                {
-                    behavior.pong((uws_websocket_t *)ws, message.data(), message.length(), user_data);
-                };
-            if (behavior.close)
-                generic_handler.close = [behavior, user_data](auto *ws, int code, auto message)
-                {
-                    behavior.close((uws_websocket_t *)ws, code, message.data(), message.length(), user_data);
-                };
-            if (behavior.subscription)
-                generic_handler.subscription = [behavior, user_data](auto *ws, auto topic, int subscribers, int old_subscribers)
-                {
-                    behavior.subscription((uws_websocket_t *)ws, topic.data(), topic.length(), subscribers, old_subscribers, user_data);
-                };
-            uWS::App *uwsApp = (uWS::App *)app;
-            uwsApp->ws<void *>(pattern, std::move(generic_handler));
-        }
-    }
-
-    void *uws_ws_get_user_data(int ssl, uws_websocket_t *ws)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return *uws->getUserData();
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return *uws->getUserData();
-    }
-
-    void uws_ws_close(int ssl, uws_websocket_t *ws)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            uws->close();
-        }
-        else
-        {
-            uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-            uws->close();
-        }
-    }
-
-    uws_sendstatus_t uws_ws_send(int ssl, uws_websocket_t *ws, const char *message, size_t length, uws_opcode_t opcode)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return (uws_sendstatus_t)uws->send(std::string_view(message, length), (uWS::OpCode)(unsigned char)opcode);
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return (uws_sendstatus_t)uws->send(std::string_view(message, length), (uWS::OpCode)(unsigned char)opcode);
-    }
-
-    uws_sendstatus_t uws_ws_send_with_options(int ssl, uws_websocket_t *ws, const char *message, size_t length, uws_opcode_t opcode, bool compress, bool fin)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return (uws_sendstatus_t)uws->send(std::string_view(message, length), (uWS::OpCode)(unsigned char)opcode, compress, fin);
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return (uws_sendstatus_t)uws->send(std::string_view(message, length), (uWS::OpCode)(unsigned char)opcode, compress, fin);
-    }
-
-    uws_sendstatus_t uws_ws_send_fragment(int ssl, uws_websocket_t *ws, const char *message, size_t length, bool compress)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return (uws_sendstatus_t)uws->sendFragment(std::string_view(message, length), compress);
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return (uws_sendstatus_t)uws->sendFragment(std::string_view(message, length), compress);
-    }
-    uws_sendstatus_t uws_ws_send_first_fragment(int ssl, uws_websocket_t *ws, const char *message, size_t length, bool compress)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return (uws_sendstatus_t)uws->sendFirstFragment(std::string_view(message, length), uWS::OpCode::BINARY, compress);
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return (uws_sendstatus_t)uws->sendFirstFragment(std::string_view(message, length), uWS::OpCode::BINARY, compress);
-    }
-    uws_sendstatus_t uws_ws_send_first_fragment_with_opcode(int ssl, uws_websocket_t *ws, const char *message, size_t length, uws_opcode_t opcode, bool compress)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return (uws_sendstatus_t)uws->sendFirstFragment(std::string_view(message, length), (uWS::OpCode)(unsigned char)opcode, compress);
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return (uws_sendstatus_t)uws->sendFirstFragment(std::string_view(message, length), (uWS::OpCode)(unsigned char)opcode, compress);
-    }
-    uws_sendstatus_t uws_ws_send_last_fragment(int ssl, uws_websocket_t *ws, const char *message, size_t length, bool compress)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return (uws_sendstatus_t)uws->sendLastFragment(std::string_view(message, length), compress);
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return (uws_sendstatus_t)uws->sendLastFragment(std::string_view(message, length), compress);
-    }
-
-    void uws_ws_end(int ssl, uws_websocket_t *ws, int code, const char *message, size_t length)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            uws->end(code, std::string_view(message, length));
-        }
-        else
-        {
-            uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-            uws->end(code, std::string_view(message, length));
-        }
-    }
-
-    void uws_ws_cork(int ssl, uws_websocket_t *ws, void (*handler)(void *user_data), void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            uws->cork([handler, user_data]()
-                      { handler(user_data); });
-        }
-        else
-        {
-            uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-
-            uws->cork([handler, user_data]()
-                      { handler(user_data); });
-        }
-    }
-    bool uws_ws_subscribe(int ssl, uws_websocket_t *ws, const char *topic, size_t length)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return uws->subscribe(std::string_view(topic, length));
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return uws->subscribe(std::string_view(topic, length));
-    }
-    bool uws_ws_unsubscribe(int ssl, uws_websocket_t *ws, const char *topic, size_t length)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return uws->unsubscribe(std::string_view(topic, length));
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return uws->unsubscribe(std::string_view(topic, length));
-    }
-
-    bool uws_ws_is_subscribed(int ssl, uws_websocket_t *ws, const char *topic, size_t length)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return uws->isSubscribed(std::string_view(topic, length));
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return uws->isSubscribed(std::string_view(topic, length));
-    }
-    void uws_ws_iterate_topics(int ssl, uws_websocket_t *ws, void (*callback)(const char *topic, size_t length, void *user_data), void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            uws->iterateTopics([callback, user_data](auto topic)
-                               { callback(topic.data(), topic.length(), user_data); });
-        }
-        else
-        {
-            uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-
-            uws->iterateTopics([callback, user_data](auto topic)
-                               { callback(topic.data(), topic.length(), user_data); });
-        }
-    }
-
-    bool uws_ws_publish(int ssl, uws_websocket_t *ws, const char *topic, size_t topic_length, const char *message, size_t message_length)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return uws->publish(std::string_view(topic, topic_length), std::string_view(message, message_length));
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return uws->publish(std::string_view(topic, topic_length), std::string_view(message, message_length));
-    }
-
-    bool uws_ws_publish_with_options(int ssl, uws_websocket_t *ws, const char *topic, size_t topic_length, const char *message, size_t message_length, uws_opcode_t opcode, bool compress)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return uws->publish(std::string_view(topic, topic_length), std::string_view(message, message_length), (uWS::OpCode)(unsigned char)opcode, compress);
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return uws->publish(std::string_view(topic, topic_length), std::string_view(message, message_length), (uWS::OpCode)(unsigned char)opcode, compress);
-    }
-
-    unsigned int uws_ws_get_buffered_amount(int ssl, uws_websocket_t *ws)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            return uws->getBufferedAmount();
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-        return uws->getBufferedAmount();
-    }
-
-    size_t uws_ws_get_remote_address(int ssl, uws_websocket_t *ws, const char **dest)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-            std::string_view value = uws->getRemoteAddress();
-            *dest = value.data();
-            return value.length();
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-
-        std::string_view value = uws->getRemoteAddress();
-        *dest = value.data();
-        return value.length();
-    }
-
-    size_t uws_ws_get_remote_address_as_text(int ssl, uws_websocket_t *ws, const char **dest)
-    {
-        if (ssl)
-        {
-            uWS::WebSocket<true, true, void *> *uws = (uWS::WebSocket<true, true, void *> *)ws;
-
-            std::string_view value = uws->getRemoteAddressAsText();
-            *dest = value.data();
-            return value.length();
-        }
-        uWS::WebSocket<false, true, void *> *uws = (uWS::WebSocket<false, true, void *> *)ws;
-
-        std::string_view value = uws->getRemoteAddressAsText();
-        *dest = value.data();
-        return value.length();
-    }
-    void uws_res_close(int ssl, uws_res_t *res)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->close();
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->close();
-        }
-    }
-    void uws_res_end(int ssl, uws_res_t *res, const char *data, size_t length, bool close_connection)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->end(std::string_view(data, length), close_connection);
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->end(std::string_view(data, length), close_connection);
-        }
-    }
-
-    size_t uws_res_get_remote_address(int ssl, uws_res_t *res, const char **dest)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            std::string_view value = uwsRes->getRemoteAddress();
-            *dest = value.data();
-            return value.length();
-        }
-        uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-
-        std::string_view value = uwsRes->getRemoteAddress();
-        *dest = value.data();
-        return value.length();
-    }
-
-    size_t uws_res_get_remote_address_as_text(int ssl, uws_res_t *res, const char **dest)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            std::string_view value = uwsRes->getRemoteAddressAsText();
-            *dest = value.data();
-            return value.length();
-        }
-        uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-
-        std::string_view value = uwsRes->getRemoteAddressAsText();
-        *dest = value.data();
-        return value.length();
-    }
-#ifdef UWS_WITH_PROXY
-    size_t uws_res_get_proxied_remote_address(int ssl, uws_res_t *res, const char **dest)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            std::string_view value = uwsRes->getProxiedRemoteAddress();
-            *dest = value.data();
-            return value.length();
-        }
-        uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-
-        std::string_view value = uwsRes->getProxiedRemoteAddress();
-        *dest = value.data();
-        return value.length();
-    }
-
-    size_t uws_res_get_proxied_remote_address_as_text(int ssl, uws_res_t *res, const char **dest)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            std::string_view value = uwsRes->getProxiedRemoteAddressAsText();
-            *dest = value.data();
-            return value.length();
-        }
-        uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-
-        std::string_view value = uwsRes->getProxiedRemoteAddressAsText();
-        *dest = value.data();
-        return value.length();
-    }
-#endif
-    uws_try_end_result_t uws_res_try_end(int ssl, uws_res_t *res, const char *data, size_t length, uint64_t total_size, bool close_connection)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            // uwsRes->end(std::string_view(data, length), close_connection);
-            std::pair<bool, bool> result = uwsRes->tryEnd(std::string_view(data, length), total_size, close_connection);
-            return uws_try_end_result_t{
-                .ok = result.first,
-                .has_responded = result.second,
-            };
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            std::pair<bool, bool> result = uwsRes->tryEnd(std::string_view(data, length), total_size);
-            return uws_try_end_result_t{
-                .ok = result.first,
-                .has_responded = result.second,
-            };
-        }
-    }
-
-    void uws_res_cork(int ssl, uws_res_t *res, void (*callback)(uws_res_t *res, void *user_data), void *user_data)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->cork([=]()
-                         { callback(res, user_data); });
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->cork([=]()
-                         { callback(res, user_data); });
-        }
-    }
-
-    void uws_res_pause(int ssl, uws_res_t *res)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->pause();
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->pause();
-        }
-    }
-
-    void uws_res_resume(int ssl, uws_res_t *res)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->pause();
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->pause();
-        }
-    }
-
-    void uws_res_write_continue(int ssl, uws_res_t *res)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->writeContinue();
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->writeContinue();
-        }
-    }
-
-    void uws_res_write_status(int ssl, uws_res_t *res, const char *status, size_t length)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->writeStatus(std::string_view(status, length));
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->writeStatus(std::string_view(status, length));
-        }
-    }
-
-    void uws_res_write_header(int ssl, uws_res_t *res, const char *key, size_t key_length, const char *value, size_t value_length)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->writeHeader(std::string_view(key, key_length), std::string_view(value, value_length));
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->writeHeader(std::string_view(key, key_length), std::string_view(value, value_length));
-        }
-    }
-    void uws_res_write_header_int(int ssl, uws_res_t *res, const char *key, size_t key_length, uint64_t value)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->writeHeader(std::string_view(key, key_length), value);
-        }
-        else
-        {
-
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->writeHeader(std::string_view(key, key_length), value);
-        }
-    }
-
-    void uws_res_end_without_body(int ssl, uws_res_t *res, bool close_connection)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->endWithoutBody(std::nullopt, close_connection);
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->endWithoutBody(std::nullopt, close_connection);
-        }
-    }
-
-    bool uws_res_write(int ssl, uws_res_t *res, const char *data, size_t length)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            return uwsRes->write(std::string_view(data, length));
-        }
-        uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-        return uwsRes->write(std::string_view(data, length));
-    }
-    uint64_t uws_res_get_write_offset(int ssl, uws_res_t *res)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            return uwsRes->getWriteOffset();
-        }
-        uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-        return uwsRes->getWriteOffset();
-    }
-    void uws_res_override_write_offset(int ssl, uws_res_t *res, uint64_t offset)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->overrideWriteOffset(offset);
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->overrideWriteOffset(offset);
-        }
-    }
-    bool uws_res_has_responded(int ssl, uws_res_t *res)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            return uwsRes->hasResponded();
-        }
-        uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-        return uwsRes->hasResponded();
-    }
-
-    void uws_res_on_writable(int ssl, uws_res_t *res, bool (*handler)(uws_res_t *res, uint64_t, void *optional_data), void *optional_data)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->onWritable([handler, res, optional_data](uint64_t a)
-                               { return handler(res, a, optional_data); });
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->onWritable([handler, res, optional_data](uint64_t a)
-                               { return handler(res, a, optional_data); });
-        }
-    }
-
-    void uws_res_on_aborted(int ssl, uws_res_t *res, void (*handler)(uws_res_t *res, void *optional_data), void *optional_data)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->onAborted([handler, res, optional_data]
-                              { handler(res, optional_data); });
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->onAborted([handler, res, optional_data]
-                              { handler(res, optional_data); });
-        }
-    }
-
-    void uws_res_on_data(int ssl, uws_res_t *res, void (*handler)(uws_res_t *res, const char *chunk, size_t chunk_length, bool is_end, void *optional_data), void *optional_data)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            uwsRes->onData([handler, res, optional_data](auto chunk, bool is_end)
-                           { handler(res, chunk.data(), chunk.length(), is_end, optional_data); });
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            uwsRes->onData([handler, res, optional_data](auto chunk, bool is_end)
-                           { handler(res, chunk.data(), chunk.length(), is_end, optional_data); });
-        }
-    }
-
-    bool uws_req_is_ancient(uws_req_t *res)
-    {
-        uWS::HttpRequest *uwsReq = (uWS::HttpRequest *)res;
-        return uwsReq->isAncient();
-    }
-
-    bool uws_req_get_yield(uws_req_t *res)
-    {
-        uWS::HttpRequest *uwsReq = (uWS::HttpRequest *)res;
-        return uwsReq->getYield();
-    }
-
-    void uws_req_set_yield(uws_req_t *res, bool yield)
-    {
-        uWS::HttpRequest *uwsReq = (uWS::HttpRequest *)res;
-        return uwsReq->setYield(yield);
-    }
-
-    size_t uws_req_get_url(uws_req_t *res, const char **dest)
-    {
-        uWS::HttpRequest *uwsReq = (uWS::HttpRequest *)res;
-        std::string_view value = uwsReq->getUrl();
-        *dest = value.data();
-        return value.length();
-    }
-
-    size_t uws_req_get_full_url(uws_req_t *res, const char **dest)
-    {
-        uWS::HttpRequest *uwsReq = (uWS::HttpRequest *)res;
-        std::string_view value = uwsReq->getFullUrl();
-        *dest = value.data();
-        return value.length();
-    }
-
-    size_t uws_req_get_method(uws_req_t *res, const char **dest)
-    {
-        uWS::HttpRequest *uwsReq = (uWS::HttpRequest *)res;
-        std::string_view value = uwsReq->getMethod();
-        *dest = value.data();
-        return value.length();
-    }
-
-    size_t uws_req_get_case_sensitive_method(uws_req_t *res, const char **dest)
-    {
-        uWS::HttpRequest *uwsReq = (uWS::HttpRequest *)res;
-        std::string_view value = uwsReq->getCaseSensitiveMethod();
-        *dest = value.data();
-        return value.length();
-    }
-
-    void uws_req_for_each_header(uws_req_t *res, uws_get_headers_server_handler handler, void *user_data)
-    {
-        uWS::HttpRequest *uwsReq = (uWS::HttpRequest *)res;
-        for (auto header : *uwsReq)
-        {
-            handler(header.first.data(), header.first.length(), header.second.data(), header.second.length(), user_data);
-        }
-    }
-
-    size_t uws_req_get_header(uws_req_t *res, const char *lower_case_header, size_t lower_case_header_length, const char **dest)
-    {
-        uWS::HttpRequest *uwsReq = (uWS::HttpRequest *)res;
-
-        std::string_view value = uwsReq->getHeader(std::string_view(lower_case_header, lower_case_header_length));
-        *dest = value.data();
-        return value.length();
-    }
-
-    size_t uws_req_get_query(uws_req_t *res, const char *key, size_t key_length, const char **dest)
-    {
-        uWS::HttpRequest *uwsReq = (uWS::HttpRequest *)res;
-
-        std::string_view value = uwsReq->getQuery(std::string_view(key, key_length));
-        *dest = value.data();
-        return value.length();
-    }
-
-    size_t uws_req_get_parameter(uws_req_t *res, unsigned short index, const char **dest)
-    {
-        uWS::HttpRequest *uwsReq = (uWS::HttpRequest *)res;
-        std::string_view value = uwsReq->getParameter(index);
-        *dest = value.data();
-        return value.length();
-    }
-
-    void uws_res_upgrade(int ssl, uws_res_t *res, void *data, const char *sec_web_socket_key, size_t sec_web_socket_key_length, const char *sec_web_socket_protocol, size_t sec_web_socket_protocol_length, const char *sec_web_socket_extensions, size_t sec_web_socket_extensions_length, uws_socket_context_t *ws)
-    {
-
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-
-            uwsRes->template upgrade<void *>(data ? std::move(data) : NULL,
-                                             std::string_view(sec_web_socket_key, sec_web_socket_key_length),
-                                             std::string_view(sec_web_socket_protocol, sec_web_socket_protocol_length),
-                                             std::string_view(sec_web_socket_extensions, sec_web_socket_extensions_length),
-                                             (struct us_socket_context_t *)ws);
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-
-            uwsRes->template upgrade<void *>(data ? std::move(data) : NULL,
-                                             std::string_view(sec_web_socket_key, sec_web_socket_key_length),
-                                             std::string_view(sec_web_socket_protocol, sec_web_socket_protocol_length),
-                                             std::string_view(sec_web_socket_extensions, sec_web_socket_extensions_length),
-                                             (struct us_socket_context_t *)ws);
-        }
-    }
-
-    void *uws_res_get_native_handle(int ssl, uws_res_t *res)
-    {
-        if (ssl)
-        {
-            uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-            return uwsRes->getNativeHandle();
-        }
-        else
-        {
-            uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-            return uwsRes->getNativeHandle();
-        }
-    }
-
-    struct us_loop_t *uws_get_loop()
-    {
-        return (struct us_loop_t *)uWS::Loop::get();
-    }
-
-    struct us_loop_t *uws_get_loop_with_native(void *existing_native_loop)
-    {
-        return (struct us_loop_t *)uWS::Loop::get(existing_native_loop);
-    }
-    void uws_loop_defer(us_loop_t *loop, void( cb(void *user_data) ), void *user_data)
-    {
-        uWS::Loop *loop_instance = (uWS::Loop *)loop;
-        loop_instance->defer([cb, user_data](){
-            cb(user_data);
-        });
-
-    }
-}
diff --git a/packages/bun-uws/capi/libuwebsockets.h b/packages/bun-uws/capi/libuwebsockets.h
deleted file mode 100644
index 14de7fb651..0000000000
--- a/packages/bun-uws/capi/libuwebsockets.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright 2022 Ciro Spaciari
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-// clang-format off
-#ifndef LIBUWS_CAPI_HEADER
-#define LIBUWS_CAPI_HEADER
-
-#include <stddef.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include "libusockets.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-#ifdef _WIN32
-#  define DLL_EXPORT __declspec( dllexport )
-#else
-#  define DLL_EXPORT
-#endif
-
-    DLL_EXPORT typedef enum
-    {
-        /* These are not actual compression options */
-        _COMPRESSOR_MASK = 0x00FF,
-        _DECOMPRESSOR_MASK = 0x0F00,
-        /* Disabled, shared, shared are "special" values */
-        DISABLED = 0,
-        SHARED_COMPRESSOR = 1,
-        SHARED_DECOMPRESSOR = 1 << 8,
-        /* Highest 4 bits describe decompressor */
-        DEDICATED_DECOMPRESSOR_32KB = 15 << 8,
-        DEDICATED_DECOMPRESSOR_16KB = 14 << 8,
-        DEDICATED_DECOMPRESSOR_8KB = 13 << 8,
-        DEDICATED_DECOMPRESSOR_4KB = 12 << 8,
-        DEDICATED_DECOMPRESSOR_2KB = 11 << 8,
-        DEDICATED_DECOMPRESSOR_1KB = 10 << 8,
-        DEDICATED_DECOMPRESSOR_512B = 9 << 8,
-        /* Same as 32kb */
-        DEDICATED_DECOMPRESSOR = 15 << 8,
-
-        /* Lowest 8 bit describe compressor */
-        DEDICATED_COMPRESSOR_3KB = 9 << 4 | 1,
-        DEDICATED_COMPRESSOR_4KB = 9 << 4 | 2,
-        DEDICATED_COMPRESSOR_8KB = 10 << 4 | 3,
-        DEDICATED_COMPRESSOR_16KB = 11 << 4 | 4,
-        DEDICATED_COMPRESSOR_32KB = 12 << 4 | 5,
-        DEDICATED_COMPRESSOR_64KB = 13 << 4 | 6,
-        DEDICATED_COMPRESSOR_128KB = 14 << 4 | 7,
-        DEDICATED_COMPRESSOR_256KB = 15 << 4 | 8,
-        /* Same as 256kb */
-        DEDICATED_COMPRESSOR = 15 << 4 | 8
-    } uws_compress_options_t;
-
-    DLL_EXPORT typedef enum
-    {
-        CONTINUATION = 0,
-        TEXT = 1,
-        BINARY = 2,
-        CLOSE = 8,
-        PING = 9,
-        PONG = 10
-    } uws_opcode_t;
-
-    DLL_EXPORT typedef enum
-    {
-        BACKPRESSURE,
-        SUCCESS,
-        DROPPED
-    } uws_sendstatus_t;
-
-    DLL_EXPORT typedef struct
-    {
-
-        int port;
-        const char *host;
-        int options;
-    } uws_app_listen_config_t;
-
-    DLL_EXPORT typedef struct {
-        bool ok;
-        bool has_responded;
-    } uws_try_end_result_t;
-
-    DLL_EXPORT struct uws_app_s;
-    DLL_EXPORT struct uws_req_s;
-    DLL_EXPORT struct uws_res_s;
-    DLL_EXPORT struct uws_websocket_s;
-    DLL_EXPORT struct uws_header_iterator_s;
-    DLL_EXPORT typedef struct uws_app_s uws_app_t;
-    DLL_EXPORT typedef struct uws_req_s uws_req_t;
-    DLL_EXPORT typedef struct uws_res_s uws_res_t;
-    DLL_EXPORT typedef struct uws_socket_context_s uws_socket_context_t;
-    DLL_EXPORT typedef struct uws_websocket_s uws_websocket_t;
-
-    DLL_EXPORT typedef void (*uws_websocket_handler)(uws_websocket_t *ws, void* user_data);
-    DLL_EXPORT typedef void (*uws_websocket_message_handler)(uws_websocket_t *ws, const char *message, size_t length, uws_opcode_t opcode, void* user_data);
-    DLL_EXPORT typedef void (*uws_websocket_ping_pong_handler)(uws_websocket_t *ws, const char *message, size_t length, void* user_data);
-    DLL_EXPORT typedef void (*uws_websocket_close_handler)(uws_websocket_t *ws, int code, const char *message, size_t length, void* user_data);
-    DLL_EXPORT typedef void (*uws_websocket_upgrade_handler)(uws_res_t *response, uws_req_t *request, uws_socket_context_t *context, void* user_data);
-    DLL_EXPORT typedef void (*uws_websocket_subscription_handler)(uws_websocket_t *ws, const char *topic_name, size_t topic_name_length, int new_number_of_subscriber, int old_number_of_subscriber, void* user_data);
-
-    DLL_EXPORT typedef struct
-    {
-        uws_compress_options_t compression;
-        /* Maximum message size we can receive */
-        unsigned int maxPayloadLength;
-        /* 2 minutes timeout is good */
-        unsigned short idleTimeout;
-        /* 64kb backpressure is probably good */
-        unsigned int maxBackpressure;
-        bool closeOnBackpressureLimit;
-        /* This one depends on kernel timeouts and is a bad default */
-        bool resetIdleTimeoutOnSend;
-        /* A good default, esp. for newcomers */
-        bool sendPingsAutomatically;
-        /* Maximum socket lifetime in seconds before forced closure (defaults to disabled) */
-        unsigned short maxLifetime;
-        uws_websocket_upgrade_handler upgrade;
-        uws_websocket_handler open;
-        uws_websocket_message_handler message;
-        uws_websocket_handler drain;
-        uws_websocket_ping_pong_handler ping;
-        uws_websocket_ping_pong_handler pong;
-        uws_websocket_close_handler close;
-        uws_websocket_subscription_handler subscription;
-    } uws_socket_behavior_t;
-
-    DLL_EXPORT typedef void (*uws_listen_handler)(struct us_listen_socket_t *listen_socket, uws_app_listen_config_t config, void *user_data);
-    DLL_EXPORT typedef void (*uws_listen_domain_handler)(struct us_listen_socket_t *listen_socket, const char* domain, size_t domain_length, int options, void *user_data);
-    DLL_EXPORT typedef void (*uws_method_handler)(uws_res_t *response, uws_req_t *request, void *user_data);
-    DLL_EXPORT typedef void (*uws_filter_handler)(uws_res_t *response, int, void *user_data);
-    DLL_EXPORT typedef void (*uws_missing_server_handler)(const char *hostname, size_t hostname_length, void *user_data);
-    DLL_EXPORT typedef void (*uws_get_headers_server_handler)(const char *header_name, size_t header_name_size, const char *header_value, size_t header_value_size, void *user_data);
-    //Basic HTTP
-    DLL_EXPORT uws_app_t *uws_create_app(int ssl, struct us_bun_socket_context_options_t options);
-    DLL_EXPORT void uws_app_destroy(int ssl, uws_app_t *app);
-    DLL_EXPORT void uws_app_get(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_post(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_options(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_delete(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_patch(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_put(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_head(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_connect(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_trace(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_any(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data);
-
-    DLL_EXPORT void uws_app_run(int ssl, uws_app_t *);
-
-    DLL_EXPORT void uws_app_listen(int ssl, uws_app_t *app, int port, uws_listen_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_listen_with_config(int ssl, uws_app_t *app, uws_app_listen_config_t config, uws_listen_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_listen_domain(int ssl, uws_app_t *app, const char *domain, size_t domain_length, uws_listen_domain_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_listen_domain_with_options(int ssl, uws_app_t *app, const char *domain,size_t domain_length, int options, uws_listen_domain_handler handler, void *user_data);
-    DLL_EXPORT void uws_app_domain(int ssl, uws_app_t *app, const char* server_name, size_t server_name_length);
-
-    DLL_EXPORT bool uws_constructor_failed(int ssl, uws_app_t *app);
-    DLL_EXPORT unsigned int uws_num_subscribers(int ssl, uws_app_t *app, const char *topic, size_t topic_length);
-    DLL_EXPORT bool uws_publish(int ssl, uws_app_t *app, const char *topic, size_t topic_length, const char *message, size_t message_length, uws_opcode_t opcode, bool compress);
-    DLL_EXPORT void *uws_get_native_handle(int ssl, uws_app_t *app);
-    DLL_EXPORT void uws_remove_server_name(int ssl, uws_app_t *app, const char *hostname_pattern, size_t hostname_pattern_length);
-    DLL_EXPORT void uws_add_server_name(int ssl, uws_app_t *app, const char *hostname_pattern, size_t hostname_pattern_length);
-    DLL_EXPORT void uws_add_server_name_with_options(int ssl, uws_app_t *app, const char *hostname_pattern, size_t hostname_pattern_length, struct us_bun_socket_context_options_t options);
-    DLL_EXPORT void uws_missing_server_name(int ssl, uws_app_t *app, uws_missing_server_handler handler, void *user_data);
-    DLL_EXPORT void uws_filter(int ssl, uws_app_t *app, uws_filter_handler handler, void *user_data);
-
-    //WebSocket
-    DLL_EXPORT void uws_ws(int ssl, uws_app_t *app, const char *pattern, uws_socket_behavior_t behavior, void* user_data);
-    DLL_EXPORT void *uws_ws_get_user_data(int ssl, uws_websocket_t *ws);
-    DLL_EXPORT void uws_ws_close(int ssl, uws_websocket_t *ws);
-    DLL_EXPORT uws_sendstatus_t uws_ws_send(int ssl, uws_websocket_t *ws, const char *message, size_t length, uws_opcode_t opcode);
-    DLL_EXPORT uws_sendstatus_t uws_ws_send_with_options(int ssl, uws_websocket_t *ws, const char *message, size_t length, uws_opcode_t opcode, bool compress, bool fin);
-    DLL_EXPORT uws_sendstatus_t uws_ws_send_fragment(int ssl, uws_websocket_t *ws, const char *message, size_t length, bool compress);
-    DLL_EXPORT uws_sendstatus_t uws_ws_send_first_fragment(int ssl, uws_websocket_t *ws, const char *message, size_t length, bool compress);
-    DLL_EXPORT uws_sendstatus_t uws_ws_send_first_fragment_with_opcode(int ssl, uws_websocket_t *ws, const char *message, size_t length, uws_opcode_t opcode, bool compress);
-    DLL_EXPORT uws_sendstatus_t uws_ws_send_last_fragment(int ssl, uws_websocket_t *ws, const char *message, size_t length, bool compress);
-    DLL_EXPORT void uws_ws_end(int ssl, uws_websocket_t *ws, int code, const char *message, size_t length);
-    DLL_EXPORT void uws_ws_cork(int ssl, uws_websocket_t *ws, void (*handler)(void *user_data), void *user_data);
-
-    DLL_EXPORT bool uws_ws_subscribe(int ssl, uws_websocket_t *ws, const char *topic, size_t length);
-    DLL_EXPORT bool uws_ws_unsubscribe(int ssl, uws_websocket_t *ws, const char *topic, size_t length);
-    DLL_EXPORT bool uws_ws_is_subscribed(int ssl, uws_websocket_t *ws, const char *topic, size_t length);
-    DLL_EXPORT void uws_ws_iterate_topics(int ssl, uws_websocket_t *ws, void (*callback)(const char *topic, size_t length, void *user_data), void *user_data);
-    DLL_EXPORT bool uws_ws_publish(int ssl, uws_websocket_t *ws, const char *topic, size_t topic_length, const char *message, size_t message_length);
-    DLL_EXPORT bool uws_ws_publish_with_options(int ssl, uws_websocket_t *ws, const char *topic, size_t topic_length, const char *message, size_t message_length, uws_opcode_t opcode, bool compress);
-    DLL_EXPORT unsigned int uws_ws_get_buffered_amount(int ssl, uws_websocket_t *ws);
-    DLL_EXPORT size_t uws_ws_get_remote_address(int ssl, uws_websocket_t *ws, const char **dest);
-    DLL_EXPORT size_t uws_ws_get_remote_address_as_text(int ssl, uws_websocket_t *ws, const char **dest);
-    DLL_EXPORT void uws_res_get_remote_address_info(uws_res_t *res, const char **dest, size_t *length, unsigned int *port);
-
-    //Response
-    DLL_EXPORT void uws_res_end(int ssl, uws_res_t *res, const char *data, size_t length, bool close_connection);
-    DLL_EXPORT uws_try_end_result_t uws_res_try_end(int ssl, uws_res_t *res, const char *data, size_t length, uint64_t total_size, bool close_connection);
-    DLL_EXPORT void uws_res_cork(int ssl, uws_res_t *res, void(*callback)(uws_res_t *res, void* user_data) ,void* user_data);
-    DLL_EXPORT void uws_res_pause(int ssl, uws_res_t *res);
-    DLL_EXPORT void uws_res_resume(int ssl, uws_res_t *res);
-    DLL_EXPORT void uws_res_write_continue(int ssl, uws_res_t *res);
-    DLL_EXPORT void uws_res_write_status(int ssl, uws_res_t *res, const char *status, size_t length);
-    DLL_EXPORT void uws_res_write_header(int ssl, uws_res_t *res, const char *key, size_t key_length, const char *value, size_t value_length);
-
-    DLL_EXPORT void uws_res_write_header_int(int ssl, uws_res_t *res, const char *key, size_t key_length, uint64_t value);
-    DLL_EXPORT void uws_res_end_without_body(int ssl, uws_res_t *res, bool close_connection);
-    DLL_EXPORT bool uws_res_write(int ssl, uws_res_t *res, const char *data, size_t length);
-    DLL_EXPORT uint64_t uws_res_get_write_offset(int ssl, uws_res_t *res);
-    DLL_EXPORT void uws_res_override_write_offset(int ssl, uws_res_t *res, uint64_t offset);
-    DLL_EXPORT bool uws_res_has_responded(int ssl, uws_res_t *res);
-    DLL_EXPORT void uws_res_on_writable(int ssl, uws_res_t *res, bool (*handler)(uws_res_t *res, uint64_t, void *optional_data), void *user_data);
-    DLL_EXPORT void uws_res_on_aborted(int ssl, uws_res_t *res, void (*handler)(uws_res_t *res, void *optional_data), void *optional_data);
-    DLL_EXPORT void uws_res_on_data(int ssl, uws_res_t *res, void (*handler)(uws_res_t *res, const char *chunk, size_t chunk_length, bool is_end, void *optional_data), void *optional_data);
-    DLL_EXPORT void uws_res_upgrade(int ssl, uws_res_t *res, void *data, const char *sec_web_socket_key, size_t sec_web_socket_key_length, const char *sec_web_socket_protocol, size_t sec_web_socket_protocol_length, const char *sec_web_socket_extensions, size_t sec_web_socket_extensions_length, uws_socket_context_t *ws);
-    DLL_EXPORT size_t uws_res_get_remote_address(int ssl, uws_res_t *res, const char **dest);
-    DLL_EXPORT size_t uws_res_get_remote_address_as_text(int ssl, uws_res_t *res, const char **dest);
-#ifdef UWS_WITH_PROXY
-    DLL_EXPORT size_t uws_res_get_proxied_remote_address(int ssl, uws_res_t *res, const char **dest);
-    DLL_EXPORT size_t uws_res_get_proxied_remote_address_as_text(int ssl, uws_res_t *res, const char **dest);
-#endif
-    DLL_EXPORT void *uws_res_get_native_handle(int ssl, uws_res_t *res);
-
-    //Request
-    DLL_EXPORT bool uws_req_is_ancient(uws_req_t *res);
-    DLL_EXPORT bool uws_req_get_yield(uws_req_t *res);
-    DLL_EXPORT void uws_req_set_yield(uws_req_t *res, bool yield);
-    DLL_EXPORT size_t uws_req_get_url(uws_req_t *res, const char **dest);
-    DLL_EXPORT size_t uws_req_get_full_url(uws_req_t *res, const char **dest);
-    DLL_EXPORT size_t uws_req_get_method(uws_req_t *res, const char **dest);
-    DLL_EXPORT size_t uws_req_get_case_sensitive_method(uws_req_t *res, const char **dest);
-
-    DLL_EXPORT size_t uws_req_get_header(uws_req_t *res, const char *lower_case_header, size_t lower_case_header_length, const char **dest);
-    DLL_EXPORT void uws_req_for_each_header(uws_req_t *res, uws_get_headers_server_handler handler, void *user_data);
-    DLL_EXPORT size_t uws_req_get_query(uws_req_t *res, const char *key, size_t key_length, const char **dest);
-    DLL_EXPORT size_t uws_req_get_parameter(uws_req_t *res, unsigned short index, const char **dest);
-
-    DLL_EXPORT struct us_loop_t *uws_get_loop();
-    DLL_EXPORT struct us_loop_t *uws_get_loop_with_native(void* existing_native_loop);
-    DLL_EXPORT void uws_loop_defer(struct us_loop_t *loop, void( cb(void *user_data) ), void *user_data);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/packages/bun-uws/src/HttpContext.h b/packages/bun-uws/src/HttpContext.h
index 9637361204..43c68fd90f 100644
--- a/packages/bun-uws/src/HttpContext.h
+++ b/packages/bun-uws/src/HttpContext.h
@@ -124,7 +124,7 @@ private:
 
             /* Signal broken HTTP request only if we have a pending request */
             if (httpResponseData->onAborted) {
-                httpResponseData->onAborted();
+                httpResponseData->onAborted((HttpResponse<SSL> *)s, httpResponseData->userData);
             }
 
             /* Destruct socket ext */
@@ -258,7 +258,7 @@ private:
                     }
 
                     /* We might respond in the handler, so do not change timeout after this */
-                    httpResponseData->inStream(data, fin);
+                    httpResponseData->inStream(static_cast<HttpResponse<SSL>*>(user), data.data(), data.length(), fin, httpResponseData->userData);
 
                     /* Was the socket closed? */
                     if (us_socket_is_closed(SSL, (struct us_socket_t *) user)) {
@@ -366,7 +366,7 @@ private:
 
                 /* We expect the developer to return whether or not write was successful (true).
                  * If write was never called, the developer should still return true so that we may drain. */
-                bool success = httpResponseData->callOnWritable(httpResponseData->offset);
+                bool success = httpResponseData->callOnWritable((HttpResponse<SSL> *)asyncSocket, httpResponseData->offset);
 
                 /* The developer indicated that their onWritable failed. */
                 if (!success) {
diff --git a/packages/bun-uws/src/HttpResponse.h b/packages/bun-uws/src/HttpResponse.h
index e4f325113c..15e7057a11 100644
--- a/packages/bun-uws/src/HttpResponse.h
+++ b/packages/bun-uws/src/HttpResponse.h
@@ -558,10 +558,11 @@ public:
     }
 
     /* Attach handler for writable HTTP response */
-    HttpResponse *onWritable(MoveOnlyFunction<bool(uint64_t)> &&handler) {
+    HttpResponse *onWritable(void* userData, HttpResponseData<SSL>::OnWritableCallback handler) {
         HttpResponseData<SSL> *httpResponseData = getHttpResponseData();
 
-        httpResponseData->onWritable = std::move(handler);
+        httpResponseData->userData = userData;
+        httpResponseData->onWritable = handler;
         return this;
     }
 
@@ -574,10 +575,11 @@ public:
     }
 
     /* Attach handler for aborted HTTP request */
-    HttpResponse *onAborted(MoveOnlyFunction<void()> &&handler) {
+    HttpResponse *onAborted(void* userData,  HttpResponseData<SSL>::OnAbortedCallback handler) {
         HttpResponseData<SSL> *httpResponseData = getHttpResponseData();
-
-        httpResponseData->onAborted = std::move(handler);
+        
+        httpResponseData->userData = userData;
+        httpResponseData->onAborted = handler;
         return this;
     }
     HttpResponse* clearOnWritableAndAborted() {
@@ -594,9 +596,10 @@ public:
         return this;
     }
     /* Attach a read handler for data sent. Will be called with FIN set true if last segment. */
-    void onData(MoveOnlyFunction<void(std::string_view, bool)> &&handler) {
+    void onData(void* userData, HttpResponseData<SSL>::OnDataCallback handler) { 
         HttpResponseData<SSL> *data = getHttpResponseData();
-        data->inStream = std::move(handler);
+        data->userData = userData;
+        data->inStream = handler;
 
         /* Always reset this counter here */
         data->received_bytes_per_timeout = 0;
diff --git a/packages/bun-uws/src/HttpResponseData.h b/packages/bun-uws/src/HttpResponseData.h
index 6be7b99303..00320e4ab9 100644
--- a/packages/bun-uws/src/HttpResponseData.h
+++ b/packages/bun-uws/src/HttpResponseData.h
@@ -33,6 +33,10 @@ struct HttpResponseData : AsyncSocketData<SSL>, HttpParser {
     template <bool> friend struct HttpResponse;
     template <bool> friend struct HttpContext;
     public:
+    using OnWritableCallback = bool (*)(uWS::HttpResponse<SSL>*, uint64_t, void*);
+    using OnAbortedCallback = void (*)(uWS::HttpResponse<SSL>*, void*);
+    using OnDataCallback = void (*)(uWS::HttpResponse<SSL>* response, const char* chunk, size_t chunk_length, bool, void*);
+
     /* When we are done with a response we mark it like so */
     void markDone() {
         onAborted = nullptr;
@@ -46,15 +50,15 @@ struct HttpResponseData : AsyncSocketData<SSL>, HttpParser {
     }
 
     /* Caller of onWritable. It is possible onWritable calls markDone so we need to borrow it. */
-    bool callOnWritable(uint64_t offset) {
+    bool callOnWritable( uWS::HttpResponse<SSL>* response, uint64_t offset) {
         /* Borrow real onWritable */
-        MoveOnlyFunction<bool(uint64_t)> borrowedOnWritable = std::move(onWritable);
+        auto* borrowedOnWritable = std::move(onWritable);
 
         /* Set onWritable to placeholder */
-        onWritable = [](uint64_t) {return true;};
+        onWritable = [](uWS::HttpResponse<SSL>*, uint64_t, void*) {return true;};
 
         /* Run borrowed onWritable */
-        bool ret = borrowedOnWritable(offset);
+        bool ret = borrowedOnWritable(response, offset, userData);
 
         /* If we still have onWritable (the placeholder) then move back the real one */
         if (onWritable) {
@@ -74,10 +78,13 @@ struct HttpResponseData : AsyncSocketData<SSL>, HttpParser {
         HTTP_CONNECTION_CLOSE = 16 // used
     };
 
+    /* Shared context pointer */
+    void* userData = nullptr;
+
     /* Per socket event handlers */
-    MoveOnlyFunction<bool(uint64_t)> onWritable;
-    MoveOnlyFunction<void()> onAborted;
-    MoveOnlyFunction<void(std::string_view, bool)> inStream; // onData
+    OnWritableCallback onWritable = nullptr;
+    OnAbortedCallback onAborted = nullptr;
+    OnDataCallback inStream = nullptr;
     /* Outgoing offset */
     uint64_t offset = 0;
 
diff --git a/packages/bun-uws/src/Loop.h b/packages/bun-uws/src/Loop.h
index ce4f3da95a..f8ea7f6e3a 100644
--- a/packages/bun-uws/src/Loop.h
+++ b/packages/bun-uws/src/Loop.h
@@ -95,13 +95,14 @@ private:
             // This is both a performance thing, and also to prevent freeing some things which are not meant to be freed
             // such as uv_tty_t 
             if(loop && cleanMe && !bun_is_exiting()) {
+                cleanMe = false;
                 loop->free();
             }
         }
         Loop *loop = nullptr;
         bool cleanMe = false;
     };
-    
+
     static LoopCleaner &getLazyLoop() {
         static thread_local LoopCleaner lazyLoop;
         return lazyLoop;
@@ -126,6 +127,12 @@ public:
         return getLazyLoop().loop;
     }
 
+    static void clearLoopAtThreadExit() {
+        if (getLazyLoop().cleanMe) {
+            getLazyLoop().loop->free();
+        }
+    }
+
     /* Freeing the default loop should be done once */
     void free() {
         LoopData *loopData = (LoopData *) us_loop_ext((us_loop_t *) this);
diff --git a/packages/bun-uws/src/PerMessageDeflate.h b/packages/bun-uws/src/PerMessageDeflate.h
index 17832c7165..e4ebaf0ac5 100644
--- a/packages/bun-uws/src/PerMessageDeflate.h
+++ b/packages/bun-uws/src/PerMessageDeflate.h
@@ -20,6 +20,8 @@
 #ifndef UWS_PERMESSAGEDEFLATE_H
 #define UWS_PERMESSAGEDEFLATE_H
 
+#define UWS_USE_LIBDEFLATE 1
+
 #include <cstdint>
 #include <cstring>
 
@@ -134,6 +136,9 @@ struct ZlibContext {
 
 struct DeflationStream {
     z_stream deflationStream = {};
+#ifdef UWS_USE_LIBDEFLATE
+    unsigned char reset_buffer[4096 + 1];
+#endif
 
     DeflationStream(CompressOptions compressOptions) {
 
@@ -154,13 +159,11 @@ struct DeflationStream {
         /* Run a fast path in case of shared_compressor */
         if (reset) {
             size_t written = 0;
-            static unsigned char buf[1024 + 1];
-
-            written = libdeflate_deflate_compress(zlibContext->compressor, raw.data(), raw.length(), buf, 1024);
+            written = libdeflate_deflate_compress(zlibContext->compressor, raw.data(), raw.length(), reset_buffer, 4096);
 
             if (written) {
-                memcpy(&buf[written], "\x00", 1);
-                return std::string_view((char *) buf, written + 1);
+                memcpy(&reset_buffer[written], "\x00", 1);
+                return std::string_view((char *) reset_buffer, written + 1);
             }
         }
 #endif
@@ -214,6 +217,9 @@ struct DeflationStream {
 
 struct InflationStream {
     z_stream inflationStream = {};
+#ifdef UWS_USE_LIBDEFLATE
+    char buf[4096];
+#endif
 
     InflationStream(CompressOptions compressOptions) {
         /* Inflation windowBits are the top 8 bits of the 16 bit compressOptions */
@@ -230,13 +236,12 @@ struct InflationStream {
 #ifdef UWS_USE_LIBDEFLATE
         /* Try fast path first */
         size_t written = 0;
-        static char buf[1024];
 
         /* We have to pad 9 bytes and restore those bytes when done since 9 is more than 6 of next WebSocket message */
         char tmp[9];
         memcpy(tmp, (char *) compressed.data() + compressed.length(), 9);
         memcpy((char *) compressed.data() + compressed.length(), "\x00\x00\xff\xff\x01\x00\x00\xff\xff", 9);
-        libdeflate_result res = libdeflate_deflate_decompress(zlibContext->decompressor, compressed.data(), compressed.length() + 9, buf, 1024, &written);
+        libdeflate_result res = libdeflate_deflate_decompress(zlibContext->decompressor, compressed.data(), compressed.length() + 9, buf, 4096, &written);
         memcpy((char *) compressed.data() + compressed.length(), tmp, 9);
 
         if (res == 0) {
diff --git a/scripts/all-dependencies.ps1 b/scripts/all-dependencies.ps1
index 23838d1a99..24ac5513d8 100755
--- a/scripts/all-dependencies.ps1
+++ b/scripts/all-dependencies.ps1
@@ -79,6 +79,10 @@ Build-Dependency `
   -Script "lshpack" `
   -Outputs @("lshpack.lib")
 
+Build-Dependency `
+  -Script "libdeflate" `
+  -Outputs @("deflate.lib")
+
 if (!($Script:DidAnything)) {
   Write-Host "(run with -Force to rebuild all)"
 }
diff --git a/scripts/all-dependencies.sh b/scripts/all-dependencies.sh
index e3ddd6c476..627339a077 100755
--- a/scripts/all-dependencies.sh
+++ b/scripts/all-dependencies.sh
@@ -3,7 +3,7 @@ set -eo pipefail
 source "$(dirname -- "${BASH_SOURCE[0]}")/env.sh"
 
 if [[ "$CI" ]]; then
-  $(dirname -- "${BASH_SOURCE[0]}")/update-submodules.sh
+    $(dirname -- "${BASH_SOURCE[0]}")/update-submodules.sh
 fi
 
 FORCE=
@@ -36,9 +36,11 @@ fi
 dep() {
     local submodule="$1"
     local script="$2"
-    CACHE_KEY=
     if [ "$CACHE" == "1" ]; then
-        CACHE_KEY="$submodule/$(echo "$SUBMODULES" | grep "$submodule" | git hash-object --stdin)"
+        local hash="$(echo "$SUBMODULES" | grep "$submodule" | awk '{print $1}')"
+        local os="$(uname -s | tr '[:upper:]' '[:lower:]')"
+        local arch="$(uname -m)"
+        CACHE_KEY="$submodule/$hash-$os-$arch-$CPU_TARGET"
     fi
     if [ -z "$FORCE" ]; then
         HAS_ALL_DEPS=1
@@ -92,6 +94,7 @@ dep mimalloc mimalloc libmimalloc.a libmimalloc.o
 dep tinycc tinycc libtcc.a
 dep zlib zlib libz.a
 dep zstd zstd libzstd.a
+dep libdeflate libdeflate libdeflate.a
 dep ls-hpack lshpack liblshpack.a
 
 if [ "$BUILT_ANY" -eq 0 ]; then
diff --git a/scripts/build-boringssl.ps1 b/scripts/build-boringssl.ps1
index 596f0b3058..5a48215f4b 100755
--- a/scripts/build-boringssl.ps1
+++ b/scripts/build-boringssl.ps1
@@ -3,6 +3,7 @@ $ErrorActionPreference = 'Stop'  # Setting strict mode, similar to 'set -euo pip
 
 Push-Location (Join-Path $BUN_DEPS_DIR 'boringssl')
 try {
+  Remove-Item -ErrorAction SilentlyContinue -Recurse -Force build
   Set-Location (mkdir -Force build)
   
   Run cmake @CMAKE_FLAGS ..
diff --git a/scripts/build-boringssl.sh b/scripts/build-boringssl.sh
index 26a84d1398..34749705e1 100755
--- a/scripts/build-boringssl.sh
+++ b/scripts/build-boringssl.sh
@@ -6,7 +6,7 @@ cd $BUN_DEPS_DIR/boringssl
 mkdir -p build
 cd build
 
-cmake "${CMAKE_FLAGS[@]}" -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" -GNinja ..
+cmake "${CMAKE_FLAGS[@]}" -GNinja ..
 ninja libcrypto.a libssl.a libdecrepit.a
 
 cp **/libcrypto.a $BUN_DEPS_OUT_DIR/libcrypto.a
diff --git a/scripts/build-bun-cpp.ps1 b/scripts/build-bun-cpp.ps1
index ab79b7f1b3..adb1a57cf7 100755
--- a/scripts/build-bun-cpp.ps1
+++ b/scripts/build-bun-cpp.ps1
@@ -1,29 +1,29 @@
-param (
-  [switch] $Baseline = $False,
-  [switch] $Fast = $False
-)
-
 $ErrorActionPreference = 'Stop'  # Setting strict mode, similar to 'set -euo pipefail' in bash
 
-$Tag = If ($Baseline) { "-Baseline" } Else { "" }
-$UseBaselineBuild = If ($Baseline) { "ON" } Else { "OFF" }
-$UseLto = If ($Fast) { "OFF" } Else { "ON" }
-
-# $CANARY_REVISION = if (Test-Path build/.canary_revision) { Get-Content build/.canary_revision } else { "0" }
-$CANARY_REVISION = 0
-.\scripts\env.ps1 $Tag
+.\scripts\env.ps1
 .\scripts\update-submodules.ps1
 .\scripts\build-libuv.ps1 -CloneOnly $True
-cd build
 
-cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release `
+# libdeflate.h is needed otherwise the build fails
+git submodule update --init --recursive --progress --depth=1 --checkout src/deps/libdeflate
+
+cd build
+cmake .. @CMAKE_FLAGS `
+  -G Ninja `
+  -DCMAKE_BUILD_TYPE=Release `
   -DNO_CODEGEN=0 `
   -DNO_CONFIGURE_DEPENDS=1 `
-  "-DUSE_BASELINE_BUILD=${UseBaselineBuild}" `
-  "-DUSE_LTO=${UseLto}" `
-  "-DCANARY=${CANARY_REVISION}" `
-  -DBUN_CPP_ONLY=1 $Flags
+  -DBUN_CPP_ONLY=1
 if ($LASTEXITCODE -ne 0) { throw "CMake configuration failed" }
 
-.\compile-cpp-only.ps1 -v
-if ($LASTEXITCODE -ne 0) { throw "C++ compilation failed" }
\ No newline at end of file
+.\compile-cpp-only.ps1 -v -j $env:CPUS
+if ($LASTEXITCODE -ne 0) { throw "C++ compilation failed" }
+
+# HACK: For some reason, the buildkite agent is hanging when uploading bun-cpp-objects.a
+# Best guess is that there is an issue when uploading files larger than 500 MB
+#
+# For now, use FileSplitter to split the file into smaller chunks:
+# https://www.powershellgallery.com/packages/FileSplitter/1.3
+if ($env:BUILDKITE) {
+  Split-File -Path (Resolve-Path "bun-cpp-objects.a") -PartSizeBytes "50MB" -Verbose
+}
diff --git a/scripts/build-bun-cpp.sh b/scripts/build-bun-cpp.sh
deleted file mode 100755
index 631452d942..0000000000
--- a/scripts/build-bun-cpp.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-set -exo pipefail
-source $(dirname -- "${BASH_SOURCE[0]}")/env.sh
-
-export USE_LTO="${USE_LTO:-ON}"
-case "$(uname -m)" in
-  aarch64|arm64)
-    export CPU_TARGET="${CPU_TARGET:-native}"
-    ;;
-  *)
-    export CPU_TARGET="${CPU_TARGET:-haswell}"
-    ;;
-esac
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --fast|--no-lto)
-      export USE_LTO="OFF"
-      shift
-      ;;
-    --baseline)
-      export CPU_TARGET="nehalem"
-      shift
-      ;;
-    --cpu)
-      export CPU_TARGET="$2"
-      shift
-      shift
-      ;;
-    *|-*|--*)
-      echo "Unknown option $1"
-      exit 1
-      ;;
-  esac
-done
-
-mkdir -p build
-cd build
-mkdir -p tmp_modules tmp_functions js codegen
-cmake .. \
-  -GNinja \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DUSE_LTO=${USE_LTO} \
-  -DCPU_TARGET=${CPU_TARGET} \
-  -DBUN_CPP_ONLY=1 \
-  -DNO_CONFIGURE_DEPENDS=1
-chmod +x ./compile-cpp-only.sh
-bash ./compile-cpp-only.sh -v
diff --git a/scripts/build-bun-zig.sh b/scripts/build-bun-zig.sh
deleted file mode 100755
index 489c635d12..0000000000
--- a/scripts/build-bun-zig.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env bash
-set -exo pipefail
-source $(dirname -- "${BASH_SOURCE[0]}")/env.sh
-
-cwd=$(pwd)
-zig=
-
-if [[ "$CI" ]]; then
-  # Since the zig build depends on files from the zig submodule,
-  # make sure to update the submodule before building.
-  git submodule update --init --recursive --progress --depth=1 --checkout src/deps/zig
-
-  # Also update the correct version of zig in the submodule.
-  $(dirname -- "${BASH_SOURCE[0]}")/download-zig.sh
-fi
-
-if [ -f "$cwd/.cache/zig/zig" ]; then
-  zig="$cwd/.cache/zig/zig"
-else
-  zig=$(which zig)
-fi
-
-ZIG_OPTIMIZE="${ZIG_OPTIMIZE:-ReleaseFast}"
-CANARY="${CANARY:-0}"
-GIT_SHA="${GIT_SHA:-$(git rev-parse HEAD)}"
-
-BUILD_MACHINE_ARCH="${BUILD_MACHINE_ARCH:-$(uname -m)}"
-DOCKER_MACHINE_ARCH=""
-if [[ "$BUILD_MACHINE_ARCH" == "x86_64" || "$BUILD_MACHINE_ARCH" == "amd64" ]]; then
-  BUILD_MACHINE_ARCH="x86_64"
-  DOCKER_MACHINE_ARCH="amd64"
-elif [[ "$BUILD_MACHINE_ARCH" == "aarch64" || "$BUILD_MACHINE_ARCH" == "arm64" ]]; then
-  BUILD_MACHINE_ARCH="aarch64"
-  DOCKER_MACHINE_ARCH="arm64"
-fi
-
-TARGET_OS="${1:-linux}"
-TARGET_ARCH="${2:-x64}"
-TARGET_CPU="${3:-${CPU_TARGET:-native}}"
-
-BUILDARCH=""
-if [[ "$TARGET_ARCH" == "x64" || "$TARGET_ARCH" == "x86_64" || "$TARGET_ARCH" == "amd64" ]]; then
-  TARGET_ARCH="x86_64"
-  BUILDARCH="amd64"
-elif [[ "$TARGET_ARCH" == "aarch64" || "$TARGET_ARCH" == "arm64" ]]; then
-  TARGET_ARCH="aarch64"
-  BUILDARCH="arm64"
-fi
-
-TRIPLET=""
-if [[ "$TARGET_OS" == "linux" ]]; then
-  TRIPLET="$TARGET_ARCH-linux-gnu"
-elif [[ "$TARGET_OS" == "darwin" ]]; then
-  TRIPLET="$TARGET_ARCH-macos-none"
-elif [[ "$TARGET_OS" == "windows" ]]; then
-  TRIPLET="$TARGET_ARCH-windows-msvc"
-fi
-
-echo "--- Building identifier-cache"
-$zig run src/js_lexer/identifier_data.zig
-
-echo "--- Building node-fallbacks"
-cd src/node-fallbacks
-bun install --frozen-lockfile
-bun run build
-cd "$cwd"
-
-echo "--- Building codegen"
-bun install --frozen-lockfile
-make runtime_js fallback_decoder bun_error
-
-echo "--- Building modules"
-mkdir -p build
-bun run src/codegen/bundle-modules.ts --debug=OFF build
-
-echo "--- Building zig"
-cd build
-cmake .. \
-  -GNinja \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DUSE_LTO=ON \
-  -DZIG_OPTIMIZE="${ZIG_OPTIMIZE}" \
-  -DGIT_SHA="${GIT_SHA}" \
-  -DARCH="${TARGET_ARCH}" \
-  -DBUILDARCH="${BUILDARCH}" \
-  -DCPU_TARGET="${TARGET_CPU}" \
-  -DZIG_TARGET="${TRIPLET}" \
-  -DASSERTIONS="OFF" \
-  -DWEBKIT_DIR="omit" \
-  -DNO_CONFIGURE_DEPENDS=1 \
-  -DNO_CODEGEN=1 \
-  -DBUN_ZIG_OBJ_DIR="$cwd/build" \
-  -DCANARY="$CANARY" \
-  -DZIG_LIB_DIR=src/deps/zig/lib
-ONLY_ZIG=1 ninja "$cwd/build/bun-zig.o" -v
diff --git a/scripts/build-cares.sh b/scripts/build-cares.sh
index 266e4292b1..575a4da3d1 100755
--- a/scripts/build-cares.sh
+++ b/scripts/build-cares.sh
@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 set -exo pipefail
+
+export FORCE_PIC=1
 source $(dirname -- "${BASH_SOURCE[0]}")/env.sh
 
 cd $BUN_DEPS_DIR/c-ares
 
-rm -rf build
+rm -rf build CMakeCache.txt CMakeFiles
 mkdir -p build
 
 cd build
@@ -12,8 +14,9 @@ cd build
 cmake "${CMAKE_FLAGS[@]}" .. \
   -DCMAKE_INSTALL_LIBDIR=lib \
   -DCARES_STATIC=ON \
-  -DCARES_STATIC_PIC=ON \
+  -DCARES_STATIC_PIC=OFF \
   -DCARES_SHARED=OFF \
+  -DCARES_BUILD_TOOLS=ON \
   -G "Ninja"
 
 ninja
diff --git a/scripts/build-libarchive.sh b/scripts/build-libarchive.sh
index 464da3f338..d1ad80580b 100755
--- a/scripts/build-libarchive.sh
+++ b/scripts/build-libarchive.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -exo pipefail
+export FORCE_PIC=1
 source $(dirname -- "${BASH_SOURCE[0]}")/env.sh
 
 mkdir -p $BUN_DEPS_OUT_DIR
diff --git a/scripts/build-libdeflate.ps1 b/scripts/build-libdeflate.ps1
new file mode 100644
index 0000000000..1d9b9b957b
--- /dev/null
+++ b/scripts/build-libdeflate.ps1
@@ -0,0 +1,16 @@
+$ErrorActionPreference = 'Stop'  # Setting strict mode, similar to 'set -euo pipefail' in bash
+. (Join-Path $PSScriptRoot "env.ps1")
+
+Push-Location (Join-Path $BUN_DEPS_DIR 'libdeflate')
+try {
+  Remove-Item CMakeCache.txt, CMakeFiles, build -Recurse -ErrorAction SilentlyContinue
+  mkdir -Force build
+
+  Run cmake -S "." -B build @CMAKE_FLAGS -DLIBDEFLATE_BUILD_STATIC_LIB=ON -DLIBDEFLATE_BUILD_SHARED_LIB=OFF -DLIBDEFLATE_BUILD_GZIP=OFF
+  Run cmake --build build --clean-first --config Release
+
+  # In https://github.com/ebiggers/libdeflate/releases/tag/v1.20, it's outputting libdeflate.a even on Windows
+  Copy-Item build/deflatestatic.lib $BUN_DEPS_OUT_DIR/deflate.lib
+  Write-Host "-> deflate.lib"
+} finally { Pop-Location }
+
diff --git a/scripts/build-libdeflate.sh b/scripts/build-libdeflate.sh
new file mode 100755
index 0000000000..0bfd2cb565
--- /dev/null
+++ b/scripts/build-libdeflate.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -exo pipefail
+source $(dirname -- "${BASH_SOURCE[0]}")/env.sh
+
+mkdir -p $BUN_DEPS_OUT_DIR
+cd $BUN_DEPS_DIR/libdeflate
+rm -rf build CMakeCache.txt CMakeFiles
+cmake "${CMAKE_FLAGS[@]}" -DLIBDEFLATE_BUILD_STATIC_LIB=ON -DLIBDEFLATE_BUILD_SHARED_LIB=OFF -DLIBDEFLATE_BUILD_GZIP=OFF -B build -S . -G Ninja
+ninja libdeflate.a -C build
+cp build/libdeflate.a $BUN_DEPS_OUT_DIR/libdeflate.a
diff --git a/scripts/build-lshpack.sh b/scripts/build-lshpack.sh
index e2b2011994..1a870efe56 100755
--- a/scripts/build-lshpack.sh
+++ b/scripts/build-lshpack.sh
@@ -2,11 +2,11 @@
 set -exo pipefail
 source $(dirname -- "${BASH_SOURCE[0]}")/env.sh
 
+rm -rf CMakeFiles CMakeCache build.ninja
 mkdir -p $BUN_DEPS_OUT_DIR
 
 cd $BUN_DEPS_DIR/ls-hpack
 
-
 rm -rf CMakeCache* CMakeFiles
 
 cmake "${CMAKE_FLAGS[@]}" . \
@@ -15,6 +15,6 @@ cmake "${CMAKE_FLAGS[@]}" . \
     -DSHARED=0 \
     -GNinja
 
-ninja
+ninja libls-hpack.a
 
 cp ./libls-hpack.a $BUN_DEPS_OUT_DIR/liblshpack.a
diff --git a/scripts/build-mimalloc.ps1 b/scripts/build-mimalloc.ps1
index a62bc9bcaf..478c12f4b8 100755
--- a/scripts/build-mimalloc.ps1
+++ b/scripts/build-mimalloc.ps1
@@ -3,6 +3,7 @@ $ErrorActionPreference = 'Stop'  # Setting strict mode, similar to 'set -euo pip
 
 Push-Location (Join-Path $BUN_DEPS_DIR 'mimalloc')
 try {
+  Remove-Item -ErrorAction SilentlyContinue -Recurse -Force build
   Set-Location (mkdir -Force build)
   
   Run cmake .. @CMAKE_FLAGS `
diff --git a/scripts/build-tinycc.ps1 b/scripts/build-tinycc.ps1
index 78a10f42e8..095fd97dd0 100755
--- a/scripts/build-tinycc.ps1
+++ b/scripts/build-tinycc.ps1
@@ -20,8 +20,6 @@ try {
   Run clang-cl -DTCC_TARGET_PE -DTCC_TARGET_X86_64 config.h -DC2STR -o c2str.exe conftest.c
   Run .\c2str.exe .\include\tccdefs.h tccdefs_.h
 
-  $Baseline = $env:BUN_DEV_ENV_SET -eq "Baseline=True"
-
   Run clang-cl @($env:CFLAGS -split ' ') libtcc.c -o tcc.obj "-DTCC_TARGET_PE" "-DTCC_TARGET_X86_64" "-O2" "-W2" "-Zi" "-MD" "-GS-" "-c" "-MT"
   Run llvm-lib "tcc.obj" "-OUT:tcc.lib"
 
diff --git a/scripts/build-zlib.sh b/scripts/build-zlib.sh
index c7cba5cf25..2377c7f198 100755
--- a/scripts/build-zlib.sh
+++ b/scripts/build-zlib.sh
@@ -4,10 +4,9 @@ source $(dirname -- "${BASH_SOURCE[0]}")/env.sh
 
 mkdir -p $BUN_DEPS_OUT_DIR
 cd $BUN_DEPS_DIR/zlib
-export CFLAGS="-O3"
-if [[ $(uname -s) == 'Darwin' ]]; then
-  export CFLAGS="$CFLAGS -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-fi
-CFLAGS="${CFLAGS}" ./configure --static
-make -j${CPUS}
+rm -rf build
+mkdir build
+cd build
+cmake $CMAKE_FLAGS -G Ninja -DCMAKE_BUILD_TYPE=Release ..
+ninja
 cp ./libz.a $BUN_DEPS_OUT_DIR/libz.a
diff --git a/scripts/build-zstd.sh b/scripts/build-zstd.sh
index 2150d43204..3adb9fa764 100755
--- a/scripts/build-zstd.sh
+++ b/scripts/build-zstd.sh
@@ -7,5 +7,5 @@ mkdir -p $BUN_DEPS_OUT_DIR
 cd $BUN_DEPS_DIR/zstd
 rm -rf Release CMakeCache.txt CMakeFiles
 cmake "${CMAKE_FLAGS[@]}" -DZSTD_BUILD_STATIC=ON -B Release -S build/cmake -G Ninja
-ninja -C Release
+ninja libzstd_static -C Release
 cp Release/lib/libzstd.a $BUN_DEPS_OUT_DIR/libzstd.a
diff --git a/scripts/buildkite-link-bun.ps1 b/scripts/buildkite-link-bun.ps1
index b56e0eefc1..caa7d98ce7 100755
--- a/scripts/buildkite-link-bun.ps1
+++ b/scripts/buildkite-link-bun.ps1
@@ -1,17 +1,13 @@
-param (
-  [switch] $Baseline = $False,
-  [switch] $Fast = $False
+param(
+  [switch]$Baseline = $false
 )
 
 $ErrorActionPreference = 'Stop'  # Setting strict mode, similar to 'set -euo pipefail' in bash
 
 $Target = If ($Baseline) { "windows-x64-baseline" } Else { "windows-x64" }
 $Tag = "bun-$Target"
-$TagSuffix = If ($Baseline) { "-Baseline" } Else { "" }
-$UseBaselineBuild = If ($Baseline) { "ON" } Else { "OFF" }
-$UseLto = If ($Fast) { "OFF" } Else { "ON" }
 
-.\scripts\env.ps1 $TagSuffix
+.\scripts\env.ps1
 
 mkdir -Force build
 buildkite-agent artifact download "**" build --step "${Target}-build-zig"
@@ -21,29 +17,24 @@ mv -Force -ErrorAction SilentlyContinue build\build\bun-deps\* build\bun-deps
 mv -Force -ErrorAction SilentlyContinue build\build\* build
 
 Set-Location build
-$CANARY_REVISION = 0
-cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release `
+
+# HACK: See scripts/build-bun-cpp.ps1
+Join-File -Path "$(Resolve-Path .)\bun-cpp-objects.a" -Verbose -DeletePartFiles
+
+cmake .. @CMAKE_FLAGS `
+  -G Ninja `
+  -DCMAKE_BUILD_TYPE=Release `
   -DNO_CODEGEN=1 `
   -DNO_CONFIGURE_DEPENDS=1 `
-  "-DCPU_TARGET=${CPU_TARGET}" `
-  "-DCANARY=${CANARY_REVISION}" `
   -DBUN_LINK_ONLY=1 `
-  "-DUSE_BASELINE_BUILD=${UseBaselineBuild}" `
-  "-DUSE_LTO=${UseLto}" `
   "-DBUN_DEPS_OUT_DIR=$(Resolve-Path bun-deps)" `
   "-DBUN_CPP_ARCHIVE=$(Resolve-Path bun-cpp-objects.a)" `
-  "-DBUN_ZIG_OBJ_DIR=$(Resolve-Path .)" `
-  "$Flags"
+  "-DBUN_ZIG_OBJ_DIR=$(Resolve-Path .)"
 if ($LASTEXITCODE -ne 0) { throw "CMake configuration failed" }
 
-ninja -v
+ninja -v -j $env:CPUS
 if ($LASTEXITCODE -ne 0) { throw "Link failed!" }
 
-ls
-if ($Fast) {
-  $Tag = "$Tag-nolto"
-}
-
 Set-Location ..
 $Dist = mkdir -Force "${Tag}"
 cp -r build\bun.exe "$Dist\bun.exe"
diff --git a/scripts/buildkite-link-bun.sh b/scripts/buildkite-link-bun.sh
deleted file mode 100755
index d0456e25ff..0000000000
--- a/scripts/buildkite-link-bun.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env bash
-set -exo pipefail
-source $(dirname -- "${BASH_SOURCE[0]}")/env.sh
-
-export USE_LTO="${USE_LTO:-ON}"
-case "$(uname -m)" in
-  aarch64|arm64)
-    export CPU_TARGET="${CPU_TARGET:-native}"
-    ;;
-  *)
-    export CPU_TARGET="${CPU_TARGET:-haswell}"
-    ;;
-esac
-
-export TAG=""
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --tag)
-      export TAG="$2"
-      shift
-      shift
-      ;;
-    --fast|--no-lto)
-      export USE_LTO="OFF"
-      shift
-      ;;
-    --baseline)
-      export CPU_TARGET="nehalem"
-      shift
-      ;;
-    --cpu)
-      export CPU_TARGET="$2"
-      shift
-      shift
-      ;;
-    *|-*|--*)
-      echo "Unknown option $1"
-      exit 1
-      ;;
-  esac
-done
-
-if [[ -z "$TAG" ]]; then
-  echo "--tag <name> is required"
-  exit 1
-fi
-
-rm -rf release
-mkdir -p release
-buildkite-agent artifact download '**' release --step $TAG-build-deps
-buildkite-agent artifact download '**' release --step $TAG-build-zig
-buildkite-agent artifact download '**' release --step $TAG-build-cpp
-
-cd release
-cmake .. \
-  -GNinja \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DCPU_TARGET=${CPU_TARGET} \
-  -DUSE_LTO=${USE_LTO} \
-  -DBUN_LINK_ONLY=1 \
-  -DBUN_ZIG_OBJ_DIR="$(pwd)/build" \
-  -DBUN_CPP_ARCHIVE="$(pwd)/build/bun-cpp-objects.a" \
-  -DBUN_DEPS_OUT_DIR="$(pwd)/build/bun-deps" \
-  -DNO_CONFIGURE_DEPENDS=1
-ninja -v
-
-if [[ "${USE_LTO}" == "OFF" ]]; then
-  TAG="${TAG}-nolto"
-fi
-
-chmod +x bun-profile bun
-mkdir -p bun-$TAG-profile/ bun-$TAG/
-mv bun-profile bun-$TAG-profile/bun-profile
-mv bun bun-$TAG/bun
-zip -r bun-$TAG-profile.zip bun-$TAG-profile
-zip -r bun-$TAG.zip bun-$TAG
-
-cd ..
-mv release/bun-$TAG.zip bun-$TAG.zip
-mv release/bun-$TAG-profile.zip bun-$TAG-profile.zip
diff --git a/scripts/env.ps1 b/scripts/env.ps1
index cf92d5c312..406c168169 100755
--- a/scripts/env.ps1
+++ b/scripts/env.ps1
@@ -1,11 +1,3 @@
-param(
-  [switch]$Baseline = $false
-)
-
-if ($ENV:BUN_DEV_ENV_SET -eq "Baseline=True") {
-  $Baseline = $true
-}
-
 $ErrorActionPreference = 'Stop' # Setting strict mode, similar to 'set -euo pipefail' in bash
 
 # this is the environment script for building bun's dependencies
@@ -38,13 +30,19 @@ if($Env:VSCMD_ARG_TGT_ARCH -eq "x86") {
   throw "Visual Studio environment is targetting 32 bit. This configuration is definetly a mistake."
 }
 
-$ENV:BUN_DEV_ENV_SET = "Baseline=$Baseline";
-
 $BUN_BASE_DIR = if ($env:BUN_BASE_DIR) { $env:BUN_BASE_DIR } else { Join-Path $ScriptDir '..' }
 $BUN_DEPS_DIR = if ($env:BUN_DEPS_DIR) { $env:BUN_DEPS_DIR } else { Join-Path $BUN_BASE_DIR 'src\deps' }
 $BUN_DEPS_OUT_DIR = if ($env:BUN_DEPS_OUT_DIR) { $env:BUN_DEPS_OUT_DIR } else { Join-Path $BUN_BASE_DIR 'build\bun-deps' }
 
 $CPUS = if ($env:CPUS) { $env:CPUS } else { (Get-CimInstance -Class Win32_Processor).NumberOfCores }
+$Lto = if ($env:USE_LTO) { $env:USE_LTO -eq "1" } else { $True }
+$Baseline = if ($env:USE_BASELINE_BUILD) {
+  $env:USE_BASELINE_BUILD -eq "1"
+} elseif ($env:BUILDKITE_STEP_KEY -match "baseline") {
+  $True
+} else {
+  $False
+}
 
 $CC = "clang-cl"
 $CXX = "clang-cl"
@@ -52,7 +50,7 @@ $CXX = "clang-cl"
 $CFLAGS = '/O2 /Z7 /MT /O2 /Ob2 /DNDEBUG /U_DLL'
 $CXXFLAGS = '/O2 /Z7 /MT /O2 /Ob2 /DNDEBUG /U_DLL'
 
-if ($env:USE_LTO -eq "1") {
+if ($Lto) {
   $CXXFLAGS += " -fuse-ld=lld -flto -Xclang -emit-llvm-bc"
   $CFLAGS += " -fuse-ld=lld -flto -Xclang -emit-llvm-bc"
 }
@@ -63,6 +61,14 @@ $env:CPU_TARGET = $CPU_NAME
 $CFLAGS += " -march=${CPU_NAME}"
 $CXXFLAGS += " -march=${CPU_NAME}"
 
+$Canary = If ($env:CANARY) {
+  $env:CANARY
+} ElseIf ($env:BUILDKITE -eq "true") {
+  (buildkite-agent meta-data get canary)
+} Else {
+  "1"
+}
+
 $CMAKE_FLAGS = @(
   "-GNinja",
   "-DCMAKE_BUILD_TYPE=Release",
@@ -72,15 +78,15 @@ $CMAKE_FLAGS = @(
   "-DCMAKE_CXX_FLAGS=$CXXFLAGS",
   "-DCMAKE_C_FLAGS_RELEASE=$CFLAGS",
   "-DCMAKE_CXX_FLAGS_RELEASE=$CXXFLAGS",
-  "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded"
+  "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded",
+  "-DCANARY=$Canary"
 )
 
-if ($env:USE_LTO -eq "1") {
-  if (Get-Command lld-lib -ErrorAction SilentlyContinue) { 
-    $AR = Get-Command lld-lib -ErrorAction SilentlyContinue
-    $env:AR = $AR
-    $CMAKE_FLAGS += "-DCMAKE_AR=$AR"
-  }
+if (Get-Command llvm-lib -ErrorAction SilentlyContinue) { 
+  $AR_CMD = Get-Command llvm-lib -ErrorAction SilentlyContinue
+  $AR = $AR_CMD.Path
+  $env:AR = $AR
+  $CMAKE_FLAGS += "-DCMAKE_AR=$AR"
 }
 
 $env:CC = "clang-cl"
@@ -93,6 +99,10 @@ if ($Baseline) {
   $CMAKE_FLAGS += "-DUSE_BASELINE_BUILD=ON"
 }
 
+if ($Lto) {
+  $CMAKE_FLAGS += "-DUSE_LTO=ON"
+}
+
 if (Get-Command sccache -ErrorAction SilentlyContinue) {
   # Continue with local compiler if sccache has an error
   $env:SCCACHE_IGNORE_SERVER_IO_ERROR = "1"
diff --git a/scripts/env.sh b/scripts/env.sh
index 012bd2be18..617c1c75ed 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -1,12 +1,18 @@
 #!/usr/bin/env bash
 
-# Hack for Buildkite sometimes not having the right path
+# Hack for buildkite sometimes not having the right path
 if [[ "${CI:-}" == "1" || "${CI:-}" == "true" ]]; then
   if [ -f ~/.bashrc ]; then
     source ~/.bashrc
   fi
 fi
 
+if [[ $(uname -s) == 'Darwin' ]]; then
+  export LLVM_VERSION=18
+else
+  export LLVM_VERSION=16
+fi
+
 # this is the environment script for building bun's dependencies
 # it sets c compiler and flags
 export SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
@@ -18,17 +24,69 @@ export BUN_DEPS_OUT_DIR=${BUN_DEPS_OUT_DIR:-$BUN_BASE_DIR/build/bun-deps}
 export LC_CTYPE="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"
 
+if [[ $(uname -s) == 'Darwin' ]]; then
+  export CXX="$(brew --prefix llvm)@$LLVM_VERSION/bin/clang++"
+  export CC="$(brew --prefix llvm)@$LLVM_VERSION/bin/clang"
+  export AR="$(brew --prefix llvm)@$LLVM_VERSION/bin/llvm-ar"
+  export RANLIB="$(brew --prefix llvm)@$LLVM_VERSION/bin/llvm-ranlib"
+  export LIBTOOL="$(brew --prefix llvm)@$LLVM_VERSION/bin/llvm-libtool-darwin"
+  export PATH="$(brew --prefix llvm)@$LLVM_VERSION/bin:$PATH"
+  ln -sf $LIBTOOL "$(brew --prefix llvm)@$LLVM_VERSION/bin/libtool" || true
+elif [[ "$CI" != "1" && "$CI" != "true" ]]; then
+  if [[ -f $SCRIPT_DIR/env.local ]]; then
+    echo "Sourcing $SCRIPT_DIR/env.local"
+    source $SCRIPT_DIR/env.local
+  fi
+fi
+
 # this compiler detection could be better
-export CC=${CC:-$(which clang-16 || which clang || which cc)}
-export CXX=${CXX:-$(which clang++-16 || which clang++ || which c++)}
+export CC=${CC:-$(which clang-$LLVM_VERSION || which clang || which cc)}
+export CXX=${CXX:-$(which clang++-$LLVM_VERSION || which clang++ || which c++)}
 export AR=${AR:-$(which llvm-ar || which ar)}
 export CPUS=${CPUS:-$(nproc || sysctl -n hw.ncpu || echo 1)}
+export RANLIB=${RANLIB:-$(which llvm-ranlib-$LLVM_VERSION || which llvm-ranlib || which ranlib)}
+
+# on Linux, force using lld as the linker
+if [[ $(uname -s) == 'Linux' ]]; then
+  export LD=${LD:-$(which ld.lld-$LLVM_VERSION || which ld.lld || which ld)}
+  export LDFLAGS="${LDFLAGS} -fuse-ld=lld "
+fi
 
 export CMAKE_CXX_COMPILER=${CXX}
 export CMAKE_C_COMPILER=${CC}
 
-export CFLAGS='-O3 -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer'
-export CXXFLAGS='-O3 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer'
+export CFLAGS='-O3 -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer -fno-asynchronous-unwind-tables -fno-unwind-tables  '
+export CXXFLAGS='-O3 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-c++-static-destructors '
+
+# Add flags for LTO
+# We cannot enable LTO on macOS for dependencies because it requires -fuse-ld=lld and lld causes many segfaults on macOS (likely related to stack size)
+if [ "$BUN_ENABLE_LTO" == "1" ]; then
+  export CFLAGS="$CFLAGS -flto=full "
+  export CXXFLAGS="$CXXFLAGS -flto=full -fwhole-program-vtables -fforce-emit-vtables "
+  export LDFLAGS="$LDFLAGS -flto=full -fwhole-program-vtables -fforce-emit-vtables "
+fi
+
+if [[ $(uname -s) == 'Linux' ]]; then
+  export CFLAGS="$CFLAGS -ffunction-sections -fdata-sections -faddrsig "
+  export CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -faddrsig "
+  export LDFLAGS="${LDFLAGS} -Wl,-z,norelro"
+fi
+
+# Clang 18 on macOS needs to have -fno-define-target-os-macros to fix a zlib build issue
+# https://gitlab.kitware.com/cmake/cmake/-/issues/25755
+if [[ $(uname -s) == 'Darwin' && $LLVM_VERSION == '18' ]]; then
+  export CFLAGS="$CFLAGS -fno-define-target-os-macros "
+  export CXXFLAGS="$CXXFLAGS -fno-define-target-os-macros -D_LIBCXX_ENABLE_ASSERTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_NONE "
+fi
+
+# libarchive needs position-independent executables to compile successfully
+if [ -n "$FORCE_PIC" ]; then
+  export CFLAGS="$CFLAGS -fPIC "
+  export CXXFLAGS="$CXXFLAGS -fPIC "
+elif [[ $(uname -s) == 'Linux' ]]; then
+  export CFLAGS="$CFLAGS -fno-pie -fno-pic "
+  export CXXFLAGS="$CXXFLAGS -fno-pie -fno-pic "
+fi
 
 if [[ $(uname -s) == 'Linux' && ($(uname -m) == 'aarch64' || $(uname -m) == 'arm64') ]]; then
   export CFLAGS="$CFLAGS -march=armv8-a+crc -mtune=ampere1 "
@@ -61,8 +119,7 @@ if [[ $(uname -s) == 'Linux' ]]; then
 fi
 
 if [[ $(uname -s) == 'Darwin' ]]; then
-  export CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET:-12.0}
-
+  export CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET:-13.0}
   CMAKE_FLAGS+=(-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET})
   export CFLAGS="$CFLAGS -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -D__DARWIN_NON_CANCELABLE=1 "
   export CXXFLAGS="$CXXFLAGS -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -D__DARWIN_NON_CANCELABLE=1 "
diff --git a/scripts/experimental-build.mjs b/scripts/experimental-build.mjs
index 33b26ab02f..0dcc53138c 100755
--- a/scripts/experimental-build.mjs
+++ b/scripts/experimental-build.mjs
@@ -6,16 +6,162 @@ import { copyFileSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdir
 import { basename, dirname, join } from "node:path";
 import { tmpdir } from "node:os";
 
-const projectPath = dirname(import.meta.dirname);
-const vendorPath = process.env.BUN_VENDOR_PATH || join(projectPath, "vendor");
-
 const isWindows = process.platform === "win32";
 const isMacOS = process.platform === "darwin";
 const isLinux = process.platform === "linux";
 
+const cwd = dirname(import.meta.dirname);
 const spawnSyncTimeout = 1000 * 60;
 const spawnTimeout = 1000 * 60 * 3;
 
+/**
+ * @typedef {Object} S3UploadOptions
+ * @property {string} [bucket]
+ * @property {string} filename
+ * @property {string} content
+ * @property {Record<string, string>} [headers]
+ */
+
+/**
+ * @param {S3UploadOptions} options
+ */
+async function uploadFileToS3(options) {
+  const { AwsV4Signer } = await import("aws4fetch");
+
+  const { bucket, filename, content, ...extra } = options;
+  const baseUrl = getEnv(["S3_ENDPOINT", "S3_BASE_URL", "AWS_ENDPOINT"], "https://s3.amazonaws.com");
+  const bucketUrl = new URL(bucket || getEnv(["S3_BUCKET", "AWS_BUCKET"]), baseUrl);
+
+  const signer = new AwsV4Signer({
+    accessKeyId: getSecret(["S3_ACCESS_KEY_ID", "AWS_ACCESS_KEY_ID"]),
+    secretAccessKey: getSecret(["S3_SECRET_ACCESS_KEY", "AWS_SECRET_ACCESS_KEY"]),
+    url: new URL(filename, bucketUrl),
+    method: "PUT",
+    body: content,
+    ...extra,
+  });
+
+  const { url, method, headers, body } = signer.sign();
+  await fetchSafe(url, {
+    method,
+    headers,
+    body,
+  });
+
+  console.log("Uploaded file to S3:", {
+    url: `${bucketUrl}`,
+    filename,
+  });
+}
+
+/**
+ * @typedef {Object} SentryRelease
+ * @property {string} organizationId
+ * @property {string} projectId
+ * @property {string} version
+ * @property {string} [url]
+ * @property {string} [ref]
+ * @property {string} [dateReleased]
+ */
+
+/**
+ * @param {SentryRelease} options
+ * @returns {Promise<void>}
+ */
+async function createSentryRelease(options) {
+  const { organizationId, projectId, ...body } = options;
+
+  const baseUrl = getEnv("SENTRY_BASE_URL", "https://sentry.io");
+  const url = new URL(`api/0/organizations/${organizationId}/releases`, baseUrl);
+  const accessToken = getSecret(["SENTRY_AUTH_TOKEN", "SENTRY_TOKEN"]);
+
+  const release = await fetchSafe(url, {
+    method: "POST",
+    headers: {
+      "Authorization": `Bearer ${accessToken}`,
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify(body),
+    format: "json",
+  });
+
+  console.log("Created Sentry release:", release);
+}
+
+/**
+ * @return {string}
+ */
+function getGithubToken() {
+  const token = getEnv("GITHUB_TOKEN", null);
+  if (token) {
+    return token;
+  }
+
+  const gh = which("gh");
+  if (gh) {
+    const { exitCode, stdout } = spawnSyncSafe(gh, ["auth", "token"]);
+    if (exitCode === 0) {
+      return stdout.trim();
+    }
+  }
+
+  throw new Error("Failed to get GitHub token (set GITHUB_TOKEN or run `gh auth login`)");
+}
+
+/**
+ * @param {string | string[]} name
+ * @return {string}
+ */
+function getSecret(name) {
+  return getEnv(name);
+}
+
+/**
+ * @param {string | string[]} name
+ * @param {string | null} [defaultValue]
+ * @returns {string | undefined}
+ */
+function getEnv(name, defaultValue) {
+  let result = defaultValue;
+
+  for (const key of typeof name === "string" ? [name] : name) {
+    const value = process.env[key];
+    if (value) {
+      result = value;
+      break;
+    }
+  }
+
+  if (result || result === null) {
+    return result;
+  }
+
+  throw new Error(`Environment variable is required: ${name}`);
+}
+
+/**
+ * @typedef {Object} SpawnOptions
+ * @property {boolean} [throwOnError]
+ * @property {string} [cwd]
+ * @property {string} [env]
+ * @property {string} [encoding]
+ * @property {number} [timeout]
+ */
+
+/**
+ * @typedef {Object} SpawnResult
+ * @property {number | null} exitCode
+ * @property {number | null} signalCode
+ * @property {string} stdout
+ * @property {string} stderr
+ */
+
+/**
+ * @param {string} command
+ * @param {string[]} [args]
+ * @param {SpawnOptions} [options]
+ * @returns {Promise<SpawnResult>}
+ */
 async function spawnSafe(command, args, options = {}) {
   const result = new Promise((resolve, reject) => {
     let stdout = "";
@@ -60,6 +206,12 @@ async function spawnSafe(command, args, options = {}) {
   }
 }
 
+/**
+ * @param {string} command
+ * @param {string[]} [args]
+ * @param {SpawnOptions} [options]
+ * @returns {SpawnResult}
+ */
 function spawnSyncSafe(command, args, options = {}) {
   try {
     const { error, status, signal, stdout, stderr } = spawnSync(command, args, {
@@ -86,6 +238,20 @@ function spawnSyncSafe(command, args, options = {}) {
   }
 }
 
+/**
+ * @typedef {Object} FetchOptions
+ * @property {string} [method]
+ * @property {Record<string, string>} [headers]
+ * @property {string | Uint8Array} [body]
+ * @property {"json" | "text" | "bytes"} [format]
+ * @property {boolean} [throwOnError]
+ */
+
+/**
+ * @param {string | URL} url
+ * @param {FetchOptions} [options]
+ * @returns {Promise<Response | string | Uint8Array>}
+ */
 async function fetchSafe(url, options = {}) {
   let response;
   try {
@@ -138,47 +304,6 @@ function which(command, path) {
   return result.trimEnd();
 }
 
-function getZigTarget(os = process.platform, arch = process.arch) {
-  if (arch === "x64") {
-    if (os === "linux") return "linux-x86_64";
-    if (os === "darwin") return "macos-x86_64";
-    if (os === "win32") return "windows-x86_64";
-  }
-  if (arch === "arm64") {
-    if (os === "linux") return "linux-aarch64";
-    if (os === "darwin") return "macos-aarch64";
-  }
-  throw new Error(`Unsupported zig target: os=${os}, arch=${arch}`);
-}
-
-function getRecommendedZigVersion() {
-  const scriptPath = join(projectPath, "build.zig");
-  try {
-    const scriptContent = readFileSync(scriptPath, "utf-8");
-    const match = scriptContent.match(/recommended_zig_version = "([^"]+)"/);
-    if (!match) {
-      throw new Error("File does not contain string: 'recommended_zig_version'");
-    }
-    return match[1];
-  } catch (cause) {
-    throw new Error("Failed to find recommended Zig version", { cause });
-  }
-}
-
-/**
- * @returns {Promise<string>}
- */
-async function getLatestZigVersion() {
-  try {
-    const response = await fetchSafe("https://ziglang.org/download/index.json", { format: "json" });
-    const { master } = response;
-    const { version } = master;
-    return version;
-  } catch (cause) {
-    throw new Error("Failed to get latest Zig version", { cause });
-  }
-}
-
 /**
  * @param {string} execPath
  * @returns {string | undefined}
@@ -191,110 +316,3 @@ function getVersion(execPath) {
   }
   return result.trim();
 }
-
-/**
- * @returns {string}
- */
-function getTmpdir() {
-  if (isMacOS && existsSync("/tmp")) {
-    return "/tmp";
-  }
-  return tmpdir();
-}
-
-/**
- * @returns {string}
- */
-function mkTmpdir() {
-  return mkdtempSync(join(getTmpdir(), "bun-"));
-}
-
-/**
- * @param {string} url
- * @param {string} [path]
- * @returns {Promise<string>}
- */
-async function downloadFile(url, path) {
-  const outPath = path || join(mkTmpdir(), basename(url));
-  const bytes = await fetchSafe(url, { format: "bytes" });
-  mkdirSync(dirname(outPath), { recursive: true });
-  writeFileSync(outPath, bytes);
-  return outPath;
-}
-
-/**
- * @param {string} tarPath
- * @param {string} [path]
- * @returns {Promise<string>}
- */
-async function extractFile(tarPath, path) {
-  const outPath = path || join(mkTmpdir(), basename(tarPath));
-  mkdirSync(outPath, { recursive: true });
-  await spawnSafe("tar", ["-xf", tarPath, "-C", outPath, "--strip-components=1"]);
-  return outPath;
-}
-
-const dependencies = [
-  {
-    name: "zig",
-    version: getRecommendedZigVersion(),
-    download: downloadZig,
-  },
-];
-
-async function getDependencyPath(name) {
-  let dependency;
-  for (const entry of dependencies) {
-    if (name === entry.name) {
-      dependency = entry;
-      break;
-    }
-  }
-  if (!dependency) {
-    throw new Error(`Unknown dependency: ${name}`);
-  }
-  const { version, download } = dependency;
-  mkdirSync(vendorPath, { recursive: true });
-  for (const path of readdirSync(vendorPath)) {
-    if (!path.startsWith(name)) {
-      continue;
-    }
-    const dependencyPath = join(vendorPath, path);
-    const dependencyVersion = getVersion(dependencyPath);
-    if (dependencyVersion === version) {
-      return dependencyPath;
-    }
-  }
-  if (!download) {
-    throw new Error(`Dependency not found: ${name}`);
-  }
-  return await download(version);
-}
-
-/**
- * @param {string} [version]
- */
-async function downloadZig(version) {
-  const target = getZigTarget();
-  const expectedVersion = version || getRecommendedZigVersion();
-  const url = `https://ziglang.org/builds/zig-${target}-${expectedVersion}.tar.xz`;
-  const tarPath = await downloadFile(url);
-  const extractedPath = await extractFile(tarPath);
-  const zigPath = join(extractedPath, exePath("zig"));
-  const actualVersion = getVersion(zigPath);
-  const outPath = join(vendorPath, exePath(`zig-${actualVersion}`));
-  mkdirSync(dirname(outPath), { recursive: true });
-  copyFileSync(zigPath, outPath);
-  return outPath;
-}
-
-/**
- * @param {string} path
- * @returns {string}
- */
-function exePath(path) {
-  return isWindows ? `${path}.exe` : path;
-}
-
-const execPath = await getDependencyPath("zig");
-console.log(execPath);
diff --git a/scripts/make-old-js.ps1 b/scripts/make-old-js.ps1
index b59d95f867..b3898ef758 100755
--- a/scripts/make-old-js.ps1
+++ b/scripts/make-old-js.ps1
@@ -5,11 +5,20 @@ $npm_client = "npm"
 $root = Join-Path (Split-Path -Path $MyInvocation.MyCommand.Definition -Parent) "..\"
 
 # search for .cmd or .exe 
-$esbuild = Join-Path $root "node_modules\.bin\esbuild.cmd"
-if (!(Test-Path $esbuild)) {
-    $esbuild = Join-Path $root "node_modules\.bin\esbuild.exe"
+function Get-Esbuild-Path {
+  param(
+      $Path
+  )
+
+  $Result = Join-Path $Path "node_modules\.bin\esbuild.cmd"
+  if (Test-Path $Result) {
+      return $Result
+  }
+
+  return Join-Path $Path "node_modules\.bin\esbuild.exe"
 }
 
+$esbuild = Get-Esbuild-Path $root
 
 $env:NODE_ENV = "production"
 
@@ -34,5 +43,5 @@ Pop-Location
 # node-fallbacks
 Push-Location src\node-fallbacks
 & ${npm_client} install
-& ${esbuild} --bundle @(Get-Item .\*.js) --outdir=out --format=esm --minify --platform=browser
+& (Get-Esbuild-Path (Get-Location)) --bundle @(Get-Item .\*.js) --outdir=out --format=esm --minify --platform=browser
 Pop-Location
diff --git a/scripts/runner.node.mjs b/scripts/runner.node.mjs
index 7d50b148cb..2523da8586 100755
--- a/scripts/runner.node.mjs
+++ b/scripts/runner.node.mjs
@@ -26,7 +26,7 @@ import { normalize as normalizeWindows } from "node:path/win32";
 import { isIP } from "node:net";
 import { parseArgs } from "node:util";
 
-const spawnTimeout = 30_000;
+const spawnTimeout = 5_000;
 const testTimeout = 3 * 60_000;
 const integrationTimeout = 5 * 60_000;
 
@@ -231,18 +231,20 @@ async function runTests() {
  */
 
 /**
- * @param {SpawnOptions} request
+ * @param {SpawnOptions} options
  * @returns {Promise<SpawnResult>}
  */
-async function spawnSafe({
-  command,
-  args,
-  cwd,
-  env,
-  timeout = spawnTimeout,
-  stdout = process.stdout.write.bind(process.stdout),
-  stderr = process.stderr.write.bind(process.stderr),
-}) {
+async function spawnSafe(options) {
+  const {
+    command,
+    args,
+    cwd,
+    env,
+    timeout = spawnTimeout,
+    stdout = process.stdout.write.bind(process.stdout),
+    stderr = process.stderr.write.bind(process.stderr),
+    retries = 0,
+  } = options;
   let exitCode;
   let signalCode;
   let spawnError;
@@ -318,6 +320,16 @@ async function spawnSafe({
       resolve();
     }
   });
+  if (spawnError && retries < 5) {
+    const { code } = spawnError;
+    if (code === "EBUSY" || code === "UNKNOWN") {
+      await new Promise(resolve => setTimeout(resolve, 1000 * (retries + 1)));
+      return spawnSafe({
+        ...options,
+        retries: retries + 1,
+      });
+    }
+  }
   let error;
   if (exitCode === 0) {
     // ...
@@ -1332,7 +1344,7 @@ function formatTestToMarkdown(result, concise) {
 
   let markdown = "";
   for (const { testPath, ok, tests, error, stdoutPreview: stdout } of results) {
-    if (ok) {
+    if (ok || error === "SIGTERM") {
       continue;
     }
 
diff --git a/scripts/setup.sh b/scripts/setup.sh
index fb57795fc0..bd58cdabed 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -15,12 +15,35 @@ fail() {
   printf "${C_RED}setup error${C_RESET}: %s\n" "$@"
 }
 
-LLVM_VERSION=16
+if [[ $(uname -s) == 'Darwin' ]]; then
+  export LLVM_VERSION=18
 
-# this compiler detection could be better
-# it is copy pasted from ./env.sh
-CC=${CC:-$(which clang-16 || which clang || which cc)}
-CXX=${CXX:-$(which clang++-16 || which clang++ || which c++)}
+  # Use from brew --prefix if available
+  if has_exec brew; then
+    export PKG_CONFIG_PATH=$(brew --prefix)/lib/pkgconfig:$PKG_CONFIG_PATH
+
+    # if llvm@18/bin/clang exists, use it
+    if [ -x "$(brew --prefix)/opt/llvm@$LLVM_VERSION/bin/clang" ]; then
+      export PATH=$(brew --prefix)/opt/llvm@$LLVM_VERSION/bin:$PATH
+      export CC=$(brew --prefix)/opt/llvm@$LLVM_VERSION/bin/clang
+      export CXX=$(brew --prefix)/opt/llvm@$LLVM_VERSION/bin/clang++
+      export AR=$(brew --prefix)/opt/llvm@$LLVM_VERSION/bin/llvm-ar
+    else
+      export CC=$(which clang-$LLVM_VERSION || which clang || which cc)
+      export CXX=$(which clang++-$LLVM_VERSION || which clang++ || which c++)
+      export AR=$(which llvm-ar-$LLVM_VERSION || which llvm-ar || which ar)
+    fi
+  fi
+
+  test -n "$CC" || fail "missing LLVM $LLVM_VERSION (could not find clang)"
+  test -n "$CXX" || fail "missing LLVM $LLVM_VERSION (could not find clang++)"
+else
+  export LLVM_VERSION=16
+
+  export CC=$(which clang-$LLVM_VERSION || which clang || which cc)
+  export CXX=$(which clang++-$LLVM_VERSION || which clang++ || which c++)
+  export AR=$(which llvm-ar-$LLVM_VERSION || which llvm-ar || which ar)
+fi
 
 test -n "$CC" || fail "missing LLVM $LLVM_VERSION (could not find clang)"
 test -n "$CXX" || fail "missing LLVM $LLVM_VERSION (could not find clang++)"
@@ -36,9 +59,9 @@ has_exec "bun" || fail "you need an existing copy of 'bun' in your path to build
 has_exec "cmake" || fail "'cmake' is missing"
 has_exec "ninja" || fail "'ninja' is missing"
 $(
-  has_exec "rustc" \
-  && (test $(cargo --version | awk '{print $2}' | cut -d. -f2) -gt 57) \
-  && has_exec "cargo"
+  has_exec "rustc" &&
+    (test $(cargo --version | awk '{print $2}' | cut -d. -f2) -gt 57) &&
+    has_exec "cargo"
 ) || fail "Rust and Cargo version must be installed (minimum version 1.57)"
 has_exec "go" || fail "'go' is missing"
 
@@ -59,6 +82,15 @@ printf "C Compiler for dependencies: ${CC}\n"
 printf "C++ Compiler for dependencies: ${CXX}\n"
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
+
+rm -rf env.local
+echo "# Environment variables as of last setup.sh run at $(date)" >env.local
+echo "export CC=\"${CC}\"" >>env.local
+echo "export CXX\"=${CXX}\"" >>env.local
+echo "export AR=\"${AR}\"" >>env.local
+echo "export PATH=\"${PATH}\"" >>env.local
+echo "Saved environment variables to $(pwd)/env.local"
+
 bash ./update-submodules.sh
 bash ./all-dependencies.sh
 
@@ -67,7 +99,9 @@ cd ../
 # Install bun dependencies
 bun i
 # Install test dependencies
-cd test; bun i; cd ..
+cd test
+bun i
+cd ..
 
 # TODO(@paperdave): do not use the Makefile please
 has_exec "make" || fail "'make' is missing"
@@ -81,7 +115,7 @@ cmake -B build -S . \
   -DCMAKE_BUILD_TYPE=Debug \
   -DCMAKE_C_COMPILER="$CC" \
   -DCMAKE_CXX_COMPILER="$CXX" \
-  -UZIG_COMPILER "$*" \
+  -UZIG_COMPILER "$*"
 
 ninja -C build
 
diff --git a/scripts/write-versions.sh b/scripts/write-versions.sh
index 74bc29c68c..389acf702c 100755
--- a/scripts/write-versions.sh
+++ b/scripts/write-versions.sh
@@ -12,6 +12,7 @@ TINYCC=$(git rev-parse HEAD:./src/deps/tinycc)
 C_ARES=$(git rev-parse HEAD:./src/deps/c-ares)
 ZSTD=$(git rev-parse HEAD:./src/deps/zstd)
 LSHPACK=$(git rev-parse HEAD:./src/deps/ls-hpack)
+LIBDEFLATE=$(git rev-parse HEAD:./src/deps/libdeflate)
 
 rm -rf src/generated_versions_list.zig
 echo "// AUTO-GENERATED FILE. Created via .scripts/write-versions.sh" >src/generated_versions_list.zig
@@ -26,6 +27,7 @@ echo "pub const zlib = \"$ZLIB_VERSION\";" >>src/generated_versions_list.zig
 echo "pub const tinycc = \"$TINYCC\";" >>src/generated_versions_list.zig
 echo "pub const lolhtml = \"$LOLHTML\";" >>src/generated_versions_list.zig
 echo "pub const c_ares = \"$C_ARES\";" >>src/generated_versions_list.zig
+echo "pub const libdeflate = \"$LIBDEFLATE\";" >>src/generated_versions_list.zig
 echo "pub const zstd = \"$ZSTD\";" >>src/generated_versions_list.zig
 echo "pub const lshpack = \"$LSHPACK\";" >>src/generated_versions_list.zig
 echo "" >>src/generated_versions_list.zig
diff --git a/src/Global.zig b/src/Global.zig
index d56b5fc269..d3becfed78 100644
--- a/src/Global.zig
+++ b/src/Global.zig
@@ -101,11 +101,6 @@ pub fn runExitCallbacks() void {
     on_exit_callbacks.items.len = 0;
 }
 
-/// Flushes stdout and stderr and exits with the given code.
-pub fn exit(code: u8) noreturn {
-    exitWide(@as(u32, code));
-}
-
 var is_exiting = std.atomic.Value(bool).init(false);
 export fn bun_is_exiting() c_int {
     return @intFromBool(isExiting());
@@ -114,36 +109,25 @@ pub fn isExiting() bool {
     return is_exiting.load(.monotonic);
 }
 
-pub fn exitWide(code: u32) noreturn {
+/// Flushes stdout and stderr (in exit/quick_exit callback) and exits with the given code.
+pub fn exit(code: u32) noreturn {
     is_exiting.store(true, .monotonic);
 
-    if (comptime Environment.isMac) {
-        std.c.exit(@bitCast(code));
+    // If we are crashing, allow the crash handler to finish it's work.
+    bun.crash_handler.sleepForeverIfAnotherThreadIsCrashing();
+
+    switch (Environment.os) {
+        .mac => std.c.exit(@bitCast(code)),
+        else => bun.C.quick_exit(@bitCast(code)),
     }
-    bun.C.quick_exit(@bitCast(code));
 }
 
-pub fn raiseIgnoringPanicHandler(sig: anytype) noreturn {
-    if (comptime @TypeOf(sig) == bun.SignalCode) {
-        return raiseIgnoringPanicHandler(@intFromEnum(sig));
-    }
-
+pub fn raiseIgnoringPanicHandler(sig: bun.SignalCode) noreturn {
     Output.flush();
-
-    if (!Environment.isWindows) {
-        if (sig >= 1 and sig != std.posix.SIG.STOP and sig != std.posix.SIG.KILL) {
-            const act = std.posix.Sigaction{
-                .handler = .{ .sigaction = @ptrCast(@alignCast(std.posix.SIG.DFL)) },
-                .mask = std.posix.empty_sigset,
-                .flags = 0,
-            };
-            std.posix.sigaction(@intCast(sig), &act, null) catch {};
-        }
-    }
-
     Output.Source.Stdio.restore();
 
-    _ = std.c.raise(sig);
+    bun.crash_handler.resetSegfaultHandler();
+    _ = std.c.raise(@intFromEnum(sig));
     std.c.abort();
 }
 
@@ -171,11 +155,9 @@ pub inline fn configureAllocator(_: AllocatorConfiguration) void {
     // if (!config.long_running) Mimalloc.mi_option_set(Mimalloc.mi_option_reset_delay, 0);
 }
 
-pub const panic = Output.panic; // deprecated
-
 pub fn notimpl() noreturn {
     @setCold(true);
-    Global.panic("Not implemented yet!!!!!", .{});
+    Output.panic("Not implemented yet!!!!!", .{});
 }
 
 // Make sure we always print any leftover
diff --git a/src/ast/base.zig b/src/ast/base.zig
index 160bb28815..151a771919 100644
--- a/src/ast/base.zig
+++ b/src/ast/base.zig
@@ -100,6 +100,8 @@ pub const Index = packed struct(u32) {
 /// The maps can be merged quickly by creating a single outer array containing
 /// all inner arrays from all parsed files.
 pub const Ref = packed struct(u64) {
+    pub const Int = u31;
+
     inner_index: Int = 0,
 
     tag: enum(u2) {
@@ -114,6 +116,10 @@ pub const Ref = packed struct(u64) {
     /// Represents a null state without using an extra bit
     pub const None = Ref{ .inner_index = 0, .source_index = 0, .tag = .invalid };
 
+    comptime {
+        bun.assert(None.isEmpty());
+    }
+
     pub inline fn isEmpty(this: Ref) bool {
         return this.asU64() == 0;
     }
@@ -121,12 +127,6 @@ pub const Ref = packed struct(u64) {
     pub const ArrayHashCtx = RefHashCtx;
     pub const HashCtx = RefCtx;
 
-    pub const Int = std.meta.Int(.unsigned, (64 - 2) / 2);
-
-    pub fn toInt(value: anytype) Int {
-        return @as(Int, @intCast(value));
-    }
-
     pub fn isSourceIndexNull(this: anytype) bool {
         return this == std.math.maxInt(Int);
     }
@@ -140,8 +140,8 @@ pub const Ref = packed struct(u64) {
             writer,
             "Ref[inner={d}, src={d}, .{s}]",
             .{
-                ref.sourceIndex(),
                 ref.innerIndex(),
+                ref.sourceIndex(),
                 @tagName(ref.tag),
             },
         );
@@ -177,11 +177,11 @@ pub const Ref = packed struct(u64) {
     }
 
     pub fn hash(key: Ref) u32 {
-        return @as(u32, @truncate(key.hash64()));
+        return @truncate(key.hash64());
     }
 
     pub inline fn asU64(key: Ref) u64 {
-        return @as(u64, @bitCast(key));
+        return @bitCast(key);
     }
 
     pub inline fn hash64(key: Ref) u64 {
@@ -192,9 +192,7 @@ pub const Ref = packed struct(u64) {
         return ref.asU64() == other.asU64();
     }
 
-    pub inline fn isNull(self: Ref) bool {
-        return self.tag == .invalid;
-    }
+    pub const isNull = isEmpty; // deprecated
 
     pub fn jsonStringify(self: *const Ref, writer: anytype) !void {
         return try writer.write([2]u32{ self.sourceIndex(), self.innerIndex() });
diff --git a/src/async/posix_event_loop.zig b/src/async/posix_event_loop.zig
index aa42d1848c..491e09ce7b 100644
--- a/src/async/posix_event_loop.zig
+++ b/src/async/posix_event_loop.zig
@@ -537,7 +537,7 @@ pub const FilePoll = struct {
         }
     };
 
-    const HiveArray = bun.HiveArray(FilePoll, 128).Fallback;
+    const HiveArray = bun.HiveArray(FilePoll, if (bun.heap_breakdown.enabled) 0 else 128).Fallback;
 
     // We defer freeing FilePoll until the end of the next event loop iteration
     // This ensures that we don't free a FilePoll before the next callback is called
@@ -548,9 +548,9 @@ pub const FilePoll = struct {
 
         const log = Output.scoped(.FilePoll, false);
 
-        pub fn init(allocator: std.mem.Allocator) Store {
+        pub fn init() Store {
             return .{
-                .hive = HiveArray.init(allocator),
+                .hive = HiveArray.init(bun.typedAllocator(FilePoll)),
             };
         }
 
diff --git a/src/async/windows_event_loop.zig b/src/async/windows_event_loop.zig
index 24a2d7647c..0943d1959b 100644
--- a/src/async/windows_event_loop.zig
+++ b/src/async/windows_event_loop.zig
@@ -316,9 +316,9 @@ pub const FilePoll = struct {
 
         const log = Output.scoped(.FilePoll, false);
 
-        pub fn init(allocator: std.mem.Allocator) Store {
+        pub fn init() Store {
             return .{
-                .hive = HiveArray.init(allocator),
+                .hive = HiveArray.init(bun.typedAllocator(FilePoll)),
             };
         }
 
diff --git a/src/brotli.zig b/src/brotli.zig
index 082fedeb81..7dcfe457da 100644
--- a/src/brotli.zig
+++ b/src/brotli.zig
@@ -12,7 +12,7 @@ const mimalloc = bun.Mimalloc;
 const BrotliAllocator = struct {
     pub fn alloc(_: ?*anyopaque, len: usize) callconv(.C) *anyopaque {
         if (bun.heap_breakdown.enabled) {
-            const zone = bun.heap_breakdown.getZone(BrotliAllocator);
+            const zone = bun.heap_breakdown.getZone("brotli");
             return zone.malloc_zone_malloc(len) orelse bun.outOfMemory();
         }
 
@@ -21,7 +21,7 @@ const BrotliAllocator = struct {
 
     pub fn free(_: ?*anyopaque, data: ?*anyopaque) callconv(.C) void {
         if (bun.heap_breakdown.enabled) {
-            const zone = bun.heap_breakdown.getZone(BrotliAllocator);
+            const zone = bun.heap_breakdown.getZone("brotli");
             zone.malloc_zone_free(data);
             return;
         }
diff --git a/src/bun.js/ConsoleObject.zig b/src/bun.js/ConsoleObject.zig
index 04553fa537..23f20dd25a 100644
--- a/src/bun.js/ConsoleObject.zig
+++ b/src/bun.js/ConsoleObject.zig
@@ -869,7 +869,6 @@ pub const Formatter = struct {
 
     pub const ZigFormatter = struct {
         formatter: *ConsoleObject.Formatter,
-        global: *JSGlobalObject,
         value: JSValue,
 
         pub const WriteError = error{UhOh};
@@ -878,9 +877,8 @@ pub const Formatter = struct {
             defer {
                 self.formatter.remaining_values = &[_]JSValue{};
             }
-            self.formatter.globalThis = self.global;
             self.formatter.format(
-                Tag.get(self.value, self.global),
+                Tag.get(self.value, self.formatter.globalThis),
                 @TypeOf(writer),
                 writer,
                 self.value,
@@ -1283,6 +1281,7 @@ pub const Formatter = struct {
                             writer.writeAll(end);
                             // then skip the second % so we dont hit it again
                             slice = slice[@min(slice.len, i + 1)..];
+                            len = @truncate(slice.len);
                             i = 0;
                             continue;
                         },
@@ -1295,7 +1294,7 @@ pub const Formatter = struct {
                     slice = slice[@min(slice.len, i + 1)..];
                     i = 0;
                     hit_percent = true;
-                    len = @as(u32, @truncate(slice.len));
+                    len = @truncate(slice.len);
                     const next_value = this.remaining_values[0];
                     this.remaining_values = this.remaining_values[1..];
 
@@ -2310,7 +2309,7 @@ pub const Formatter = struct {
                             .Object,
                             Writer,
                             writer_,
-                            toJSONFunction.callWithThis(this.globalThis, value, &.{}),
+                            toJSONFunction.call(this.globalThis, value, &.{}),
                             .Object,
                             enable_ansi_colors,
                         );
@@ -2325,7 +2324,7 @@ pub const Formatter = struct {
                             .Object,
                             Writer,
                             writer_,
-                            toJSONFunction.callWithThis(this.globalThis, value, &.{}),
+                            toJSONFunction.call(this.globalThis, value, &.{}),
                             .Object,
                             enable_ansi_colors,
                         );
@@ -2574,7 +2573,7 @@ pub const Formatter = struct {
             },
             .toJSON => {
                 if (value.get(this.globalThis, "toJSON")) |func| {
-                    const result = func.callWithThis(this.globalThis, value, &.{});
+                    const result = func.call(this.globalThis, value, &.{});
                     if (result.toError() == null) {
                         const prev_quote_keys = this.quote_keys;
                         this.quote_keys = true;
diff --git a/src/bun.js/RuntimeTranspilerCache.zig b/src/bun.js/RuntimeTranspilerCache.zig
index 9b57d24fb6..551659c6e0 100644
--- a/src/bun.js/RuntimeTranspilerCache.zig
+++ b/src/bun.js/RuntimeTranspilerCache.zig
@@ -201,7 +201,7 @@ pub const RuntimeTranspilerCache = struct {
 
                     try metadata.encode(metadata_stream.writer());
 
-                    if (comptime bun.Environment.allow_assert) {
+                    if (comptime bun.Environment.isDebug) {
                         var metadata_stream2 = std.io.fixedBufferStream(metadata_buf[0..Metadata.size]);
                         var metadata2 = Metadata{};
                         metadata2.decode(metadata_stream2.reader()) catch |err| bun.Output.panic("Metadata did not roundtrip encode -> decode  successfully: {s}", .{@errorName(err)});
diff --git a/src/bun.js/WebKit b/src/bun.js/WebKit
index 615e8585f9..49907bff87 160000
--- a/src/bun.js/WebKit
+++ b/src/bun.js/WebKit
@@ -1 +1 @@
-Subproject commit 615e8585f96aa718b0f5158210259b83fe8440ea
+Subproject commit 49907bff8781719bc2ded068b0c934f6d0074d1e
diff --git a/src/bun.js/api/BunObject.zig b/src/bun.js/api/BunObject.zig
index 78ca8c367f..7b0b70def7 100644
--- a/src/bun.js/api/BunObject.zig
+++ b/src/bun.js/api/BunObject.zig
@@ -12,14 +12,14 @@ pub const BunObject = struct {
     pub const allocUnsafe = toJSCallback(Bun.allocUnsafe);
     pub const build = toJSCallback(Bun.JSBundler.buildFn);
     pub const connect = toJSCallback(JSC.wrapStaticMethod(JSC.API.Listener, "connect", false));
-    pub const deflateSync = toJSCallback(JSC.wrapStaticMethod(JSZlib, "deflateSync", true));
+    pub const deflateSync = toJSCallback(JSZlib.deflateSync);
     pub const file = toJSCallback(WebCore.Blob.constructBunFile);
     pub const gc = toJSCallback(Bun.runGC);
     pub const generateHeapSnapshot = toJSCallback(Bun.generateHeapSnapshot);
-    pub const gunzipSync = toJSCallback(JSC.wrapStaticMethod(JSZlib, "gunzipSync", true));
-    pub const gzipSync = toJSCallback(JSC.wrapStaticMethod(JSZlib, "gzipSync", true));
+    pub const gunzipSync = toJSCallback(JSZlib.gunzipSync);
+    pub const gzipSync = toJSCallback(JSZlib.gzipSync);
     pub const indexOfLine = toJSCallback(Bun.indexOfLine);
-    pub const inflateSync = toJSCallback(JSC.wrapStaticMethod(JSZlib, "inflateSync", true));
+    pub const inflateSync = toJSCallback(JSZlib.inflateSync);
     pub const jest = toJSCallback(@import("../test/jest.zig").Jest.call);
     pub const listen = toJSCallback(JSC.wrapStaticMethod(JSC.API.Listener, "listen", false));
     pub const udpSocket = toJSCallback(JSC.wrapStaticMethod(JSC.API.UDPSocket, "udpSocket", false));
@@ -327,7 +327,7 @@ pub fn shell(
     var arguments = JSC.Node.ArgumentsSlice.init(globalThis.bunVM(), arguments_.slice());
     const string_args = arguments.nextEat() orelse {
         globalThis.throw("shell: expected 2 arguments, got 0", .{});
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     };
 
     const template_args_js = arguments.nextEat() orelse {
@@ -459,7 +459,7 @@ pub fn braces(
 
     const brace_str_js = arguments.nextEat() orelse {
         globalThis.throw("braces: expected at least 1 argument, got 0", .{});
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     };
     const brace_str = brace_str_js.toBunString(globalThis);
     defer brace_str.deref();
@@ -566,7 +566,7 @@ pub fn which(
     defer arguments.deinit();
     const path_arg = arguments.nextEat() orelse {
         globalThis.throw("which: expected 1 argument, got 0", .{});
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     };
 
     var path_str: ZigString.Slice = ZigString.Slice.empty;
@@ -589,7 +589,7 @@ pub fn which(
 
     if (bin_str.len >= bun.MAX_PATH_BYTES) {
         globalThis.throw("bin path is too long", .{});
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     if (bin_str.len == 0) {
@@ -980,7 +980,7 @@ pub fn openInEditor(
         return .zero;
     };
 
-    return JSC.JSValue.jsUndefined();
+    return .undefined;
 }
 
 pub fn getPublicPath(to: string, origin: URL, comptime Writer: type, writer: Writer) void {
@@ -2178,6 +2178,8 @@ pub const Crypto = struct {
             ref: Async.KeepAlive = .{},
             task: JSC.WorkPoolTask = .{ .callback = &run },
 
+            pub usingnamespace bun.New(@This());
+
             pub const Result = struct {
                 value: Value,
                 ref: Async.KeepAlive = .{},
@@ -2186,6 +2188,8 @@ pub const Crypto = struct {
                 promise: JSC.JSPromise.Strong,
                 global: *JSC.JSGlobalObject,
 
+                pub usingnamespace bun.New(@This());
+
                 pub const Value = union(enum) {
                     err: PasswordObject.HashError,
                     hash: []const u8,
@@ -2201,18 +2205,19 @@ pub const Crypto = struct {
 
                 pub fn runFromJS(this: *Result) void {
                     var promise = this.promise;
+                    defer promise.deinit();
                     this.promise = .{};
                     this.ref.unref(this.global.bunVM());
                     const global = this.global;
                     switch (this.value) {
                         .err => {
                             const error_instance = this.value.toErrorInstance(global);
-                            bun.default_allocator.destroy(this);
+                            this.destroy();
                             promise.reject(global, error_instance);
                         },
                         .hash => |value| {
                             const js_string = JSC.ZigString.init(value).toJS(global);
-                            bun.default_allocator.destroy(this);
+                            this.destroy();
                             promise.resolve(global, js_string);
                         },
                     }
@@ -2220,10 +2225,9 @@ pub const Crypto = struct {
             };
 
             pub fn deinit(this: *HashJob) void {
-                this.ref = .{};
                 this.promise.strong.deinit();
                 bun.default_allocator.free(this.password);
-                bun.default_allocator.destroy(this);
+                this.destroy();
             }
 
             pub fn getValue(password: []const u8, algorithm: PasswordObject.Algorithm.Value) Result.Value {
@@ -2236,14 +2240,14 @@ pub const Crypto = struct {
             pub fn run(task: *bun.ThreadPool.Task) void {
                 var this: *HashJob = @fieldParentPtr("task", task);
 
-                var result = bun.default_allocator.create(Result) catch bun.outOfMemory();
-                result.* = Result{
+                var result = Result.new(.{
                     .value = getValue(this.password, this.algorithm),
-                    .task = JSC.AnyTask.New(Result, Result.runFromJS).init(result),
+                    .task = undefined,
                     .promise = this.promise,
                     .global = this.global,
                     .ref = this.ref,
-                };
+                });
+                result.task = JSC.AnyTask.New(Result, Result.runFromJS).init(result);
                 this.ref = .{};
                 this.promise.strong = .{};
                 this.event_loop.enqueueTaskConcurrent(JSC.ConcurrentTask.createFrom(&result.task));
@@ -2274,17 +2278,15 @@ pub const Crypto = struct {
                 unreachable;
             }
 
-            var job = bun.default_allocator.create(HashJob) catch bun.outOfMemory();
-            var promise = JSC.JSPromise.Strong.init(globalObject);
+            const promise = JSC.JSPromise.Strong.init(globalObject);
 
-            job.* = HashJob{
+            var job = HashJob.new(.{
                 .algorithm = algorithm,
                 .password = password,
                 .promise = promise,
                 .event_loop = globalObject.bunVM().eventLoop(),
                 .global = globalObject,
-            };
-
+            });
             job.ref.ref(globalObject.bunVM());
             JSC.WorkPool.schedule(&job.task);
 
@@ -2316,18 +2318,16 @@ pub const Crypto = struct {
                 unreachable;
             }
 
-            var job = bun.default_allocator.create(VerifyJob) catch bun.outOfMemory();
             var promise = JSC.JSPromise.Strong.init(globalObject);
 
-            job.* = VerifyJob{
+            const job = VerifyJob.new(.{
                 .algorithm = algorithm,
                 .password = password,
                 .prev_hash = prev_hash,
                 .promise = promise,
                 .event_loop = globalObject.bunVM().eventLoop(),
                 .global = globalObject,
-            };
-
+            });
             job.ref.ref(globalObject.bunVM());
             JSC.WorkPool.schedule(&job.task);
 
@@ -2414,6 +2414,8 @@ pub const Crypto = struct {
             ref: Async.KeepAlive = .{},
             task: JSC.WorkPoolTask = .{ .callback = &run },
 
+            pub usingnamespace bun.New(@This());
+
             pub const Result = struct {
                 value: Value,
                 ref: Async.KeepAlive = .{},
@@ -2422,6 +2424,8 @@ pub const Crypto = struct {
                 promise: JSC.JSPromise.Strong,
                 global: *JSC.JSGlobalObject,
 
+                pub usingnamespace bun.New(@This());
+
                 pub const Value = union(enum) {
                     err: PasswordObject.HashError,
                     pass: bool,
@@ -2437,17 +2441,18 @@ pub const Crypto = struct {
 
                 pub fn runFromJS(this: *Result) void {
                     var promise = this.promise;
+                    defer promise.deinit();
                     this.promise = .{};
                     this.ref.unref(this.global.bunVM());
                     const global = this.global;
                     switch (this.value) {
                         .err => {
                             const error_instance = this.value.toErrorInstance(global);
-                            bun.default_allocator.destroy(this);
+                            this.destroy();
                             promise.reject(global, error_instance);
                         },
                         .pass => |pass| {
-                            bun.default_allocator.destroy(this);
+                            this.destroy();
                             promise.resolve(global, JSC.JSValue.jsBoolean(pass));
                         },
                     }
@@ -2455,11 +2460,10 @@ pub const Crypto = struct {
             };
 
             pub fn deinit(this: *VerifyJob) void {
-                this.ref = .{};
                 this.promise.strong.deinit();
                 bun.default_allocator.free(this.password);
                 bun.default_allocator.free(this.prev_hash);
-                bun.default_allocator.destroy(this);
+                this.destroy();
             }
 
             pub fn getValue(password: []const u8, prev_hash: []const u8, algorithm: ?PasswordObject.Algorithm) Result.Value {
@@ -2472,14 +2476,14 @@ pub const Crypto = struct {
             pub fn run(task: *bun.ThreadPool.Task) void {
                 var this: *VerifyJob = @fieldParentPtr("task", task);
 
-                var result = bun.default_allocator.create(Result) catch bun.outOfMemory();
-                result.* = Result{
+                var result = Result.new(.{
                     .value = getValue(this.password, this.prev_hash, this.algorithm),
-                    .task = JSC.AnyTask.New(Result, Result.runFromJS).init(result),
+                    .task = undefined,
                     .promise = this.promise,
                     .global = this.global,
                     .ref = this.ref,
-                };
+                });
+                result.task = JSC.AnyTask.New(Result, Result.runFromJS).init(result);
                 this.ref = .{};
                 this.promise.strong = .{};
                 this.event_loop.enqueueTaskConcurrent(JSC.ConcurrentTask.createFrom(&result.task));
@@ -2772,6 +2776,10 @@ pub const Crypto = struct {
             const thisValue = callframe.this();
             const arguments = callframe.arguments(2);
             const input = arguments.ptr[0];
+            if (input.isEmptyOrUndefinedOrNull()) {
+                globalThis.throwInvalidArguments("expected blob, string or buffer", .{});
+                return JSC.JSValue.zero;
+            }
             const encoding = arguments.ptr[1];
             const buffer = JSC.Node.BlobOrStringOrBuffer.fromJSWithEncodingValue(globalThis, globalThis.bunVM().allocator, input, encoding) orelse {
                 globalThis.throwInvalidArguments("expected blob, string or buffer", .{});
@@ -3437,7 +3445,7 @@ pub export fn Bun__escapeHTML16(globalObject: *JSC.JSGlobalObject, input_value:
     const input_slice = ptr[0..len];
     const escaped = strings.escapeHTMLForUTF16Input(globalObject.bunVM().allocator, input_slice) catch {
         globalObject.vm().throwError(globalObject, ZigString.init("Out of memory").toJS(globalObject));
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     };
 
     switch (escaped) {
@@ -3483,7 +3491,7 @@ pub export fn Bun__escapeHTML8(globalObject: *JSC.JSGlobalObject, input_value: J
 
     const escaped = strings.escapeHTMLForLatin1Input(allocator, input_slice) catch {
         globalObject.vm().throwError(globalObject, ZigString.init("Out of memory").toJS(globalObject));
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     };
 
     switch (escaped) {
@@ -4549,8 +4557,8 @@ pub const FFIObject = struct {
 
 fn stringWidth(globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) JSC.JSValue {
     const arguments = callframe.arguments(2).slice();
-    const value = if (arguments.len > 0) arguments[0] else JSC.JSValue.jsUndefined();
-    const options_object = if (arguments.len > 1) arguments[1] else JSC.JSValue.jsUndefined();
+    const value = if (arguments.len > 0) arguments[0] else .undefined;
+    const options_object = if (arguments.len > 1) arguments[1] else .undefined;
 
     if (!value.isString()) {
         return JSC.jsNumber(0);
@@ -4643,27 +4651,220 @@ pub const JSZlib = struct {
         reader.list.deinit(reader.allocator);
         reader.deinit();
     }
-
+    export fn global_deallocator(_: ?*anyopaque, ctx: ?*anyopaque) void {
+        comptime assert(bun.use_mimalloc);
+        bun.Mimalloc.mi_free(ctx);
+    }
     export fn compressor_deallocator(_: ?*anyopaque, ctx: ?*anyopaque) void {
         var compressor: *zlib.ZlibCompressorArrayList = bun.cast(*zlib.ZlibCompressorArrayList, ctx.?);
         compressor.list.deinit(compressor.allocator);
         compressor.deinit();
     }
 
+    const Library = enum {
+        zlib,
+        libdeflate,
+
+        pub const map = bun.ComptimeEnumMap(Library);
+    };
+
+    // This has to be `inline` due to the callframe.
+    inline fn getOptions(globalThis: *JSGlobalObject, callframe: *JSC.CallFrame) ?struct { JSC.Node.StringOrBuffer, ?JSValue } {
+        const arguments = callframe.arguments(2).slice();
+        const buffer_value = if (arguments.len > 0) arguments[0] else .undefined;
+        const options_val: ?JSValue =
+            if (arguments.len > 1 and arguments[1].isObject())
+            arguments[1]
+        else if (arguments.len > 1 and !arguments[1].isUndefined()) {
+            globalThis.throwInvalidArguments("Expected options to be an object", .{});
+            return null;
+        } else null;
+
+        if (JSC.Node.StringOrBuffer.fromJS(globalThis, bun.default_allocator, buffer_value)) |buffer| {
+            return .{ buffer, options_val };
+        }
+
+        globalThis.throwInvalidArguments("Expected buffer to be a string or buffer", .{});
+        return null;
+    }
+
     pub fn gzipSync(
         globalThis: *JSGlobalObject,
-        buffer: JSC.Node.StringOrBuffer,
-        options_val_: ?JSValue,
+        callframe: *JSC.CallFrame,
     ) JSValue {
-        return gzipOrDeflateSync(globalThis, buffer, options_val_, true);
+        const buffer, const options_val = getOptions(globalThis, callframe) orelse return .zero;
+        defer buffer.deinit();
+        return gzipOrDeflateSync(globalThis, buffer, options_val, true);
+    }
+
+    pub fn inflateSync(
+        globalThis: *JSGlobalObject,
+        callframe: *JSC.CallFrame,
+    ) JSValue {
+        const buffer, const options_val = getOptions(globalThis, callframe) orelse return .zero;
+        defer buffer.deinit();
+        return gunzipOrInflateSync(globalThis, buffer, options_val, false);
     }
 
     pub fn deflateSync(
+        globalThis: *JSGlobalObject,
+        callframe: *JSC.CallFrame,
+    ) JSValue {
+        const buffer, const options_val = getOptions(globalThis, callframe) orelse return .zero;
+        defer buffer.deinit();
+        return gzipOrDeflateSync(globalThis, buffer, options_val, false);
+    }
+
+    pub fn gunzipSync(
+        globalThis: *JSGlobalObject,
+        callframe: *JSC.CallFrame,
+    ) JSValue {
+        const buffer, const options_val = getOptions(globalThis, callframe) orelse return .zero;
+        defer buffer.deinit();
+        return gunzipOrInflateSync(globalThis, buffer, options_val, true);
+    }
+
+    pub fn gunzipOrInflateSync(
         globalThis: *JSGlobalObject,
         buffer: JSC.Node.StringOrBuffer,
         options_val_: ?JSValue,
+        is_gzip: bool,
     ) JSValue {
-        return gzipOrDeflateSync(globalThis, buffer, options_val_, false);
+        var opts = zlib.Options{
+            .gzip = is_gzip,
+            .windowBits = if (is_gzip) 31 else -15,
+        };
+
+        var library: Library = .zlib;
+        if (options_val_) |options_val| {
+            if (options_val.get(globalThis, "windowBits")) |window| {
+                opts.windowBits = window.coerce(i32, globalThis);
+                library = .zlib;
+            }
+
+            if (options_val.get(globalThis, "level")) |level| {
+                opts.level = level.coerce(i32, globalThis);
+            }
+
+            if (options_val.get(globalThis, "memLevel")) |memLevel| {
+                opts.memLevel = memLevel.coerce(i32, globalThis);
+                library = .zlib;
+            }
+
+            if (options_val.get(globalThis, "strategy")) |strategy| {
+                opts.strategy = strategy.coerce(i32, globalThis);
+                library = .zlib;
+            }
+
+            if (options_val.getTruthy(globalThis, "library")) |library_value| {
+                if (!library_value.isString()) {
+                    globalThis.throwInvalidArguments("Expected library to be a string", .{});
+                    return .zero;
+                }
+
+                library = Library.map.fromJS(globalThis, library_value) orelse {
+                    globalThis.throwInvalidArguments("Expected library to be one of 'zlib' or 'libdeflate'", .{});
+                    return .zero;
+                };
+            }
+        }
+
+        if (globalThis.hasException()) return .zero;
+
+        const compressed = buffer.slice();
+        const allocator = JSC.VirtualMachine.get().allocator;
+
+        var list = brk: {
+            if (is_gzip and compressed.len > 64) {
+                //   0   1   2   3   4   5   6   7
+                //  +---+---+---+---+---+---+---+---+
+                //  |     CRC32     |     ISIZE     |
+                //  +---+---+---+---+---+---+---+---+
+                const estimated_size: u32 = @bitCast(compressed[compressed.len - 4 ..][0..4].*);
+                // If it's > 256 MB, let's rely on dynamic allocation to minimize the risk of OOM.
+                if (estimated_size > 0 and estimated_size < 256 * 1024 * 1024) {
+                    break :brk std.ArrayListUnmanaged(u8).initCapacity(allocator, @max(estimated_size, 64)) catch {
+                        globalThis.throwOutOfMemory();
+                        return .zero;
+                    };
+                }
+            }
+
+            break :brk std.ArrayListUnmanaged(u8).initCapacity(allocator, if (compressed.len > 512) compressed.len else 32) catch {
+                globalThis.throwOutOfMemory();
+                return .zero;
+            };
+        };
+
+        switch (library) {
+            .zlib => {
+                var reader = zlib.ZlibReaderArrayList.initWithOptions(compressed, &list, allocator, .{
+                    .windowBits = opts.windowBits,
+                    .level = opts.level,
+                }) catch |err| {
+                    list.deinit(allocator);
+                    if (err == error.InvalidArgument) {
+                        globalThis.throw("Zlib error: Invalid argument", .{});
+                        return .zero;
+                    }
+
+                    globalThis.throwError(err, "Zlib error");
+                    return .zero;
+                };
+
+                reader.readAll() catch {
+                    defer reader.deinit();
+                    globalThis.throwValue(ZigString.init(reader.errorMessage() orelse "Zlib returned an error").toErrorInstance(globalThis));
+                    return .zero;
+                };
+                reader.list = .{ .items = reader.list.items };
+                reader.list.capacity = reader.list.items.len;
+                reader.list_ptr = &reader.list;
+
+                var array_buffer = JSC.ArrayBuffer.fromBytes(reader.list.items, .Uint8Array);
+                return array_buffer.toJSWithContext(globalThis, reader, reader_deallocator, null);
+            },
+            .libdeflate => {
+                var decompressor: *bun.libdeflate.Decompressor = bun.libdeflate.Decompressor.alloc() orelse {
+                    list.deinit(allocator);
+                    globalThis.throwOutOfMemory();
+                    return .zero;
+                };
+                defer decompressor.deinit();
+                while (true) {
+                    const result = decompressor.decompress(compressed, list.allocatedSlice(), if (is_gzip) .gzip else .deflate);
+
+                    list.items.len = result.written;
+
+                    if (result.status == .insufficient_space) {
+                        if (list.capacity > 1024 * 1024 * 1024) {
+                            list.deinit(allocator);
+                            globalThis.throwOutOfMemory();
+                            return .zero;
+                        }
+
+                        list.ensureTotalCapacity(allocator, list.capacity * 2) catch {
+                            list.deinit(allocator);
+                            globalThis.throwOutOfMemory();
+                            return .zero;
+                        };
+                        continue;
+                    }
+
+                    if (result.status == .success) {
+                        list.items.len = result.written;
+                        break;
+                    }
+
+                    list.deinit(allocator);
+                    globalThis.throw("libdeflate returned an error: {s}", .{@tagName(result.status)});
+                    return .zero;
+                }
+
+                var array_buffer = JSC.ArrayBuffer.fromBytes(list.items, .Uint8Array);
+                return array_buffer.toJSWithContext(globalThis, list.items.ptr, global_deallocator, null);
+            },
+        }
     }
 
     pub fn gzipOrDeflateSync(
@@ -4672,107 +4873,112 @@ pub const JSZlib = struct {
         options_val_: ?JSValue,
         is_gzip: bool,
     ) JSValue {
-        var opts = zlib.Options{ .gzip = is_gzip };
+        var level: ?i32 = null;
+        var library: Library = .zlib;
+        var windowBits: i32 = 0;
+
         if (options_val_) |options_val| {
-            if (options_val.isObject()) {
-                if (options_val.get(globalThis, "windowBits")) |window| {
-                    opts.windowBits = window.coerce(i32, globalThis);
+            if (options_val.get(globalThis, "windowBits")) |window| {
+                windowBits = window.coerce(i32, globalThis);
+                library = .zlib;
+            }
+
+            if (options_val.getTruthy(globalThis, "library")) |library_value| {
+                if (!library_value.isString()) {
+                    globalThis.throwInvalidArguments("Expected library to be a string", .{});
+                    return .zero;
                 }
 
-                if (options_val.get(globalThis, "level")) |level| {
-                    opts.level = level.coerce(i32, globalThis);
-                }
+                library = Library.map.fromJS(globalThis, library_value) orelse {
+                    globalThis.throwInvalidArguments("Expected library to be one of 'zlib' or 'libdeflate'", .{});
+                    return .zero;
+                };
+            }
 
-                if (options_val.get(globalThis, "memLevel")) |memLevel| {
-                    opts.memLevel = memLevel.coerce(i32, globalThis);
-                }
-
-                if (options_val.get(globalThis, "strategy")) |strategy| {
-                    opts.strategy = strategy.coerce(i32, globalThis);
-                }
+            if (options_val.get(globalThis, "level")) |level_value| {
+                level = level_value.coerce(i32, globalThis);
+                if (globalThis.hasException()) return .zero;
             }
         }
 
+        if (globalThis.hasException()) return .zero;
+
         const compressed = buffer.slice();
-        const allocator = JSC.VirtualMachine.get().allocator;
-        var list = std.ArrayListUnmanaged(u8).initCapacity(allocator, if (compressed.len > 512) compressed.len else 32) catch unreachable;
-        var reader = zlib.ZlibCompressorArrayList.init(compressed, &list, allocator, opts) catch |err| {
-            if (err == error.InvalidArgument) {
-                return JSC.toInvalidArguments("Invalid buffer", .{}, globalThis);
-            }
+        const allocator = bun.default_allocator;
 
-            return JSC.toInvalidArguments("Unexpected", .{}, globalThis);
-        };
+        switch (library) {
+            .zlib => {
+                var list = std.ArrayListUnmanaged(u8).initCapacity(
+                    allocator,
+                    if (compressed.len > 512) compressed.len else 32,
+                ) catch {
+                    globalThis.throwOutOfMemory();
+                    return .zero;
+                };
 
-        reader.readAll() catch {
-            defer reader.deinit();
-            globalThis.throwValue(ZigString.init(reader.errorMessage() orelse "Zlib returned an error").toErrorInstance(globalThis));
-            return .zero;
-        };
-        reader.list = .{ .items = reader.list.toOwnedSlice(allocator) catch @panic("TODO") };
-        reader.list.capacity = reader.list.items.len;
-        reader.list_ptr = &reader.list;
+                var reader = zlib.ZlibCompressorArrayList.init(compressed, &list, allocator, .{
+                    .windowBits = 15,
+                    .gzip = is_gzip,
+                    .level = level orelse 6,
+                }) catch |err| {
+                    defer list.deinit(allocator);
+                    if (err == error.InvalidArgument) {
+                        globalThis.throw("Zlib error: Invalid argument", .{});
+                        return .zero;
+                    }
 
-        var array_buffer = JSC.ArrayBuffer.fromBytes(reader.list.items, .Uint8Array);
-        return array_buffer.toJSWithContext(globalThis, reader, reader_deallocator, null);
-    }
+                    globalThis.throwError(err, "Zlib error");
+                    return .zero;
+                };
 
-    pub fn inflateSync(
-        globalThis: *JSGlobalObject,
-        buffer: JSC.Node.StringOrBuffer,
-    ) JSValue {
-        const compressed = buffer.slice();
-        const allocator = JSC.VirtualMachine.get().allocator;
-        var list = std.ArrayListUnmanaged(u8).initCapacity(allocator, if (compressed.len > 512) compressed.len else 32) catch unreachable;
-        var reader = zlib.ZlibReaderArrayList.initWithOptions(compressed, &list, allocator, .{
-            .windowBits = -15,
-        }) catch |err| {
-            if (err == error.InvalidArgument) {
-                return JSC.toInvalidArguments("Invalid buffer", .{}, globalThis);
-            }
+                reader.readAll() catch {
+                    defer reader.deinit();
+                    globalThis.throwValue(ZigString.init(reader.errorMessage() orelse "Zlib returned an error").toErrorInstance(globalThis));
+                    return .zero;
+                };
+                reader.list = .{ .items = reader.list.toOwnedSlice(allocator) catch @panic("TODO") };
+                reader.list.capacity = reader.list.items.len;
+                reader.list_ptr = &reader.list;
 
-            return JSC.toInvalidArguments("Unexpected", .{}, globalThis);
-        };
+                var array_buffer = JSC.ArrayBuffer.fromBytes(reader.list.items, .Uint8Array);
+                return array_buffer.toJSWithContext(globalThis, reader, reader_deallocator, null);
+            },
+            .libdeflate => {
+                var compressor: *bun.libdeflate.Compressor = bun.libdeflate.Compressor.alloc(level orelse 6) orelse {
+                    globalThis.throwOutOfMemory();
+                    return .zero;
+                };
+                const encoding: bun.libdeflate.Encoding = if (is_gzip) .gzip else .deflate;
+                defer compressor.deinit();
 
-        reader.readAll() catch {
-            defer reader.deinit();
-            globalThis.throwValue(ZigString.init(reader.errorMessage() orelse "Zlib returned an error").toErrorInstance(globalThis));
-            return .zero;
-        };
-        reader.list = .{ .items = reader.list.toOwnedSlice(allocator) catch @panic("TODO") };
-        reader.list.capacity = reader.list.items.len;
-        reader.list_ptr = &reader.list;
+                var list = std.ArrayListUnmanaged(u8).initCapacity(
+                    allocator,
+                    // This allocation size is unfortunate, but it's not clear how to avoid it with libdeflate.
+                    compressor.maxBytesNeeded(compressed, encoding),
+                ) catch {
+                    globalThis.throwOutOfMemory();
+                    return .zero;
+                };
 
-        var array_buffer = JSC.ArrayBuffer.fromBytes(reader.list.items, .Uint8Array);
-        return array_buffer.toJSWithContext(globalThis, reader, reader_deallocator, null);
-    }
+                while (true) {
+                    const result = compressor.compress(compressed, list.allocatedSlice(), encoding);
 
-    pub fn gunzipSync(
-        globalThis: *JSGlobalObject,
-        buffer: JSC.Node.StringOrBuffer,
-    ) JSValue {
-        const compressed = buffer.slice();
-        const allocator = JSC.VirtualMachine.get().allocator;
-        var list = std.ArrayListUnmanaged(u8).initCapacity(allocator, if (compressed.len > 512) compressed.len else 32) catch unreachable;
-        var reader = zlib.ZlibReaderArrayList.init(compressed, &list, allocator) catch |err| {
-            if (err == error.InvalidArgument) {
-                return JSC.toInvalidArguments("Invalid buffer", .{}, globalThis);
-            }
+                    list.items.len = result.written;
 
-            return JSC.toInvalidArguments("Unexpected", .{}, globalThis);
-        };
+                    if (result.status == .success) {
+                        list.items.len = result.written;
+                        break;
+                    }
 
-        reader.readAll() catch {
-            defer reader.deinit();
-            globalThis.throwValue(ZigString.init(reader.errorMessage() orelse "Zlib returned an error").toErrorInstance(globalThis));
-            return .zero;
-        };
-        reader.list = .{ .items = reader.list.toOwnedSlice(allocator) catch @panic("TODO") };
-        reader.list.capacity = reader.list.items.len;
-        reader.list_ptr = &reader.list;
+                    list.deinit(allocator);
+                    globalThis.throw("libdeflate error: {s}", .{@tagName(result.status)});
+                    return .zero;
+                }
 
-        var array_buffer = JSC.ArrayBuffer.fromBytes(reader.list.items, .Uint8Array);
-        return array_buffer.toJSWithContext(globalThis, reader, reader_deallocator, null);
+                var array_buffer = JSC.ArrayBuffer.fromBytes(list.items, .Uint8Array);
+                return array_buffer.toJSWithContext(globalThis, list.items.ptr, global_deallocator, null);
+            },
+        }
     }
 };
 
diff --git a/src/bun.js/api/JSBundler.zig b/src/bun.js/api/JSBundler.zig
index 9a9ad0c11f..1b1a2a9e65 100644
--- a/src/bun.js/api/JSBundler.zig
+++ b/src/bun.js/api/JSBundler.zig
@@ -548,12 +548,12 @@ pub const JSBundler = struct {
     ) JSC.JSValue {
         if (arguments.len == 0 or !arguments[0].isObject()) {
             globalThis.throwInvalidArguments("Expected a config object to be passed to Bun.build", .{});
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         var plugins: ?*Plugin = null;
         const config = Config.fromJS(globalThis, arguments[0], &plugins, globalThis.allocator()) catch {
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         };
 
         return bun.BundleV2.generateFromJavaScript(
@@ -563,7 +563,7 @@ pub const JSBundler = struct {
             globalThis.bunVM().eventLoop(),
             bun.default_allocator,
         ) catch {
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         };
     }
 
diff --git a/src/bun.js/api/JSTranspiler.zig b/src/bun.js/api/JSTranspiler.zig
index 966372a0d7..56390b6eb9 100644
--- a/src/bun.js/api/JSTranspiler.zig
+++ b/src/bun.js/api/JSTranspiler.zig
@@ -247,6 +247,9 @@ pub const TransformTask = struct {
         this.log.deinit();
         this.input_code.deinitAndUnprotect();
         this.output_code.deref();
+        if (this.tsconfig) |tsconfig| {
+            tsconfig.destroy();
+        }
 
         this.destroy();
     }
diff --git a/src/bun.js/api/bun/h2_frame_parser.zig b/src/bun.js/api/bun/h2_frame_parser.zig
index a98142aa92..7aff206554 100644
--- a/src/bun.js/api/bun/h2_frame_parser.zig
+++ b/src/bun.js/api/bun/h2_frame_parser.zig
@@ -716,7 +716,7 @@ pub const H2FrameParser = struct {
 
         stream.state = .CLOSED;
         if (rstCode == .NO_ERROR) {
-            this.dispatchWithExtra(.onStreamEnd, JSC.JSValue.jsNumber(stream.id), JSC.JSValue.jsUndefined());
+            this.dispatchWithExtra(.onStreamEnd, JSC.JSValue.jsNumber(stream.id), .undefined);
         } else {
             this.dispatchWithExtra(.onStreamError, JSC.JSValue.jsNumber(stream.id), JSC.JSValue.jsNumber(@intFromEnum(rstCode)));
         }
@@ -1428,7 +1428,7 @@ pub const H2FrameParser = struct {
             return .zero;
         };
 
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn loadSettingsFromJSValue(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, options: JSC.JSValue) bool {
@@ -1544,7 +1544,7 @@ pub const H2FrameParser = struct {
 
         if (this.loadSettingsFromJSValue(globalObject, options)) {
             this.setSettings(this.localSettings);
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         return .zero;
@@ -1608,14 +1608,14 @@ pub const H2FrameParser = struct {
                     if (opaque_data_arg.asArrayBuffer(globalObject)) |array_buffer| {
                         const slice = array_buffer.byteSlice();
                         this.sendGoAway(0, @enumFromInt(errorCode), slice, lastStreamID);
-                        return JSC.JSValue.jsUndefined();
+                        return .undefined;
                     }
                 }
             }
         }
 
         this.sendGoAway(0, @enumFromInt(errorCode), "", lastStreamID);
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn ping(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) JSValue {
@@ -1629,7 +1629,7 @@ pub const H2FrameParser = struct {
         if (args_list.ptr[0].asArrayBuffer(globalObject)) |array_buffer| {
             const slice = array_buffer.slice();
             this.sendPing(false, slice);
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         globalObject.throw("Expected payload to be a Buffer", .{});
@@ -2038,7 +2038,7 @@ pub const H2FrameParser = struct {
                         stream.state = .CLOSED;
                         stream.rstCode = @intFromEnum(ErrorCode.COMPRESSION_ERROR);
                         this.dispatchWithExtra(.onStreamError, JSC.JSValue.jsNumber(stream_id), JSC.JSValue.jsNumber(stream.rstCode));
-                        return JSC.JSValue.jsUndefined();
+                        return .undefined;
                     };
                 }
             } else {
@@ -2058,7 +2058,7 @@ pub const H2FrameParser = struct {
                     stream.state = .CLOSED;
                     stream.rstCode = @intFromEnum(ErrorCode.COMPRESSION_ERROR);
                     this.dispatchWithExtra(.onStreamError, JSC.JSValue.jsNumber(stream_id), JSC.JSValue.jsNumber(stream.rstCode));
-                    return JSC.JSValue.jsUndefined();
+                    return .undefined;
                 };
             }
         }
@@ -2075,7 +2075,7 @@ pub const H2FrameParser = struct {
         frame.write(@TypeOf(writer), writer);
         _ = writer.write(buffer[0..encoded_size]) catch 0;
 
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
     pub fn writeStream(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) JSValue {
         JSC.markBinding(@src());
@@ -2250,7 +2250,7 @@ pub const H2FrameParser = struct {
                             stream.state = .CLOSED;
                             stream.rstCode = @intFromEnum(ErrorCode.COMPRESSION_ERROR);
                             this.dispatchWithExtra(.onStreamError, JSC.JSValue.jsNumber(stream_id), JSC.JSValue.jsNumber(stream.rstCode));
-                            return JSC.JSValue.jsUndefined();
+                            return .undefined;
                         };
                     }
                 } else {
@@ -2439,7 +2439,7 @@ pub const H2FrameParser = struct {
                 const result = this.readBytes(bytes);
                 bytes = bytes[result..];
             }
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
         globalObject.throw("Expected data to be a Buffer or ArrayBuffer", .{});
         return .zero;
diff --git a/src/bun.js/api/bun/socket.zig b/src/bun.js/api/bun/socket.zig
index d6642fcf17..d3ba902e8e 100644
--- a/src/bun.js/api/bun/socket.zig
+++ b/src/bun.js/api/bun/socket.zig
@@ -258,7 +258,7 @@ const Handlers = struct {
             return false;
         }
 
-        const result = onError.callWithThis(globalObject, thisValue, err);
+        const result = onError.call(globalObject, thisValue, err);
         if (result.isAnyError()) {
             _ = vm.uncaughtException(globalObject, result, false);
         }
@@ -874,11 +874,22 @@ pub const Listener = struct {
         return JSValue.jsUndefined();
     }
 
+    pub fn dispose(this: *Listener, _: *JSC.JSGlobalObject, _: *JSC.CallFrame) JSValue {
+        this.doStop(true);
+        return .undefined;
+    }
+
     pub fn stop(this: *Listener, _: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) JSValue {
         const arguments = callframe.arguments(1);
         log("close", .{});
 
-        var listener = this.listener orelse return JSValue.jsUndefined();
+        this.doStop(if (arguments.len > 0 and arguments.ptr[0].isBoolean()) arguments.ptr[0].toBoolean() else false);
+
+        return .undefined;
+    }
+
+    fn doStop(this: *Listener, force_close: bool) void {
+        var listener = this.listener orelse return;
         this.listener = null;
 
         this.poll_ref.unref(this.handlers.vm);
@@ -891,8 +902,7 @@ pub const Listener = struct {
             this.strong_self.clear();
             this.strong_data.clear();
         } else {
-            const forceClose = arguments.len > 0 and arguments.ptr[0].isBoolean() and arguments.ptr[0].toBoolean() and this.socket_context != null;
-            if (forceClose) {
+            if (force_close) {
                 // close all connections in this context and wait for them to close
                 this.socket_context.?.close(this.ssl);
             } else {
@@ -900,8 +910,6 @@ pub const Listener = struct {
                 listener.close(this.ssl);
             }
         }
-
-        return JSValue.jsUndefined();
     }
 
     pub fn finalize(this: *Listener) callconv(.C) void {
@@ -1275,7 +1283,7 @@ fn NewSocket(comptime ssl: bool) type {
 
             const globalObject = handlers.globalObject;
             const this_value = this.getThisValue(globalObject);
-            const result = callback.callWithThis(globalObject, this_value, &[_]JSValue{
+            const result = callback.call(globalObject, this_value, &[_]JSValue{
                 this_value,
             });
 
@@ -1305,7 +1313,7 @@ fn NewSocket(comptime ssl: bool) type {
 
             const globalObject = handlers.globalObject;
             const this_value = this.getThisValue(globalObject);
-            const result = callback.callWithThis(globalObject, this_value, &[_]JSValue{
+            const result = callback.call(globalObject, this_value, &[_]JSValue{
                 this_value,
             });
 
@@ -1355,7 +1363,7 @@ fn NewSocket(comptime ssl: bool) type {
 
             const this_value = this.getThisValue(globalObject);
             const err_value = err.toErrorInstance(globalObject);
-            const result = callback.callWithThis(globalObject, this_value, &[_]JSValue{
+            const result = callback.call(globalObject, this_value, &[_]JSValue{
                 this_value,
                 err_value,
             });
@@ -1472,7 +1480,7 @@ fn NewSocket(comptime ssl: bool) type {
             const vm = handlers.vm;
             vm.eventLoop().enter();
             defer vm.eventLoop().exit();
-            const result = callback.callWithThis(globalObject, this_value, &[_]JSValue{
+            const result = callback.call(globalObject, this_value, &[_]JSValue{
                 this_value,
             });
 
@@ -1524,7 +1532,7 @@ fn NewSocket(comptime ssl: bool) type {
 
             const globalObject = handlers.globalObject;
             const this_value = this.getThisValue(globalObject);
-            const result = callback.callWithThis(globalObject, this_value, &[_]JSValue{
+            const result = callback.call(globalObject, this_value, &[_]JSValue{
                 this_value,
             });
 
@@ -1570,7 +1578,7 @@ fn NewSocket(comptime ssl: bool) type {
             // open callback only have 1 parameters and its the socket
             // you should use getAuthorizationError and authorized getter to get those values in this case
             if (is_open) {
-                result = callback.callWithThis(globalObject, this_value, &[_]JSValue{this_value});
+                result = callback.call(globalObject, this_value, &[_]JSValue{this_value});
 
                 // only call onOpen once for clients
                 if (!handlers.is_server) {
@@ -1597,7 +1605,7 @@ fn NewSocket(comptime ssl: bool) type {
 
                     authorization_error = fallback.toErrorInstance(globalObject);
                 }
-                result = callback.callWithThis(globalObject, this_value, &[_]JSValue{
+                result = callback.call(globalObject, this_value, &[_]JSValue{
                     this_value,
                     JSValue.jsBoolean(authorized),
                     authorization_error,
@@ -1639,7 +1647,7 @@ fn NewSocket(comptime ssl: bool) type {
 
             const globalObject = handlers.globalObject;
             const this_value = this.getThisValue(globalObject);
-            const result = callback.callWithThis(globalObject, this_value, &[_]JSValue{
+            const result = callback.call(globalObject, this_value, &[_]JSValue{
                 this_value,
                 JSValue.jsNumber(@as(i32, err)),
             });
@@ -1671,7 +1679,7 @@ fn NewSocket(comptime ssl: bool) type {
             defer scope.exit(ssl, this.wrapped);
 
             // const encoding = handlers.encoding;
-            const result = callback.callWithThis(globalObject, this_value, &[_]JSValue{
+            const result = callback.call(globalObject, this_value, &[_]JSValue{
                 this_value,
                 output_value,
             });
diff --git a/src/bun.js/api/bun/spawn/stdio.zig b/src/bun.js/api/bun/spawn/stdio.zig
index ec5a6053bf..9b5b132c6e 100644
--- a/src/bun.js/api/bun/spawn/stdio.zig
+++ b/src/bun.js/api/bun/spawn/stdio.zig
@@ -330,7 +330,7 @@ pub const Stdio = union(enum) {
             if (file_fd >= std.math.maxInt(i32)) {
                 var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis };
                 globalThis.throwInvalidArguments("file descriptor must be a valid integer, received: {}", .{
-                    value.toFmt(globalThis, &formatter),
+                    value.toFmt(&formatter),
                 });
                 return false;
             }
diff --git a/src/bun.js/api/bun/subprocess.zig b/src/bun.js/api/bun/subprocess.zig
index 6d8822f27e..c2e80ec629 100644
--- a/src/bun.js/api/bun/subprocess.zig
+++ b/src/bun.js/api/bun/subprocess.zig
@@ -696,12 +696,12 @@ pub const Subprocess = struct {
 
     pub fn doRef(this: *Subprocess, _: *JSC.JSGlobalObject, _: *JSC.CallFrame) JSValue {
         this.ref();
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn doUnref(this: *Subprocess, _: *JSC.JSGlobalObject, _: *JSC.CallFrame) JSValue {
         this.unref();
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn onStdinDestroyed(this: *Subprocess) void {
@@ -737,7 +737,7 @@ pub const Subprocess = struct {
         const success = ipc_data.serializeAndSend(global, value);
         if (!success) return .zero;
 
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn disconnect(this: *Subprocess) void {
@@ -1471,9 +1471,9 @@ pub const Subprocess = struct {
                     if (status == .err)
                     status.err.toJSC(globalThis)
                 else
-                    JSC.JSValue.jsUndefined();
+                    .undefined;
 
-                const this_value = if (this_jsvalue.isEmptyOrUndefinedOrNull()) JSC.JSValue.jsUndefined() else this_jsvalue;
+                const this_value = if (this_jsvalue.isEmptyOrUndefinedOrNull()) .undefined else this_jsvalue;
                 this_value.ensureStillAlive();
 
                 const args = [_]JSValue{
@@ -1856,7 +1856,7 @@ pub const Subprocess = struct {
                             var i: u32 = 0;
                             while (stdio_iter.next()) |value| : (i += 1) {
                                 if (!stdio[i].extract(globalThis, i, value))
-                                    return JSC.JSValue.jsUndefined();
+                                    return .undefined;
                                 if (i == 2)
                                     break;
                             }
@@ -1865,7 +1865,7 @@ pub const Subprocess = struct {
                             while (stdio_iter.next()) |value| : (i += 1) {
                                 var new_item: Stdio = undefined;
                                 if (!new_item.extract(globalThis, i, value)) {
-                                    return JSC.JSValue.jsUndefined();
+                                    return .undefined;
                                 }
 
                                 const opt = switch (new_item.asSpawnOption(i)) {
diff --git a/src/bun.js/api/bun/udp_socket.zig b/src/bun.js/api/bun/udp_socket.zig
index ea43d4947d..3e88e568d2 100644
--- a/src/bun.js/api/bun/udp_socket.zig
+++ b/src/bun.js/api/bun/udp_socket.zig
@@ -27,7 +27,7 @@ fn onClose(socket: *uws.udp.Socket) callconv(.C) void {
 
     const this: *UDPSocket = bun.cast(*UDPSocket, socket.user().?);
     this.closed = true;
-    this.poll_ref.unref(this.globalThis.bunVM());
+    this.poll_ref.disable();
     _ = this.js_refcount.fetchSub(1, .monotonic);
 }
 
@@ -38,7 +38,11 @@ fn onDrain(socket: *uws.udp.Socket) callconv(.C) void {
     const callback = this.config.on_drain;
     if (callback == .zero) return;
 
-    const result = callback.callWithThis(this.globalThis, this.thisValue, &[_]JSValue{this.thisValue});
+    const vm = JSC.VirtualMachine.get();
+    const event_loop = vm.eventLoop();
+    event_loop.enter();
+    defer event_loop.exit();
+    const result = callback.call(this.globalThis, this.thisValue, &[_]JSValue{this.thisValue});
     if (result.toError()) |err| {
         _ = this.callErrorHandler(.zero, &[_]JSValue{err});
     }
@@ -87,7 +91,7 @@ fn onData(socket: *uws.udp.Socket, buf: *uws.udp.PacketBuffer, packets: c_int) c
         _ = udpSocket.js_refcount.fetchAdd(1, .monotonic);
         defer _ = udpSocket.js_refcount.fetchSub(1, .monotonic);
 
-        const result = callback.callWithThis(globalThis, udpSocket.thisValue, &[_]JSValue{
+        const result = callback.call(globalThis, udpSocket.thisValue, &[_]JSValue{
             udpSocket.thisValue,
             udpSocket.config.binary_type.toJS(slice, globalThis),
             JSC.jsNumber(port),
@@ -364,7 +368,7 @@ pub const UDPSocket = struct {
             return false;
         }
 
-        const result = callback.callWithThis(globalThis, thisValue, err);
+        const result = callback.call(globalThis, thisValue, err);
         if (result.isAnyError()) {
             _ = vm.uncaughtException(globalThis, result, false);
         }
@@ -575,9 +579,7 @@ pub const UDPSocket = struct {
     }
 
     pub fn unref(this: *This, globalThis: *JSC.JSGlobalObject, _: *JSC.CallFrame) JSValue {
-        if (!this.closed) {
-            this.poll_ref.unref(globalThis.bunVM());
-        }
+        this.poll_ref.unref(globalThis.bunVM());
 
         return .undefined;
     }
diff --git a/src/bun.js/api/ffi.zig b/src/bun.js/api/ffi.zig
index 7b64c504c0..963ea23db8 100644
--- a/src/bun.js/api/ffi.zig
+++ b/src/bun.js/api/ffi.zig
@@ -145,7 +145,7 @@ pub const FFI = struct {
     ) callconv(.C) JSValue {
         JSC.markBinding(@src());
         if (this.closed) {
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
         this.closed = true;
         if (this.dylib) |*dylib| {
@@ -160,7 +160,7 @@ pub const FFI = struct {
         }
         this.functions.deinit(allocator);
 
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn printCallback(global: *JSGlobalObject, object: JSC.JSValue) JSValue {
diff --git a/src/bun.js/api/glob.zig b/src/bun.js/api/glob.zig
index 2aa6fd17ad..69b4295e87 100644
--- a/src/bun.js/api/glob.zig
+++ b/src/bun.js/api/glob.zig
@@ -448,12 +448,12 @@ pub fn match(this: *Glob, globalThis: *JSGlobalObject, callframe: *JSC.CallFrame
     defer arguments.deinit();
     const str_arg = arguments.nextEat() orelse {
         globalThis.throw("Glob.matchString: expected 1 arguments, got 0", .{});
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     };
 
     if (!str_arg.isString()) {
         globalThis.throw("Glob.matchString: first argument is not a string", .{});
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     var str = str_arg.toSlice(globalThis, arena.allocator());
diff --git a/src/bun.js/api/html_rewriter.zig b/src/bun.js/api/html_rewriter.zig
index 3de0d37fed..de315f69c4 100644
--- a/src/bun.js/api/html_rewriter.zig
+++ b/src/bun.js/api/html_rewriter.zig
@@ -880,7 +880,7 @@ fn HandlerCallback(
             @field(zig_element, field_name) = value;
             defer @field(zig_element, field_name) = null;
 
-            var result = @field(this, callback_name).?.callWithThis(
+            var result = @field(this, callback_name).?.call(
                 this.global,
                 if (comptime @hasField(HandlerType, "thisObject"))
                     @field(this, "thisObject")
@@ -1040,7 +1040,7 @@ pub const TextChunk = struct {
 
     fn contentHandler(this: *TextChunk, comptime Callback: (fn (*LOLHTML.TextChunk, []const u8, bool) LOLHTML.Error!void), thisObject: JSValue, globalObject: *JSGlobalObject, content: ZigString, contentOptions: ?ContentOptions) JSValue {
         if (this.text_chunk == null)
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         var content_slice = content.toSlice(bun.default_allocator);
         defer content_slice.deinit();
 
diff --git a/src/bun.js/api/js_brotli.zig b/src/bun.js/api/js_brotli.zig
index ec2402fc3d..92eeb8a496 100644
--- a/src/bun.js/api/js_brotli.zig
+++ b/src/bun.js/api/js_brotli.zig
@@ -5,14 +5,40 @@ const brotli = bun.brotli;
 
 const Queue = std.fifo.LinearFifo(JSC.Node.BlobOrStringOrBuffer, .Dynamic);
 
+// We cannot free outside the JavaScript thread.
+const FreeList = struct {
+    write_lock: bun.Lock = bun.Lock.init(),
+    list: std.ArrayListUnmanaged(JSC.Node.BlobOrStringOrBuffer) = .{},
+
+    pub fn append(this: *FreeList, slice: []const JSC.Node.BlobOrStringOrBuffer) void {
+        this.write_lock.lock();
+        defer this.write_lock.unlock();
+        this.list.appendSlice(bun.default_allocator, slice) catch bun.outOfMemory();
+    }
+
+    pub fn drain(this: *FreeList) void {
+        this.write_lock.lock();
+        defer this.write_lock.unlock();
+        const out = this.list.items;
+        for (out) |*item| {
+            item.deinitAndUnprotect();
+        }
+        this.list.clearRetainingCapacity();
+    }
+
+    pub fn deinit(this: *FreeList) void {
+        this.drain();
+        this.list.deinit(bun.default_allocator);
+    }
+};
+
 pub const BrotliEncoder = struct {
     pub usingnamespace bun.New(@This());
     pub usingnamespace JSC.Codegen.JSBrotliEncoder;
 
     stream: brotli.BrotliCompressionStream,
 
-    freelist: Queue = Queue.init(bun.default_allocator),
-    freelist_write_lock: bun.Lock = bun.Lock.init(),
+    freelist: FreeList = .{},
 
     globalThis: *JSC.JSGlobalObject,
 
@@ -85,20 +111,14 @@ pub const BrotliEncoder = struct {
 
     pub fn deinit(this: *BrotliEncoder) void {
         this.callback_value.deinit();
-        this.drainFreelist();
+        this.freelist.deinit();
         this.stream.deinit();
         this.input.deinit();
         this.destroy();
     }
 
     fn drainFreelist(this: *BrotliEncoder) void {
-        this.freelist_write_lock.lock();
-        defer this.freelist_write_lock.unlock();
-        const to_free = this.freelist.readableSlice(0);
-        for (to_free) |*input| {
-            input.deinit();
-        }
-        this.freelist.discard(to_free.len);
+        this.freelist.drain();
     }
 
     fn collectOutputValue(this: *BrotliEncoder) JSC.JSValue {
@@ -115,7 +135,7 @@ pub const BrotliEncoder = struct {
         defer _ = this.has_pending_activity.fetchSub(1, .monotonic);
         this.drainFreelist();
 
-        const result = this.callback_value.get().?.call(this.globalThis, &.{
+        const result = this.callback_value.get().?.call(this.globalThis, .undefined, &.{
             if (this.write_failed)
                 // TODO: propagate error from brotli
                 this.globalThis.createErrorInstance("BrotliError", .{})
@@ -175,11 +195,9 @@ pub const BrotliEncoder = struct {
                     };
 
                     defer {
-                        this.encoder.freelist_write_lock.lock();
-                        this.encoder.freelist.write(pending) catch unreachable;
-                        this.encoder.freelist_write_lock.unlock();
+                        this.encoder.freelist.append(pending);
                     }
-                    for (pending) |input| {
+                    for (pending) |*input| {
                         var writer = this.encoder.stream.writer(Writer{ .encoder = this.encoder });
                         writer.writeAll(input.slice()) catch {
                             _ = this.encoder.pending_encode_job_count.fetchSub(1, .monotonic);
@@ -255,7 +273,9 @@ pub const BrotliEncoder = struct {
             this.input_lock.lock();
             defer this.input_lock.unlock();
 
-            this.input.writeItem(input_to_queue) catch unreachable;
+            // need to protect because no longer on the stack. unprotected in FreeList.deinit
+            input_to_queue.protect();
+            this.input.writeItem(input_to_queue) catch bun.outOfMemory();
         }
         JSC.WorkPool.schedule(&task.task);
 
@@ -297,7 +317,9 @@ pub const BrotliEncoder = struct {
             this.input_lock.lock();
             defer this.input_lock.unlock();
 
-            this.input.writeItem(input_to_queue) catch unreachable;
+            // need to protect because no longer on the stack. unprotected in FreeList.deinit
+            input_to_queue.protect();
+            this.input.writeItem(input_to_queue) catch bun.outOfMemory();
         }
         task.run();
         return if (!is_last and this.output.items.len == 0) .undefined else this.collectOutputValue();
@@ -341,8 +363,7 @@ pub const BrotliDecoder = struct {
     output: std.ArrayListUnmanaged(u8) = .{},
     output_lock: bun.Lock = bun.Lock.init(),
 
-    freelist: Queue = Queue.init(bun.default_allocator),
-    freelist_write_lock: bun.Lock = bun.Lock.init(),
+    freelist: FreeList = .{},
 
     pub fn hasPendingActivity(this: *BrotliDecoder) callconv(.C) bool {
         return this.has_pending_activity.load(.monotonic) > 0;
@@ -350,7 +371,7 @@ pub const BrotliDecoder = struct {
 
     pub fn deinit(this: *BrotliDecoder) void {
         this.callback_value.deinit();
-        this.drainFreelist();
+        this.freelist.deinit();
         this.output.deinit(bun.default_allocator);
         this.stream.brotli.destroyInstance();
         this.input.deinit();
@@ -420,7 +441,7 @@ pub const BrotliDecoder = struct {
         defer _ = this.has_pending_activity.fetchSub(1, .monotonic);
         this.drainFreelist();
 
-        const result = this.callback_value.get().?.call(this.globalThis, &.{
+        const result = this.callback_value.get().?.call(this.globalThis, .undefined, &.{
             if (this.write_failed)
                 // TODO: propagate error from brotli
                 this.globalThis.createErrorInstance("BrotliError", .{})
@@ -435,13 +456,7 @@ pub const BrotliDecoder = struct {
     }
 
     fn drainFreelist(this: *BrotliDecoder) void {
-        this.freelist_write_lock.lock();
-        defer this.freelist_write_lock.unlock();
-        const to_free = this.freelist.readableSlice(0);
-        for (to_free) |*input| {
-            input.deinit();
-        }
-        this.freelist.discard(to_free.len);
+        this.freelist.drain();
     }
 
     pub fn decode(this: *BrotliDecoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) JSC.JSValue {
@@ -479,7 +494,9 @@ pub const BrotliDecoder = struct {
             this.input_lock.lock();
             defer this.input_lock.unlock();
 
-            this.input.writeItem(input_to_queue) catch unreachable;
+            // need to protect because no longer on the stack. unprotected in FreeList.deinit
+            input_to_queue.protect();
+            this.input.writeItem(input_to_queue) catch bun.outOfMemory();
         }
         JSC.WorkPool.schedule(&task.task);
 
@@ -521,7 +538,9 @@ pub const BrotliDecoder = struct {
             this.input_lock.lock();
             defer this.input_lock.unlock();
 
-            this.input.writeItem(input_to_queue) catch unreachable;
+            // need to protect because no longer on the stack. unprotected in FreeList.deinit
+            input_to_queue.protect();
+            this.input.writeItem(input_to_queue) catch bun.outOfMemory();
         }
         task.run();
         return if (!is_last) .undefined else this.collectOutputValue();
@@ -557,20 +576,25 @@ pub const BrotliDecoder = struct {
                     this.decoder.input_lock.lock();
                     defer this.decoder.input_lock.unlock();
                     if (!is_last) break;
-                    const readable = this.decoder.input.readableSlice(0);
-                    const pending = readable;
+                    const pending = this.decoder.input.readableSlice(0);
 
                     defer {
-                        this.decoder.freelist_write_lock.lock();
-                        this.decoder.freelist.write(pending) catch unreachable;
-                        this.decoder.freelist_write_lock.unlock();
+                        this.decoder.freelist.append(pending);
                     }
 
                     var input_list = std.ArrayListUnmanaged(u8){};
                     defer input_list.deinit(bun.default_allocator);
+
                     if (pending.len > 1) {
+                        var count: usize = 0;
                         for (pending) |input| {
-                            input_list.appendSlice(bun.default_allocator, input.slice()) catch bun.outOfMemory();
+                            count += input.slice().len;
+                        }
+
+                        input_list.ensureTotalCapacityPrecise(bun.default_allocator, count) catch bun.outOfMemory();
+
+                        for (pending) |*input| {
+                            input_list.appendSliceAssumeCapacity(input.slice());
                         }
                     }
 
diff --git a/src/bun.js/api/server.zig b/src/bun.js/api/server.zig
index c6bc8f1df7..19fd82e2fc 100644
--- a/src/bun.js/api/server.zig
+++ b/src/bun.js/api/server.zig
@@ -1283,7 +1283,6 @@ fn NewFlags(comptime debug_mode: bool) type {
         has_marked_pending: bool = false,
         has_abort_handler: bool = false,
         has_sendfile_ctx: bool = false,
-        has_pending_read: bool = false,
         has_called_error_handler: bool = false,
         needs_content_length: bool = false,
         needs_content_range: bool = false,
@@ -1401,7 +1400,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
 
         // This pre-allocates up to 2,048 RequestContext structs.
         // It costs about 655,632 bytes.
-        pub const RequestContextStackAllocator = bun.HiveArray(RequestContext, 2048).Fallback;
+        pub const RequestContextStackAllocator = bun.HiveArray(RequestContext, if (bun.heap_breakdown.enabled) 0 else 2048).Fallback;
 
         pub const name = "HTTPRequestContext" ++ (if (debug_mode) "Debug" else "") ++ (if (ThisServer.ssl_enabled) "TLS" else "");
         pub const shim = JSC.Shimmer("Bun", name, @This());
@@ -1422,14 +1421,13 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
         /// We can only safely free once the request body promise is finalized
         /// and the response is rejected
         response_jsvalue: JSC.JSValue = JSC.JSValue.zero,
-        pending_promises_for_abort: u8 = 0,
+        ref_count: u8 = 1,
 
         response_ptr: ?*JSC.WebCore.Response = null,
         blob: JSC.WebCore.AnyBlob = JSC.WebCore.AnyBlob{ .Blob = .{} },
-        promise: ?*JSC.JSValue = null,
 
         sendfile: SendfileContext = undefined,
-        request_body: ?*JSC.WebCore.BodyValueRef = null,
+        request_body: ?*JSC.BodyValueRef = null,
         request_body_buf: std.ArrayListUnmanaged(u8) = .{},
         request_body_content_len: usize = 0,
 
@@ -1476,15 +1474,15 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             const result = arguments.ptr[0];
             result.ensureStillAlive();
 
-            ctx.pending_promises_for_abort -|= 1;
+            defer ctx.deref();
 
             if (ctx.isAbortedOrEnded()) {
-                ctx.finalizeForAbort();
+                ctx.deref();
                 return JSValue.jsUndefined();
             }
 
             if (ctx.didUpgradeWebSocket()) {
-                ctx.finalize();
+                ctx.deref();
                 return JSValue.jsUndefined();
             }
 
@@ -1507,7 +1505,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                     .globalThis = globalThis,
                     .quote_strings = true,
                 };
-                Output.errGeneric("Expected a Response object, but received '{}'", .{value.toFmt(formatter.globalThis, &formatter)});
+                Output.errGeneric("Expected a Response object, but received '{}'", .{value.toFmt(&formatter)});
             } else {
                 Output.errGeneric("Expected a Response object", .{});
             }
@@ -1538,10 +1536,75 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             ctx.render(response);
         }
 
-        pub fn finalizeForAbort(this: *RequestContext) void {
-            streamLog("finalizeForAbort", .{});
-            this.pending_promises_for_abort -|= 1;
-            if (this.pending_promises_for_abort == 0) this.finalize();
+        pub fn shouldRenderMissing(this: *RequestContext) bool {
+            // If we did not respond yet, we should render missing
+            // To allow this all the conditions above should be true:
+            // 1 - still has a response (not detached)
+            // 2 - not aborted
+            // 3 - not marked completed
+            // 4 - not marked pending
+            // 5 - is the only reference of the context
+            // 6 - is not waiting for request body
+            // 7 - did not call sendfile
+            return this.resp != null and !this.flags.aborted and !this.flags.has_marked_complete and !this.flags.has_marked_pending and this.ref_count == 1 and !this.flags.is_waiting_for_request_body and !this.flags.has_sendfile_ctx;
+        }
+
+        pub fn isDeadRequest(this: *RequestContext) bool {
+            // check if has pending promise or extra reference (aka not the only reference)
+            if (this.ref_count > 1) return false;
+            // check if the body is Locked (streaming)
+            if (this.request_body) |body| {
+                if (body.value == .Locked) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        /// destroy RequestContext, should be only called by deref or if defer_deinit_until_callback_completes is ref is set to true
+        fn deinit(this: *RequestContext) void {
+            this.detachResponse();
+            // TODO: has_marked_complete is doing something?
+            this.flags.has_marked_complete = true;
+
+            if (this.defer_deinit_until_callback_completes) |defer_deinit| {
+                defer_deinit.* = true;
+                ctxLog("deferred deinit <d> ({*})<r>", .{this});
+                return;
+            }
+
+            ctxLog("deinit<d> ({*})<r>", .{this});
+            if (comptime Environment.allow_assert)
+                assert(this.flags.has_finalized);
+
+            this.request_body_buf.clearAndFree(this.allocator);
+            this.response_buf_owned.clearAndFree(this.allocator);
+
+            if (this.request_body) |body| {
+                _ = body.unref();
+                this.request_body = null;
+            }
+
+            const server = this.server;
+            server.request_pool_allocator.put(this);
+            server.onRequestComplete();
+        }
+
+        pub fn deref(this: *RequestContext) void {
+            streamLog("deref", .{});
+            bun.assert(this.ref_count > 0);
+            const ref_count = this.ref_count;
+            this.ref_count -= 1;
+            if (ref_count == 1) {
+                this.finalizeWithoutDeinit();
+                this.deinit();
+            }
+        }
+
+        pub fn ref(this: *RequestContext) void {
+            streamLog("ref", .{});
+            this.ref_count += 1;
         }
 
         pub fn onReject(_: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
@@ -1551,15 +1614,15 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             var ctx = arguments.ptr[1].asPromisePtr(@This());
             const err = arguments.ptr[0];
 
-            ctx.pending_promises_for_abort -|= 1;
+            defer ctx.deref();
 
-            handleReject(ctx, if (!err.isEmptyOrUndefinedOrNull()) err else JSC.JSValue.jsUndefined());
+            handleReject(ctx, if (!err.isEmptyOrUndefinedOrNull()) err else .undefined);
             return JSValue.jsUndefined();
         }
 
         fn handleReject(ctx: *RequestContext, value: JSC.JSValue) void {
             if (ctx.isAbortedOrEnded()) {
-                ctx.finalizeForAbort();
+                ctx.deref();
                 return;
             }
 
@@ -1582,13 +1645,13 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
 
             // check again in case it get aborted after runErrorHandler
             if (ctx.isAbortedOrEnded()) {
-                ctx.finalizeForAbort();
+                ctx.deref();
                 return;
             }
 
             // I don't think this case happens?
             if (ctx.didUpgradeWebSocket()) {
-                ctx.finalize();
+                ctx.deref();
                 return;
             }
 
@@ -1602,7 +1665,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             if (ctx.resp) |resp| {
                 resp.runCorkedWithType(*RequestContext, renderMissingCorked, ctx);
             }
-            ctx.finalize();
+            ctx.deref();
         }
 
         pub fn renderMissingCorked(ctx: *RequestContext) void {
@@ -1721,7 +1784,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                     return;
                 }
             }
-            this.finalize();
+            this.deref();
         }
 
         /// Drain a partial response buffer
@@ -1739,40 +1802,27 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
 
         pub fn end(this: *RequestContext, data: []const u8, closeConnection: bool) void {
             if (this.resp) |resp| {
-                if (this.flags.is_waiting_for_request_body) {
-                    this.flags.is_waiting_for_request_body = false;
-                    resp.clearOnData();
-                }
-                resp.end(data, closeConnection);
                 this.detachResponse();
+                resp.end(data, closeConnection);
             }
         }
 
         pub fn endStream(this: *RequestContext, closeConnection: bool) void {
             ctxLog("endStream", .{});
             if (this.resp) |resp| {
-                if (this.flags.is_waiting_for_request_body) {
-                    this.flags.is_waiting_for_request_body = false;
-                    resp.clearOnData();
-                }
-
+                this.detachResponse();
                 // This will send a terminating 0\r\n\r\n chunk to the client
                 // We only want to do that if they're still expecting a body
                 // We cannot call this function if the Content-Length header was previously set
                 if (resp.state().isResponsePending())
                     resp.endStream(closeConnection);
-                this.detachResponse();
             }
         }
 
         pub fn endWithoutBody(this: *RequestContext, closeConnection: bool) void {
             if (this.resp) |resp| {
-                if (this.flags.is_waiting_for_request_body) {
-                    this.flags.is_waiting_for_request_body = false;
-                    resp.clearOnData();
-                }
-                resp.endWithoutBody(closeConnection);
                 this.detachResponse();
+                resp.endWithoutBody(closeConnection);
             }
         }
 
@@ -1781,11 +1831,11 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
 
             assert(this.resp == resp);
             if (this.isAbortedOrEnded()) {
-                this.finalizeForAbort();
+                this.deref();
                 return false;
             }
             this.end("", this.shouldCloseConnection());
-            this.finalize();
+            this.deref();
             return false;
         }
 
@@ -1795,7 +1845,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             assert(this.resp == resp);
 
             if (this.isAbortedOrEnded()) {
-                this.finalizeForAbort();
+                this.deref();
                 return false;
             }
 
@@ -1805,7 +1855,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
 
             if (this.method == .HEAD) {
                 this.end("", this.shouldCloseConnection());
-                this.finalize();
+                this.deref();
                 return false;
             }
 
@@ -1816,7 +1866,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             ctxLog("onWritableCompleteResponseBuffer", .{});
             assert(this.resp == resp);
             if (this.isAbortedOrEnded()) {
-                this.finalizeForAbort();
+                this.deref();
                 return false;
             }
             return this.sendWritableBytesForCompleteResponseBuffer(this.response_buf_owned.items, write_offset, resp);
@@ -1834,27 +1884,13 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             ctxLog("create<d> ({*})<r>", .{this});
         }
 
-        pub fn isDeadRequest(this: *RequestContext) bool {
-            if (this.pending_promises_for_abort > 0 or this.flags.has_pending_read) return false;
-
-            if (this.promise != null) {
-                return false;
-            }
-
-            if (this.request_body) |body| {
-                if (body.value == .Locked) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
         pub fn onAbort(this: *RequestContext, resp: *App.Response) void {
             assert(this.resp == resp);
             assert(!this.flags.aborted);
             // mark request as aborted
             this.flags.aborted = true;
+            // we should not use the response anymore
+            this.resp = null;
             var any_js_calls = false;
             var vm = this.server.vm;
             defer {
@@ -1886,46 +1922,33 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             // if we can, free the request now.
             if (this.isDeadRequest()) {
                 this.finalizeWithoutDeinit();
-                this.deinit();
+                this.deref();
             } else {
-                this.pending_promises_for_abort = 0;
+                this.ref();
+                defer this.deref();
 
                 // if we cannot, we have to reject pending promises
                 // first, we reject the request body promise
                 if (this.request_body) |body| {
                     // User called .blob(), .json(), text(), or .arrayBuffer() on the Request object
                     // but we received nothing or the connection was aborted
-
                     if (body.value == .Locked) {
-                        // the promise is pending
-                        if (body.value.Locked.action != .none or body.value.Locked.promise != null) {
-                            this.pending_promises_for_abort += 1;
-                        } else if (body.value.Locked.readable.get()) |readable| {
-                            readable.abort(this.server.globalThis);
-                            body.value.Locked.readable.deinit();
-                            any_js_calls = true;
-                        }
                         body.value.toErrorInstance(JSC.toTypeError(.ABORT_ERR, "Request aborted", .{}, this.server.globalThis), this.server.globalThis);
+                        any_js_calls = true;
                     }
                 }
 
                 if (this.response_ptr) |response| {
                     if (response.body.value == .Locked) {
-                        if (response.body.value.Locked.readable.get()) |readable| {
-                            defer response.body.value.Locked.readable.deinit();
+                        var strong_readable = response.body.value.Locked.readable;
+                        response.body.value.Locked.readable = .{};
+                        defer strong_readable.deinit();
+                        if (strong_readable.get()) |readable| {
                             readable.abort(this.server.globalThis);
                             any_js_calls = true;
                         }
                     }
                 }
-
-                // then, we reject the response promise
-                if (this.promise) |promise| {
-                    this.pending_promises_for_abort += 1;
-                    this.promise = null;
-                    promise.asAnyPromise().?.reject(this.server.globalThis, JSC.toTypeError(.ABORT_ERR, "Request aborted", .{}, this.server.globalThis));
-                    any_js_calls = true;
-                }
             }
         }
 
@@ -1975,16 +1998,6 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                 }
             }
 
-            if (this.promise) |promise| {
-                ctxLog("finalizeWithoutDeinit: this.promise != null", .{});
-                this.promise = null;
-
-                if (promise.asAnyPromise()) |prom| {
-                    prom.rejectAsHandled(this.server.globalThis, (JSC.toTypeError(.ABORT_ERR, "Request aborted", .{}, this.server.globalThis)));
-                }
-                JSC.C.JSValueUnprotect(this.server.globalThis, promise.asObjectRef());
-            }
-
             if (this.byte_stream) |stream| {
                 ctxLog("finalizeWithoutDeinit: stream != null", .{});
 
@@ -2007,48 +2020,6 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                 }
             }
         }
-        pub fn finalize(this: *RequestContext) void {
-            ctxLog("finalize<d> ({*})<r>", .{this});
-            this.finalizeWithoutDeinit();
-            this.deinit();
-        }
-
-        pub fn deinit(this: *RequestContext) void {
-            ctxLog("deinit<d> ({*})<r>", .{this});
-
-            if (!this.isDeadRequest()) {
-                ctxLog("deinit<d> ({*})<r> waiting request", .{this});
-                return;
-            }
-
-            if (!this.flags.has_marked_complete) this.server.onRequestComplete();
-            this.flags.has_marked_complete = true;
-
-            this.detachResponse();
-
-            if (this.defer_deinit_until_callback_completes) |defer_deinit| {
-                defer_deinit.* = true;
-                ctxLog("deferred deinit <d> ({*})<r>", .{this});
-                return;
-            }
-
-            ctxLog("deinit<d> ({*})<r>", .{this});
-            if (comptime Environment.allow_assert)
-                assert(this.flags.has_finalized);
-
-            if (comptime Environment.allow_assert)
-                assert(this.flags.has_marked_complete);
-
-            this.request_body_buf.clearAndFree(this.allocator);
-            this.response_buf_owned.clearAndFree(this.allocator);
-
-            if (this.request_body) |body| {
-                _ = body.unref();
-                this.request_body = null;
-            }
-
-            this.server.request_pool_allocator.put(this);
-        }
 
         fn writeHeaders(
             this: *RequestContext,
@@ -2086,7 +2057,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             if (this.sendfile.auto_close)
                 _ = bun.sys.close(this.sendfile.fd);
             this.sendfile = undefined;
-            this.finalize();
+            this.deref();
         }
         const separator: string = "\r\n";
         const separator_iovec = [1]std.posix.iovec_const{.{
@@ -2163,7 +2134,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             ctxLog("onWritableBytes", .{});
             assert(this.resp == resp);
             if (this.isAbortedOrEnded()) {
-                this.finalizeForAbort();
+                this.deref();
                 return false;
             }
 
@@ -2181,7 +2152,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
 
             const bytes = bytes_[@min(bytes_.len, @as(usize, @truncate(write_offset)))..];
             if (resp.tryEnd(bytes, bytes_.len, this.shouldCloseConnection())) {
-                this.finalize();
+                this.deref();
                 return true;
             } else {
                 this.flags.has_marked_pending = true;
@@ -2197,7 +2168,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             const bytes = bytes_[@min(bytes_.len, @as(usize, @truncate(write_offset)))..];
             if (resp.tryEnd(bytes, bytes_.len, this.shouldCloseConnection())) {
                 this.response_buf_owned.items.len = 0;
-                this.finalize();
+                this.deref();
             } else {
                 this.flags.has_marked_pending = true;
                 resp.onWritable(*RequestContext, onWritableCompleteResponseBuffer, this);
@@ -2331,7 +2302,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
 
         pub fn doSendfile(this: *RequestContext, blob: Blob) void {
             if (this.isAbortedOrEnded()) {
-                this.finalizeForAbort();
+                this.deref();
                 return;
             }
 
@@ -2344,15 +2315,15 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             }
 
             this.setAbortHandler();
-            this.flags.has_pending_read = true;
+            this.ref();
             this.blob.Blob.doReadFileInternal(*RequestContext, this, onReadFile, this.server.globalThis);
         }
 
         pub fn onReadFile(this: *RequestContext, result: Blob.ReadFile.ResultType) void {
-            this.flags.has_pending_read = false;
+            defer this.deref();
 
             if (this.isAbortedOrEnded()) {
-                this.finalizeForAbort();
+                this.deref();
                 return;
             }
 
@@ -2405,7 +2376,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
 
         fn renderWithBlobFromBodyValue(this: *RequestContext) void {
             if (this.isAbortedOrEnded()) {
-                this.finalizeForAbort();
+                this.deref();
                 return;
             }
 
@@ -2434,7 +2405,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             if (this.isAbortedOrEnded()) {
                 stream.cancel(this.server.globalThis);
                 this.readable_stream_ref.deinit();
-                this.finalizeForAbort();
+                this.deref();
                 return;
             }
             const resp = this.resp.?;
@@ -2502,7 +2473,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                 stream.done(this.server.globalThis);
                 this.readable_stream_ref.deinit();
                 this.endStream(this.shouldCloseConnection());
-                this.finalize();
+                this.deref();
                 return;
             }
 
@@ -2524,7 +2495,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
 
                             // TODO: should this timeout?
                             this.setAbortHandler();
-                            this.pending_promises_for_abort += 1;
+                            this.ref();
                             this.response_ptr.?.body.value = .{
                                 .Locked = .{
                                     .readable = JSC.WebCore.ReadableStream.Strong.init(stream, globalThis),
@@ -2576,7 +2547,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                 defer this.readable_stream_ref.deinit();
 
                 response_stream.sink.markDone();
-                this.finalizeForAbort();
+                this.deref();
                 response_stream.sink.onFirstWrite = null;
 
                 response_stream.sink.finalize();
@@ -2645,7 +2616,20 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
         }
 
         fn detachResponse(this: *RequestContext) void {
-            this.resp = null;
+            if (this.resp) |resp| {
+                this.resp = null;
+
+                // onAbort should have set this to null
+                bun.assert(!this.flags.aborted);
+                if (this.flags.is_waiting_for_request_body) {
+                    this.flags.is_waiting_for_request_body = false;
+                    resp.clearOnData();
+                }
+                if (this.flags.has_abort_handler) {
+                    resp.clearAborted();
+                    this.flags.has_abort_handler = false;
+                }
+            }
         }
 
         fn isAbortedOrEnded(this: *const RequestContext) bool {
@@ -2678,7 +2662,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             ctx.drainMicrotasks();
 
             if (ctx.isAbortedOrEnded()) {
-                ctx.finalizeForAbort();
+                ctx.deref();
                 return;
             }
 
@@ -2687,7 +2671,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             // just ignore the Response object. It doesn't do anything.
             // it's better to do that than to throw an error
             if (ctx.didUpgradeWebSocket()) {
-                ctx.finalize();
+                ctx.deref();
                 return;
             }
 
@@ -2740,7 +2724,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                         // just ignore the Response object. It doesn't do anything.
                         // it's better to do that than to throw an error
                         if (ctx.didUpgradeWebSocket()) {
-                            ctx.finalize();
+                            ctx.deref();
                             return;
                         }
 
@@ -2785,7 +2769,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             }
 
             if (wait_for_promise) {
-                ctx.pending_promises_for_abort += 1;
+                ctx.ref();
                 response_value.then(this.globalThis, ctx, RequestContext.onResolve, RequestContext.onReject);
                 return;
             }
@@ -2820,7 +2804,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             streamLog("onResolve({any})", .{wrote_anything});
             //aborted so call finalizeForAbort
             if (req.isAbortedOrEnded()) {
-                req.finalizeForAbort();
+                req.deref();
                 return;
             }
             const resp = req.resp.?;
@@ -2835,14 +2819,14 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                 req.endStream(req.shouldCloseConnection());
             }
 
-            req.finalize();
+            req.deref();
         }
 
         pub fn onResolveStream(_: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
             streamLog("onResolveStream", .{});
             var args = callframe.arguments(2);
             var req: *@This() = args.ptr[args.len - 1].asPromisePtr(@This());
-            req.pending_promises_for_abort -|= 1;
+            defer req.deref();
             req.handleResolveStream();
             return JSValue.jsUndefined();
         }
@@ -2850,7 +2834,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             streamLog("onRejectStream", .{});
             const args = callframe.arguments(2);
             var req = args.ptr[args.len - 1].asPromisePtr(@This());
-            req.pending_promises_for_abort -|= 1;
+            defer req.deref();
             const err = args.ptr[0];
             req.handleRejectStream(globalThis, err);
             return JSValue.jsUndefined();
@@ -2881,7 +2865,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
 
             // aborted so call finalizeForAbort
             if (req.isAbortedOrEnded()) {
-                req.finalizeForAbort();
+                req.deref();
                 return;
             }
 
@@ -2899,7 +2883,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                     req.server.vm.runErrorHandler(err, &exception_list);
                 }
             }
-            req.finalize();
+            req.deref();
         }
 
         pub fn doRenderWithBody(this: *RequestContext, value: *JSC.WebCore.Body.Value) void {
@@ -2914,7 +2898,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                     const err = value.Error;
                     _ = value.use();
                     if (this.isAbortedOrEnded()) {
-                        this.finalizeForAbort();
+                        this.deref();
                         return;
                     }
                     this.runErrorHandler(err);
@@ -2932,7 +2916,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                 },
                 .Locked => |*lock| {
                     if (this.isAbortedOrEnded()) {
-                        this.finalizeForAbort();
+                        this.deref();
                         return;
                     }
 
@@ -3047,7 +3031,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             }
 
             if (this.isAbortedOrEnded()) {
-                this.finalizeForAbort();
+                this.deref();
                 return;
             }
             const resp = this.resp.?;
@@ -3060,7 +3044,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             if (resp.write(chunk)) {
                 if (stream.isDone()) {
                     this.endStream(this.shouldCloseConnection());
-                    this.finalize();
+                    this.deref();
                 }
             } else {
                 // when it's the last one, we just want to know if it's done
@@ -3095,7 +3079,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             ctxLog("doRender", .{});
 
             if (this.isAbortedOrEnded()) {
-                this.finalizeForAbort();
+                this.deref();
                 return;
             }
             var response = this.response_ptr.?;
@@ -3123,7 +3107,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                     },
                 }
             }
-            this.finalize();
+            this.deref();
         }
 
         pub fn runErrorHandler(
@@ -3199,7 +3183,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             JSC.markBinding(@src());
             if (!this.server.config.onError.isEmpty() and !this.flags.has_called_error_handler) {
                 this.flags.has_called_error_handler = true;
-                const result = this.server.config.onError.callWithThis(
+                const result = this.server.config.onError.call(
                     this.server.globalThis,
                     this.server.thisObject,
                     &.{value},
@@ -3281,7 +3265,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
             // Promise is not fulfilled yet
             {
                 ctx.flags.is_error_promise_pending = true;
-                ctx.pending_promises_for_abort += 1;
+                ctx.ref();
                 promise_js.then(
                     ctx.server.globalThis,
                     ctx,
@@ -3435,7 +3419,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                 }
             }
 
-            this.finalize();
+            this.deref();
         }
 
         pub fn render(this: *RequestContext, response: *JSC.WebCore.Response) void {
@@ -3670,7 +3654,7 @@ pub const WebSocketServer = struct {
         pub fn runErrorCallback(this: *const Handler, vm: *JSC.VirtualMachine, globalObject: *JSC.JSGlobalObject, error_value: JSC.JSValue) void {
             const onError = this.onError;
             if (!onError.isEmptyOrUndefinedOrNull()) {
-                const err_ret = onError.callWithThis(globalObject, .undefined, &.{error_value});
+                const err_ret = onError.call(globalObject, .undefined, &.{error_value});
                 if (err_ret.toError()) |actual_err| {
                     _ = vm.uncaughtException(globalObject, actual_err, false);
                 }
@@ -3995,9 +3979,9 @@ const Corker = struct {
     pub fn run(this: *Corker) void {
         const this_value = this.this_value;
         this.result = if (this_value == .zero)
-            this.callback.call(this.globalObject, this.args)
+            this.callback.call(this.globalObject, .undefined, this.args)
         else
-            this.callback.callWithThis(this.globalObject, this_value, this.args);
+            this.callback.call(this.globalObject, this_value, this.args);
     }
 };
 
@@ -4240,6 +4224,7 @@ pub const ServerWebSocket = struct {
 
         const result = cb.call(
             globalThis,
+            .undefined,
             &[_]JSC.JSValue{ this.this_value, this.binaryToJS(globalThis, data) },
         );
 
@@ -4268,6 +4253,7 @@ pub const ServerWebSocket = struct {
 
         const result = cb.call(
             globalThis,
+            .undefined,
             &[_]JSC.JSValue{ this.this_value, this.binaryToJS(globalThis, data) },
         );
 
@@ -4300,6 +4286,7 @@ pub const ServerWebSocket = struct {
             str.markUTF8();
             const result = handler.onClose.call(
                 globalObject,
+                .undefined,
                 &[_]JSC.JSValue{ this.this_value, JSValue.jsNumber(code), str.toJS(globalObject) },
             );
 
@@ -5313,6 +5300,7 @@ pub fn NewServer(comptime NamespaceType: type, comptime ssl_enabled_: bool, comp
         pub const doRequestIP = JSC.wrapInstanceMethod(ThisServer, "requestIP", false);
 
         pub usingnamespace NamespaceType;
+        pub usingnamespace bun.New(@This());
 
         pub fn constructor(globalThis: *JSC.JSGlobalObject, _: *JSC.CallFrame) ?*ThisServer {
             globalThis.throw("Server() is not a constructor", .{});
@@ -5680,7 +5668,7 @@ pub fn NewServer(comptime NamespaceType: type, comptime ssl_enabled_: bool, comp
                 existing_request = Request.init(
                     bun.String.createUTF8(url.href),
                     headers,
-                    JSC.WebCore.InitRequestBodyValue(body) catch bun.outOfMemory(),
+                    this.vm.initRequestBodyValue(body) catch bun.outOfMemory(),
                     method,
                 );
             } else if (first_arg.as(Request)) |request_| {
@@ -5697,10 +5685,9 @@ pub fn NewServer(comptime NamespaceType: type, comptime ssl_enabled_: bool, comp
                 return JSPromise.rejectedPromiseValue(ctx, err);
             }
 
-            var request = bun.default_allocator.create(Request) catch unreachable;
-            request.* = existing_request;
+            var request = Request.new(existing_request);
 
-            const response_value = this.config.onRequest.callWithThis(
+            const response_value = this.config.onRequest.call(
                 this.globalThis,
                 this.thisObject,
                 &[_]JSC.JSValue{request.toJS(this.globalThis)},
@@ -5736,21 +5723,21 @@ pub fn NewServer(comptime NamespaceType: type, comptime ssl_enabled_: bool, comp
                 };
 
                 JSC.C.JSValueUnprotect(this.globalThis, this.thisObject.asObjectRef());
-                this.thisObject = JSC.JSValue.jsUndefined();
+                this.thisObject = .undefined;
                 this.stop(abrupt);
             }
 
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         pub fn disposeFromJS(this: *ThisServer) JSC.JSValue {
             if (this.listener != null) {
                 JSC.C.JSValueUnprotect(this.globalThis, this.thisObject.asObjectRef());
-                this.thisObject = JSC.JSValue.jsUndefined();
+                this.thisObject = .undefined;
                 this.stop(true);
             }
 
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         pub fn getPort(
@@ -5990,23 +5977,26 @@ pub fn NewServer(comptime NamespaceType: type, comptime ssl_enabled_: bool, comp
 
             this.config.deinit();
             this.app.destroy();
-            const allocator = this.allocator;
-            allocator.destroy(this);
+            this.destroy();
         }
 
         pub fn init(config: ServerConfig, globalThis: *JSGlobalObject) *ThisServer {
-            var server = bun.default_allocator.create(ThisServer) catch bun.outOfMemory();
-            server.* = .{
+            var server = ThisServer.new(.{
                 .globalThis = globalThis,
                 .config = config,
                 .base_url_string_for_joining = bun.default_allocator.dupe(u8, strings.trim(config.base_url.href, "/")) catch unreachable,
                 .vm = JSC.VirtualMachine.get(),
                 .allocator = Arena.getThreadlocalDefault(),
-            };
+            });
 
             if (RequestContext.pool == null) {
                 RequestContext.pool = server.allocator.create(RequestContext.RequestContextStackAllocator) catch bun.outOfMemory();
-                RequestContext.pool.?.* = RequestContext.RequestContextStackAllocator.init(server.allocator);
+                RequestContext.pool.?.* = RequestContext.RequestContextStackAllocator.init(
+                    if (comptime bun.heap_breakdown.enabled)
+                        bun.typedAllocator(RequestContext)
+                    else
+                        bun.default_allocator,
+                );
             }
 
             server.request_pool_allocator = RequestContext.pool.?;
@@ -6249,20 +6239,19 @@ pub fn NewServer(comptime NamespaceType: type, comptime ssl_enabled_: bool, comp
             var ctx = this.request_pool_allocator.tryGet() catch bun.outOfMemory();
             ctx.create(this, req, resp);
             this.vm.jsc.reportExtraMemory(@sizeOf(RequestContext));
-            var request_object = this.allocator.create(JSC.WebCore.Request) catch bun.outOfMemory();
-            var body = JSC.WebCore.InitRequestBodyValue(.{ .Null = {} }) catch unreachable;
+            var body = this.vm.initRequestBodyValue(.{ .Null = {} }) catch unreachable;
 
             ctx.request_body = body;
             var signal = JSC.WebCore.AbortSignal.new(this.globalThis);
             ctx.signal = signal;
 
-            request_object.* = .{
+            const request_object = Request.new(.{
                 .method = ctx.method,
                 .request_context = AnyRequestContext.init(ctx),
                 .https = ssl_enabled,
                 .signal = signal.ref(),
                 .body = body.ref(),
-            };
+            });
 
             if (comptime debug_mode) {
                 ctx.flags.is_web_browser_navigation = brk: {
@@ -6324,7 +6313,7 @@ pub fn NewServer(comptime NamespaceType: type, comptime ssl_enabled_: bool, comp
             const request_value = args[0];
             request_value.ensureStillAlive();
 
-            const response_value = this.config.onRequest.callWithThis(this.globalThis, this.thisObject, &args);
+            const response_value = this.config.onRequest.call(this.globalThis, this.thisObject, &args);
             defer {
                 // uWS request will not live longer than this function
                 request_object.request_context = JSC.API.AnyRequestContext.Null;
@@ -6347,7 +6336,7 @@ pub fn NewServer(comptime NamespaceType: type, comptime ssl_enabled_: bool, comp
                 return;
             }
 
-            if (!ctx.flags.has_marked_complete and !ctx.flags.has_marked_pending and ctx.pending_promises_for_abort == 0 and !ctx.flags.is_waiting_for_request_body and !ctx.flags.has_sendfile_ctx) {
+            if (ctx.shouldRenderMissing()) {
                 ctx.renderMissing();
                 return;
             }
@@ -6367,21 +6356,20 @@ pub fn NewServer(comptime NamespaceType: type, comptime ssl_enabled_: bool, comp
             req.setYield(false);
             var ctx = this.request_pool_allocator.tryGet() catch @panic("ran out of memory");
             ctx.create(this, req, resp);
-            var request_object = this.allocator.create(JSC.WebCore.Request) catch unreachable;
-            var body = JSC.WebCore.InitRequestBodyValue(.{ .Null = {} }) catch unreachable;
+            var body = this.vm.initRequestBodyValue(.{ .Null = {} }) catch unreachable;
 
             ctx.request_body = body;
             var signal = JSC.WebCore.AbortSignal.new(this.globalThis);
             ctx.signal = signal;
 
-            request_object.* = .{
+            var request_object = Request.new(.{
                 .method = ctx.method,
                 .request_context = AnyRequestContext.init(ctx),
                 .upgrader = ctx,
                 .https = ssl_enabled,
                 .signal = signal.ref(),
                 .body = body.ref(),
-            };
+            });
             ctx.upgrade_context = upgrade_ctx;
 
             // We keep the Request object alive for the duration of the request so that we can remove the pointer to the UWS request object.
@@ -6391,7 +6379,7 @@ pub fn NewServer(comptime NamespaceType: type, comptime ssl_enabled_: bool, comp
             };
             const request_value = args[0];
             request_value.ensureStillAlive();
-            const response_value = this.config.onRequest.callWithThis(this.globalThis, this.thisObject, &args);
+            const response_value = this.config.onRequest.call(this.globalThis, this.thisObject, &args);
             defer {
                 if (!ctx.didUpgradeWebSocket()) {}
                 // uWS request will not live longer than this function
@@ -6416,7 +6404,7 @@ pub fn NewServer(comptime NamespaceType: type, comptime ssl_enabled_: bool, comp
                 return;
             }
 
-            if (!ctx.flags.has_marked_complete and !ctx.flags.has_marked_pending and ctx.pending_promises_for_abort == 0 and !ctx.flags.is_waiting_for_request_body and !ctx.flags.has_sendfile_ctx) {
+            if (ctx.shouldRenderMissing()) {
                 ctx.renderMissing();
                 return;
             }
diff --git a/src/bun.js/api/sockets.classes.ts b/src/bun.js/api/sockets.classes.ts
index 192ba84665..d36ca4629c 100644
--- a/src/bun.js/api/sockets.classes.ts
+++ b/src/bun.js/api/sockets.classes.ts
@@ -116,7 +116,7 @@ function generate(ssl) {
       },
 
       "@@dispose": {
-        fn: "shutdown",
+        fn: "end",
         length: 0,
       },
 
@@ -191,7 +191,7 @@ export default [
         length: 1,
       },
       "@@dispose": {
-        fn: "stop",
+        fn: "dispose",
         length: 0,
       },
 
diff --git a/src/bun.js/bindings/BunClientData.cpp b/src/bun.js/bindings/BunClientData.cpp
index 544827ae7e..3aaf738664 100644
--- a/src/bun.js/bindings/BunClientData.cpp
+++ b/src/bun.js/bindings/BunClientData.cpp
@@ -26,6 +26,8 @@
 namespace WebCore {
 using namespace JSC;
 
+RefPtr<JSC::SourceProvider> createBuiltinsSourceProvider();
+
 JSHeapData::JSHeapData(Heap& heap)
     : m_heapCellTypeForJSWorkerGlobalScope(JSC::IsoHeapCellType::Args<Zig::GlobalObject>())
     , m_domBuiltinConstructorSpace ISO_SUBSPACE_INIT(heap, heap.cellHeapCellType, JSDOMBuiltinConstructorBase)
@@ -38,15 +40,14 @@ JSHeapData::JSHeapData(Heap& heap)
 
 #define CLIENT_ISO_SUBSPACE_INIT(subspace) subspace(m_heapData->subspace)
 
-JSVMClientData::JSVMClientData(VM& vm)
-    : m_builtinFunctions(vm)
-    , m_builtinNames(vm)
+JSVMClientData::JSVMClientData(VM& vm, RefPtr<SourceProvider> sourceProvider)
+    : m_builtinNames(vm)
+    , m_builtinFunctions(vm, sourceProvider, m_builtinNames)
     , m_heapData(JSHeapData::ensureHeapData(vm.heap))
     , CLIENT_ISO_SUBSPACE_INIT(m_domBuiltinConstructorSpace)
     , CLIENT_ISO_SUBSPACE_INIT(m_domConstructorSpace)
     , CLIENT_ISO_SUBSPACE_INIT(m_domNamespaceObjectSpace)
     , m_clientSubspaces(makeUnique<ExtendedDOMClientIsoSubspaces>())
-
 {
 }
 
@@ -72,7 +73,8 @@ JSVMClientData::~JSVMClientData()
 }
 void JSVMClientData::create(VM* vm, void* bunVM)
 {
-    JSVMClientData* clientData = new JSVMClientData(*vm);
+    auto provider = WebCore::createBuiltinsSourceProvider();
+    JSVMClientData* clientData = new JSVMClientData(*vm, provider);
     clientData->bunVM = bunVM;
     vm->deferredWorkTimer->onAddPendingWork = Bun::JSCTaskScheduler::onAddPendingWork;
     vm->deferredWorkTimer->onScheduleWorkSoon = Bun::JSCTaskScheduler::onScheduleWorkSoon;
@@ -83,6 +85,7 @@ void JSVMClientData::create(VM* vm, void* bunVM)
 
     vm->heap.addMarkingConstraint(makeUnique<WebCore::DOMGCOutputConstraint>(*vm, clientData->heapData()));
     vm->m_typedArrayController = adoptRef(new WebCoreTypedArrayController(true));
+    clientData->builtinFunctions().exportNames();
 }
 
 } // namespace WebCore
\ No newline at end of file
diff --git a/src/bun.js/bindings/BunClientData.h b/src/bun.js/bindings/BunClientData.h
index e6862b9553..e0f8fb3034 100644
--- a/src/bun.js/bindings/BunClientData.h
+++ b/src/bun.js/bindings/BunClientData.h
@@ -76,7 +76,7 @@ class JSVMClientData : public JSC::VM::ClientData {
     WTF_MAKE_FAST_ALLOCATED;
 
 public:
-    explicit JSVMClientData(JSC::VM&);
+    explicit JSVMClientData(JSC::VM&, RefPtr<JSC::SourceProvider>);
 
     virtual ~JSVMClientData();
 
diff --git a/src/bun.js/bindings/BunObject.cpp b/src/bun.js/bindings/BunObject.cpp
index c15cb12a5a..8f7b40708e 100644
--- a/src/bun.js/bindings/BunObject.cpp
+++ b/src/bun.js/bindings/BunObject.cpp
@@ -49,6 +49,7 @@ BUN_DECLARE_HOST_FUNCTION(Bun__DNSResolver__lookupService);
 BUN_DECLARE_HOST_FUNCTION(Bun__DNSResolver__prefetch);
 BUN_DECLARE_HOST_FUNCTION(Bun__DNSResolver__getCacheStats);
 BUN_DECLARE_HOST_FUNCTION(Bun__fetch);
+BUN_DECLARE_HOST_FUNCTION(Bun__fetchPreconnect);
 
 namespace Bun {
 
@@ -267,6 +268,17 @@ static JSValue constructPasswordObject(VM& vm, JSObject* bunObject)
     return JSValue::decode(JSPasswordObject__create(bunObject->globalObject()));
 }
 
+JSValue constructBunFetchObject(VM& vm, JSObject* bunObject)
+{
+    JSFunction* fetchFn = JSFunction::create(vm, bunObject->globalObject(), 1, "fetch"_s, Bun__fetch, ImplementationVisibility::Public, NoIntrinsic);
+
+    auto* globalObject = jsCast<Zig::GlobalObject*>(bunObject->globalObject());
+    fetchFn->putDirectNativeFunction(vm, globalObject, JSC::Identifier::fromString(vm, "preconnect"_s), 1, Bun__fetchPreconnect, ImplementationVisibility::Public, NoIntrinsic,
+        JSC::PropertyAttribute::ReadOnly | JSC::PropertyAttribute::DontDelete | 0);
+
+    return fetchFn;
+}
+
 static JSValue constructBunShell(VM& vm, JSObject* bunObject)
 {
     auto* globalObject = jsCast<Zig::GlobalObject*>(bunObject->globalObject());
@@ -299,7 +311,7 @@ static JSValue constructDNSObject(VM& vm, JSObject* bunObject)
     JSC::JSObject* dnsObject = JSC::constructEmptyObject(globalObject);
     dnsObject->putDirectNativeFunction(vm, globalObject, JSC::Identifier::fromString(vm, "lookup"_s), 2, Bun__DNSResolver__lookup, ImplementationVisibility::Public, NoIntrinsic,
         JSC::PropertyAttribute::DontDelete | 0);
-    dnsObject->putDirectNativeFunction(vm, globalObject, builtinNames(vm).resolvePublicName(), 2, Bun__DNSResolver__resolve, ImplementationVisibility::Public, NoIntrinsic,
+    dnsObject->putDirectNativeFunction(vm, globalObject, vm.propertyNames->resolve, 2, Bun__DNSResolver__resolve, ImplementationVisibility::Public, NoIntrinsic,
         JSC::PropertyAttribute::DontDelete | 0);
     dnsObject->putDirectNativeFunction(vm, globalObject, JSC::Identifier::fromString(vm, "resolveSrv"_s), 2, Bun__DNSResolver__resolveSrv, ImplementationVisibility::Public, NoIntrinsic,
         JSC::PropertyAttribute::DontDelete | 0);
@@ -549,14 +561,14 @@ JSC_DEFINE_HOST_FUNCTION(functionFileURLToPath, (JSC::JSGlobalObject * globalObj
     cwd                                            BunObject_getter_wrap_cwd                                           DontEnum|DontDelete|PropertyCallback
     deepEquals                                     functionBunDeepEquals                                               DontDelete|Function 2
     deepMatch                                      functionBunDeepMatch                                                DontDelete|Function 2
-    deflateSync                                    BunObject_callback_deflateSync                                      DontDelete|Function 1
+    deflateSync                                    BunObject_callback_deflateSync                                        DontDelete|Function 1
     dns                                            constructDNSObject                                                  ReadOnly|DontDelete|PropertyCallback
     enableANSIColors                               BunObject_getter_wrap_enableANSIColors                              DontDelete|PropertyCallback
     env                                            constructEnvObject                                                  ReadOnly|DontDelete|PropertyCallback
     escapeHTML                                     functionBunEscapeHTML                                               DontDelete|Function 2
-    fetch                                          Bun__fetch                                                          ReadOnly|DontDelete|Function 1
-    file                                           BunObject_callback_file                                             DontDelete|Function 1
-    fileURLToPath                                  functionFileURLToPath                                               DontDelete|Function 1
+    fetch                                         constructBunFetchObject                                              ReadOnly|DontDelete|PropertyCallback
+    file                                           BunObject_callback_file                                               DontDelete|Function 1
+    fileURLToPath                                  functionFileURLToPath                                                DontDelete|Function 1
     gc                                             BunObject_callback_gc                                               DontDelete|Function 1
     generateHeapSnapshot                           BunObject_callback_generateHeapSnapshot                             DontDelete|Function 1
     gunzipSync                                     BunObject_callback_gunzipSync                                       DontDelete|Function 1
diff --git a/src/bun.js/bindings/BunObject.h b/src/bun.js/bindings/BunObject.h
index f5c167e2fb..2ddd9ab04a 100644
--- a/src/bun.js/bindings/BunObject.h
+++ b/src/bun.js/bindings/BunObject.h
@@ -12,5 +12,7 @@ JSC_DECLARE_HOST_FUNCTION(functionBunNanoseconds);
 JSC_DECLARE_HOST_FUNCTION(functionPathToFileURL);
 JSC_DECLARE_HOST_FUNCTION(functionFileURLToPath);
 
+JSC::JSValue constructBunFetchObject(VM& vm, JSObject* bunObject);
 JSC::JSObject* createBunObject(VM& vm, JSObject* globalObject);
+
 }
diff --git a/src/bun.js/bindings/BunProcess.cpp b/src/bun.js/bindings/BunProcess.cpp
index 3b02306650..e03743ba17 100644
--- a/src/bun.js/bindings/BunProcess.cpp
+++ b/src/bun.js/bindings/BunProcess.cpp
@@ -109,7 +109,7 @@ static bool processIsExiting = false;
 extern "C" uint8_t Bun__getExitCode(void*);
 extern "C" uint8_t Bun__setExitCode(void*, uint8_t);
 extern "C" void* Bun__getVM();
-extern "C" Zig::GlobalObject* Bun__getDefaultGlobal();
+extern "C" Zig::GlobalObject* Bun__getDefaultGlobalObject();
 extern "C" bool Bun__GlobalObject__hasIPC(JSGlobalObject*);
 extern "C" bool Bun__ensureProcessIPCInitialized(JSGlobalObject*);
 extern "C" const char* Bun__githubURL;
@@ -143,7 +143,7 @@ static JSValue constructPlatform(VM& vm, JSObject* processObject)
 static JSValue constructVersions(VM& vm, JSObject* processObject)
 {
     auto* globalObject = processObject->globalObject();
-    JSC::JSObject* object = JSC::constructEmptyObject(globalObject, globalObject->objectPrototype(), 23);
+    JSC::JSObject* object = JSC::constructEmptyObject(globalObject, globalObject->objectPrototype(), 24);
 
     object->putDirect(vm, JSC::Identifier::fromString(vm, "node"_s),
         JSC::JSValue(JSC::jsOwnedString(vm, makeAtomString(ASCIILiteral::fromLiteralUnsafe(REPORTED_NODEJS_VERSION)))));
@@ -176,6 +176,8 @@ static JSValue constructVersions(VM& vm, JSObject* processObject)
         JSC::JSValue(JSC::jsString(vm, makeString(ASCIILiteral::fromLiteralUnsafe(Bun__versions_lolhtml)))), 0);
     object->putDirect(vm, JSC::Identifier::fromString(vm, "ares"_s),
         JSC::JSValue(JSC::jsString(vm, makeString(ASCIILiteral::fromLiteralUnsafe(Bun__versions_c_ares)))), 0);
+    object->putDirect(vm, JSC::Identifier::fromString(vm, "libdeflate"_s),
+        JSC::JSValue(JSC::jsString(vm, makeString(ASCIILiteral::fromLiteralUnsafe(Bun__versions_libdeflate)))), 0);
     object->putDirect(vm, JSC::Identifier::fromString(vm, "usockets"_s),
         JSC::JSValue(JSC::jsString(vm, makeString(ASCIILiteral::fromLiteralUnsafe(Bun__versions_usockets)))), 0);
     object->putDirect(vm, JSC::Identifier::fromString(vm, "lshpack"_s),
@@ -464,6 +466,8 @@ extern "C" void Process__dispatchOnExit(Zig::GlobalObject* globalObject, uint8_t
     }
 
     auto* process = jsCast<Process*>(globalObject->processObject());
+    if (exitCode > 0)
+        process->m_isExitCodeObservable = true;
     dispatchExitInternal(globalObject, process, exitCode);
 }
 
@@ -487,6 +491,7 @@ JSC_DEFINE_HOST_FUNCTION(Process_functionExit,
         RETURN_IF_EXCEPTION(throwScope, JSC::JSValue::encode(JSC::JSValue {}));
 
         exitCode = static_cast<uint8_t>(extiCode32);
+        Bun__setExitCode(Bun__getVM(), exitCode);
     } else if (!arg0.isUndefinedOrNull()) {
         throwTypeError(globalObject, throwScope, "The \"code\" argument must be an integer"_s);
         return JSC::JSValue::encode(JSC::JSValue {});
@@ -496,8 +501,10 @@ JSC_DEFINE_HOST_FUNCTION(Process_functionExit,
 
     auto* zigGlobal = jsDynamicCast<Zig::GlobalObject*>(globalObject);
     if (UNLIKELY(!zigGlobal)) {
-        zigGlobal = Bun__getDefaultGlobal();
+        zigGlobal = Bun__getDefaultGlobalObject();
     }
+    auto process = jsCast<Process*>(zigGlobal->processObject());
+    process->m_isExitCodeObservable = true;
 
     Process__dispatchOnExit(zigGlobal, exitCode);
     Bun__Process__exit(zigGlobal, exitCode);
@@ -515,7 +522,7 @@ JSC_DEFINE_HOST_FUNCTION(Process_setUncaughtExceptionCaptureCallback,
     }
     auto* zigGlobal = jsDynamicCast<Zig::GlobalObject*>(globalObject);
     if (UNLIKELY(!zigGlobal)) {
-        zigGlobal = Bun__getDefaultGlobal();
+        zigGlobal = Bun__getDefaultGlobalObject();
     }
     jsCast<Process*>(zigGlobal->processObject())->setUncaughtExceptionCaptureCallback(arg0);
     return JSC::JSValue::encode(jsUndefined());
@@ -526,7 +533,7 @@ JSC_DEFINE_HOST_FUNCTION(Process_hasUncaughtExceptionCaptureCallback,
 {
     auto* zigGlobal = jsDynamicCast<Zig::GlobalObject*>(globalObject);
     if (UNLIKELY(!zigGlobal)) {
-        zigGlobal = Bun__getDefaultGlobal();
+        zigGlobal = Bun__getDefaultGlobalObject();
     }
     JSValue cb = jsCast<Process*>(zigGlobal->processObject())->getUncaughtExceptionCaptureCallback();
     if (cb.isEmpty() || !cb.isCell()) {
@@ -1091,9 +1098,13 @@ JSC_DEFINE_CUSTOM_GETTER(processExitCode, (JSC::JSGlobalObject * lexicalGlobalOb
     if (!process) {
         return JSValue::encode(jsUndefined());
     }
+    if (!process->m_isExitCodeObservable) {
+        return JSValue::encode(jsUndefined());
+    }
 
     return JSValue::encode(jsNumber(Bun__getExitCode(jsCast<Zig::GlobalObject*>(process->globalObject())->bunVM())));
 }
+
 JSC_DEFINE_CUSTOM_SETTER(setProcessExitCode, (JSC::JSGlobalObject * lexicalGlobalObject, JSC::EncodedJSValue thisValue, JSC::EncodedJSValue value, JSC::PropertyName))
 {
     Process* process = jsDynamicCast<Process*>(JSValue::decode(thisValue));
@@ -1111,6 +1122,7 @@ JSC_DEFINE_CUSTOM_SETTER(setProcessExitCode, (JSC::JSGlobalObject * lexicalGloba
     int exitCodeInt = exitCode.toInt32(lexicalGlobalObject) % 256;
     RETURN_IF_EXCEPTION(throwScope, false);
 
+    process->m_isExitCodeObservable = true;
     void* ptr = jsCast<Zig::GlobalObject*>(process->globalObject())->bunVM();
     Bun__setExitCode(ptr, static_cast<uint8_t>(exitCodeInt));
 
@@ -1604,7 +1616,7 @@ static JSValue constructReportObjectComplete(VM& vm, Zig::GlobalObject* globalOb
     auto constructJavaScriptStack = [&]() -> JSC::JSValue {
         JSC::JSObject* javascriptStack = JSC::constructEmptyObject(globalObject, globalObject->objectPrototype(), 3);
 
-        javascriptStack->putDirect(vm, JSC::Identifier::fromString(vm, "message"_s), JSC::jsString(vm, String("Error [ERR_SYNTHETIC]: JavaScript Callstack"_s)), 0);
+        javascriptStack->putDirect(vm, vm.propertyNames->message, JSC::jsString(vm, String("Error [ERR_SYNTHETIC]: JavaScript Callstack"_s)), 0);
 
         // TODO: allow errors as an argument
         {
@@ -1840,13 +1852,13 @@ static JSValue constructStdioWriteStream(JSC::JSGlobalObject* globalObject, int
 
 static JSValue constructStdout(VM& vm, JSObject* processObject)
 {
-    auto* globalObject = Bun__getDefaultGlobal();
+    auto* globalObject = Bun__getDefaultGlobalObject();
     return constructStdioWriteStream(globalObject, 1);
 }
 
 static JSValue constructStderr(VM& vm, JSObject* processObject)
 {
-    auto* globalObject = Bun__getDefaultGlobal();
+    auto* globalObject = Bun__getDefaultGlobalObject();
     return constructStdioWriteStream(globalObject, 2);
 }
 
@@ -1856,7 +1868,7 @@ static JSValue constructStderr(VM& vm, JSObject* processObject)
 
 static JSValue constructStdin(VM& vm, JSObject* processObject)
 {
-    auto* globalObject = Bun__getDefaultGlobal();
+    auto* globalObject = Bun__getDefaultGlobalObject();
     auto scope = DECLARE_THROW_SCOPE(vm);
     JSC::JSFunction* getStdioWriteStream = JSC::JSFunction::create(vm, processObjectInternalsGetStdinStreamCodeGenerator(vm), globalObject);
     JSC::MarkedArgumentBuffer args;
@@ -2145,7 +2157,7 @@ JSC_DEFINE_HOST_FUNCTION(Process_functionReallyExit, (JSGlobalObject * globalObj
 
     auto* zigGlobal = jsDynamicCast<Zig::GlobalObject*>(globalObject);
     if (UNLIKELY(!zigGlobal)) {
-        zigGlobal = Bun__getDefaultGlobal();
+        zigGlobal = Bun__getDefaultGlobalObject();
     }
     Bun__Process__exit(zigGlobal, exitCode);
     return JSC::JSValue::encode(jsUndefined());
@@ -2232,7 +2244,7 @@ static Process* getProcessObject(JSC::JSGlobalObject* lexicalGlobalObject, JSVal
         Zig::GlobalObject* zigGlobalObject = jsDynamicCast<Zig::GlobalObject*>(lexicalGlobalObject);
 
         if (UNLIKELY(!zigGlobalObject)) {
-            zigGlobalObject = Bun__getDefaultGlobal();
+            zigGlobalObject = Bun__getDefaultGlobalObject();
         }
 
         return jsCast<Process*>(zigGlobalObject->processObject());
@@ -2478,7 +2490,7 @@ JSC_DEFINE_HOST_FUNCTION(Process_functionOpenStdin, (JSGlobalObject * globalObje
     auto& vm = globalObject->vm();
     Zig::GlobalObject* global = jsDynamicCast<Zig::GlobalObject*>(globalObject);
     if (UNLIKELY(!global)) {
-        global = Bun__getDefaultGlobal();
+        global = Bun__getDefaultGlobalObject();
     }
     auto throwScope = DECLARE_THROW_SCOPE(vm);
 
@@ -2713,6 +2725,11 @@ JSC_DEFINE_HOST_FUNCTION(Process_functionReallyKill,
 {
     auto scope = DECLARE_THROW_SCOPE(globalObject->vm());
 
+    if (callFrame->argumentCount() < 2) {
+        throwVMError(globalObject, scope, "Not enough arguments"_s);
+        return {};
+    }
+
     int pid = callFrame->argument(0).toInt32(globalObject);
     RETURN_IF_EXCEPTION(scope, {});
 
@@ -2721,16 +2738,15 @@ JSC_DEFINE_HOST_FUNCTION(Process_functionReallyKill,
 
 #if !OS(WINDOWS)
     int result = kill(pid, signal);
+    if (result < 0)
+        result = errno;
 #else
     int result = uv_kill(pid, signal);
 #endif
 
-    if (result < 0) {
-        throwSystemError(scope, globalObject, "kill"_s, errno);
-    }
-
-    RELEASE_AND_RETURN(scope, JSValue::encode(jsUndefined()));
+    RELEASE_AND_RETURN(scope, JSValue::encode(jsNumber(result)));
 }
+
 JSC_DEFINE_HOST_FUNCTION(Process_functionKill,
     (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callFrame))
 {
@@ -2764,15 +2780,33 @@ JSC_DEFINE_HOST_FUNCTION(Process_functionKill,
         return JSValue::encode(jsUndefined());
     }
 
-#if OS(WINDOWS)
-    int result = uv_kill(pid, signal);
-#else
-    int result = kill(pid, signal);
-#endif
+    auto global = jsCast<Zig::GlobalObject*>(globalObject);
+    auto& vm = global->vm();
+    JSValue _killFn = global->processObject()->get(globalObject, Identifier::fromString(vm, "_kill"_s));
+    RETURN_IF_EXCEPTION(scope, {});
+    if (!_killFn.isCallable()) {
+        throwTypeError(globalObject, scope, "process._kill is not a function"_s);
+        return JSValue::encode({});
+    }
 
-    if (result < 0) {
-        throwSystemError(scope, globalObject, "kill"_s, errno);
-        return JSValue::encode(jsUndefined());
+    JSC::MarkedArgumentBuffer args;
+    args.append(jsNumber(pid));
+    args.append(jsNumber(signal));
+    JSC::CallData callData = JSC::getCallData(_killFn);
+
+    NakedPtr<JSC::Exception> returnedException = nullptr;
+    auto result = JSC::call(globalObject, _killFn, callData, globalObject->globalThis(), args, returnedException);
+    RETURN_IF_EXCEPTION(scope, {});
+
+    if (auto* exception = returnedException.get()) {
+        scope.throwException(globalObject, exception->value());
+        returnedException.clear();
+        return {};
+    }
+    auto err = result.toInt32(globalObject);
+    if (err) {
+        throwSystemError(scope, globalObject, "kill"_s, err);
+        return {};
     }
 
     return JSValue::encode(jsBoolean(true));
@@ -2783,7 +2817,7 @@ extern "C" void Process__emitMessageEvent(Zig::GlobalObject* global, EncodedJSVa
     auto* process = static_cast<Process*>(global->processObject());
     auto& vm = global->vm();
 
-    auto ident = Identifier::fromString(vm, "message"_s);
+    auto ident = vm.propertyNames->message;
     if (process->wrapped().hasEventListeners(ident)) {
         JSC::MarkedArgumentBuffer args;
         args.append(JSValue::decode(value));
diff --git a/src/bun.js/bindings/BunProcess.h b/src/bun.js/bindings/BunProcess.h
index 653f4d54a4..6b11936372 100644
--- a/src/bun.js/bindings/BunProcess.h
+++ b/src/bun.js/bindings/BunProcess.h
@@ -37,6 +37,8 @@ public:
 
     ~Process();
 
+    bool m_isExitCodeObservable = false;
+
     static constexpr unsigned StructureFlags = Base::StructureFlags | HasStaticPropertyTable;
 
     static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject,
@@ -71,11 +73,13 @@ public:
 
     void finishCreation(JSC::VM& vm);
 
-    inline void setUncaughtExceptionCaptureCallback(JSC::JSValue callback) {
+    inline void setUncaughtExceptionCaptureCallback(JSC::JSValue callback)
+    {
         m_uncaughtExceptionCaptureCallback.set(vm(), this, callback);
     }
 
-    inline JSC::JSValue getUncaughtExceptionCaptureCallback() {
+    inline JSC::JSValue getUncaughtExceptionCaptureCallback()
+    {
         return m_uncaughtExceptionCaptureCallback.get();
     }
 
diff --git a/src/bun.js/bindings/CallSite.cpp b/src/bun.js/bindings/CallSite.cpp
index 85a41a17be..f1a5181265 100644
--- a/src/bun.js/bindings/CallSite.cpp
+++ b/src/bun.js/bindings/CallSite.cpp
@@ -126,11 +126,21 @@ void CallSite::formatAsString(JSC::VM& vm, JSC::JSGlobalObject* globalObject, WT
     if (isNative()) {
         sb.append("native"_s);
     } else {
-        sb.append(mySourceURL->getString(globalObject));
-        sb.append(":"_s);
-        sb.append(myLineNumber->getString(globalObject));
-        sb.append(":"_s);
-        sb.append(myColumnNumber->getString(globalObject));
+        if (mySourceURL->length() == 0) {
+            sb.append("unknown"_s);
+        } else {
+            sb.append(mySourceURL->getString(globalObject));
+        }
+
+        if (myLineNumber->length() > 0 && myColumnNumber->length() > 0) {
+            sb.append(":"_s);
+            sb.append(myLineNumber->getString(globalObject));
+            sb.append(":"_s);
+            sb.append(myColumnNumber->getString(globalObject));
+        } else if (myLineNumber->length() > 0) {
+            sb.append(":"_s);
+            sb.append(myLineNumber->getString(globalObject));
+        }
     }
     sb.append(")"_s);
 }
diff --git a/src/bun.js/bindings/CommonJSModuleRecord.cpp b/src/bun.js/bindings/CommonJSModuleRecord.cpp
index 3ed8339213..eb7bcb75eb 100644
--- a/src/bun.js/bindings/CommonJSModuleRecord.cpp
+++ b/src/bun.js/bindings/CommonJSModuleRecord.cpp
@@ -290,7 +290,7 @@ RequireFunctionPrototype* RequireFunctionPrototype::create(
     RequireFunctionPrototype* prototype = new (NotNull, JSC::allocateCell<RequireFunctionPrototype>(vm)) RequireFunctionPrototype(vm, structure);
     prototype->finishCreation(vm);
 
-    prototype->putDirect(vm, builtinNames(vm).resolvePublicName(), jsCast<Zig::GlobalObject*>(globalObject)->requireResolveFunctionUnbound(), 0);
+    prototype->putDirect(vm, vm.propertyNames->resolve, jsCast<Zig::GlobalObject*>(globalObject)->requireResolveFunctionUnbound(), 0);
 
     return prototype;
 }
diff --git a/src/bun.js/bindings/InternalModuleRegistry.cpp b/src/bun.js/bindings/InternalModuleRegistry.cpp
index 501c7a92aa..fdf5c3eb55 100644
--- a/src/bun.js/bindings/InternalModuleRegistry.cpp
+++ b/src/bun.js/bindings/InternalModuleRegistry.cpp
@@ -1,5 +1,4 @@
 #include "InternalModuleRegistry.h"
-
 #include "ZigGlobalObject.h"
 #include <JavaScriptCore/BuiltinUtils.h>
 #include <JavaScriptCore/JSFunction.h>
diff --git a/src/bun.js/bindings/JSMockFunction.cpp b/src/bun.js/bindings/JSMockFunction.cpp
index 894e198db9..6073537f7b 100644
--- a/src/bun.js/bindings/JSMockFunction.cpp
+++ b/src/bun.js/bindings/JSMockFunction.cpp
@@ -1362,12 +1362,9 @@ BUN_DEFINE_HOST_FUNCTION(JSMock__jsSetSystemTime, (JSC::JSGlobalObject * globalO
         }
         return JSValue::encode(callFrame->thisValue());
     }
+    // number > 0 is a valid date otherwise it's invalid and we should reset the time (set to -1)
+    globalObject->overridenDateNow = (argument0.isNumber() && argument0.asNumber() >= 0) ? argument0.asNumber() : -1;
 
-    if (argument0.isNumber() && argument0.asNumber() > 0) {
-        globalObject->overridenDateNow = argument0.asNumber();
-    }
-
-    globalObject->overridenDateNow = -1;
     return JSValue::encode(callFrame->thisValue());
 }
 
diff --git a/src/bun.js/bindings/NodeError.cpp b/src/bun.js/bindings/NodeError.cpp
new file mode 100644
index 0000000000..c29dd34338
--- /dev/null
+++ b/src/bun.js/bindings/NodeError.cpp
@@ -0,0 +1,95 @@
+#include "root.h"
+#include "headers-handwritten.h"
+#include "BunClientData.h"
+#include "helpers.h"
+#include "JavaScriptCore/JSCJSValue.h"
+#include "JavaScriptCore/ErrorInstance.h"
+#include "JavaScriptCore/ExceptionScope.h"
+#include "wtf/text/ASCIILiteral.h"
+#include "wtf/text/MakeString.h"
+#include <cstdio>
+
+JSC::EncodedJSValue JSC__JSValue__createTypeError(const ZigString* message, const ZigString* arg1, JSC::JSGlobalObject* globalObject);
+JSC::EncodedJSValue JSC__JSValue__createRangeError(const ZigString* message, const ZigString* arg1, JSC::JSGlobalObject* globalObject);
+
+namespace Bun {
+
+using namespace JSC;
+
+JSC::JSValue createTypeErrorWithCode(JSC::JSGlobalObject* globalObject, String message, ASCIILiteral code)
+{
+    JSC::VM& vm = globalObject->vm();
+
+    JSC::JSObject* result = JSC::createTypeError(globalObject, message);
+    JSC::EnsureStillAliveScope ensureAlive(result);
+    auto typeError = JSC::JSValue(result).asCell()->getObject();
+
+    auto clientData = WebCore::clientData(vm);
+    typeError->putDirect(vm, clientData->builtinNames().codePublicName(), jsString(vm, String(code)), 0);
+
+    return typeError;
+}
+
+JSC::JSValue createRangeErrorWithCode(JSC::JSGlobalObject* globalObject, String message, ASCIILiteral code)
+{
+    JSC::VM& vm = globalObject->vm();
+
+    JSC::JSObject* result = JSC::createRangeError(globalObject, message);
+    JSC::EnsureStillAliveScope ensureAlive(result);
+    auto typeError = JSC::JSValue(result).asCell()->getObject();
+
+    auto clientData = WebCore::clientData(vm);
+    typeError->putDirect(vm, clientData->builtinNames().codePublicName(), jsString(vm, String(code)), 0);
+
+    return typeError;
+}
+
+JSC_DEFINE_HOST_FUNCTION(jsFunction_ERR_INVALID_ARG_TYPE, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callFrame))
+{
+    JSC::VM& vm = globalObject->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    auto argCount = callFrame->argumentCount();
+    if (argCount < 3) {
+        JSC::throwTypeError(globalObject, scope, "requires 3 arguments"_s);
+        return {};
+    }
+
+    auto arg_name = callFrame->argument(0).toWTFString(globalObject);
+    RETURN_IF_EXCEPTION(scope, {});
+
+    auto expected_type = callFrame->argument(1).toWTFString(globalObject);
+    RETURN_IF_EXCEPTION(scope, {});
+
+    auto actual_value = callFrame->argument(2).toWTFString(globalObject);
+    RETURN_IF_EXCEPTION(scope, {});
+
+    auto message = makeString("The \""_s, arg_name, "\" argument must be of type "_s, expected_type, ". Recieved "_s, actual_value);
+    return JSC::JSValue::encode(createTypeErrorWithCode(globalObject, message, "ERR_INVALID_ARG_TYPE"_s));
+}
+
+JSC_DEFINE_HOST_FUNCTION(jsFunction_ERR_OUT_OF_RANGE, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callFrame))
+{
+    JSC::VM& vm = globalObject->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    auto argCount = callFrame->argumentCount();
+    if (argCount < 3) {
+        JSC::throwTypeError(globalObject, scope, "requires 3 arguments"_s);
+        return {};
+    }
+
+    auto arg_name = callFrame->argument(0).toWTFString(globalObject);
+    RETURN_IF_EXCEPTION(scope, {});
+
+    auto range = callFrame->argument(1).toWTFString(globalObject);
+    RETURN_IF_EXCEPTION(scope, {});
+
+    auto input = callFrame->argument(2).toWTFString(globalObject);
+    RETURN_IF_EXCEPTION(scope, {});
+
+    auto message = makeString("The value of \""_s, arg_name, "\" is out of range. It must be "_s, range, ". Received "_s, input);
+    return JSC::JSValue::encode(createRangeErrorWithCode(globalObject, message, "ERR_OUT_OF_RANGE"_s));
+}
+
+}
diff --git a/src/bun.js/bindings/NodeError.h b/src/bun.js/bindings/NodeError.h
new file mode 100644
index 0000000000..dc959feff0
--- /dev/null
+++ b/src/bun.js/bindings/NodeError.h
@@ -0,0 +1,8 @@
+#include "root.h"
+
+namespace Bun {
+
+JSC_DEFINE_HOST_FUNCTION(jsFunction_ERR_INVALID_ARG_TYPE, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callFrame));
+JSC_DEFINE_HOST_FUNCTION(jsFunction_ERR_OUT_OF_RANGE, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callFrame));
+
+}
diff --git a/src/bun.js/bindings/NodeFetch.cpp b/src/bun.js/bindings/NodeFetch.cpp
new file mode 100644
index 0000000000..1b25af677d
--- /dev/null
+++ b/src/bun.js/bindings/NodeFetch.cpp
@@ -0,0 +1,50 @@
+#include "root.h"
+#include "JSDOMGlobalObjectInlines.h"
+#include "ZigGlobalObject.h"
+
+#include "JSFetchHeaders.h"
+#include "JSDOMFormData.h"
+#include "JavaScriptCore/ObjectConstructor.h"
+
+#include "helpers.h"
+#include "BunClientData.h"
+
+#include "JavaScriptCore/AggregateError.h"
+#include "JavaScriptCore/JSFunction.h"
+#include "JSDOMFile.h"
+
+namespace Bun {
+
+using namespace JSC;
+using namespace WebCore;
+
+// Ensure overriding globals doesn't impact usages.
+JSC::JSValue createNodeFetchInternalBinding(Zig::GlobalObject* globalObject)
+{
+    auto& vm = globalObject->vm();
+
+    auto* obj = constructEmptyObject(globalObject);
+    obj->putDirectIndex(
+        globalObject, 0,
+        globalObject->JSResponseConstructor());
+    obj->putDirectIndex(
+        globalObject, 1,
+        globalObject->JSRequestConstructor());
+    obj->putDirectIndex(
+        globalObject, 2,
+        globalObject->JSBlobConstructor());
+    obj->putDirectIndex(
+        globalObject, 3,
+        WebCore::JSFetchHeaders::getConstructor(vm, globalObject));
+
+    obj->putDirectIndex(
+        globalObject, 4,
+        WebCore::JSDOMFormData::getConstructor(vm, globalObject));
+    obj->putDirectIndex(
+        globalObject, 5,
+        globalObject->JSDOMFileConstructor());
+
+    return obj;
+}
+
+}
\ No newline at end of file
diff --git a/src/bun.js/bindings/NodeFetch.h b/src/bun.js/bindings/NodeFetch.h
new file mode 100644
index 0000000000..2b20c2d0be
--- /dev/null
+++ b/src/bun.js/bindings/NodeFetch.h
@@ -0,0 +1,7 @@
+#include "config.h"
+
+namespace Bun {
+
+JSC::JSValue createNodeFetchInternalBinding(Zig::GlobalObject*);
+
+}
\ No newline at end of file
diff --git a/src/bun.js/bindings/NodeHTTP.cpp b/src/bun.js/bindings/NodeHTTP.cpp
index a49e17adcd..2f5c810ebf 100644
--- a/src/bun.js/bindings/NodeHTTP.cpp
+++ b/src/bun.js/bindings/NodeHTTP.cpp
@@ -1,4 +1,5 @@
 #include "root.h"
+#include "JSDOMGlobalObjectInlines.h"
 #include "ZigGlobalObject.h"
 #include <JavaScriptCore/GlobalObjectMethodTable.h>
 #include "helpers.h"
@@ -259,10 +260,11 @@ JSC_DEFINE_HOST_FUNCTION(jsHTTPAssignHeaders, (JSGlobalObject * globalObject, Ca
     auto& vm = globalObject->vm();
     auto scope = DECLARE_THROW_SCOPE(vm);
 
-    JSValue requestValue = callFrame->argument(0);
-    JSObject* objectValue = callFrame->argument(1).getObject();
-
-    JSC::InternalFieldTuple* tuple = JSC::InternalFieldTuple::create(vm, globalObject->m_internalFieldTupleStructure.get());
+    // This is an internal binding.
+    JSValue requestValue = callFrame->uncheckedArgument(0);
+    JSObject* objectValue = callFrame->uncheckedArgument(1).getObject();
+    JSC::InternalFieldTuple* tuple = jsCast<JSC::InternalFieldTuple*>(callFrame->uncheckedArgument(2));
+    ASSERT(callFrame->argumentCount() == 3);
 
     JSValue headersValue = JSValue();
     JSValue urlValue = JSValue();
@@ -409,13 +411,28 @@ JSValue createNodeHTTPInternalBinding(Zig::GlobalObject* globalObject)
     VM& vm = globalObject->vm();
     obj->putDirect(
         vm, JSC::PropertyName(JSC::Identifier::fromString(vm, "setHeader"_s)),
-        JSC::JSFunction::create(vm, globalObject, 3, "setHeader"_s, jsHTTPSetHeader, ImplementationVisibility::Public), NoIntrinsic);
+        JSC::JSFunction::create(vm, globalObject, 3, "setHeader"_s, jsHTTPSetHeader, ImplementationVisibility::Public), 0);
     obj->putDirect(
         vm, JSC::PropertyName(JSC::Identifier::fromString(vm, "getHeader"_s)),
-        JSC::JSFunction::create(vm, globalObject, 2, "getHeader"_s, jsHTTPGetHeader, ImplementationVisibility::Public), NoIntrinsic);
+        JSC::JSFunction::create(vm, globalObject, 2, "getHeader"_s, jsHTTPGetHeader, ImplementationVisibility::Public), 0);
     obj->putDirect(
         vm, JSC::PropertyName(JSC::Identifier::fromString(vm, "assignHeaders"_s)),
-        JSC::JSFunction::create(vm, globalObject, 2, "assignHeaders"_s, jsHTTPAssignHeaders, ImplementationVisibility::Public), NoIntrinsic);
+        JSC::JSFunction::create(vm, globalObject, 2, "assignHeaders"_s, jsHTTPAssignHeaders, ImplementationVisibility::Public), 0);
+    obj->putDirect(
+        vm, JSC::PropertyName(JSC::Identifier::fromString(vm, "Response"_s)),
+        globalObject->JSResponseConstructor(), 0);
+    obj->putDirect(
+        vm, JSC::PropertyName(JSC::Identifier::fromString(vm, "Request"_s)),
+        globalObject->JSRequestConstructor(), 0);
+    obj->putDirect(
+        vm, JSC::PropertyName(JSC::Identifier::fromString(vm, "Blob"_s)),
+        globalObject->JSBlobConstructor(), 0);
+    obj->putDirect(
+        vm, JSC::PropertyName(JSC::Identifier::fromString(vm, "Headers"_s)),
+        WebCore::JSFetchHeaders::getConstructor(vm, globalObject), 0);
+    obj->putDirect(
+        vm, JSC::PropertyName(JSC::Identifier::fromString(vm, "headersTuple"_s)),
+        JSC::InternalFieldTuple::create(vm, globalObject->m_internalFieldTupleStructure.get()), 0);
     return obj;
 }
 
diff --git a/src/bun.js/bindings/Path.cpp b/src/bun.js/bindings/Path.cpp
index 516b4da73a..74ced1bd76 100644
--- a/src/bun.js/bindings/Path.cpp
+++ b/src/bun.js/bindings/Path.cpp
@@ -119,8 +119,7 @@ JSC_DEFINE_HOST_FUNCTION(Path_functionToNamespacedPath,
 static JSC::JSObject* createPath(JSGlobalObject* globalThis, bool isWindows)
 {
     JSC::VM& vm = globalThis->vm();
-    JSC::Structure* plainObjectStructure = JSC::JSFinalObject::createStructure(vm, globalThis, globalThis->objectPrototype(), 0);
-    JSC::JSObject* path = JSC::JSFinalObject::create(vm, plainObjectStructure);
+    auto* path = JSC::constructEmptyObject(globalThis);
     auto clientData = WebCore::clientData(vm);
 
     path->putDirect(vm, clientData->builtinNames().isWindowsPrivateName(),
diff --git a/src/bun.js/bindings/ProcessBindingUV.cpp b/src/bun.js/bindings/ProcessBindingUV.cpp
index d62eefa3be..c6151ffefe 100644
--- a/src/bun.js/bindings/ProcessBindingUV.cpp
+++ b/src/bun.js/bindings/ProcessBindingUV.cpp
@@ -132,14 +132,15 @@ JSC_DEFINE_HOST_FUNCTION(jsGetErrorMap, (JSGlobalObject * globalObject, JSC::Cal
     auto& vm = globalObject->vm();
     auto map = JSC::JSMap::create(vm, globalObject->mapStructure());
 
-#define PUT_PROPERTY(name, value, desc)                                                                           \
-    {                                                                                                             \
-        auto arr = JSC::constructEmptyArray(globalObject, static_cast<JSC::ArrayAllocationProfile*>(nullptr), 2); \
-        arr->putDirectIndex(globalObject, 0, JSC::jsString(vm, String(#name##_s)));                               \
-        arr->putDirectIndex(globalObject, 1, JSC::jsString(vm, String(desc##_s)));                                \
-        map->set(globalObject, JSC::jsNumber(value), arr);                                                        \
-    }
+    // Inlining each of these via macros costs like 300 KB.
+    const auto putProperty = [](JSC::VM& vm, JSC::JSMap* map, JSC::JSGlobalObject* globalObject, ASCIILiteral name, int value, ASCIILiteral desc) -> void {
+        auto arr = JSC::constructEmptyArray(globalObject, static_cast<JSC::ArrayAllocationProfile*>(nullptr), 2);
+        arr->putDirectIndex(globalObject, 0, JSC::jsString(vm, String(name)));
+        arr->putDirectIndex(globalObject, 1, JSC::jsString(vm, String(desc)));
+        map->set(globalObject, JSC::jsNumber(value), arr);
+    };
 
+#define PUT_PROPERTY(name, value, desc) putProperty(vm, map, globalObject, #name##_s, value, desc##_s);
     BUN_UV_ERRNO_MAP(PUT_PROPERTY)
 #undef PUT_PROPERTY
 
@@ -152,9 +153,15 @@ JSObject* create(VM& vm, JSGlobalObject* globalObject)
     EnsureStillAliveScope ensureStillAlive(bindingObject);
     bindingObject->putDirect(vm, JSC::Identifier::fromString(vm, "errname"_s), JSC::JSFunction::create(vm, globalObject, 1, "errname"_s, jsErrname, ImplementationVisibility::Public));
 
-#define PUT_PROPERTY(name, value, desc) \
-    bindingObject->putDirect(vm, JSC::Identifier::fromString(vm, "UV_" #name##_s), JSC::jsNumber(value));
+    // Inlining each of these via macros costs like 300 KB.
+    // Before: 96305608
+    // After:  95973832
+    const auto putNamedProperty = [](JSC::VM& vm, JSObject* bindingObject, const ASCIILiteral name, int value) -> void {
+        bindingObject->putDirect(vm, JSC::Identifier::fromString(vm, makeString("UV_"_s, name)), JSC::jsNumber(value));
+    };
 
+#define PUT_PROPERTY(name, value, desc) \
+    putNamedProperty(vm, bindingObject, #name##_s, value);
     BUN_UV_ERRNO_MAP(PUT_PROPERTY)
 #undef PUT_PROPERTY
 
diff --git a/src/bun.js/bindings/Undici.cpp b/src/bun.js/bindings/Undici.cpp
new file mode 100644
index 0000000000..879b9f4fe2
--- /dev/null
+++ b/src/bun.js/bindings/Undici.cpp
@@ -0,0 +1,59 @@
+#include "root.h"
+
+#include "JSDOMURL.h"
+#include "JSURLSearchParams.h"
+#include "JSAbortSignal.h"
+#include "JSDOMGlobalObjectInlines.h"
+#include "ZigGlobalObject.h"
+
+#include "JSFetchHeaders.h"
+#include "JSDOMFormData.h"
+#include "JavaScriptCore/ObjectConstructor.h"
+
+#include "helpers.h"
+#include "BunClientData.h"
+
+#include "JavaScriptCore/AggregateError.h"
+#include "JavaScriptCore/JSFunction.h"
+#include "JSDOMFile.h"
+
+namespace Bun {
+
+using namespace JSC;
+using namespace WebCore;
+
+// Ensure overriding globals doesn't impact usages.
+JSC::JSValue createUndiciInternalBinding(Zig::GlobalObject* globalObject)
+{
+    auto& vm = globalObject->vm();
+
+    auto* obj = constructEmptyObject(globalObject);
+    obj->putDirectIndex(
+        globalObject, 0,
+        globalObject->JSResponseConstructor());
+    obj->putDirectIndex(
+        globalObject, 1,
+        globalObject->JSRequestConstructor());
+    obj->putDirectIndex(
+        globalObject, 2,
+        WebCore::JSFetchHeaders::getConstructor(vm, globalObject));
+    obj->putDirectIndex(
+        globalObject, 3,
+        WebCore::JSDOMFormData::getConstructor(vm, globalObject));
+    obj->putDirectIndex(
+        globalObject, 4,
+        globalObject->JSDOMFileConstructor());
+    obj->putDirectIndex(
+        globalObject, 5,
+        JSDOMURL::getConstructor(vm, globalObject));
+    obj->putDirectIndex(
+        globalObject, 6,
+        JSAbortSignal::getConstructor(vm, globalObject));
+    obj->putDirectIndex(
+        globalObject, 7,
+        JSURLSearchParams::getConstructor(vm, globalObject));
+
+    return obj;
+}
+
+}
\ No newline at end of file
diff --git a/src/bun.js/bindings/Undici.h b/src/bun.js/bindings/Undici.h
new file mode 100644
index 0000000000..5bc89e5a29
--- /dev/null
+++ b/src/bun.js/bindings/Undici.h
@@ -0,0 +1,6 @@
+
+namespace Bun {
+
+JSC::JSValue createUndiciInternalBinding(Zig::GlobalObject* globalObject);
+
+}
\ No newline at end of file
diff --git a/src/bun.js/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp
index b97bf396d1..51b5276bca 100644
--- a/src/bun.js/bindings/ZigGlobalObject.cpp
+++ b/src/bun.js/bindings/ZigGlobalObject.cpp
@@ -1,8 +1,9 @@
 
+
 #include "root.h"
 #include "ZigGlobalObject.h"
 #include "helpers.h"
-
+#include "JavaScriptCore/ArgList.h"
 #include "JavaScriptCore/JSImmutableButterfly.h"
 #include "wtf/text/Base64.h"
 #include "JavaScriptCore/BuiltinNames.h"
@@ -165,7 +166,6 @@
 using namespace Bun;
 
 BUN_DECLARE_HOST_FUNCTION(Bun__NodeUtil__jsParseArgs);
-BUN_DECLARE_HOST_FUNCTION(Bun__fetch);
 BUN_DECLARE_HOST_FUNCTION(BUN__HTTP2__getUnpackedSettings);
 BUN_DECLARE_HOST_FUNCTION(BUN__HTTP2_getPackedSettings);
 
@@ -245,7 +245,8 @@ extern "C" void JSCInitialize(const char* envp[], size_t envc, void (*onCrash)(c
 }
 
 extern "C" void* Bun__getVM();
-extern "C" Zig::GlobalObject* Bun__getDefaultGlobal();
+extern "C" Zig::GlobalObject* Bun__getDefaultGlobalObject();
+extern "C" void Bun__setDefaultGlobalObject(Zig::GlobalObject* globalObject);
 
 // Error.captureStackTrace may cause computeErrorInfo to be called twice
 // Rather than figure out the plumbing in JSC, we just skip the next call
@@ -561,7 +562,7 @@ static String computeErrorInfoWithoutPrepareStackTrace(
     }
 
     if (UNLIKELY(!globalObject)) {
-        globalObject = Bun__getDefaultGlobal();
+        globalObject = Bun__getDefaultGlobalObject();
     }
 
     return Bun::formatStackTrace(vm, globalObject, name, message, line, column, sourceURL, stackTrace, errorInstance);
@@ -640,7 +641,7 @@ static String computeErrorInfo(JSC::VM& vm, Vector<StackFrame>& stackTrace, Ordi
         // Error.prepareStackTrace - https://v8.dev/docs/stack-trace-api#customizing-stack-traces
         if (!globalObject) {
             // node:vm will use a different JSGlobalObject
-            globalObject = Bun__getDefaultGlobal();
+            globalObject = Bun__getDefaultGlobalObject();
 
             auto* errorConstructor = lexicalGlobalObject->m_errorStructure.constructor(lexicalGlobalObject);
             if (JSValue prepareStackTrace = errorConstructor->getIfPropertyExists(lexicalGlobalObject, Identifier::fromString(vm, "prepareStackTrace"_s))) {
@@ -676,7 +677,7 @@ static String computeErrorInfoWrapper(JSC::VM& vm, Vector<StackFrame>& stackTrac
 
 static void checkIfNextTickWasCalledDuringMicrotask(JSC::VM& vm)
 {
-    auto* globalObject = Bun__getDefaultGlobal();
+    auto* globalObject = Bun__getDefaultGlobalObject();
     if (auto nextTickQueueValue = globalObject->m_nextTickQueue.get()) {
         auto* queue = jsCast<Bun::JSNextTickQueue*>(nextTickQueueValue);
         globalObject->resetOnEachMicrotaskTick();
@@ -686,7 +687,7 @@ static void checkIfNextTickWasCalledDuringMicrotask(JSC::VM& vm)
 
 static void cleanupAsyncHooksData(JSC::VM& vm)
 {
-    auto* globalObject = Bun__getDefaultGlobal();
+    auto* globalObject = Bun__getDefaultGlobalObject();
     globalObject->m_asyncContextData.get()->putInternalField(vm, 0, jsUndefined());
     globalObject->asyncHooksNeedsCleanup = false;
     if (!globalObject->m_nextTickQueue) {
@@ -713,7 +714,6 @@ void Zig::GlobalObject::resetOnEachMicrotaskTick()
 
 extern "C" JSC__JSGlobalObject* Zig__GlobalObject__create(void* console_client, int32_t executionContextId, bool miniMode, bool evalMode, void* worker_ptr)
 {
-
     auto heapSize = miniMode ? JSC::HeapType::Small : JSC::HeapType::Large;
     JSC::VM& vm = JSC::VM::create(heapSize).leakRef();
     // This must happen before JSVMClientData::create
@@ -722,55 +722,51 @@ extern "C" JSC__JSGlobalObject* Zig__GlobalObject__create(void* console_client,
 
     WebCore::JSVMClientData::create(&vm, Bun__getVM());
 
-    Zig::GlobalObject* globalObject;
-
-    if (UNLIKELY(executionContextId > -1)) {
-        globalObject = Zig::GlobalObject::create(
-            vm,
-            Zig::GlobalObject::createStructure(vm, JSC::JSGlobalObject::create(vm, JSC::JSGlobalObject::createStructure(vm, JSC::jsNull())), JSC::jsNull()),
-            static_cast<ScriptExecutionContextIdentifier>(executionContextId));
-
-        if (auto* worker = static_cast<WebCore::Worker*>(worker_ptr)) {
-            auto& options = worker->options();
-
-            // ensure remote termination works.
-            vm.ensureTerminationException();
-            vm.forbidExecutionOnTermination();
-
-            if (options.bun.env) {
-                auto map = WTFMove(options.bun.env);
-                auto size = map->size();
-                auto env = JSC::constructEmptyObject(globalObject, globalObject->objectPrototype(), size >= JSFinalObject::maxInlineCapacity ? JSFinalObject::maxInlineCapacity : size);
-                for (auto k : *map) {
-                    env->putDirect(vm, JSC::Identifier::fromString(vm, WTFMove(k.key)), JSC::jsString(vm, WTFMove(k.value)));
-                }
-                map->clear();
-                globalObject->m_processEnvObject.set(vm, globalObject, env);
+    const auto createGlobalObject = [&]() -> Zig::GlobalObject* {
+        if (UNLIKELY(executionContextId > -1)) {
+            auto* structure = Zig::GlobalObject::createStructure(vm);
+            if (UNLIKELY(!structure)) {
+                return nullptr;
             }
-        }
-    } else if (evalMode) {
-        globalObject = Zig::EvalGlobalObject::create(
-            vm,
-            Zig::EvalGlobalObject::createStructure(vm, JSC::JSGlobalObject::create(vm, JSC::JSGlobalObject::createStructure(vm, JSC::jsNull())),
-                JSC::jsNull()),
-            &Zig::EvalGlobalObject::s_globalObjectMethodTable);
+            return Zig::GlobalObject::create(
+                vm,
+                structure,
+                static_cast<ScriptExecutionContextIdentifier>(executionContextId));
+        } else if (evalMode) {
+            auto* structure = Zig::EvalGlobalObject::createStructure(vm);
+            if (UNLIKELY(!structure)) {
+                return nullptr;
+            }
+            return Zig::EvalGlobalObject::create(
+                vm,
+                structure,
+                &Zig::EvalGlobalObject::s_globalObjectMethodTable);
 
-    } else {
-        globalObject = Zig::GlobalObject::create(
-            vm,
-            Zig::GlobalObject::createStructure(vm, JSC::JSGlobalObject::create(vm, JSC::JSGlobalObject::createStructure(vm, JSC::jsNull())),
-                JSC::jsNull()));
+        } else {
+            auto* structure = Zig::GlobalObject::createStructure(vm);
+            if (UNLIKELY(!structure)) {
+                return nullptr;
+            }
+            return Zig::GlobalObject::create(
+                vm,
+                structure);
+        }
+    };
+
+    auto* globalObject = createGlobalObject();
+    if (UNLIKELY(!globalObject)) {
+        BUN_PANIC("Failed to allocate JavaScript global object. Did your computer run out of memory?");
     }
 
     globalObject->setConsole(console_client);
     globalObject->isThreadLocalDefaultGlobalObject = true;
     globalObject->setStackTraceLimit(DEFAULT_ERROR_STACK_TRACE_LIMIT); // Node.js defaults to 10
-    vm.setOnComputeErrorInfo(computeErrorInfoWrapper);
-
+    Bun__setDefaultGlobalObject(globalObject);
     JSC::gcProtect(globalObject);
 
+    vm.setOnComputeErrorInfo(computeErrorInfoWrapper);
     vm.setOnEachMicrotaskTick([](JSC::VM& vm) -> void {
-        auto* globalObject = Bun__getDefaultGlobal();
+        auto* globalObject = Bun__getDefaultGlobalObject();
         if (auto nextTickQueue = globalObject->m_nextTickQueue.get()) {
             globalObject->resetOnEachMicrotaskTick();
             Bun::JSNextTickQueue* queue = jsCast<Bun::JSNextTickQueue*>(nextTickQueue);
@@ -779,6 +775,43 @@ extern "C" JSC__JSGlobalObject* Zig__GlobalObject__create(void* console_client,
         }
     });
 
+    if (executionContextId > -1) {
+        const auto initializeWorker = [&](WebCore::Worker& worker) -> void {
+            auto& options = worker.options();
+
+            if (options.bun.env) {
+                auto map = WTFMove(options.bun.env);
+                auto size = map->size();
+
+                // In theory, a GC could happen before we finish putting all the properties on the object.
+                // So we use a MarkedArgumentBuffer to ensure that the strings are not collected and we immediately put them on the object.
+                MarkedArgumentBuffer strings;
+                strings.ensureCapacity(map->size());
+                for (const auto& value : map->values()) {
+                    strings.append(jsString(vm, value));
+                }
+
+                auto env = JSC::constructEmptyObject(globalObject, globalObject->objectPrototype(), size >= JSFinalObject::maxInlineCapacity ? JSFinalObject::maxInlineCapacity : size);
+                size_t i = 0;
+                for (auto k : *map) {
+                    // They can have environment variables with numbers as keys.
+                    // So we must use putDirectMayBeIndex to handle that.
+                    env->putDirectMayBeIndex(globalObject, JSC::Identifier::fromString(vm, WTFMove(k.key)), strings.at(i++));
+                }
+                map->clear();
+                globalObject->m_processEnvObject.set(vm, globalObject, env);
+            }
+
+            // ensure remote termination works.
+            vm.ensureTerminationException();
+            vm.forbidExecutionOnTermination();
+        };
+
+        if (auto* worker = static_cast<WebCore::Worker*>(worker_ptr)) {
+            initializeWorker(*worker);
+        }
+    }
+
     return globalObject;
 }
 
@@ -912,7 +945,7 @@ using namespace WebCore;
 static JSGlobalObject* deriveShadowRealmGlobalObject(JSGlobalObject* globalObject)
 {
     auto& vm = globalObject->vm();
-    Zig::GlobalObject* shadow = Zig::GlobalObject::create(vm, Zig::GlobalObject::createStructure(vm, JSC::JSGlobalObject::create(vm, JSC::JSGlobalObject::createStructure(vm, JSC::jsNull())), JSC::jsNull()));
+    Zig::GlobalObject* shadow = Zig::GlobalObject::create(vm, Zig::GlobalObject::createStructure(vm));
     shadow->setConsole(shadow);
 
     return shadow;
@@ -2436,7 +2469,7 @@ JSC_DEFINE_HOST_FUNCTION(jsFunctionDefaultErrorPrepareStackTrace, (JSGlobalObjec
 
     if (!globalObject) {
         // node:vm will use a different JSGlobalObject
-        globalObject = Bun__getDefaultGlobal();
+        globalObject = Bun__getDefaultGlobalObject();
     }
 
     auto errorObject = jsDynamicCast<JSC::ErrorInstance*>(callFrame->argument(0));
diff --git a/src/bun.js/bindings/ZigGlobalObject.h b/src/bun.js/bindings/ZigGlobalObject.h
index f366a43d1a..bad31b0252 100644
--- a/src/bun.js/bindings/ZigGlobalObject.h
+++ b/src/bun.js/bindings/ZigGlobalObject.h
@@ -88,9 +88,9 @@ public:
 
     static constexpr const JSC::ClassInfo* info() { return &s_info; }
 
-    static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* global, JSC::JSValue prototype)
+    static JSC::Structure* createStructure(JSC::VM& vm)
     {
-        return JSC::Structure::create(vm, global, prototype, JSC::TypeInfo(JSC::GlobalObjectType, StructureFlags & ~IsImmutablePrototypeExoticObject), info());
+        return JSC::Structure::create(vm, nullptr, jsNull(), JSC::TypeInfo(JSC::GlobalObjectType, StructureFlags & ~IsImmutablePrototypeExoticObject), info());
     }
 
     // Make binding code generation easier.
diff --git a/src/bun.js/bindings/ZigGlobalObject.lut.txt b/src/bun.js/bindings/ZigGlobalObject.lut.txt
index 1e57ace3f5..91eb9d3e94 100644
--- a/src/bun.js/bindings/ZigGlobalObject.lut.txt
+++ b/src/bun.js/bindings/ZigGlobalObject.lut.txt
@@ -11,7 +11,7 @@
   clearTimeout                    functionClearTimeout                                 Function 1
   confirm                         WebCore__confirm                                     Function 1
   dispatchEvent                   jsFunctionDispatchEvent                              Function 1
-  fetch                           Bun__fetch                                           Function 2
+  fetch                           constructBunFetchObject                              PropertyCallback
   postMessage                     jsFunctionPostMessage                                Function 1
   prompt                          WebCore__prompt                                      Function 1
   queueMicrotask                  functionQueueMicrotask                               Function 2
diff --git a/src/bun.js/bindings/bindings.cpp b/src/bun.js/bindings/bindings.cpp
index 8e6104573f..def0956044 100644
--- a/src/bun.js/bindings/bindings.cpp
+++ b/src/bun.js/bindings/bindings.cpp
@@ -1,4 +1,3 @@
-#include "JSFFIFunction.h"
 #include "root.h"
 #include "JavaScriptCore/JSCast.h"
 #include "JavaScriptCore/JSType.h"
@@ -8,6 +7,7 @@
 #include "JavaScriptCore/JSPromiseConstructor.h"
 #include "JavaScriptCore/DeleteAllCodeEffort.h"
 #include "JavaScriptCore/BooleanObject.h"
+#include "JSFFIFunction.h"
 #include "headers.h"
 
 #include "BunClientData.h"
@@ -116,6 +116,13 @@
 
 #include "ErrorStackFrame.h"
 
+#if OS(DARWIN)
+#if BUN_DEBUG
+#include <malloc/malloc.h>
+#define IS_MALLOC_DEBUGGING_ENABLED 1
+#endif
+#endif
+
 static WTF::StringView StringView_slice(WTF::StringView sv, unsigned start, unsigned end)
 {
     return sv.substring(start, end - start);
@@ -1570,6 +1577,7 @@ JSC__JSValue WebCore__FetchHeaders__toJS(WebCore__FetchHeaders* headers, JSC__JS
 
     return JSC::JSValue::encode(value);
 }
+
 JSC__JSValue WebCore__FetchHeaders__clone(WebCore__FetchHeaders* headers, JSC__JSGlobalObject* arg1)
 {
     auto throwScope = DECLARE_THROW_SCOPE(arg1->vm());
@@ -2132,6 +2140,7 @@ JSC__JSPromise* JSC__JSValue__asPromise(JSC__JSValue JSValue0)
     JSC::JSValue value = JSC::JSValue::decode(JSValue0);
     return JSC::jsDynamicCast<JSC::JSPromise*>(value);
 }
+
 JSC__JSValue JSC__JSValue__createInternalPromise(JSC__JSGlobalObject* globalObject)
 {
     JSC::VM& vm = globalObject->vm();
@@ -2192,6 +2201,7 @@ JSC__JSValue JSC__JSPromise__asValue(JSC__JSPromise* arg0, JSC__JSGlobalObject*
     ASSERT_WITH_MESSAGE(value.inherits<JSC::JSPromise>(), "JSPromise::asValue() called on a non-promise object");
     return JSC::JSValue::encode(value);
 }
+
 JSC__JSPromise* JSC__JSPromise__create(JSC__JSGlobalObject* arg0)
 {
     return JSC::JSPromise::create(arg0->vm(), arg0->promiseStructure());
@@ -2232,6 +2242,7 @@ JSC__JSValue JSC__JSGlobalObject__getCachedObject(JSC__JSGlobalObject* globalObj
     JSC::JSValue result = globalObject->getIfPropertyExists(globalObject, ident);
     return JSC::JSValue::encode(result);
 }
+
 JSC__JSValue JSC__JSGlobalObject__putCachedObject(JSC__JSGlobalObject* globalObject, const ZigString* arg1, JSC__JSValue JSValue2)
 {
     JSC::VM& vm = globalObject->vm();
@@ -2473,6 +2484,7 @@ JSC__Exception* JSC__Exception__create(JSC__JSGlobalObject* arg0, JSC__JSObject*
             ? JSC::Exception::StackCaptureAction::CaptureStack
             : JSC::Exception::StackCaptureAction::DoNotCaptureStack);
 }
+
 JSC__JSValue JSC__Exception__value(JSC__Exception* arg0)
 {
     return JSC::JSValue::encode(arg0->value());
@@ -2485,17 +2497,20 @@ JSC__JSValue JSC__Exception__value(JSC__Exception* arg0)
 // JSC__PropertyNameArray__next(JSC__PropertyNameArray* arg0, size_t arg1);
 // CPP_DECL void JSC__PropertyNameArray__release(JSC__PropertyNameArray* arg0);
 size_t JSC__JSObject__getArrayLength(JSC__JSObject* arg0) { return arg0->getArrayLength(); }
+
 JSC__JSValue JSC__JSObject__getIndex(JSC__JSValue jsValue, JSC__JSGlobalObject* arg1,
     uint32_t arg3)
 {
     return JSC::JSValue::encode(JSC::JSValue::decode(jsValue).toObject(arg1)->getIndex(arg1, arg3));
 }
+
 JSC__JSValue JSC__JSValue__getDirectIndex(JSC__JSValue jsValue, JSC__JSGlobalObject* arg1,
     uint32_t arg3)
 {
     JSC::JSObject* object = JSC::JSValue::decode(jsValue).getObject();
     return JSC::JSValue::encode(object->getDirectIndex(arg1, arg3));
 }
+
 JSC__JSValue JSC__JSObject__getDirect(JSC__JSObject* arg0, JSC__JSGlobalObject* arg1,
     const ZigString* arg2)
 {
@@ -2530,6 +2545,7 @@ bool JSC__JSString__eql(const JSC__JSString* arg0, JSC__JSGlobalObject* obj, JSC
 }
 bool JSC__JSString__is8Bit(const JSC__JSString* arg0) { return arg0->is8Bit(); };
 size_t JSC__JSString__length(const JSC__JSString* arg0) { return arg0->length(); }
+
 JSC__JSObject* JSC__JSString__toObject(JSC__JSString* arg0, JSC__JSGlobalObject* arg1)
 {
     return arg0->toObject(arg1);
@@ -2551,6 +2567,7 @@ extern "C" JSC::JSInternalPromise* JSModuleLoader__import(JSC::JSGlobalObject* g
     RETURN_IF_EXCEPTION(scope, nullptr);
     return promise;
 }
+
 JSC__JSValue JSC__JSModuleLoader__evaluate(JSC__JSGlobalObject* globalObject, const unsigned char* arg1,
     size_t arg2, const unsigned char* originUrlPtr, size_t originURLLen, const unsigned char* referrerUrlPtr, size_t referrerUrlLen,
     JSC__JSValue JSValue5, JSC__JSValue* arg6)
@@ -2625,6 +2642,7 @@ JSC__JSValue JSC__JSValue__createRangeError(const ZigString* message, const ZigS
 
     return JSC::JSValue::encode(rangeError);
 }
+
 JSC__JSValue JSC__JSValue__createTypeError(const ZigString* message, const ZigString* arg1,
     JSC__JSGlobalObject* globalObject)
 {
@@ -3056,6 +3074,7 @@ void JSC__JSPromise__reject(JSC__JSPromise* arg0, JSC__JSGlobalObject* globalObj
     JSC__JSValue JSValue2)
 {
     JSValue value = JSC::JSValue::decode(JSValue2);
+    ASSERT_WITH_MESSAGE(!value.isEmpty(), "Promise.reject cannot be called with a empty JSValue");
     auto& vm = globalObject->vm();
     ASSERT_WITH_MESSAGE(arg0->inherits<JSC::JSPromise>(), "Argument is not a promise");
     ASSERT_WITH_MESSAGE(arg0->status(vm) == JSC::JSPromise::Status::Pending, "Promise is already resolved or rejected");
@@ -3082,6 +3101,7 @@ void JSC__JSPromise__rejectAsHandledException(JSC__JSPromise* arg0, JSC__JSGloba
 {
     arg0->rejectAsHandled(arg1, arg2);
 }
+
 JSC__JSPromise* JSC__JSPromise__rejectedPromise(JSC__JSGlobalObject* arg0, JSC__JSValue JSValue1)
 {
     return JSC::JSPromise::rejectedPromise(arg0, JSC::JSValue::decode(JSValue1));
@@ -3147,6 +3167,7 @@ void JSC__JSPromise__rejectOnNextTickWithHandled(JSC__JSPromise* promise, JSC__J
         RETURN_IF_EXCEPTION(scope, void());
     }
 }
+
 JSC__JSPromise* JSC__JSPromise__resolvedPromise(JSC__JSGlobalObject* globalObject, JSC__JSValue JSValue1)
 {
     JSC::VM& vm = globalObject->vm();
@@ -3235,6 +3256,7 @@ void JSC__JSInternalPromise__rejectAsHandledException(JSC__JSInternalPromise* ar
 {
     arg0->rejectAsHandled(arg1, arg2);
 }
+
 JSC__JSInternalPromise* JSC__JSInternalPromise__rejectedPromise(JSC__JSGlobalObject* arg0,
     JSC__JSValue JSValue1)
 {
@@ -3247,6 +3269,7 @@ void JSC__JSInternalPromise__resolve(JSC__JSInternalPromise* arg0, JSC__JSGlobal
 {
     arg0->resolve(arg1, JSC::JSValue::decode(JSValue2));
 }
+
 JSC__JSInternalPromise* JSC__JSInternalPromise__resolvedPromise(JSC__JSGlobalObject* arg0,
     JSC__JSValue JSValue1)
 {
@@ -3492,6 +3515,7 @@ bool JSC__JSValue__isUndefinedOrNull(JSC__JSValue JSValue0)
 {
     return JSC::JSValue::decode(JSValue0).isUndefinedOrNull();
 }
+
 JSC__JSValue JSC__JSValue__jsBoolean(bool arg0)
 {
     return JSC::JSValue::encode(JSC::jsBoolean(arg0));
@@ -3500,6 +3524,7 @@ JSC__JSValue JSC__JSValue__jsDoubleNumber(double arg0)
 {
     return JSC::JSValue::encode(JSC::jsNumber(arg0));
 }
+
 JSC__JSValue JSC__JSValue__jsEmptyString(JSC__JSGlobalObject* arg0)
 {
     return JSC::JSValue::encode(JSC::jsEmptyString(arg0->vm()));
@@ -3993,13 +4018,24 @@ bool JSC__JSValue__stringIncludes(JSC__JSValue value, JSC__JSGlobalObject* globa
 static void populateStackFrameMetadata(JSC::VM& vm, const JSC::StackFrame* stackFrame, ZigStackFrame* frame)
 {
 
-    frame->source_url = Bun::toStringRef(stackFrame->sourceURL(vm));
-
     if (stackFrame->isWasmFrame()) {
         frame->code_type = ZigStackFrameCodeWasm;
+
+        auto name = stackFrame->functionName(vm);
+        if (!name.isEmpty()) {
+            frame->function_name = Bun::toStringRef(name);
+        }
+
+        auto sourceURL = stackFrame->sourceURL(vm);
+        if (sourceURL != "[wasm code]"_s) {
+            // [wasm code] is a useless source URL, so we don't bother to set it.
+            // It is the default value JSC returns.
+            frame->source_url = Bun::toStringRef(sourceURL);
+        }
         return;
     }
 
+    frame->source_url = Bun::toStringRef(stackFrame->sourceURL(vm));
     auto m_codeBlock = stackFrame->codeBlock();
     if (m_codeBlock) {
         switch (m_codeBlock->codeType()) {
@@ -4041,7 +4077,7 @@ static void populateStackFrameMetadata(JSC::VM& vm, const JSC::StackFrame* stack
 
 static void populateStackFramePosition(const JSC::StackFrame* stackFrame, BunString* source_lines,
     OrdinalNumber* source_line_numbers, uint8_t source_lines_count,
-    ZigStackFramePosition* position)
+    ZigStackFramePosition* position, JSC::SourceProvider** referenced_source_provider)
 {
     auto code = stackFrame->codeBlock();
     if (!code)
@@ -4055,15 +4091,20 @@ static void populateStackFramePosition(const JSC::StackFrame* stackFrame, BunStr
     WTF::StringView sourceString = provider->source();
     if (UNLIKELY(sourceString.isNull()))
         return;
+
     if (!stackFrame->hasBytecodeIndex()) {
-        auto lineColumn = stackFrame->computeLineAndColumn();
-        position->line_zero_based = OrdinalNumber::fromOneBasedInt(lineColumn.line).zeroBasedInt();
-        position->column_zero_based = OrdinalNumber::fromOneBasedInt(lineColumn.column).zeroBasedInt();
+        if (stackFrame->hasLineAndColumnInfo()) {
+            auto lineColumn = stackFrame->computeLineAndColumn();
+            position->line_zero_based = OrdinalNumber::fromOneBasedInt(lineColumn.line).zeroBasedInt();
+            position->column_zero_based = OrdinalNumber::fromOneBasedInt(lineColumn.column).zeroBasedInt();
+        }
+
         position->byte_position = -1;
         return;
     }
 
     auto location = Bun::getAdjustedPositionForBytecode(code, stackFrame->bytecodeIndex());
+    *position = location;
 
     if (source_lines_count > 1 && source_lines != nullptr && sourceString.is8Bit()) {
         // Search for the beginning of the line
@@ -4081,8 +4122,14 @@ static void populateStackFramePosition(const JSC::StackFrame* stackFrame, BunStr
 
         const unsigned char* bytes = sourceString.span8().data();
 
-        // Most of the time, when you look at a stack trace, you want a couple lines above
-        source_lines[0] = Bun::toStringRef(sourceString.substring(lineStart, lineEnd - lineStart).toStringWithoutCopying());
+        // Most of the time, when you look at a stack trace, you want a couple lines above.
+
+        // It is key to not clone this data because source code strings are large.
+        // Usage of toStringView (non-owning) is safe as we ref the provider.
+        provider->ref();
+        ASSERT(*referenced_source_provider == nullptr);
+        *referenced_source_provider = provider;
+        source_lines[0] = Bun::toStringView(sourceString.substring(lineStart, lineEnd - lineStart));
         source_line_numbers[0] = location.line();
 
         if (lineStart > 0) {
@@ -4108,9 +4155,7 @@ static void populateStackFramePosition(const JSC::StackFrame* stackFrame, BunStr
                 }
 
                 // We are at the beginning of the line
-                source_lines[source_line_i] = Bun::toStringRef(
-                    sourceString.substring(byte_offset_in_source_string, end_of_line_offset - byte_offset_in_source_string + 1)
-                        .toStringWithoutCopying());
+                source_lines[source_line_i] = Bun::toStringView(sourceString.substring(byte_offset_in_source_string, end_of_line_offset - byte_offset_in_source_string + 1));
 
                 source_line_numbers[source_line_i] = location.line().fromZeroBasedInt(location.line().zeroBasedInt() - source_line_i);
                 source_line_i++;
@@ -4121,17 +4166,15 @@ static void populateStackFramePosition(const JSC::StackFrame* stackFrame, BunStr
             }
         }
     }
-
-    *position = location;
 }
 
 static void populateStackFrame(JSC::VM& vm, ZigStackTrace* trace, const JSC::StackFrame* stackFrame,
-    ZigStackFrame* frame, bool is_top)
+    ZigStackFrame* frame, bool is_top, JSC::SourceProvider** referenced_source_provider)
 {
     populateStackFrameMetadata(vm, stackFrame, frame);
     populateStackFramePosition(stackFrame, is_top ? trace->source_lines_ptr : nullptr,
         is_top ? trace->source_lines_numbers : nullptr,
-        is_top ? trace->source_lines_to_collect : 0, &frame->position);
+        is_top ? trace->source_lines_to_collect : 0, &frame->position, referenced_source_provider);
 }
 
 class V8StackTraceIterator {
@@ -4310,14 +4353,14 @@ static void populateStackTrace(JSC::VM& vm, const WTF::Vector<JSC::StackFrame>&
 
     while (frame_i < frame_count && stack_frame_i < total_frame_count) {
         // Skip native frames
-        while (stack_frame_i < total_frame_count && !(&frames.at(stack_frame_i))->codeBlock() && !(&frames.at(stack_frame_i))->isWasmFrame()) {
+        while (stack_frame_i < total_frame_count && !(&frames.at(stack_frame_i))->hasLineAndColumnInfo() && !(&frames.at(stack_frame_i))->isWasmFrame()) {
             stack_frame_i++;
         }
         if (stack_frame_i >= total_frame_count)
             break;
 
         ZigStackFrame* frame = &trace->frames_ptr[frame_i];
-        populateStackFrame(vm, trace, &frames[stack_frame_i], frame, frame_i == 0);
+        populateStackFrame(vm, trace, &frames[stack_frame_i], frame, frame_i == 0, &trace->referenced_source_provider);
         stack_frame_i++;
         frame_i++;
     }
@@ -4739,10 +4782,9 @@ JSC__JSValue JSC__JSValue__toError_(JSC__JSValue JSValue0)
     return JSC::JSValue::encode({});
 }
 
-void JSC__JSValue__toZigException(JSC__JSValue JSValue0, JSC__JSGlobalObject* arg1,
-    ZigException* exception)
+void JSC__JSValue__toZigException(JSC__JSValue jsException, JSC__JSGlobalObject* global, ZigException* exception)
 {
-    JSC::JSValue value = JSC::JSValue::decode(JSValue0);
+    JSC::JSValue value = JSC::JSValue::decode(jsException);
     if (value == JSC::JSValue {}) {
         exception->code = JSErrorCodeError;
         exception->name = Bun::toStringRef("Error"_s);
@@ -4752,17 +4794,17 @@ void JSC__JSValue__toZigException(JSC__JSValue JSValue0, JSC__JSGlobalObject* ar
 
     if (JSC::Exception* jscException = JSC::jsDynamicCast<JSC::Exception*>(value)) {
         if (JSC::ErrorInstance* error = JSC::jsDynamicCast<JSC::ErrorInstance*>(jscException->value())) {
-            fromErrorInstance(exception, arg1, error, &jscException->stack(), value);
+            fromErrorInstance(exception, global, error, &jscException->stack(), value);
             return;
         }
     }
 
     if (JSC::ErrorInstance* error = JSC::jsDynamicCast<JSC::ErrorInstance*>(value)) {
-        fromErrorInstance(exception, arg1, error, nullptr, value);
+        fromErrorInstance(exception, global, error, nullptr, value);
         return;
     }
 
-    exceptionFromString(exception, value, arg1);
+    exceptionFromString(exception, value, global);
 }
 
 void JSC__Exception__getStackTrace(JSC__Exception* arg0, ZigStackTrace* trace)
@@ -4776,6 +4818,12 @@ JSC__JSValue JSC__VM__runGC(JSC__VM* vm, bool sync)
 {
     JSC::JSLockHolder lock(vm);
 
+#if IS_MALLOC_DEBUGGING_ENABLED && OS(DARWIN)
+    if (!malloc_zone_check(nullptr)) {
+        BUN_PANIC("Heap corruption detected!!");
+    }
+#endif
+
     vm->finalizeSynchronousJSExecution();
     WTF::releaseFastMallocFreeMemory();
 
@@ -4790,6 +4838,12 @@ JSC__JSValue JSC__VM__runGC(JSC__VM* vm, bool sync)
 
     vm->finalizeSynchronousJSExecution();
 
+#if IS_MALLOC_DEBUGGING_ENABLED && OS(DARWIN)
+    if (!malloc_zone_check(nullptr)) {
+        BUN_PANIC("Heap corruption detected after GC!!");
+    }
+#endif
+
     return JSC::JSValue::encode(JSC::jsNumber(vm->heap.sizeAfterLastFullCollection()));
 }
 
@@ -4900,6 +4954,7 @@ JSC__JSValue JSC__JSPromise__rejectedPromiseValue(JSC__JSGlobalObject* globalObj
     JSC::ensureStillAliveHere(JSC::JSValue::decode(JSValue1));
     return JSC::JSValue::encode(promise);
 }
+
 JSC__JSValue JSC__JSPromise__resolvedPromiseValue(JSC__JSGlobalObject* globalObject,
     JSC__JSValue JSValue1)
 {
@@ -5050,8 +5105,8 @@ static void JSC__JSValue__forEachPropertyImpl(JSC__JSValue JSValue0, JSC__JSGlob
             }
         }
     }
-
-    auto* clientData = WebCore::clientData(vm);
+    auto* propertyNames = vm.propertyNames;
+    auto& builtinNames = WebCore::builtinNames(vm);
     WTF::Vector<Identifier, 6> visitedProperties;
 
 restart:
@@ -5064,12 +5119,12 @@ restart:
             }
             auto* prop = entry.key();
 
-            if (prop == vm.propertyNames->constructor
-                || prop == vm.propertyNames->underscoreProto
-                || prop == vm.propertyNames->toStringTagSymbol)
+            if (prop == propertyNames->constructor
+                || prop == propertyNames->underscoreProto
+                || prop == propertyNames->toStringTagSymbol)
                 return true;
 
-            if (clientData->builtinNames().bunNativePtrPrivateName() == prop)
+            if (builtinNames.bunNativePtrPrivateName() == prop)
                 return true;
 
             if (visitedProperties.contains(Identifier::fromUid(vm, prop))) {
@@ -5148,11 +5203,11 @@ restart:
                     continue;
 
                 // ignore constructor
-                if (property == vm.propertyNames->constructor || clientData->builtinNames().bunNativePtrPrivateName() == property)
+                if (property == propertyNames->constructor || builtinNames.bunNativePtrPrivateName() == property)
                     continue;
 
                 if constexpr (nonIndexedOnly) {
-                    if (property == vm.propertyNames->length) {
+                    if (property == propertyNames->length) {
                         continue;
                     }
                 }
@@ -5162,8 +5217,8 @@ restart:
                     continue;
 
                 if ((slot.attributes() & PropertyAttribute::DontEnum) != 0) {
-                    if (property == vm.propertyNames->underscoreProto
-                        || property == vm.propertyNames->toStringTagSymbol)
+                    if (property == propertyNames->underscoreProto
+                        || property == propertyNames->toStringTagSymbol)
                         continue;
                 }
 
@@ -5560,7 +5615,7 @@ extern "C" EncodedJSValue JSC__JSValue__dateInstanceFromNullTerminatedString(JSC
 // this is largely copied from dateProtoFuncToISOString
 extern "C" int JSC__JSValue__toISOString(JSC::JSGlobalObject* globalObject, EncodedJSValue dateValue, char* buf)
 {
-    char buffer[28];
+    char buffer[29];
     JSC::DateInstance* thisDateObj = JSC::jsDynamicCast<JSC::DateInstance*>(JSC::JSValue::decode(dateValue));
     if (!thisDateObj)
         return -1;
@@ -5760,3 +5815,8 @@ CPP_DECL JSC__JSValue Bun__ProxyObject__getInternalField(JSC__JSValue value, uin
 {
     return JSValue::encode(jsCast<ProxyObject*>(JSValue::decode(value))->internalField((ProxyObject::Field)id).get());
 }
+
+CPP_DECL void JSC__SourceProvider__deref(JSC::SourceProvider* provider)
+{
+    provider->deref();
+}
diff --git a/src/bun.js/bindings/bindings.zig b/src/bun.js/bindings/bindings.zig
index 7c1e1e4724..d1aa20bf0e 100644
--- a/src/bun.js/bindings/bindings.zig
+++ b/src/bun.js/bindings/bindings.zig
@@ -609,10 +609,10 @@ pub const ZigString = extern struct {
 
     pub fn static(comptime slice_: []const u8) *const ZigString {
         const Holder = struct {
-            pub const value = ZigString{ ._unsafe_ptr_do_not_use = slice_.ptr, .len = slice_.len };
+            pub const value = &ZigString{ ._unsafe_ptr_do_not_use = slice_.ptr, .len = slice_.len };
         };
 
-        return &Holder.value;
+        return Holder.value;
     }
 
     pub const GithubActionFormatter = struct {
@@ -3355,115 +3355,84 @@ pub const JSValue = enum(JSValueReprInt) {
     pub const name = "JSC::JSValue";
     pub const namespace = "JSC";
     pub const JSType = enum(u8) {
-        // The Cell value must come before any JS that is a JSCell.
-        Cell,
-        Structure,
-        String,
-        HeapBigInt,
-        Symbol,
-
-        GetterSetter,
-        CustomGetterSetter,
-        /// For 32-bit architectures, this wraps a 64-bit JSValue
-        APIValueWrapper,
-
-        NativeExecutable,
-
-        ProgramExecutable,
-        ModuleProgramExecutable,
-        EvalExecutable,
-        FunctionExecutable,
-
-        UnlinkedFunctionExecutable,
-
-        UnlinkedProgramCodeBlock,
-        UnlinkedModuleProgramCodeBlock,
-        UnlinkedEvalCodeBlock,
-        UnlinkedFunctionCodeBlock,
-
-        CodeBlock,
-
-        JSImmutableButterfly,
-        JSSourceCode,
-        JSScriptFetcher,
-        JSScriptFetchParameters,
-
-        // The Object value must come before any JS that is a subclass of JSObject.
-        Object,
-        FinalObject,
-        JSCallee,
-        JSFunction,
-        InternalFunction,
-        NullSetterFunction,
-        BooleanObject,
-        NumberObject,
-        ErrorInstance,
-        GlobalProxy,
-        DirectArguments,
-        ScopedArguments,
-        ClonedArguments,
-
-        // Start JSArray s.
-        Array,
-        DerivedArray,
-        // End JSArray s.
-
-        ArrayBuffer,
-
-        // Start JSArrayBufferView s. Keep in sync with the order of FOR_EACH_D_ARRAY__EXCLUDING_DATA_VIEW.
-        Int8Array,
-        Uint8Array,
-        Uint8ClampedArray,
-        Int16Array,
-        Uint16Array,
-        Int32Array,
-        Uint32Array,
-        Float32Array,
-        Float64Array,
-        BigInt64Array,
-        BigUint64Array,
-        DataView,
-        // End JSArrayBufferView s.
-
-        // JSScope <- JSWithScope
-        //         <- StrictEvalActivation
-        //         <- JSSymbolTableObject  <- JSLexicalEnvironment      <- JSModuleEnvironment
-        //                                 <- JSSegmentedVariableObject <- JSGlobalLexicalEnvironment
-        //                                                              <- JSGlobalObject
-        // Start JSScope s.
-        // Start environment record s.
-        GlobalObject,
-        GlobalLexicalEnvironment,
-        LexicalEnvironment,
-        ModuleEnvironment,
-        StrictEvalActivation,
-        // End environment record s.
-        WithScope,
-        // End JSScope s.
-
-        ModuleNamespaceObject,
-        ShadowRealm,
-        RegExpObject,
-        JSDate,
-        ProxyObject,
-        JSGenerator,
-        JSAsyncGenerator,
-        JSArrayIterator,
-        JSMapIterator,
-        JSSetIterator,
-        JSStringIterator,
-        JSPromise,
-        JSMap,
-        JSSet,
-        JSWeakMap,
-        JSWeakSet,
-        WebAssemblyModule,
-        WebAssemblyInstance,
-        WebAssemblyGCObject,
-        // Start StringObject s.
-        StringObject,
-        DerivedStringObject,
-        // End StringObject s.
+        Cell = 0,
+        Structure = 1,
+        String = 2,
+        HeapBigInt = 3,
+        Symbol = 4,
+        GetterSetter = 5,
+        CustomGetterSetter = 6,
+        APIValueWrapper = 7,
+        NativeExecutable = 8,
+        ProgramExecutable = 9,
+        ModuleProgramExecutable = 10,
+        EvalExecutable = 11,
+        FunctionExecutable = 12,
+        UnlinkedFunctionExecutable = 13,
+        UnlinkedProgramCodeBlock = 14,
+        UnlinkedModuleProgramCodeBlock = 15,
+        UnlinkedEvalCodeBlock = 16,
+        UnlinkedFunctionCodeBlock = 17,
+        CodeBlock = 18,
+        JSImmutableButterfly = 19,
+        JSSourceCode = 20,
+        JSScriptFetcher = 21,
+        JSScriptFetchParameters = 22,
+        Object = 23,
+        FinalObject = 24,
+        JSCallee = 25,
+        JSFunction = 26,
+        InternalFunction = 27,
+        NullSetterFunction = 28,
+        BooleanObject = 29,
+        NumberObject = 30,
+        ErrorInstance = 31,
+        GlobalProxy = 32,
+        DirectArguments = 33,
+        ScopedArguments = 34,
+        ClonedArguments = 35,
+        Array = 36,
+        DerivedArray = 37,
+        ArrayBuffer = 38,
+        Int8Array = 39,
+        Uint8Array = 40,
+        Uint8ClampedArray = 41,
+        Int16Array = 42,
+        Uint16Array = 43,
+        Int32Array = 44,
+        Uint32Array = 45,
+        Float32Array = 46,
+        Float64Array = 47,
+        BigInt64Array = 48,
+        BigUint64Array = 49,
+        DataView = 50,
+        GlobalObject = 51,
+        GlobalLexicalEnvironment = 52,
+        LexicalEnvironment = 53,
+        ModuleEnvironment = 54,
+        StrictEvalActivation = 55,
+        WithScope = 56,
+        ModuleNamespaceObject = 57,
+        ShadowRealm = 58,
+        RegExpObject = 59,
+        JSDate = 60,
+        ProxyObject = 61,
+        JSGenerator = 62,
+        JSAsyncGenerator = 63,
+        JSArrayIterator = 64,
+        JSMapIterator = 65,
+        JSSetIterator = 66,
+        JSStringIterator = 67,
+        JSPromise = 68,
+        JSMap = 69,
+        JSSet = 70,
+        JSWeakMap = 71,
+        JSWeakSet = 72,
+        WebAssemblyModule = 73,
+        WebAssemblyInstance = 74,
+        WebAssemblyGCObject = 75,
+        StringObject = 76,
+        DerivedStringObject = 77,
 
         InternalFieldTuple,
 
@@ -3824,10 +3793,6 @@ pub const JSValue = enum(JSValueReprInt) {
         return cppFn("isInstanceOf", .{ this, global, constructor });
     }
 
-    pub fn call(this: JSValue, globalThis: *JSGlobalObject, args: []const JSC.JSValue) JSC.JSValue {
-        return callWithThis(this, globalThis, JSC.JSValue.jsUndefined(), args);
-    }
-
     pub fn callWithGlobalThis(this: JSValue, globalThis: *JSGlobalObject, args: []const JSC.JSValue) JSC.JSValue {
         JSC.markBinding(@src());
         if (comptime bun.Environment.isDebug) {
@@ -3847,7 +3812,7 @@ pub const JSValue = enum(JSValueReprInt) {
         );
     }
 
-    pub fn callWithThis(this: JSValue, globalThis: *JSGlobalObject, thisValue: JSC.JSValue, args: []const JSC.JSValue) JSC.JSValue {
+    pub fn call(this: JSValue, globalThis: *JSGlobalObject, thisValue: JSC.JSValue, args: []const JSC.JSValue) JSC.JSValue {
         JSC.markBinding(@src());
         if (comptime bun.Environment.isDebug) {
             const loop = JSC.VirtualMachine.get().eventLoop();
@@ -5234,7 +5199,6 @@ pub const JSValue = enum(JSValueReprInt) {
 
     pub fn toFmt(
         this: JSValue,
-        global: *JSGlobalObject,
         formatter: *Exports.ConsoleObject.Formatter,
     ) Exports.ConsoleObject.Formatter.ZigFormatter {
         formatter.remaining_values = &[_]JSValue{};
@@ -5246,7 +5210,6 @@ pub const JSValue = enum(JSValueReprInt) {
         return Exports.ConsoleObject.Formatter.ZigFormatter{
             .formatter = formatter,
             .value = this,
-            .global = global,
         };
     }
 
@@ -5642,11 +5605,11 @@ pub const JSValue = enum(JSValueReprInt) {
         return AsyncContextFrame__withAsyncContextIfNeeded(global, this);
     }
 
-    extern "c" fn Bun__JSValue__deserialize(global: *JSGlobalObject, data: [*]const u8, len: isize) JSValue;
+    extern "c" fn Bun__JSValue__deserialize(global: *JSGlobalObject, data: [*]const u8, len: usize) JSValue;
 
     /// Deserializes a JSValue from a serialized buffer. Zig version of `import('bun:jsc').deserialize`
     pub inline fn deserialize(bytes: []const u8, global: *JSGlobalObject) JSValue {
-        return Bun__JSValue__deserialize(global, bytes.ptr, @intCast(bytes.len));
+        return Bun__JSValue__deserialize(global, bytes.ptr, bytes.len);
     }
 
     extern fn Bun__serializeJSValue(global: *JSC.JSGlobalObject, value: JSValue) SerializedScriptValue.External;
diff --git a/src/bun.js/bindings/exports.zig b/src/bun.js/bindings/exports.zig
index b2b46d7c91..3fd039729b 100644
--- a/src/bun.js/bindings/exports.zig
+++ b/src/bun.js/bindings/exports.zig
@@ -223,6 +223,13 @@ pub const ResolvedSource = extern struct {
     pub const Tag = @import("ResolvedSourceTag").ResolvedSourceTag;
 };
 
+pub const SourceProvider = opaque {
+    extern fn JSC__SourceProvider__deref(*SourceProvider) void;
+    pub fn deref(provider: *SourceProvider) void {
+        JSC__SourceProvider__deref(provider);
+    }
+};
+
 const Mimalloc = @import("../../allocators/mimalloc.zig");
 
 export fn ZigString__free(raw: [*]const u8, len: usize, allocator_: ?*anyopaque) void {
@@ -426,6 +433,10 @@ pub const ZigStackTrace = extern struct {
     frames_ptr: [*]ZigStackFrame,
     frames_len: u8,
 
+    /// Non-null if `source_lines_*` points into data owned by a JSC::SourceProvider.
+    /// If so, then .deref must be called on it to release the memory.
+    referenced_source_provider: ?*JSC.SourceProvider = null,
+
     pub fn toAPI(
         this: *const ZigStackTrace,
         allocator: std.mem.Allocator,
@@ -596,9 +607,16 @@ pub const ZigStackFrame = extern struct {
             }
 
             try writer.writeAll(source_slice);
+            if (source_slice.len > 0 and (this.position.line.isValid() or this.position.column.isValid())) {
+                if (this.enable_color) {
+                    try writer.writeAll(comptime Output.prettyFmt("<r><d>:", true));
+                } else {
+                    try writer.writeAll(":");
+                }
+            }
 
             if (this.enable_color) {
-                if (this.position.line.isValid()) {
+                if (this.position.line.isValid() or this.position.column.isValid()) {
                     try writer.writeAll(comptime Output.prettyFmt("<r>", true));
                 } else {
                     try writer.writeAll(comptime Output.prettyFmt("<r>", true));
@@ -610,11 +628,11 @@ pub const ZigStackFrame = extern struct {
                     if (this.enable_color) {
                         try std.fmt.format(
                             writer,
-                            comptime Output.prettyFmt("<d>:<r><yellow>{d}<r><d>:<yellow>{d}<r>", true),
+                            comptime Output.prettyFmt("<yellow>{d}<r><d>:<yellow>{d}<r>", true),
                             .{ this.position.line.oneBased(), this.position.column.oneBased() },
                         );
                     } else {
-                        try std.fmt.format(writer, ":{d}:{d}", .{
+                        try std.fmt.format(writer, "{d}:{d}", .{
                             this.position.line.oneBased(),
                             this.position.column.oneBased(),
                         });
@@ -623,13 +641,13 @@ pub const ZigStackFrame = extern struct {
                     if (this.enable_color) {
                         try std.fmt.format(
                             writer,
-                            comptime Output.prettyFmt("<d>:<r><yellow>{d}<r>", true),
+                            comptime Output.prettyFmt("<yellow>{d}<r>", true),
                             .{
                                 this.position.line.oneBased(),
                             },
                         );
                     } else {
-                        try std.fmt.format(writer, ":{d}", .{
+                        try std.fmt.format(writer, "{d}", .{
                             this.position.line.oneBased(),
                         });
                     }
@@ -670,7 +688,11 @@ pub const ZigStackFrame = extern struct {
                     }
                 },
                 .Wasm => {
-                    try std.fmt.format(writer, "WASM {}", .{name});
+                    if (!name.isEmpty()) {
+                        try std.fmt.format(writer, "{}", .{name});
+                    } else {
+                        try writer.writeAll("WASM");
+                    }
                 },
                 .Constructor => {
                     try std.fmt.format(writer, "new {}", .{name});
@@ -775,6 +797,10 @@ pub const ZigException = extern struct {
         for (this.stack.frames_ptr[0..this.stack.frames_len]) |*frame| {
             frame.deinit();
         }
+
+        if (this.stack.referenced_source_provider) |source| {
+            source.deref();
+        }
     }
 
     pub const shim = Shimmer("Zig", "Exception", @This());
@@ -817,7 +843,9 @@ pub const ZigException = extern struct {
         }
 
         pub fn deinit(this: *Holder, vm: *JSC.VirtualMachine) void {
-            this.zigException().deinit();
+            if (this.loaded) {
+                this.zig_exception.deinit();
+            }
             if (this.need_to_clear_parser_arena_on_deinit) {
                 vm.module_loader.resetArena(vm);
             }
@@ -954,6 +982,10 @@ comptime {
 /// Using characters16() does not seem to always have the sentinel. or something else
 /// broke when I just used it. Not sure. ... but this works!
 pub export fn Bun__LoadLibraryBunString(str: *bun.String) ?*anyopaque {
+    if (comptime !Environment.isWindows) {
+        unreachable;
+    }
+
     var buf: bun.WPathBuffer = undefined;
     const data = switch (str.encoding()) {
         .utf8 => bun.strings.convertUTF8toUTF16InBuffer(&buf, str.utf8()),
diff --git a/src/bun.js/bindings/headers-handwritten.h b/src/bun.js/bindings/headers-handwritten.h
index e8068957f4..73a461e208 100644
--- a/src/bun.js/bindings/headers-handwritten.h
+++ b/src/bun.js/bindings/headers-handwritten.h
@@ -139,6 +139,9 @@ const ZigStackFrameCode ZigStackFrameCodeGlobal = 4;
 const ZigStackFrameCode ZigStackFrameCodeWasm = 5;
 const ZigStackFrameCode ZigStackFrameCodeConstructor = 6;
 
+extern "C" void __attribute((__noreturn__)) Bun__panic(const char* message, size_t length);
+#define BUN_PANIC(message) Bun__panic(message, sizeof(message) - 1)
+
 typedef struct ZigStackFramePosition {
     int32_t line_zero_based;
     int32_t column_zero_based;
@@ -169,6 +172,7 @@ typedef struct ZigStackTrace {
     uint8_t source_lines_to_collect;
     ZigStackFrame* frames_ptr;
     uint8_t frames_len;
+    JSC::SourceProvider* referenced_source_provider;
 } ZigStackTrace;
 
 typedef struct ZigException {
@@ -348,6 +352,7 @@ extern "C" const char* Bun__versions_mimalloc;
 extern "C" const char* Bun__versions_picohttpparser;
 extern "C" const char* Bun__versions_uws;
 extern "C" const char* Bun__versions_webkit;
+extern "C" const char* Bun__versions_libdeflate;
 extern "C" const char* Bun__versions_zig;
 extern "C" const char* Bun__versions_zlib;
 extern "C" const char* Bun__versions_tinycc;
diff --git a/src/bun.js/bindings/napi.cpp b/src/bun.js/bindings/napi.cpp
index 787d3446ca..eb297c9374 100644
--- a/src/bun.js/bindings/napi.cpp
+++ b/src/bun.js/bindings/napi.cpp
@@ -184,7 +184,7 @@ void NapiRef::clear()
 // class Reference
 // }
 
-extern "C" Zig::GlobalObject* Bun__getDefaultGlobal();
+extern "C" Zig::GlobalObject* Bun__getDefaultGlobalObject();
 
 WTF_MAKE_ISO_ALLOCATED_IMPL(NapiRef);
 
@@ -805,13 +805,13 @@ node_api_create_external_string_latin1(napi_env env,
 #if NAPI_VERBOSE
             printf("[napi] string finalize_callback\n");
 #endif
-            finalize_callback(reinterpret_cast<napi_env>(Bun__getDefaultGlobal()), nullptr, hint);
+            finalize_callback(reinterpret_cast<napi_env>(Bun__getDefaultGlobalObject()), nullptr, hint);
         }
     });
     JSGlobalObject* globalObject = toJS(env);
     // globalObject is allowed to be null here
     if (UNLIKELY(!globalObject)) {
-        globalObject = Bun__getDefaultGlobal();
+        globalObject = Bun__getDefaultGlobalObject();
     }
 
     JSString* out = JSC::jsString(globalObject->vm(), WTF::String(impl));
@@ -847,13 +847,13 @@ node_api_create_external_string_utf16(napi_env env,
 #endif
 
         if (finalize_callback) {
-            finalize_callback(reinterpret_cast<napi_env>(Bun__getDefaultGlobal()), nullptr, hint);
+            finalize_callback(reinterpret_cast<napi_env>(Bun__getDefaultGlobalObject()), nullptr, hint);
         }
     });
     JSGlobalObject* globalObject = toJS(env);
     // globalObject is allowed to be null here
     if (UNLIKELY(!globalObject)) {
-        globalObject = Bun__getDefaultGlobal();
+        globalObject = Bun__getDefaultGlobalObject();
     }
 
     JSString* out = JSC::jsString(globalObject->vm(), WTF::String(impl));
@@ -866,7 +866,7 @@ node_api_create_external_string_utf16(napi_env env,
 
 extern "C" void napi_module_register(napi_module* mod)
 {
-    auto* globalObject = Bun__getDefaultGlobal();
+    auto* globalObject = Bun__getDefaultGlobalObject();
     JSC::VM& vm = globalObject->vm();
     auto keyStr = WTF::String::fromUTF8(mod->nm_modname);
     globalObject->napiModuleRegisterCallCount++;
@@ -2543,6 +2543,42 @@ extern "C" napi_status napi_create_symbol(napi_env env, napi_value description,
     return napi_ok;
 }
 
+// https://github.com/nodejs/node/blob/2eff28fb7a93d3f672f80b582f664a7c701569fb/src/js_native_api_v8.cc#L2904-L2930
+extern "C" napi_status napi_new_instance(napi_env env, napi_value constructor,
+    size_t argc, const napi_value* argv,
+    napi_value* result)
+{
+    NAPI_PREMABLE
+    if (UNLIKELY(!result)) {
+        return napi_invalid_arg;
+    }
+
+    Zig::GlobalObject* globalObject = toJS(env);
+    JSC::VM& vm = globalObject->vm();
+    auto throwScope = DECLARE_THROW_SCOPE(vm);
+
+    JSC::JSValue constructorValue = toJS(constructor);
+    if (UNLIKELY(!constructorValue.isObject())) {
+        return napi_function_expected;
+    }
+
+    JSC::JSObject* constructorObject = constructorValue.getObject();
+    JSC::CallData constructData = getConstructData(constructorObject);
+    if (UNLIKELY(constructData.type == JSC::CallData::Type::None)) {
+        return napi_function_expected;
+    }
+
+    JSC::MarkedArgumentBuffer args;
+    args.fill(vm, argc, [&](auto* slot) {
+        memcpy(slot, argv, sizeof(JSC::JSValue) * argc);
+    });
+
+    auto value = construct(globalObject, constructorObject, constructData, args);
+    RETURN_IF_EXCEPTION(throwScope, napi_pending_exception);
+    *result = toNapi(value);
+
+    RELEASE_AND_RETURN(throwScope, napi_ok);
+}
 extern "C" napi_status napi_call_function(napi_env env, napi_value recv_napi,
     napi_value func_napi, size_t argc,
     const napi_value* argv,
diff --git a/src/bun.js/bindings/v8.cpp b/src/bun.js/bindings/v8.cpp
index b939552c95..719e8517dc 100644
--- a/src/bun.js/bindings/v8.cpp
+++ b/src/bun.js/bindings/v8.cpp
@@ -11,7 +11,7 @@
 #define BUN_EXPORT JS_EXPORT
 #endif
 
-extern "C" Zig::GlobalObject* Bun__getDefaultGlobal();
+extern "C" Zig::GlobalObject* Bun__getDefaultGlobalObject();
 
 namespace v8 {
 
@@ -44,7 +44,7 @@ public:
 // Returns the isolate inside which the current thread is running or nullptr.
 Isolate* Isolate::TryGetCurrent()
 {
-    auto* global = Bun__getDefaultGlobal();
+    auto* global = Bun__getDefaultGlobalObject();
 
     return global ? reinterpret_cast<v8::Isolate*>(global) : nullptr;
 }
@@ -52,7 +52,7 @@ Isolate* Isolate::TryGetCurrent()
 // Returns the isolate inside which the current thread is running.
 Isolate* Isolate::GetCurrent()
 {
-    auto* global = Bun__getDefaultGlobal();
+    auto* global = Bun__getDefaultGlobalObject();
 
     return global ? reinterpret_cast<v8::Isolate*>(global) : nullptr;
 }
diff --git a/src/bun.js/bindings/webcore/EventEmitter.cpp b/src/bun.js/bindings/webcore/EventEmitter.cpp
index f582289559..021edf1fca 100644
--- a/src/bun.js/bindings/webcore/EventEmitter.cpp
+++ b/src/bun.js/bindings/webcore/EventEmitter.cpp
@@ -249,7 +249,7 @@ void EventEmitter::innerInvokeEventListeners(const Identifier& eventType, Simple
         auto* exception = exceptionPtr.get();
 
         if (UNLIKELY(exception)) {
-            auto errorIdentifier = JSC::Identifier::fromString(vm, eventNames().errorEvent);
+            auto errorIdentifier = vm.propertyNames->error;
             auto hasErrorListener = this->hasActiveEventListeners(errorIdentifier);
             if (!hasErrorListener || eventType == errorIdentifier) {
                 // If the event type is error, report the exception to the console.
diff --git a/src/bun.js/bindings/webcore/JSErrorEvent.cpp b/src/bun.js/bindings/webcore/JSErrorEvent.cpp
index 6e80cddc1c..60515f2074 100644
--- a/src/bun.js/bindings/webcore/JSErrorEvent.cpp
+++ b/src/bun.js/bindings/webcore/JSErrorEvent.cpp
@@ -114,7 +114,7 @@ template<> ErrorEvent::Init convertDictionary<ErrorEvent::Init>(JSGlobalObject&
     if (isNullOrUndefined)
         errorValue = jsUndefined();
     else {
-        errorValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "error"_s));
+        errorValue = object->get(&lexicalGlobalObject, vm.propertyNames->error);
         RETURN_IF_EXCEPTION(throwScope, {});
     }
     if (!errorValue.isUndefined()) {
@@ -150,7 +150,7 @@ template<> ErrorEvent::Init convertDictionary<ErrorEvent::Init>(JSGlobalObject&
     if (isNullOrUndefined)
         messageValue = jsUndefined();
     else {
-        messageValue = object->get(&lexicalGlobalObject, Identifier::fromString(vm, "message"_s));
+        messageValue = object->get(&lexicalGlobalObject, vm.propertyNames->message);
         RETURN_IF_EXCEPTION(throwScope, {});
     }
     if (!messageValue.isUndefined()) {
diff --git a/src/bun.js/bindings/webcore/JSReadableStream.cpp b/src/bun.js/bindings/webcore/JSReadableStream.cpp
index e7e87202a4..8f79cf3c79 100644
--- a/src/bun.js/bindings/webcore/JSReadableStream.cpp
+++ b/src/bun.js/bindings/webcore/JSReadableStream.cpp
@@ -39,6 +39,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/PointerPreparations.h>
 #include "ZigGeneratedClasses.h"
+#include "JavaScriptCore/BuiltinNames.h"
 
 namespace WebCore {
 using namespace JSC;
@@ -132,6 +133,12 @@ static JSC_DEFINE_CUSTOM_SETTER(JSReadableStreamPrototype__nativePtrSetterWrap,
 static JSC_DEFINE_CUSTOM_GETTER(JSReadableStreamPrototype__nativePtrGetterWrap, (JSC::JSGlobalObject * lexicalGlobalObject, JSC::EncodedJSValue encodedThisValue, JSC::PropertyName))
 {
     JSReadableStream* thisObject = jsCast<JSReadableStream*>(JSValue::decode(encodedThisValue));
+
+    // Force it to be locked, even though the value is still really there.
+    if (thisObject->isNativeTypeTransferred()) {
+        return JSValue::encode(jsNumber(-1));
+    }
+
     return JSValue::encode(thisObject->nativePtr());
 }
 
@@ -172,7 +179,7 @@ void JSReadableStreamPrototype::finishCreation(VM& vm)
 
     reifyStaticProperties(vm, JSReadableStream::info(), JSReadableStreamPrototypeTableValues, *this);
     this->putDirectBuiltinFunction(vm, globalObject(), vm.propertyNames->asyncIteratorSymbol, readableStreamLazyAsyncIteratorCodeGenerator(vm), JSC::PropertyAttribute::DontDelete | 0);
-    this->putDirectBuiltinFunction(vm, globalObject(), JSC::Identifier::fromString(vm, "values"_s), readableStreamValuesCodeGenerator(vm), JSC::PropertyAttribute::DontDelete | 0);
+    this->putDirectBuiltinFunction(vm, globalObject(), vm.propertyNames->builtinNames().valuesPublicName(), readableStreamValuesCodeGenerator(vm), JSC::PropertyAttribute::DontDelete | 0);
     JSC_TO_STRING_TAG_WITHOUT_TRANSITION();
 }
 
@@ -191,7 +198,6 @@ void JSReadableStream::finishCreation(VM& vm)
 
 void JSReadableStream::setNativePtr(JSC::VM& vm, JSC::JSValue value)
 {
-
     this->m_nativePtr.set(vm, this, value);
 }
 
diff --git a/src/bun.js/bindings/webcore/JSReadableStream.h b/src/bun.js/bindings/webcore/JSReadableStream.h
index c1022315c5..45c14a9a7b 100644
--- a/src/bun.js/bindings/webcore/JSReadableStream.h
+++ b/src/bun.js/bindings/webcore/JSReadableStream.h
@@ -57,6 +57,11 @@ public:
 
     int nativeType() const { return this->m_nativeType; }
     bool disturbed() const { return this->m_disturbed; }
+    bool isNativeTypeTransferred() const { return this->m_transferred; }
+    void setTransferred()
+    {
+        this->m_transferred = true;
+    }
     JSC::JSValue nativePtr()
     {
         return this->m_nativePtr.get();
@@ -80,6 +85,7 @@ protected:
     mutable JSC::WriteBarrier<JSC::Unknown> m_nativePtr;
     int m_nativeType { 0 };
     bool m_disturbed = false;
+    bool m_transferred = false;
 
     JSReadableStream(JSC::Structure*, JSDOMGlobalObject&);
 
diff --git a/src/bun.js/bindings/webcore/JSTextEncoder.cpp b/src/bun.js/bindings/webcore/JSTextEncoder.cpp
index e617345166..0cee5a0c67 100644
--- a/src/bun.js/bindings/webcore/JSTextEncoder.cpp
+++ b/src/bun.js/bindings/webcore/JSTextEncoder.cpp
@@ -73,10 +73,10 @@ extern "C" size_t TextEncoder__encodeInto8(const LChar* stringPtr, size_t string
 extern "C" size_t TextEncoder__encodeInto16(const UChar* stringPtr, size_t stringLen, void* ptr, size_t len);
 extern "C" JSC::EncodedJSValue TextEncoder__encodeRopeString(JSC::JSGlobalObject* lexicalGlobalObject, JSC::JSString* str);
 
-extern "C" {
-static JSC_DECLARE_JIT_OPERATION_WITHOUT_WTF_INTERNAL(jsTextEncoderEncodeWithoutTypeCheck, JSC::EncodedJSValue, (JSC::JSGlobalObject*, JSTextEncoder*, DOMJIT::IDLJSArgumentType<IDLDOMString>));
-static JSC_DECLARE_JIT_OPERATION_WITHOUT_WTF_INTERNAL(jsTextEncoderPrototypeFunction_encodeIntoWithoutTypeCheck, JSC::EncodedJSValue, (JSC::JSGlobalObject * lexicalGlobalObject, JSTextEncoder* castedThis, DOMJIT::IDLJSArgumentType<IDLDOMString> source, DOMJIT::IDLJSArgumentType<IDLUint8Array> destination));
-}
+// extern "C" {
+// static JSC_DECLARE_JIT_OPERATION_WITHOUT_WTF_INTERNAL(jsTextEncoderEncodeWithoutTypeCheck, JSC::EncodedJSValue, (JSC::JSGlobalObject*, JSTextEncoder*, DOMJIT::IDLJSArgumentType<IDLDOMString>));
+// static JSC_DECLARE_JIT_OPERATION_WITHOUT_WTF_INTERNAL(jsTextEncoderPrototypeFunction_encodeIntoWithoutTypeCheck, JSC::EncodedJSValue, (JSC::JSGlobalObject * lexicalGlobalObject, JSTextEncoder* castedThis, DOMJIT::IDLJSArgumentType<IDLDOMString> source, DOMJIT::IDLJSArgumentType<IDLUint8Array> destination));
+// }
 
 template<> TextEncoder::EncodeIntoResult convertDictionary<TextEncoder::EncodeIntoResult>(JSGlobalObject& lexicalGlobalObject, JSValue value)
 {
@@ -214,90 +214,97 @@ template<> void JSTextEncoderDOMConstructor::initializeProperties(VM& vm, JSDOMG
     putDirect(vm, vm.propertyNames->prototype, JSTextEncoder::prototype(vm, globalObject), JSC::PropertyAttribute::ReadOnly | JSC::PropertyAttribute::DontEnum | JSC::PropertyAttribute::DontDelete);
 }
 
-static const JSC::DOMJIT::Signature DOMJITSignatureForJSTextEncoderEncodeWithoutTypeCheck(
-    jsTextEncoderEncodeWithoutTypeCheck,
-    JSTextEncoder::info(),
-    // https://github.com/oven-sh/bun/issues/9226
-    // It's not totally clear what the correct side effects are for this function, so we just make it conservative for now.
-    JSC::DOMJIT::Effect {},
-    DOMJIT::IDLResultTypeFilter<IDLUint8Array>::value,
-    DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
+// static const JSC::DOMJIT::Signature DOMJITSignatureForJSTextEncoderEncodeWithoutTypeCheck(
+//     jsTextEncoderEncodeWithoutTypeCheck,
+//     JSTextEncoder::info(),
+//     // https://github.com/oven-sh/bun/issues/9226
+//     // It's not totally clear what the correct side effects are for this function, so we just make it conservative for now.
+//     JSC::DOMJIT::Effect {},
+//     DOMJIT::IDLResultTypeFilter<IDLUint8Array>::value,
+//     DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
 
-static const JSC::DOMJIT::Signature DOMJITSignatureForJSTextEncoderEncodeIntoWithoutTypeCheck(
-    jsTextEncoderPrototypeFunction_encodeIntoWithoutTypeCheck,
-    JSTextEncoder::info(),
+// static const JSC::DOMJIT::Signature DOMJITSignatureForJSTextEncoderEncodeIntoWithoutTypeCheck(
+//     jsTextEncoderPrototypeFunction_encodeIntoWithoutTypeCheck,
+//     JSTextEncoder::info(),
 
-    JSC::DOMJIT::Effect {},
-    // JSC::DOMJIT::Effect::forReadWriteKinds(encodeIntoRead, encodeIntoWrite),
-    DOMJIT::IDLResultTypeFilter<IDLObject>::value,
-    DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value,
-    DOMJIT::IDLArgumentTypeFilter<IDLUint8Array>::value);
+//     JSC::DOMJIT::Effect {},
+//     // JSC::DOMJIT::Effect::forReadWriteKinds(encodeIntoRead, encodeIntoWrite),
+//     DOMJIT::IDLResultTypeFilter<IDLObject>::value,
+//     DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value,
+//     DOMJIT::IDLArgumentTypeFilter<IDLUint8Array>::value);
 
 /* Hash table for prototype */
 
 static const HashTableValue JSTextEncoderPrototypeTableValues[] = {
     { "constructor"_s, static_cast<unsigned>(JSC::PropertyAttribute::DontEnum), NoIntrinsic, { HashTableValue::GetterSetterType, jsTextEncoderConstructor, 0 } },
     { "encoding"_s, static_cast<unsigned>(JSC::PropertyAttribute::ReadOnly | JSC::PropertyAttribute::CustomAccessor | JSC::PropertyAttribute::DOMAttribute), NoIntrinsic, { HashTableValue::GetterSetterType, jsTextEncoder_encoding, 0 } },
-    { "encode"_s, static_cast<unsigned>(JSC::PropertyAttribute::Function | JSC::PropertyAttribute::DOMJITFunction), NoIntrinsic, { HashTableValue::DOMJITFunctionType, jsTextEncoderPrototypeFunction_encode, &DOMJITSignatureForJSTextEncoderEncodeWithoutTypeCheck } },
-    { "encodeInto"_s, static_cast<unsigned>(JSC::PropertyAttribute::Function | JSC::PropertyAttribute::DOMJITFunction), NoIntrinsic, { HashTableValue::DOMJITFunctionType, jsTextEncoderPrototypeFunction_encodeInto, &DOMJITSignatureForJSTextEncoderEncodeIntoWithoutTypeCheck } },
+    // TODO: bring these back after fix issue with globalObject pointer argument in `encodeInto`
+    // REPRO:
+    // 1. bun create docusaurus
+    // 2. bun ./node_modules/.bin/docusaurus build --no-minify
+    // https://github.com/oven-sh/bun/issues/12335
+    // { "encode"_s, static_cast<unsigned>(JSC::PropertyAttribute::Function | JSC::PropertyAttribute::DOMJITFunction), NoIntrinsic, { HashTableValue::DOMJITFunctionType, jsTextEncoderPrototypeFunction_encode, &DOMJITSignatureForJSTextEncoderEncodeWithoutTypeCheck } },
+    // { "encodeInto"_s, static_cast<unsigned>(JSC::PropertyAttribute::Function | JSC::PropertyAttribute::DOMJITFunction), NoIntrinsic, { HashTableValue::DOMJITFunctionType, jsTextEncoderPrototypeFunction_encodeInto, &DOMJITSignatureForJSTextEncoderEncodeIntoWithoutTypeCheck } },
+    { "encode"_s, static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { HashTableValue::NativeFunctionType, jsTextEncoderPrototypeFunction_encode, 1 } },
+    { "encodeInto"_s, static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { HashTableValue::NativeFunctionType, jsTextEncoderPrototypeFunction_encodeInto, 2 } },
 };
 
-JSC_DEFINE_JIT_OPERATION(jsTextEncoderEncodeWithoutTypeCheck, JSC::EncodedJSValue, (JSC::JSGlobalObject * lexicalGlobalObject, JSTextEncoder* castedThis, DOMJIT::IDLJSArgumentType<IDLDOMString> input))
-{
-    VM& vm = JSC::getVM(lexicalGlobalObject);
-    IGNORE_WARNINGS_BEGIN("frame-address")
-    CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
-    IGNORE_WARNINGS_END
-    JSC::JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
-    auto throwScope = DECLARE_THROW_SCOPE(vm);
-    JSC::EncodedJSValue res;
-    String str;
-    if (input->is8Bit()) {
-        if (input->isRope()) {
-            GCDeferralContext gcDeferralContext(vm);
-            auto encodedValue = TextEncoder__encodeRopeString(lexicalGlobalObject, input);
-            if (!JSC::JSValue::decode(encodedValue).isUndefined()) {
-                RELEASE_AND_RETURN(throwScope, { encodedValue });
-            }
-        }
+// JSC_DEFINE_JIT_OPERATION(jsTextEncoderEncodeWithoutTypeCheck, JSC::EncodedJSValue, (JSC::JSGlobalObject * lexicalGlobalObject, JSTextEncoder* castedThis, DOMJIT::IDLJSArgumentType<IDLDOMString> input))
+// {
+//     VM& vm = JSC::getVM(lexicalGlobalObject);
+//     IGNORE_WARNINGS_BEGIN("frame-address")
+//     CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
+//     IGNORE_WARNINGS_END
+//     JSC::JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
+//     auto throwScope = DECLARE_THROW_SCOPE(vm);
+//     JSC::EncodedJSValue res;
+//     String str;
+//     if (input->is8Bit()) {
+//         if (input->isRope()) {
+//             GCDeferralContext gcDeferralContext(vm);
+//             auto encodedValue = TextEncoder__encodeRopeString(lexicalGlobalObject, input);
+//             if (!JSC::JSValue::decode(encodedValue).isUndefined()) {
+//                 RELEASE_AND_RETURN(throwScope, { encodedValue });
+//             }
+//         }
 
-        str = input->value(lexicalGlobalObject);
-        res = TextEncoder__encode8(lexicalGlobalObject, str.span8().data(), str.length());
-    } else {
-        str = input->value(lexicalGlobalObject);
-        res = TextEncoder__encode16(lexicalGlobalObject, str.span16().data(), str.length());
-    }
+//         str = input->value(lexicalGlobalObject);
+//         res = TextEncoder__encode8(lexicalGlobalObject, str.span8().data(), str.length());
+//     } else {
+//         str = input->value(lexicalGlobalObject);
+//         res = TextEncoder__encode16(lexicalGlobalObject, str.span16().data(), str.length());
+//     }
 
-    if (UNLIKELY(JSC::JSValue::decode(res).isObject() && JSC::JSValue::decode(res).getObject()->isErrorInstance())) {
-        throwScope.throwException(lexicalGlobalObject, JSC::JSValue::decode(res));
-        return { encodedJSValue() };
-    }
+//     if (UNLIKELY(JSC::JSValue::decode(res).isObject() && JSC::JSValue::decode(res).getObject()->isErrorInstance())) {
+//         throwScope.throwException(lexicalGlobalObject, JSC::JSValue::decode(res));
+//         return { encodedJSValue() };
+//     }
 
-    RELEASE_AND_RETURN(throwScope, { res });
-}
+//     RELEASE_AND_RETURN(throwScope, { res });
+// }
 
-JSC_DEFINE_JIT_OPERATION(jsTextEncoderPrototypeFunction_encodeIntoWithoutTypeCheck, JSC::EncodedJSValue, (JSC::JSGlobalObject * lexicalGlobalObject, JSTextEncoder* castedThis, DOMJIT::IDLJSArgumentType<IDLDOMString> sourceStr, DOMJIT::IDLJSArgumentType<IDLUint8Array> destination))
-{
-    VM& vm = JSC::getVM(lexicalGlobalObject);
-    IGNORE_WARNINGS_BEGIN("frame-address")
-    CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
-    IGNORE_WARNINGS_END
-    JSC::JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
-    String source = sourceStr->value(lexicalGlobalObject);
-    size_t res = 0;
-    if (!source.is8Bit()) {
-        res = TextEncoder__encodeInto16(source.span16().data(), source.length(), destination->vector(), destination->byteLength());
-    } else {
-        res = TextEncoder__encodeInto8(source.span8().data(), source.length(), destination->vector(), destination->byteLength());
-    }
+// JSC_DEFINE_JIT_OPERATION(jsTextEncoderPrototypeFunction_encodeIntoWithoutTypeCheck, JSC::EncodedJSValue, (JSC::JSGlobalObject * lexicalGlobalObject, JSTextEncoder* castedThis, DOMJIT::IDLJSArgumentType<IDLDOMString> sourceStr, DOMJIT::IDLJSArgumentType<IDLUint8Array> destination))
+// {
+//     VM& vm = JSC::getVM(lexicalGlobalObject);
+//     IGNORE_WARNINGS_BEGIN("frame-address")
+//     CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
+//     IGNORE_WARNINGS_END
+//     JSC::JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
+//     String source = sourceStr->value(lexicalGlobalObject);
+//     size_t res = 0;
+//     if (!source.is8Bit()) {
+//         res = TextEncoder__encodeInto16(source.span16().data(), source.length(), destination->vector(), destination->byteLength());
+//     } else {
+//         res = TextEncoder__encodeInto8(source.span8().data(), source.length(), destination->vector(), destination->byteLength());
+//     }
 
-    Zig::GlobalObject* globalObject = reinterpret_cast<Zig::GlobalObject*>(lexicalGlobalObject);
-    auto* result = JSC::constructEmptyObject(vm, globalObject->encodeIntoObjectStructure());
-    result->putDirectOffset(vm, 0, JSC::jsNumber(static_cast<uint32_t>(res)));
-    result->putDirectOffset(vm, 1, JSC::jsNumber(static_cast<uint32_t>(res >> 32)));
+//     Zig::GlobalObject* globalObject = reinterpret_cast<Zig::GlobalObject*>(lexicalGlobalObject);
+//     auto* result = JSC::constructEmptyObject(vm, globalObject->encodeIntoObjectStructure());
+//     result->putDirectOffset(vm, 0, JSC::jsNumber(static_cast<uint32_t>(res)));
+//     result->putDirectOffset(vm, 1, JSC::jsNumber(static_cast<uint32_t>(res >> 32)));
 
-    return { JSValue::encode(result) };
-}
+//     return { JSValue::encode(result) };
+// }
 
 const ClassInfo JSTextEncoderPrototype::s_info = { "TextEncoder"_s, &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSTextEncoderPrototype) };
 
diff --git a/src/bun.js/bindings/webcore/ReadableStream.cpp b/src/bun.js/bindings/webcore/ReadableStream.cpp
index a6f22d0f55..36828aaf15 100644
--- a/src/bun.js/bindings/webcore/ReadableStream.cpp
+++ b/src/bun.js/bindings/webcore/ReadableStream.cpp
@@ -240,4 +240,15 @@ bool ReadableStream::isDisturbed() const
     return readableStream()->disturbed();
 }
 
+JSC_DEFINE_HOST_FUNCTION(jsFunctionTransferToNativeReadableStream, (JSGlobalObject * lexicalGlobalObject, CallFrame* callFrame))
+{
+    auto& vm = lexicalGlobalObject->vm();
+    auto throwScope = DECLARE_THROW_SCOPE(vm);
+
+    auto* readableStream = jsDynamicCast<JSReadableStream*>(callFrame->argument(0));
+    readableStream->setTransferred();
+    readableStream->setDisturbed(true);
+    return JSValue::encode(jsUndefined());
+}
+
 }
diff --git a/src/bun.js/bindings/webcore/ReadableStream.h b/src/bun.js/bindings/webcore/ReadableStream.h
index ce460e52c7..3bd9463918 100644
--- a/src/bun.js/bindings/webcore/ReadableStream.h
+++ b/src/bun.js/bindings/webcore/ReadableStream.h
@@ -102,4 +102,6 @@ inline JSC::JSValue toJSNewlyCreated(JSC::JSGlobalObject*, JSDOMGlobalObject*, R
     return stream->readableStream();
 }
 
+JSC_DECLARE_HOST_FUNCTION(jsFunctionTransferToNativeReadableStream);
+
 }
diff --git a/src/bun.js/bindings/webcore/WebCoreTypedArrayController.cpp b/src/bun.js/bindings/webcore/WebCoreTypedArrayController.cpp
index e9049b91e1..169772d7c7 100644
--- a/src/bun.js/bindings/webcore/WebCoreTypedArrayController.cpp
+++ b/src/bun.js/bindings/webcore/WebCoreTypedArrayController.cpp
@@ -35,14 +35,14 @@
 
 #include <JavaScriptCore/JSArrayBuffer.h>
 
-extern "C" Zig::GlobalObject* Bun__getDefaultGlobal();
+extern "C" Zig::GlobalObject* Bun__getDefaultGlobalObject();
 static inline WebCore::JSDOMGlobalObject* getDefaultGlobal(JSC::JSGlobalObject* lexicalGlobalObject)
 {
     if (auto* global = jsDynamicCast<WebCore::JSDOMGlobalObject*>(lexicalGlobalObject)) {
         return global;
     }
 
-    return Bun__getDefaultGlobal();
+    return Bun__getDefaultGlobalObject();
 }
 
 namespace WebCore {
diff --git a/src/bun.js/bindings/workaround-missing-symbols.cpp b/src/bun.js/bindings/workaround-missing-symbols.cpp
index 5db3610ca4..8e61d2145b 100644
--- a/src/bun.js/bindings/workaround-missing-symbols.cpp
+++ b/src/bun.js/bindings/workaround-missing-symbols.cpp
@@ -1,4 +1,5 @@
 
+
 #if defined(WIN32)
 
 #include <cstdint>
@@ -266,8 +267,23 @@ extern "C" int __wrap_mknodat(int dirfd, const char* path, __mode_t mode, __dev_
 // macOS
 #if defined(__APPLE__)
 
+#include <version>
 #include <dlfcn.h>
 #include <cstdint>
+#include <cstdarg>
+#include <cstdio>
+#include "headers.h"
+
+void std::__libcpp_verbose_abort(char const* format, ...)
+{
+    va_list list;
+    va_start(list, format);
+    char buffer[1024];
+    size_t len = vsnprintf(buffer, sizeof(buffer), format, list);
+    va_end(list);
+
+    Bun__panic(buffer, len);
+}
 
 extern "C" int pthread_self_is_exiting_np()
 {
@@ -358,6 +374,10 @@ extern "C" int __ulock_wait2(uint32_t operation, void* addr, uint64_t value,
 
 #endif
 
+#ifndef U_SHOW_CPLUSPLUS_API
+#define U_SHOW_CPLUSPLUS_API 0
+#endif
+
 #include <unicode/uchar.h>
 
 extern "C" bool icu_hasBinaryProperty(UChar32 cp, unsigned int prop)
diff --git a/src/bun.js/event_loop.zig b/src/bun.js/event_loop.zig
index f8ec533624..c280085ca2 100644
--- a/src/bun.js/event_loop.zig
+++ b/src/bun.js/event_loop.zig
@@ -771,7 +771,7 @@ pub const EventLoop = struct {
     waker: ?Waker = null,
     forever_timer: ?*uws.Timer = null,
     deferred_tasks: DeferredTaskQueue = .{},
-    uws_loop: if (Environment.isWindows) *uws.Loop else void = undefined,
+    uws_loop: if (Environment.isWindows) ?*uws.Loop else void = if (Environment.isWindows) null else {},
 
     debug: Debug = .{},
     entered_event_loop_count: isize = 0,
@@ -871,7 +871,7 @@ pub const EventLoop = struct {
         this.enter();
         defer this.exit();
 
-        const result = callback.callWithThis(globalObject, thisValue, arguments);
+        const result = callback.call(globalObject, thisValue, arguments);
 
         if (result.toError()) |err| {
             _ = this.virtual_machine.uncaughtException(globalObject, err, false);
@@ -1324,7 +1324,7 @@ pub const EventLoop = struct {
 
     inline fn usocketsLoop(this: *const EventLoop) *uws.Loop {
         if (comptime Environment.isWindows) {
-            return this.uws_loop;
+            return this.uws_loop.?;
         }
 
         return this.virtual_machine.event_loop_handle.?;
@@ -1572,7 +1572,9 @@ pub const EventLoop = struct {
 
     pub fn wakeup(this: *EventLoop) void {
         if (comptime Environment.isWindows) {
-            this.uws_loop.wakeup();
+            if (this.uws_loop) |loop| {
+                loop.wakeup();
+            }
             return;
         }
 
@@ -1800,7 +1802,7 @@ pub const MiniEventLoop = struct {
     pub fn filePolls(this: *MiniEventLoop) *Async.FilePoll.Store {
         return this.file_polls_ orelse {
             this.file_polls_ = this.allocator.create(Async.FilePoll.Store) catch bun.outOfMemory();
-            this.file_polls_.?.* = Async.FilePoll.Store.init(this.allocator);
+            this.file_polls_.?.* = Async.FilePoll.Store.init();
             return this.file_polls_.?;
         };
     }
diff --git a/src/bun.js/javascript.zig b/src/bun.js/javascript.zig
index f5f2e19f1b..a65ad0c755 100644
--- a/src/bun.js/javascript.zig
+++ b/src/bun.js/javascript.zig
@@ -404,10 +404,6 @@ pub const SavedSourceMap = struct {
 };
 const uws = bun.uws;
 
-pub export fn Bun__getDefaultGlobal() *JSGlobalObject {
-    return JSC.VirtualMachine.get().global;
-}
-
 pub export fn Bun__getVM() *JSC.VirtualMachine {
     return JSC.VirtualMachine.get();
 }
@@ -491,7 +487,7 @@ pub export fn Bun__reportUnhandledError(globalObject: *JSGlobalObject, value: JS
     // See the crash in https://github.com/oven-sh/bun/issues/9778
     const jsc_vm = JSC.VirtualMachine.get();
     _ = jsc_vm.uncaughtException(globalObject, value, false);
-    return JSC.JSValue.jsUndefined();
+    return .undefined;
 }
 
 /// This function is called on another thread
@@ -650,6 +646,10 @@ export fn Bun__getVerboseFetchValue() i32 {
     };
 }
 
+const body_value_pool_size = if (bun.heap_breakdown.enabled) 0 else 256;
+pub const BodyValueRef = bun.HiveRef(JSC.WebCore.Body.Value, body_value_pool_size);
+const BodyValueHiveAllocator = bun.HiveArray(BodyValueRef, body_value_pool_size).Fallback;
+
 /// TODO: rename this to ScriptExecutionContext
 /// This is the shared global state for a single JS instance execution
 /// Today, Bun is one VM per thread, so the name "VirtualMachine" sort of makes sense
@@ -785,10 +785,16 @@ pub const VirtualMachine = struct {
 
     debug_thread_id: if (Environment.allow_assert) std.Thread.Id else void,
 
+    body_value_hive_allocator: BodyValueHiveAllocator = undefined,
+
     pub const OnUnhandledRejection = fn (*VirtualMachine, globalObject: *JSC.JSGlobalObject, JSC.JSValue) void;
 
     pub const OnException = fn (*ZigException) void;
 
+    pub fn initRequestBodyValue(this: *VirtualMachine, body: JSC.WebCore.Body.Value) !*BodyValueRef {
+        return BodyValueRef.init(body, &this.body_value_hive_allocator);
+    }
+
     pub fn uwsLoop(this: *const VirtualMachine) *uws.Loop {
         if (comptime Environment.isPosix) {
             if (Environment.allow_assert) {
@@ -841,6 +847,23 @@ pub const VirtualMachine = struct {
 
     const VMHolder = struct {
         pub threadlocal var vm: ?*VirtualMachine = null;
+        pub threadlocal var cached_global_object: ?*JSGlobalObject = null;
+        pub export fn Bun__setDefaultGlobalObject(global: *JSGlobalObject) void {
+            if (vm) |vm_instance| {
+                vm_instance.global = global;
+            }
+
+            cached_global_object = global;
+        }
+
+        pub export fn Bun__getDefaultGlobalObject() ?*JSGlobalObject {
+            return cached_global_object orelse {
+                if (vm) |vm_instance| {
+                    cached_global_object = vm_instance.global;
+                }
+                return null;
+            };
+        }
     };
 
     pub inline fn get() *VirtualMachine {
@@ -962,6 +985,10 @@ pub const VirtualMachine = struct {
             this.hide_bun_stackframes = false;
         }
 
+        if (bun.getRuntimeFeatureFlag("BUN_FEATURE_FLAG_DISABLE_ASYNC_TRANSPILER")) {
+            this.transpiler_store.enabled = false;
+        }
+
         if (map.map.fetchSwapRemove("NODE_CHANNEL_FD")) |kv| {
             const mode = if (map.map.fetchSwapRemove("NODE_CHANNEL_SERIALIZATION_MODE")) |mode_kv|
                 IPC.Mode.fromString(mode_kv.value.value) orelse .json
@@ -1040,7 +1067,7 @@ pub const VirtualMachine = struct {
 
         if (this.is_handling_uncaught_exception) {
             this.runErrorHandler(err, null);
-            Bun__Process__exit(globalObject, 1);
+            Bun__Process__exit(globalObject, 7);
             @panic("Uncaught exception while handling uncaught exception");
         }
         this.is_handling_uncaught_exception = true;
@@ -1216,6 +1243,10 @@ pub const VirtualMachine = struct {
         }
     }
 
+    pub fn globalExit(this: *VirtualMachine) noreturn {
+        bun.Global.exit(this.exit_handler.exit_code);
+    }
+
     pub fn nextAsyncTaskID(this: *VirtualMachine) u64 {
         var debugger: *Debugger = &(this.debugger orelse return 0);
         debugger.next_debugger_id +%= 1;
@@ -1468,7 +1499,7 @@ pub const VirtualMachine = struct {
 
         vm.* = VirtualMachine{
             .global = undefined,
-            .transpiler_store = RuntimeTranspilerStore.init(allocator),
+            .transpiler_store = RuntimeTranspilerStore.init(),
             .allocator = allocator,
             .entry_point = ServerEntryPoint{},
             .bundler = bundler,
@@ -1538,6 +1569,7 @@ pub const VirtualMachine = struct {
         }
 
         vm.configureDebugger(opts.debugger);
+        vm.body_value_hive_allocator = BodyValueHiveAllocator.init(bun.typedAllocator(JSC.WebCore.Body.Value));
 
         return vm;
     }
@@ -1583,7 +1615,7 @@ pub const VirtualMachine = struct {
 
         vm.* = VirtualMachine{
             .global = undefined,
-            .transpiler_store = RuntimeTranspilerStore.init(allocator),
+            .transpiler_store = RuntimeTranspilerStore.init(),
             .allocator = allocator,
             .entry_point = ServerEntryPoint{},
             .bundler = bundler,
@@ -1657,6 +1689,7 @@ pub const VirtualMachine = struct {
         }
 
         vm.configureDebugger(opts.debugger);
+        vm.body_value_hive_allocator = BodyValueHiveAllocator.init(bun.typedAllocator(JSC.WebCore.Body.Value));
 
         return vm;
     }
@@ -1731,7 +1764,7 @@ pub const VirtualMachine = struct {
         vm.* = VirtualMachine{
             .global = undefined,
             .allocator = allocator,
-            .transpiler_store = RuntimeTranspilerStore.init(allocator),
+            .transpiler_store = RuntimeTranspilerStore.init(),
             .entry_point = ServerEntryPoint{},
             .bundler = bundler,
             .console = console,
@@ -1799,6 +1832,7 @@ pub const VirtualMachine = struct {
             source_code_printer.?.* = js_printer.BufferPrinter.init(writer);
             source_code_printer.?.ctx.append_null_byte = false;
         }
+        vm.body_value_hive_allocator = BodyValueHiveAllocator.init(bun.typedAllocator(JSC.WebCore.Body.Value));
 
         return vm;
     }
@@ -2398,6 +2432,9 @@ pub const VirtualMachine = struct {
     // TODO:
     pub fn deinit(this: *VirtualMachine) void {
         this.source_mappings.deinit();
+        if (this.rare_data) |rare_data| {
+            rare_data.deinit();
+        }
         this.has_terminated = true;
     }
 
@@ -2908,7 +2945,7 @@ pub const VirtualMachine = struct {
     pub fn reportUncaughtException(globalObject: *JSGlobalObject, exception: *JSC.Exception) JSValue {
         var jsc_vm = globalObject.bunVM();
         _ = jsc_vm.uncaughtException(globalObject, exception.value(), false);
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn printStackTrace(comptime Writer: type, writer: Writer, trace: ZigStackTrace, comptime allow_ansi_colors: bool) !void {
@@ -2931,7 +2968,7 @@ pub const VirtualMachine = struct {
 
                 const has_name = std.fmt.count("{}", .{frame.nameFormatter(false)}) > 0;
 
-                if (has_name) {
+                if (has_name and !frame.position.isInvalid()) {
                     try writer.print(
                         comptime Output.prettyFmt(
                             "<r>      <d>at <r>{}<d> (<r>{}<d>)<r>\n",
@@ -2949,7 +2986,7 @@ pub const VirtualMachine = struct {
                             ),
                         },
                     );
-                } else {
+                } else if (!frame.position.isInvalid()) {
                     try writer.print(
                         comptime Output.prettyFmt(
                             "<r>      <d>at <r>{}\n",
@@ -2964,6 +3001,33 @@ pub const VirtualMachine = struct {
                             ),
                         },
                     );
+                } else if (has_name) {
+                    try writer.print(
+                        comptime Output.prettyFmt(
+                            "<r>      <d>at <r>{}<d>\n",
+                            allow_ansi_colors,
+                        ),
+                        .{
+                            frame.nameFormatter(
+                                allow_ansi_colors,
+                            ),
+                        },
+                    );
+                } else {
+                    try writer.print(
+                        comptime Output.prettyFmt(
+                            "<r>      <d>at <r>{}<d>\n",
+                            allow_ansi_colors,
+                        ),
+                        .{
+                            frame.sourceURLFormatter(
+                                dir,
+                                origin,
+                                false,
+                                allow_ansi_colors,
+                            ),
+                        },
+                    );
                 }
             }
         }
@@ -3122,6 +3186,7 @@ pub const VirtualMachine = struct {
             }
 
             const code = code: {
+                if (bun.getRuntimeFeatureFlag("BUN_DISABLE_SOURCE_CODE_PREVIEW") or bun.getRuntimeFeatureFlag("BUN_DISABLE_TRANSPILED_SOURCE_CODE_PREVIEW")) break :code ZigString.Slice.empty;
                 if (!top.remapped and lookup.source_map != null and lookup.source_map.?.isExternal()) {
                     if (lookup.getSourceCode(top_source_url.slice())) |src| {
                         break :code src;
@@ -3198,6 +3263,9 @@ pub const VirtualMachine = struct {
         var exception = exception_holder.zigException();
         defer exception_holder.deinit(this);
 
+        // The ZigException structure stores substrings of the source code, in
+        // which we need the lifetime of this data to outlive the inner call to
+        // remapZigException, but still get freed.
         var source_code_slice: ?ZigString.Slice = null;
         defer if (source_code_slice) |slice| slice.deinit();
 
@@ -3635,7 +3703,7 @@ pub const VirtualMachine = struct {
 
     pub const IPCInstance = struct {
         globalThis: ?*JSGlobalObject,
-        context: if (Environment.isPosix) *uws.SocketContext else u0,
+        context: if (Environment.isPosix) *uws.SocketContext else void,
         data: IPC.IPCData,
 
         pub usingnamespace bun.New(@This());
@@ -3644,10 +3712,7 @@ pub const VirtualMachine = struct {
             return &this.data;
         }
 
-        pub fn handleIPCMessage(
-            this: *IPCInstance,
-            message: IPC.DecodedIPCMessage,
-        ) void {
+        pub fn handleIPCMessage(this: *IPCInstance, message: IPC.DecodedIPCMessage) void {
             JSC.markBinding(@src());
             switch (message) {
                 // In future versions we can read this in order to detect version mismatches,
@@ -3682,9 +3747,7 @@ pub const VirtualMachine = struct {
     const IPCInfoType = if (Environment.isWindows) []const u8 else bun.FileDescriptor;
     pub fn initIPCInstance(this: *VirtualMachine, info: IPCInfoType, mode: IPC.Mode) void {
         IPC.log("initIPCInstance {" ++ (if (Environment.isWindows) "s" else "") ++ "}", .{info});
-        this.ipc = .{
-            .waiting = .{ .info = info, .mode = mode },
-        };
+        this.ipc = .{ .waiting = .{ .info = info, .mode = mode } };
     }
 
     pub fn getIPCInstance(this: *VirtualMachine) ?*IPCInstance {
@@ -3722,7 +3785,7 @@ pub const VirtualMachine = struct {
             .windows => instance: {
                 var instance = IPCInstance.new(.{
                     .globalThis = this.global,
-                    .context = 0,
+                    .context = {},
                     .data = .{ .mode = opts.mode },
                 });
 
diff --git a/src/bun.js/javascript_core_c_api.zig b/src/bun.js/javascript_core_c_api.zig
index b4faa3f722..e900e54af8 100644
--- a/src/bun.js/javascript_core_c_api.zig
+++ b/src/bun.js/javascript_core_c_api.zig
@@ -173,101 +173,4 @@ pub extern fn JSRemoteInspectorSetLogToSystemConsole(enabled: bool) void;
 pub extern fn JSRemoteInspectorGetInspectionEnabledByDefault(void) bool;
 pub extern fn JSRemoteInspectorSetInspectionEnabledByDefault(enabled: bool) void;
 
-// -- Manual --
-
-const size_t = usize;
-
-pub const CellType = enum(u8) {
-    pub const LastMaybeFalsyCellPrimitive = 2;
-    pub const LastJSCObjectType = 73;
-
-    CellType = 0,
-    StringType = 1,
-    HeapBigIntType = 2,
-
-    SymbolType = 3,
-    GetterSetterType = 4,
-    CustomGetterSetterType = 5,
-    APIValueWrapperType = 6,
-    NativeExecutableType = 7,
-    ProgramExecutableType = 8,
-    ModuleProgramExecutableType = 9,
-    EvalExecutableType = 10,
-    FunctionExecutableType = 11,
-    UnlinkedFunctionExecutableType = 12,
-    UnlinkedProgramCodeBlockType = 13,
-    UnlinkedModuleProgramCodeBlockType = 14,
-    UnlinkedEvalCodeBlockType = 15,
-    UnlinkedFunctionCodeBlockType = 16,
-    CodeBlockType = 17,
-    JSImmutableButterflyType = 18,
-    JSSourceCodeType = 19,
-    JSScriptFetcherType = 20,
-    JSScriptFetchParametersType = 21,
-    ObjectType = 22,
-    FinalObjectType = 23,
-    JSCalleeType = 24,
-    JSFunctionType = 25,
-    InternalFunctionType = 26,
-    NullSetterFunctionType = 27,
-    BooleanObjectType = 28,
-    NumberObjectType = 29,
-    ErrorInstanceType = 30,
-    GlobalProxyType = 31,
-    DirectArgumentsType = 32,
-    ScopedArgumentsType = 33,
-    ClonedArgumentsType = 34,
-    ArrayType = 35,
-    DerivedArrayType = 36,
-    ArrayBufferType = 37,
-    Int8ArrayType = 38,
-    Uint8ArrayType = 39,
-    Uint8ClampedArrayType = 40,
-    Int16ArrayType = 41,
-    Uint16ArrayType = 42,
-    Int32ArrayType = 43,
-    Uint32ArrayType = 44,
-    Float32ArrayType = 45,
-    Float64ArrayType = 46,
-    BigInt64ArrayType = 47,
-    BigUint64ArrayType = 48,
-    DataViewType = 49,
-    GlobalObjectType = 50,
-    GlobalLexicalEnvironmentType = 51,
-    LexicalEnvironmentType = 52,
-    ModuleEnvironmentType = 53,
-    StrictEvalActivationType = 54,
-    WithScopeType = 55,
-    ModuleNamespaceObjectType = 56,
-    RegExpObjectType = 57,
-    JSDateType = 58,
-    ProxyObjectType = 59,
-    JSGeneratorType = 60,
-    JSAsyncGeneratorType = 61,
-    JSArrayIteratorType = 62,
-    JSMapIteratorType = 63,
-    JSSetIteratorType = 64,
-    JSStringIteratorType = 65,
-    JSPromiseType = 66,
-    JSMapType = 67,
-    JSSetType = 68,
-    JSWeakMapType = 69,
-    JSWeakSetType = 70,
-    WebAssemblyModuleType = 71,
-    WebAssemblyInstanceType = 72,
-    WebAssemblyGCObjectType = 73,
-    StringObjectType = 74,
-    DerivedStringObjectType = 75,
-
-    MaxJSType = 255,
-    _,
-
-    pub fn isString(this: CellType) bool {
-        return switch (this) {
-            .StringType => true,
-            else => false,
-        };
-    }
-};
-
 pub extern "c" fn JSObjectGetProxyTarget(JSObjectRef) JSObjectRef;
diff --git a/src/bun.js/module_loader.zig b/src/bun.js/module_loader.zig
index 6bfaf54550..cb0fd1d4ca 100644
--- a/src/bun.js/module_loader.zig
+++ b/src/bun.js/module_loader.zig
@@ -166,6 +166,7 @@ fn dumpSourceString(vm: *VirtualMachine, specifier: string, written: []const u8)
 
 fn dumpSourceStringFailiable(vm: *VirtualMachine, specifier: string, written: []const u8) !void {
     if (!Environment.isDebug) return;
+    if (bun.getRuntimeFeatureFlag("BUN_DEBUG_NO_DUMP")) return;
 
     const BunDebugHolder = struct {
         pub var dir: ?std.fs.Dir = null;
@@ -265,9 +266,9 @@ pub const RuntimeTranspilerStore = struct {
 
     pub const Queue = bun.UnboundedQueue(TranspilerJob, .next);
 
-    pub fn init(allocator: std.mem.Allocator) RuntimeTranspilerStore {
+    pub fn init() RuntimeTranspilerStore {
         return RuntimeTranspilerStore{
-            .store = TranspilerJob.Store.init(allocator),
+            .store = TranspilerJob.Store.init(bun.typedAllocator(TranspilerJob)),
         };
     }
 
@@ -339,7 +340,7 @@ pub const RuntimeTranspilerStore = struct {
         work_task: JSC.WorkPoolTask = .{ .callback = runFromWorkerThread },
         next: ?*TranspilerJob = null,
 
-        pub const Store = bun.HiveArray(TranspilerJob, 64).Fallback;
+        pub const Store = bun.HiveArray(TranspilerJob, if (bun.heap_breakdown.enabled) 0 else 64).Fallback;
 
         pub const Fetcher = union(enum) {
             virtual_module: bun.String,
@@ -410,12 +411,10 @@ pub const RuntimeTranspilerStore = struct {
             };
 
             const parse_error = this.parse_error;
-            if (!vm.transpiler_store.store.hive.in(this)) {
-                this.promise.deinit();
-            }
+            this.promise.deinit();
             this.deinit();
 
-            _ = vm.transpiler_store.store.hive.put(this);
+            _ = vm.transpiler_store.store.put(this);
 
             ModuleLoader.AsyncModule.fulfill(globalThis, promise, resolved_source, parse_error, specifier, referrer, &log);
         }
diff --git a/src/bun.js/modules/BunJSCModule.h b/src/bun.js/modules/BunJSCModule.h
index eb47c2158e..18a0a45753 100644
--- a/src/bun.js/modules/BunJSCModule.h
+++ b/src/bun.js/modules/BunJSCModule.h
@@ -45,6 +45,13 @@
 
 #include <JavaScriptCore/ControlFlowProfiler.h>
 
+#if OS(DARWIN)
+#if BUN_DEBUG
+#include <malloc/malloc.h>
+#define IS_MALLOC_DEBUGGING_ENABLED 1
+#endif
+#endif
+
 using namespace JSC;
 using namespace WTF;
 using namespace WebCore;
@@ -226,6 +233,38 @@ JSC_DEFINE_HOST_FUNCTION(functionMemoryUsageStatistics,
   stats->putDirect(vm,
                    Identifier::fromLatin1(vm, "protectedObjectTypeCounts"_s),
                    protectedCounts);
+
+#if IS_MALLOC_DEBUGGING_ENABLED
+#if OS(DARWIN)
+  {
+    vm_address_t *zones;
+    unsigned count;
+
+    // Zero out the structures in case a zone is missing
+    malloc_statistics_t zone_stats;
+    zone_stats.blocks_in_use = 0;
+    zone_stats.size_in_use = 0;
+    zone_stats.max_size_in_use = 0;
+    zone_stats.size_allocated = 0;
+
+    JSObject *zonesObject = constructEmptyObject(globalObject);
+    stats->putDirect(vm, Identifier::fromString(vm, "zones"_s), zonesObject);
+    malloc_zone_pressure_relief(nullptr, 0);
+    malloc_get_all_zones(mach_task_self(), 0, &zones, &count);
+    for (unsigned i = 0; i < count; i++) {
+      auto zone = reinterpret_cast<malloc_zone_t *>(zones[i]);
+      if (const char *name = malloc_get_zone_name(zone)) {
+        malloc_zone_statistics(reinterpret_cast<malloc_zone_t *>(zones[i]),
+                               &zone_stats);
+        zonesObject->putDirect(
+            vm, Identifier::fromString(vm, String::fromUTF8(name)),
+            jsDoubleNumber(zone_stats.size_in_use));
+      }
+    }
+  }
+#endif
+#endif
+
   return JSValue::encode(stats);
 }
 
diff --git a/src/bun.js/node/node_fs.zig b/src/bun.js/node/node_fs.zig
index 2c3929314c..a4a009b943 100644
--- a/src/bun.js/node/node_fs.zig
+++ b/src/bun.js/node/node_fs.zig
@@ -39,6 +39,7 @@ const E = C.E;
 const uid_t = if (Environment.isPosix) std.posix.uid_t else bun.windows.libuv.uv_uid_t;
 const gid_t = if (Environment.isPosix) std.posix.gid_t else bun.windows.libuv.uv_gid_t;
 const ReadPosition = i64;
+const StringOrBuffer = JSC.Node.StringOrBuffer;
 
 const Stats = JSC.Node.Stats;
 const Dirent = JSC.Node.Dirent;
@@ -54,7 +55,6 @@ else
     // TODO:
     0;
 
-const StringOrBuffer = JSC.Node.StringOrBuffer;
 const ArrayBuffer = JSC.MarkedArrayBuffer;
 const Buffer = JSC.Buffer;
 const FileSystemFlags = JSC.Node.FileSystemFlags;
@@ -2304,7 +2304,7 @@ pub const Arguments = struct {
     };
 
     const MkdirTemp = struct {
-        prefix: JSC.Node.StringOrBuffer = .{ .buffer = .{ .buffer = JSC.ArrayBuffer.empty } },
+        prefix: StringOrBuffer = .{ .buffer = .{ .buffer = JSC.ArrayBuffer.empty } },
         encoding: Encoding = Encoding.utf8,
 
         pub fn deinit(this: MkdirTemp) void {
@@ -2322,7 +2322,7 @@ pub const Arguments = struct {
         pub fn fromJS(ctx: JSC.C.JSContextRef, arguments: *ArgumentsSlice, exception: JSC.C.ExceptionRef) ?MkdirTemp {
             const prefix_value = arguments.next() orelse return MkdirTemp{};
 
-            const prefix = JSC.Node.StringOrBuffer.fromJS(ctx, bun.default_allocator, prefix_value) orelse {
+            const prefix = StringOrBuffer.fromJS(ctx, bun.default_allocator, prefix_value) orelse {
                 if (exception.* == null) {
                     JSC.throwInvalidArguments(
                         "prefix must be a string or TypedArray",
@@ -2680,7 +2680,7 @@ pub const Arguments = struct {
     ///
     pub const Write = struct {
         fd: FileDescriptor,
-        buffer: JSC.Node.StringOrBuffer,
+        buffer: StringOrBuffer,
         // buffer_val: JSC.JSValue = JSC.JSValue.zero,
         offset: u64 = 0,
         length: u64 = std.math.maxInt(u64),
@@ -4019,14 +4019,14 @@ const Return = struct {
             }
         }
     };
-    pub const ReadFile = JSC.Node.StringOrBuffer;
+    pub const ReadFile = StringOrBuffer;
     pub const ReadFileWithOptions = union(enum) {
         string: string,
         buffer: JSC.Node.Buffer,
         null_terminated: [:0]const u8,
     };
-    pub const Readlink = JSC.Node.StringOrBuffer;
-    pub const Realpath = JSC.Node.StringOrBuffer;
+    pub const Readlink = StringOrBuffer;
+    pub const Realpath = StringOrBuffer;
     pub const RealpathNative = Realpath;
     pub const Rename = void;
     pub const Rmdir = void;
diff --git a/src/bun.js/node/node_fs_stat_watcher.zig b/src/bun.js/node/node_fs_stat_watcher.zig
index d5d6c23625..a4f26346a5 100644
--- a/src/bun.js/node/node_fs_stat_watcher.zig
+++ b/src/bun.js/node/node_fs_stat_watcher.zig
@@ -305,7 +305,7 @@ pub const StatWatcher = struct {
             if (obj.js_this != .zero) {
                 return obj.js_this;
             }
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
     };
 
@@ -314,7 +314,7 @@ pub const StatWatcher = struct {
             this.persistent = true;
             this.poll_ref.ref(this.ctx);
         }
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn doUnref(this: *StatWatcher, _: *JSC.JSGlobalObject, _: *JSC.CallFrame) JSC.JSValue {
@@ -322,7 +322,7 @@ pub const StatWatcher = struct {
             this.persistent = false;
             this.poll_ref.unref(this.ctx);
         }
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn hasPendingActivity(this: *StatWatcher) bool {
@@ -345,7 +345,7 @@ pub const StatWatcher = struct {
 
     pub fn doClose(this: *StatWatcher, _: *JSC.JSGlobalObject, _: *JSC.CallFrame) JSC.JSValue {
         this.close();
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     /// If the scheduler is not using this, free instantly, otherwise mark for being freed.
@@ -417,6 +417,7 @@ pub const StatWatcher = struct {
 
         const result = StatWatcher.listenerGetCached(this.js_this).?.call(
             this.globalThis,
+            .undefined,
             &[2]JSC.JSValue{
                 jsvalue,
                 jsvalue,
@@ -454,6 +455,7 @@ pub const StatWatcher = struct {
 
         const result = StatWatcher.listenerGetCached(this.js_this).?.call(
             this.globalThis,
+            .undefined,
             &[2]JSC.JSValue{
                 current_jsvalue,
                 prev_jsvalue,
diff --git a/src/bun.js/node/node_fs_watcher.zig b/src/bun.js/node/node_fs_watcher.zig
index 54e9fdaced..9c5a296bee 100644
--- a/src/bun.js/node/node_fs_watcher.zig
+++ b/src/bun.js/node/node_fs_watcher.zig
@@ -579,7 +579,7 @@ pub const FSWatcher = struct {
         if (js_this == .zero) return;
         const listener = FSWatcher.listenerGetCached(js_this) orelse return;
         const globalObject = this.globalThis;
-        var filename: JSC.JSValue = JSC.JSValue.jsUndefined();
+        var filename: JSC.JSValue = .undefined;
         if (file_name.len > 0) {
             if (this.encoding == .buffer)
                 filename = JSC.ArrayBuffer.createBuffer(globalObject, file_name)
@@ -615,7 +615,7 @@ pub const FSWatcher = struct {
             this.persistent = true;
             this.poll_ref.ref(this.ctx);
         }
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn doUnref(this: *FSWatcher, _: *JSC.JSGlobalObject, _: *JSC.CallFrame) JSC.JSValue {
@@ -623,7 +623,7 @@ pub const FSWatcher = struct {
             this.persistent = false;
             this.poll_ref.unref(this.ctx);
         }
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn hasRef(this: *FSWatcher, _: *JSC.JSGlobalObject, _: *JSC.CallFrame) JSC.JSValue {
@@ -698,7 +698,7 @@ pub const FSWatcher = struct {
 
     pub fn doClose(this: *FSWatcher, _: *JSC.JSGlobalObject, _: *JSC.CallFrame) JSC.JSValue {
         this.close();
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn finalize(this: *FSWatcher) void {
diff --git a/src/bun.js/node/node_os.zig b/src/bun.js/node/node_os.zig
index 9a153b93b1..b55d061ec4 100644
--- a/src/bun.js/node/node_os.zig
+++ b/src/bun.js/node/node_os.zig
@@ -66,7 +66,7 @@ pub const OS = struct {
             };
 
             globalThis.vm().throwError(globalThis, err.toErrorInstance(globalThis));
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         };
     }
 
@@ -320,7 +320,7 @@ pub const OS = struct {
                 globalThis,
             );
             globalThis.vm().throwError(globalThis, err);
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         const pid = if (arguments.len > 0) arguments[0].asInt32() else 0;
@@ -342,7 +342,7 @@ pub const OS = struct {
             };
 
             globalThis.vm().throwError(globalThis, err.toErrorInstance(globalThis));
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         return JSC.JSValue.jsNumberFromInt32(priority);
@@ -425,7 +425,7 @@ pub const OS = struct {
             };
 
             globalThis.vm().throwError(globalThis, err.toErrorInstance(globalThis));
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
         defer C.freeifaddrs(interface_start);
 
@@ -736,7 +736,7 @@ pub const OS = struct {
                 globalThis,
             );
             globalThis.vm().throwError(globalThis, err);
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         const pid = if (arguments.len == 2) arguments[0].coerce(i32, globalThis) else 0;
@@ -750,7 +750,7 @@ pub const OS = struct {
                 globalThis,
             );
             globalThis.vm().throwError(globalThis, err);
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         const errcode = C.setProcessPriority(pid, priority);
@@ -765,7 +765,7 @@ pub const OS = struct {
                 };
 
                 globalThis.vm().throwError(globalThis, err.toErrorInstance(globalThis));
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             },
             .ACCES => {
                 const err = JSC.SystemError{
@@ -777,12 +777,12 @@ pub const OS = struct {
                 };
 
                 globalThis.vm().throwError(globalThis, err.toErrorInstance(globalThis));
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             },
             else => {},
         }
 
-        return JSC.JSValue.jsUndefined();
+        return .undefined;
     }
 
     pub fn totalmem(_: *JSC.JSGlobalObject, _: *JSC.CallFrame) JSC.JSValue {
diff --git a/src/bun.js/node/node_util_binding.zig b/src/bun.js/node/node_util_binding.zig
new file mode 100644
index 0000000000..d58bac22db
--- /dev/null
+++ b/src/bun.js/node/node_util_binding.zig
@@ -0,0 +1,108 @@
+const std = @import("std");
+const bun = @import("root").bun;
+const Environment = bun.Environment;
+const JSC = bun.JSC;
+const string = bun.string;
+const Output = bun.Output;
+const ZigString = JSC.ZigString;
+const uv = bun.windows.libuv;
+
+pub fn internalErrorName(globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSC.JSValue {
+    const arguments = callframe.arguments(1).slice();
+    if (arguments.len < 1) {
+        globalThis.throwNotEnoughArguments("internalErrorName", 1, arguments.len);
+        return .zero;
+    }
+
+    const err_value = arguments[0];
+    const err_int = err_value.toInt32();
+
+    if (err_int == -4095) return ZigString.static("EOF").toJS(globalThis);
+    if (err_int == -4094) return ZigString.static("UNKNOWN").toJS(globalThis);
+    if (err_int == -3000) return ZigString.static("EAI_ADDRFAMILY").toJS(globalThis);
+    if (err_int == -3001) return ZigString.static("EAI_AGAIN").toJS(globalThis);
+    if (err_int == -3002) return ZigString.static("EAI_BADFLAGS").toJS(globalThis);
+    if (err_int == -3003) return ZigString.static("EAI_CANCELED").toJS(globalThis);
+    if (err_int == -3004) return ZigString.static("EAI_FAIL").toJS(globalThis);
+    if (err_int == -3005) return ZigString.static("EAI_FAMILY").toJS(globalThis);
+    if (err_int == -3006) return ZigString.static("EAI_MEMORY").toJS(globalThis);
+    if (err_int == -3007) return ZigString.static("EAI_NODATA").toJS(globalThis);
+    if (err_int == -3008) return ZigString.static("EAI_NONAME").toJS(globalThis);
+    if (err_int == -3009) return ZigString.static("EAI_OVERFLOW").toJS(globalThis);
+    if (err_int == -3010) return ZigString.static("EAI_SERVICE").toJS(globalThis);
+    if (err_int == -3011) return ZigString.static("EAI_SOCKTYPE").toJS(globalThis);
+    if (err_int == -3013) return ZigString.static("EAI_BADHINTS").toJS(globalThis);
+    if (err_int == -3014) return ZigString.static("EAI_PROTOCOL").toJS(globalThis);
+
+    if (err_int == -bun.C.UV_E2BIG) return ZigString.static("E2BIG").toJS(globalThis);
+    if (err_int == -bun.C.UV_EACCES) return ZigString.static("EACCES").toJS(globalThis);
+    if (err_int == -bun.C.UV_EADDRINUSE) return ZigString.static("EADDRINUSE").toJS(globalThis);
+    if (err_int == -bun.C.UV_EADDRNOTAVAIL) return ZigString.static("EADDRNOTAVAIL").toJS(globalThis);
+    if (err_int == -bun.C.UV_EAFNOSUPPORT) return ZigString.static("EAFNOSUPPORT").toJS(globalThis);
+    if (err_int == -bun.C.UV_EAGAIN) return ZigString.static("EAGAIN").toJS(globalThis);
+    if (err_int == -bun.C.UV_EALREADY) return ZigString.static("EALREADY").toJS(globalThis);
+    if (err_int == -bun.C.UV_EBADF) return ZigString.static("EBADF").toJS(globalThis);
+    if (err_int == -bun.C.UV_EBUSY) return ZigString.static("EBUSY").toJS(globalThis);
+    if (err_int == -bun.C.UV_ECANCELED) return ZigString.static("ECANCELED").toJS(globalThis);
+    if (err_int == -bun.C.UV_ECHARSET) return ZigString.static("ECHARSET").toJS(globalThis);
+    if (err_int == -bun.C.UV_ECONNABORTED) return ZigString.static("ECONNABORTED").toJS(globalThis);
+    if (err_int == -bun.C.UV_ECONNREFUSED) return ZigString.static("ECONNREFUSED").toJS(globalThis);
+    if (err_int == -bun.C.UV_ECONNRESET) return ZigString.static("ECONNRESET").toJS(globalThis);
+    if (err_int == -bun.C.UV_EDESTADDRREQ) return ZigString.static("EDESTADDRREQ").toJS(globalThis);
+    if (err_int == -bun.C.UV_EEXIST) return ZigString.static("EEXIST").toJS(globalThis);
+    if (err_int == -bun.C.UV_EFAULT) return ZigString.static("EFAULT").toJS(globalThis);
+    if (err_int == -bun.C.UV_EHOSTUNREACH) return ZigString.static("EHOSTUNREACH").toJS(globalThis);
+    if (err_int == -bun.C.UV_EINTR) return ZigString.static("EINTR").toJS(globalThis);
+    if (err_int == -bun.C.UV_EINVAL) return ZigString.static("EINVAL").toJS(globalThis);
+    if (err_int == -bun.C.UV_EIO) return ZigString.static("EIO").toJS(globalThis);
+    if (err_int == -bun.C.UV_EISCONN) return ZigString.static("EISCONN").toJS(globalThis);
+    if (err_int == -bun.C.UV_EISDIR) return ZigString.static("EISDIR").toJS(globalThis);
+    if (err_int == -bun.C.UV_ELOOP) return ZigString.static("ELOOP").toJS(globalThis);
+    if (err_int == -bun.C.UV_EMFILE) return ZigString.static("EMFILE").toJS(globalThis);
+    if (err_int == -bun.C.UV_EMSGSIZE) return ZigString.static("EMSGSIZE").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENAMETOOLONG) return ZigString.static("ENAMETOOLONG").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENETDOWN) return ZigString.static("ENETDOWN").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENETUNREACH) return ZigString.static("ENETUNREACH").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENFILE) return ZigString.static("ENFILE").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENOBUFS) return ZigString.static("ENOBUFS").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENODEV) return ZigString.static("ENODEV").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENOENT) return ZigString.static("ENOENT").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENOMEM) return ZigString.static("ENOMEM").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENONET) return ZigString.static("ENONET").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENOSPC) return ZigString.static("ENOSPC").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENOSYS) return ZigString.static("ENOSYS").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENOTCONN) return ZigString.static("ENOTCONN").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENOTDIR) return ZigString.static("ENOTDIR").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENOTEMPTY) return ZigString.static("ENOTEMPTY").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENOTSOCK) return ZigString.static("ENOTSOCK").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENOTSUP) return ZigString.static("ENOTSUP").toJS(globalThis);
+    if (err_int == -bun.C.UV_EPERM) return ZigString.static("EPERM").toJS(globalThis);
+    if (err_int == -bun.C.UV_EPIPE) return ZigString.static("EPIPE").toJS(globalThis);
+    if (err_int == -bun.C.UV_EPROTO) return ZigString.static("EPROTO").toJS(globalThis);
+    if (err_int == -bun.C.UV_EPROTONOSUPPORT) return ZigString.static("EPROTONOSUPPORT").toJS(globalThis);
+    if (err_int == -bun.C.UV_EPROTOTYPE) return ZigString.static("EPROTOTYPE").toJS(globalThis);
+    if (err_int == -bun.C.UV_EROFS) return ZigString.static("EROFS").toJS(globalThis);
+    if (err_int == -bun.C.UV_ESHUTDOWN) return ZigString.static("ESHUTDOWN").toJS(globalThis);
+    if (err_int == -bun.C.UV_ESPIPE) return ZigString.static("ESPIPE").toJS(globalThis);
+    if (err_int == -bun.C.UV_ESRCH) return ZigString.static("ESRCH").toJS(globalThis);
+    if (err_int == -bun.C.UV_ETIMEDOUT) return ZigString.static("ETIMEDOUT").toJS(globalThis);
+    if (err_int == -bun.C.UV_ETXTBSY) return ZigString.static("ETXTBSY").toJS(globalThis);
+    if (err_int == -bun.C.UV_EXDEV) return ZigString.static("EXDEV").toJS(globalThis);
+    if (err_int == -bun.C.UV_EFBIG) return ZigString.static("EFBIG").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENOPROTOOPT) return ZigString.static("ENOPROTOOPT").toJS(globalThis);
+    if (err_int == -bun.C.UV_ERANGE) return ZigString.static("ERANGE").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENXIO) return ZigString.static("ENXIO").toJS(globalThis);
+    if (err_int == -bun.C.UV_EMLINK) return ZigString.static("EMLINK").toJS(globalThis);
+    if (err_int == -bun.C.UV_EHOSTDOWN) return ZigString.static("EHOSTDOWN").toJS(globalThis);
+    if (err_int == -bun.C.UV_EREMOTEIO) return ZigString.static("EREMOTEIO").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENOTTY) return ZigString.static("ENOTTY").toJS(globalThis);
+    if (err_int == -bun.C.UV_EFTYPE) return ZigString.static("EFTYPE").toJS(globalThis);
+    if (err_int == -bun.C.UV_EILSEQ) return ZigString.static("EILSEQ").toJS(globalThis);
+    if (err_int == -bun.C.UV_EOVERFLOW) return ZigString.static("EOVERFLOW").toJS(globalThis);
+    if (err_int == -bun.C.UV_ESOCKTNOSUPPORT) return ZigString.static("ESOCKTNOSUPPORT").toJS(globalThis);
+    if (err_int == -bun.C.UV_ENODATA) return ZigString.static("ENODATA").toJS(globalThis);
+    if (err_int == -bun.C.UV_EUNATCH) return ZigString.static("EUNATCH").toJS(globalThis);
+
+    const fmtstring = bun.String.createFormat("Unknown system error {d}", .{err_int}) catch bun.outOfMemory();
+    return fmtstring.toJS(globalThis);
+}
diff --git a/src/bun.js/node/path.zig b/src/bun.js/node/path.zig
index c3767f3c23..e4d1365d01 100644
--- a/src/bun.js/node/path.zig
+++ b/src/bun.js/node/path.zig
@@ -117,7 +117,7 @@ pub const sep_str_windows = CHAR_STR_BACKWARD_SLASH;
 inline fn formatExtT(comptime T: type, ext: []const T, buf: []T) []const T {
     const len = ext.len;
     if (len == 0) {
-        return comptime L(T, "");
+        return &.{};
     }
     if (ext[0] == CHAR_DOT) {
         return ext;
@@ -240,18 +240,18 @@ pub fn basenamePosixT(comptime T: type, path: []const T, suffix: ?[]const T) []c
     const len = path.len;
     // Exit early for easier number type use.
     if (len == 0) {
-        return comptime L(T, "");
+        return &.{};
     }
     var start: usize = 0;
     // We use an optional value instead of -1, as in Node code, for easier number type use.
     var end: ?usize = null;
     var matchedSlash: bool = true;
 
-    const _suffix = if (suffix) |_s| _s else comptime L(T, "");
+    const _suffix = if (suffix) |_s| _s else &.{};
     const _suffixLen = _suffix.len;
     if (suffix != null and _suffixLen > 0 and _suffixLen <= len) {
         if (std.mem.eql(T, _suffix, path)) {
-            return comptime L(T, "");
+            return &.{};
         }
         // We use an optional value instead of -1, as in Node code, for easier number type use.
         var extIdx: ?usize = _suffixLen - 1;
@@ -328,7 +328,7 @@ pub fn basenamePosixT(comptime T: type, path: []const T, suffix: ?[]const T) []c
     return if (end) |_end|
         path[start.._end]
     else
-        comptime L(T, "");
+        &.{};
 }
 
 /// Based on Node v21.6.1 path.win32.basename:
@@ -340,7 +340,7 @@ pub fn basenameWindowsT(comptime T: type, path: []const T, suffix: ?[]const T) [
     const len = path.len;
     // Exit early for easier number type use.
     if (len == 0) {
-        return comptime L(T, "");
+        return &.{};
     }
 
     const isSepT = isSepWindowsT;
@@ -357,11 +357,11 @@ pub fn basenameWindowsT(comptime T: type, path: []const T, suffix: ?[]const T) [
         start = 2;
     }
 
-    const _suffix = if (suffix) |_s| _s else comptime L(T, "");
+    const _suffix = if (suffix) |_s| _s else &.{};
     const _suffixLen = _suffix.len;
     if (suffix != null and _suffixLen > 0 and _suffixLen <= len) {
         if (std.mem.eql(T, _suffix, path)) {
-            return comptime L(T, "");
+            return &.{};
         }
         // We use an optional value instead of -1, as in Node code, for easier number type use.
         var extIdx: ?usize = _suffixLen - 1;
@@ -434,7 +434,7 @@ pub fn basenameWindowsT(comptime T: type, path: []const T, suffix: ?[]const T) [
     return if (end) |_end|
         path[start.._end]
     else
-        comptime L(T, "");
+        &.{};
 }
 
 pub inline fn basenamePosixJS_T(comptime T: type, globalObject: *JSC.JSGlobalObject, path: []const T, suffix: ?[]const T) JSC.JSValue {
@@ -453,7 +453,7 @@ pub inline fn basenameJS_T(comptime T: type, globalObject: *JSC.JSGlobalObject,
 }
 
 pub fn basename(globalObject: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*]JSC.JSValue, args_len: u16) callconv(JSC.conv) JSC.JSValue {
-    const suffix_ptr: ?JSC.JSValue = if (args_len > 1) args_ptr[1] else null;
+    const suffix_ptr: ?JSC.JSValue = if (args_len > 1 and args_ptr[1] != .undefined) args_ptr[1] else null;
 
     if (suffix_ptr) |_suffix_ptr| {
         // Supress exeption in zig. It does globalThis.vm().throwError() in JS land.
@@ -463,7 +463,7 @@ pub fn basename(globalObject: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*
         };
     }
 
-    const path_ptr = if (args_len > 0) args_ptr[0] else JSC.JSValue.jsUndefined();
+    const path_ptr = if (args_len > 0) args_ptr[0] else .undefined;
     // Supress exeption in zig. It does globalThis.vm().throwError() in JS land.
     validateString(globalObject, path_ptr, "path", .{}) catch {
         return .zero;
@@ -658,7 +658,7 @@ pub inline fn dirnameJS_T(comptime T: type, globalObject: *JSC.JSGlobalObject, i
 }
 
 pub fn dirname(globalObject: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*]JSC.JSValue, args_len: u16) callconv(JSC.conv) JSC.JSValue {
-    const path_ptr = if (args_len > 0) args_ptr[0] else JSC.JSValue.jsUndefined();
+    const path_ptr = if (args_len > 0) args_ptr[0] else .undefined;
     // Supress exeption in zig. It does globalThis.vm().throwError() in JS land.
     validateString(globalObject, path_ptr, "path", .{}) catch {
         // Returning .zero translates to a nullprt JSC.JSValue.
@@ -685,7 +685,7 @@ pub fn extnamePosixT(comptime T: type, path: []const T) []const T {
     const len = path.len;
     // Exit early for easier number type use.
     if (len == 0) {
-        return comptime L(T, "");
+        return &.{};
     }
     // We use an optional value instead of -1, as in Node code, for easier number type use.
     var startDot: ?usize = null;
@@ -746,7 +746,7 @@ pub fn extnamePosixT(comptime T: type, path: []const T) []const T {
         _startDot == _end - 1 and
         _startDot == startPart + 1))
     {
-        return comptime L(T, "");
+        return &.{};
     }
 
     return path[_startDot.._end];
@@ -761,7 +761,7 @@ pub fn extnameWindowsT(comptime T: type, path: []const T) []const T {
     const len = path.len;
     // Exit early for easier number type use.
     if (len == 0) {
-        return comptime L(T, "");
+        return &.{};
     }
     var start: usize = 0;
     // We use an optional value instead of -1, as in Node code, for easier number type use.
@@ -835,7 +835,7 @@ pub fn extnameWindowsT(comptime T: type, path: []const T) []const T {
         _startDot == _end - 1 and
         _startDot == startPart + 1))
     {
-        return comptime L(T, "");
+        return &.{};
     }
 
     return path[_startDot.._end];
@@ -857,7 +857,7 @@ pub inline fn extnameJS_T(comptime T: type, globalObject: *JSC.JSGlobalObject, i
 }
 
 pub fn extname(globalObject: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*]JSC.JSValue, args_len: u16) callconv(JSC.conv) JSC.JSValue {
-    const path_ptr = if (args_len > 0) args_ptr[0] else JSC.JSValue.jsUndefined();
+    const path_ptr = if (args_len > 0) args_ptr[0] else .undefined;
     // Supress exeption in zig. It does globalThis.vm().throwError() in JS land.
     validateString(globalObject, path_ptr, "path", .{}) catch {
         // Returning .zero translates to a nullprt JSC.JSValue.
@@ -971,7 +971,7 @@ pub fn formatJS_T(comptime T: type, globalObject: *JSC.JSGlobalObject, allocator
 }
 
 pub fn format(globalObject: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*]JSC.JSValue, args_len: u16) callconv(JSC.conv) JSC.JSValue {
-    const pathObject_ptr = if (args_len > 0) args_ptr[0] else JSC.JSValue.jsUndefined();
+    const pathObject_ptr = if (args_len > 0) args_ptr[0] else .undefined;
     // Supress exeption in zig. It does globalThis.vm().throwError() in JS land.
     validateObject(globalObject, pathObject_ptr, "pathObject", .{}, .{}) catch {
         // Returning .zero translates to a nullprt JSC.JSValue.
@@ -1045,7 +1045,7 @@ pub fn isAbsoluteWindowsZigString(pathZStr: JSC.ZigString) bool {
 }
 
 pub fn isAbsolute(globalObject: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*]JSC.JSValue, args_len: u16) callconv(JSC.conv) JSC.JSValue {
-    const path_ptr = if (args_len > 0) args_ptr[0] else JSC.JSValue.jsUndefined();
+    const path_ptr = if (args_len > 0) args_ptr[0] else .undefined;
     // Supress exeption in zig. It does globalThis.vm().throwError() in JS land.
     validateString(globalObject, path_ptr, "path", .{}) catch {
         // Returning .zero translates to a nullprt JSC.JSValue.
@@ -1085,7 +1085,7 @@ pub inline fn joinPosixT(comptime T: type, paths: []const []const T, buf: []T, b
     var bufOffset: usize = 0;
 
     // Back joined by expandable buf2 in case it is long.
-    var joined: []const T = comptime L(T, "");
+    var joined: []const T = &.{};
 
     for (paths) |path| {
         // validateString of `path is performed in pub fn join.
@@ -1131,8 +1131,8 @@ pub fn joinWindowsT(comptime T: type, paths: []const []const T, buf: []T, buf2:
     var bufOffset: usize = 0;
 
     // Backed by expandable buf2 in case it is long.
-    var joined: []const T = comptime L(T, "");
-    var firstPart: []const T = comptime L(T, "");
+    var joined: []const T = &.{};
+    var firstPart: []const T = &.{};
 
     for (paths) |path| {
         // validateString of `path` is performed in pub fn join.
@@ -1282,7 +1282,7 @@ fn normalizeStringT(comptime T: type, path: []const T, allowAboveRoot: bool, sep
     var bufOffset: usize = 0;
     var bufSize: usize = 0;
 
-    var res: []const T = comptime L(T, "");
+    var res: []const T = &.{};
     var lastSegmentLength: usize = 0;
     // We use an optional value instead of -1, as in Node code, for easier number type use.
     var lastSlash: ?usize = null;
@@ -1317,7 +1317,7 @@ fn normalizeStringT(comptime T: type, path: []const T, allowAboveRoot: bool, sep
                     if (bufSize > 2) {
                         const lastSlashIndex = std.mem.lastIndexOfScalar(T, buf[0..bufSize], separator);
                         if (lastSlashIndex == null) {
-                            res = comptime L(T, "");
+                            res = &.{};
                             bufSize = 0;
                             lastSegmentLength = 0;
                         } else {
@@ -1344,7 +1344,7 @@ fn normalizeStringT(comptime T: type, path: []const T, allowAboveRoot: bool, sep
                         dots = 0;
                         continue;
                     } else if (bufSize != 0) {
-                        res = comptime L(T, "");
+                        res = &.{};
                         bufSize = 0;
                         lastSegmentLength = 0;
                         lastSlash = i;
@@ -1658,7 +1658,7 @@ pub fn normalizeJS_T(comptime T: type, globalObject: *JSC.JSGlobalObject, alloca
 }
 
 pub fn normalize(globalObject: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*]JSC.JSValue, args_len: u16) callconv(JSC.conv) JSC.JSValue {
-    const path_ptr = if (args_len > 0) args_ptr[0] else JSC.JSValue.jsUndefined();
+    const path_ptr = if (args_len > 0) args_ptr[0] else .undefined;
     // Supress exeption in zig. It does globalThis.vm().throwError() in JS land.
     validateString(globalObject, path_ptr, "path", .{}) catch {
         // Returning .zero translates to a nullprt JSC.JSValue.
@@ -1687,12 +1687,12 @@ pub fn parsePosixT(comptime T: type, path: []const T) PathParsed(T) {
         return .{};
     }
 
-    var root: []const T = comptime L(T, "");
-    var dir: []const T = comptime L(T, "");
-    var base: []const T = comptime L(T, "");
-    var ext: []const T = comptime L(T, "");
+    var root: []const T = &.{};
+    var dir: []const T = &.{};
+    var base: []const T = &.{};
+    var ext: []const T = &.{};
     // Prefix with _ to avoid shadowing the identifier in the outer scope.
-    var _name: []const T = comptime L(T, "");
+    var _name: []const T = &.{};
     // Prefix with _ to avoid shadowing the identifier in the outer scope.
     const _isAbsolute = path[0] == CHAR_FORWARD_SLASH;
     var start: usize = 0;
@@ -1786,12 +1786,12 @@ pub fn parseWindowsT(comptime T: type, path: []const T) PathParsed(T) {
     comptime validatePathT(T, "parseWindowsT");
 
     // validateString of `path` is performed in pub fn parse.
-    var root: []const T = comptime L(T, "");
-    var dir: []const T = comptime L(T, "");
-    var base: []const T = comptime L(T, "");
-    var ext: []const T = comptime L(T, "");
+    var root: []const T = &.{};
+    var dir: []const T = &.{};
+    var base: []const T = &.{};
+    var ext: []const T = &.{};
     // Prefix with _ to avoid shadowing the identifier in the outer scope.
-    var _name: []const T = comptime L(T, "");
+    var _name: []const T = &.{};
 
     const len = path.len;
     if (len == 0) {
@@ -1981,7 +1981,7 @@ pub inline fn parseJS_T(comptime T: type, globalObject: *JSC.JSGlobalObject, isW
 }
 
 pub fn parse(globalObject: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*]JSC.JSValue, args_len: u16) callconv(JSC.conv) JSC.JSValue {
-    const path_ptr = if (args_len > 0) args_ptr[0] else JSC.JSValue.jsUndefined();
+    const path_ptr = if (args_len > 0) args_ptr[0] else .undefined;
     // Supress exeption in zig. It does globalThis.vm().throwError() in JS land.
     validateString(globalObject, path_ptr, "path", .{}) catch {
         // Returning .zero translates to a nullprt JSC.JSValue.
@@ -2006,7 +2006,7 @@ pub fn relativePosixT(comptime T: type, from: []const T, to: []const T, buf: []T
 
     // validateString of `from` and `to` are performed in pub fn relative.
     if (std.mem.eql(T, from, to)) {
-        return MaybeSlice(T){ .result = comptime L(T, "") };
+        return MaybeSlice(T){ .result = &.{} };
     }
 
     // Trim leading forward slashes.
@@ -2023,7 +2023,7 @@ pub fn relativePosixT(comptime T: type, from: []const T, to: []const T, buf: []T
     };
 
     if (std.mem.eql(T, fromOrig, toOrig)) {
-        return MaybeSlice(T){ .result = comptime L(T, "") };
+        return MaybeSlice(T){ .result = &.{} };
     }
 
     const fromStart = 1;
@@ -2081,7 +2081,7 @@ pub fn relativePosixT(comptime T: type, from: []const T, to: []const T, buf: []T
     var bufSize: usize = 0;
 
     // Backed by buf3.
-    var out: []const T = comptime L(T, "");
+    var out: []const T = &.{};
     // Add a block to isolate `i`.
     {
         // Generate the relative path based on the path difference between `to`
@@ -2138,7 +2138,7 @@ pub fn relativeWindowsT(comptime T: type, from: []const T, to: []const T, buf: [
 
     // validateString of `from` and `to` are performed in pub fn relative.
     if (std.mem.eql(T, from, to)) {
-        return MaybeSlice(T){ .result = comptime L(T, "") };
+        return MaybeSlice(T){ .result = &.{} };
     }
 
     // Backed by expandable buf2 because fromOrig may be long.
@@ -2156,7 +2156,7 @@ pub fn relativeWindowsT(comptime T: type, from: []const T, to: []const T, buf: [
     if (std.mem.eql(T, fromOrig, toOrig) or
         eqlIgnoreCaseT(T, fromOrig, toOrig))
     {
-        return MaybeSlice(T){ .result = comptime L(T, "") };
+        return MaybeSlice(T){ .result = &.{} };
     }
 
     const toOrigLen = toOrig.len;
@@ -2256,7 +2256,7 @@ pub fn relativeWindowsT(comptime T: type, from: []const T, to: []const T, buf: [
     var bufSize: usize = 0;
 
     // Backed by buf3.
-    var out: []const T = comptime L(T, "");
+    var out: []const T = &.{};
     // Add a block to isolate `i`.
     {
         // Generate the relative path based on the path difference between `to`
@@ -2340,13 +2340,13 @@ pub fn relativeJS_T(comptime T: type, globalObject: *JSC.JSGlobalObject, allocat
 }
 
 pub fn relative(globalObject: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*]JSC.JSValue, args_len: u16) callconv(JSC.conv) JSC.JSValue {
-    const from_ptr = if (args_len > 0) args_ptr[0] else JSC.JSValue.jsUndefined();
+    const from_ptr = if (args_len > 0) args_ptr[0] else .undefined;
     // Supress exeption in zig. It does globalThis.vm().throwError() in JS land.
     validateString(globalObject, from_ptr, "from", .{}) catch {
         // Returning .zero translates to a nullprt JSC.JSValue.
         return .zero;
     };
-    const to_ptr = if (args_len > 1) args_ptr[1] else JSC.JSValue.jsUndefined();
+    const to_ptr = if (args_len > 1) args_ptr[1] else .undefined;
     // Supress exeption in zig. It does globalThis.vm().throwError() in JS land.
     validateString(globalObject, to_ptr, "to", .{}) catch {
         return .zero;
@@ -2374,7 +2374,7 @@ pub fn resolvePosixT(comptime T: type, paths: []const []const T, buf: []T, buf2:
     // Backed by expandable buf2 because resolvedPath may be long.
     // We use buf2 here because resolvePosixT is called by other methods and using
     // buf2 here avoids stepping on others' toes.
-    var resolvedPath: []const T = comptime L(T, "");
+    var resolvedPath: []const T = &.{};
     var resolvedPathLen: usize = 0;
     var resolvedAbsolute: bool = false;
 
@@ -2383,7 +2383,7 @@ pub fn resolvePosixT(comptime T: type, paths: []const []const T, buf: []T, buf2:
 
     var i_i64: i64 = if (paths.len == 0) -1 else @as(i64, @intCast(paths.len - 1));
     while (i_i64 > -2 and !resolvedAbsolute) : (i_i64 -= 1) {
-        var path: []const T = comptime L(T, "");
+        var path: []const T = &.{};
         if (i_i64 >= 0) {
             path = paths[@as(usize, @intCast(i_i64))];
         } else {
@@ -2460,12 +2460,12 @@ pub fn resolveWindowsT(comptime T: type, paths: []const []const T, buf: []T, buf
     var tmpBuf: [MAX_PATH_SIZE(T)]T = undefined;
 
     // Backed by tmpBuf.
-    var resolvedDevice: []const T = comptime L(T, "");
+    var resolvedDevice: []const T = &.{};
     var resolvedDeviceLen: usize = 0;
     // Backed by expandable buf2 because resolvedTail may be long.
     // We use buf2 here because resolvePosixT is called by other methods and using
     // buf2 here avoids stepping on others' toes.
-    var resolvedTail: []const T = comptime L(T, "");
+    var resolvedTail: []const T = &.{};
     var resolvedTailLen: usize = 0;
     var resolvedAbsolute: bool = false;
 
@@ -2477,7 +2477,7 @@ pub fn resolveWindowsT(comptime T: type, paths: []const []const T, buf: []T, buf
     while (i_i64 > -2) : (i_i64 -= 1) {
         // Backed by expandable buf2, to not conflict with buf2 backed resolvedTail,
         // because path may be long.
-        var path: []const T = comptime L(T, "");
+        var path: []const T = &.{};
         if (i_i64 >= 0) {
             path = paths[@as(usize, @intCast(i_i64))];
             // validateString of `path` is performed in pub fn resolve.
@@ -2581,7 +2581,7 @@ pub fn resolveWindowsT(comptime T: type, paths: []const []const T, buf: []T, buf
         const len = path.len;
         var rootEnd: usize = 0;
         // Backed by tmpBuf or an anonymous buffer.
-        var device: []const T = comptime L(T, "");
+        var device: []const T = &.{};
         // Prefix with _ to avoid shadowing the identifier in the outer scope.
         var _isAbsolute: bool = false;
         const byte0 = if (len > 0) path[0] else 0;
@@ -2906,7 +2906,7 @@ pub fn toNamespacedPathJS_T(comptime T: type, globalObject: *JSC.JSGlobalObject,
 }
 
 pub fn toNamespacedPath(globalObject: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*]JSC.JSValue, args_len: u16) callconv(JSC.conv) JSC.JSValue {
-    if (args_len == 0) return JSC.JSValue.jsUndefined();
+    if (args_len == 0) return .undefined;
     var path_ptr = args_ptr[0];
 
     // Based on Node v21.6.1 path.win32.toNamespacedPath and path.posix.toNamespacedPath:
diff --git a/src/bun.js/node/types.zig b/src/bun.js/node/types.zig
index 50220361cf..ba78ea8722 100644
--- a/src/bun.js/node/types.zig
+++ b/src/bun.js/node/types.zig
@@ -269,6 +269,26 @@ pub const BlobOrStringOrBuffer = union(enum) {
         };
     }
 
+    pub fn protect(this: *const BlobOrStringOrBuffer) void {
+        switch (this.*) {
+            .string_or_buffer => |sob| {
+                sob.protect();
+            },
+            else => {},
+        }
+    }
+
+    pub fn deinitAndUnprotect(this: *BlobOrStringOrBuffer) void {
+        switch (this.*) {
+            .string_or_buffer => |sob| {
+                sob.deinitAndUnprotect();
+            },
+            .blob => |*blob| {
+                blob.deinit();
+            },
+        }
+    }
+
     pub fn fromJS(global: *JSC.JSGlobalObject, allocator: std.mem.Allocator, value: JSC.JSValue) ?BlobOrStringOrBuffer {
         if (value.as(JSC.WebCore.Blob)) |blob| {
             if (blob.store) |store| {
@@ -316,6 +336,15 @@ pub const StringOrBuffer = union(enum) {
         }
     }
 
+    pub fn protect(this: *const StringOrBuffer) void {
+        switch (this.*) {
+            .buffer => |buf| {
+                buf.buffer.value.protect();
+            },
+            else => {},
+        }
+    }
+
     pub fn fromJSToOwnedSlice(globalObject: *JSC.JSGlobalObject, value: JSC.JSValue, allocator: std.mem.Allocator) ![]u8 {
         if (value.asArrayBuffer(globalObject)) |array_buffer| {
             defer globalObject.vm().reportExtraMemory(array_buffer.len);
@@ -1390,8 +1419,8 @@ pub fn StatType(comptime Big: bool) type {
 
         // Stats stores these as i32, but BigIntStats stores all of these as i64
         // On windows, these two need to be u64 as the numbers are often very large.
-        dev: if (Environment.isWindows) u64 else Int,
-        ino: if (Environment.isWindows) u64 else Int,
+        dev: u64,
+        ino: u64,
         mode: Int,
         nlink: Int,
         uid: Int,
@@ -1441,10 +1470,16 @@ pub fn StatType(comptime Big: bool) type {
             return struct {
                 pub fn callback(this: *This, globalObject: *JSC.JSGlobalObject) JSC.JSValue {
                     const value = @field(this, @tagName(field));
-                    if (comptime (Big and @typeInfo(@TypeOf(value)) == .Int)) {
-                        return JSC.JSValue.fromInt64NoTruncate(globalObject, @intCast(value));
+                    const Type = @TypeOf(value);
+                    if (comptime Big and @typeInfo(Type) == .Int) {
+                        if (Type == u64) {
+                            return JSC.JSValue.fromUInt64NoTruncate(globalObject, value);
+                        }
+
+                        return JSC.JSValue.fromInt64NoTruncate(globalObject, value);
                     }
-                    return globalObject.toJS(value, .temporary);
+
+                    return JSC.JSValue.jsNumber(value);
                 }
             }.callback;
         }
@@ -1565,8 +1600,8 @@ pub fn StatType(comptime Big: bool) type {
             const cTime = stat_.ctime();
 
             return .{
-                .dev = if (Environment.isWindows) stat_.dev else @truncate(@as(i64, @intCast(stat_.dev))),
-                .ino = if (Environment.isWindows) stat_.ino else @truncate(@as(i64, @intCast(stat_.ino))),
+                .dev = @intCast(@max(stat_.dev, 0)),
+                .ino = @intCast(@max(stat_.ino, 0)),
                 .mode = @truncate(@as(i64, @intCast(stat_.mode))),
                 .nlink = @truncate(@as(i64, @intCast(stat_.nlink))),
                 .uid = @truncate(@as(i64, @intCast(stat_.uid))),
@@ -2066,7 +2101,7 @@ pub const Process = struct {
                 fs.top_level_dir_buf[len + 1] = 0;
                 fs.top_level_dir = fs.top_level_dir_buf[0 .. len + 1];
 
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             },
             .err => |e| return e.toJSC(globalObject),
         }
@@ -2080,8 +2115,9 @@ pub const Process = struct {
             return;
         }
 
+        vm.exit_handler.exit_code = code;
         vm.onExit();
-        bun.Global.exit(code);
+        vm.globalExit();
     }
 
     pub export const Bun__version: [*:0]const u8 = "v" ++ bun.Global.package_json_version;
@@ -2096,6 +2132,7 @@ pub const Process = struct {
     pub export const Bun__versions_tinycc: [*:0]const u8 = bun.Global.versions.tinycc;
     pub export const Bun__versions_lolhtml: [*:0]const u8 = bun.Global.versions.lolhtml;
     pub export const Bun__versions_c_ares: [*:0]const u8 = bun.Global.versions.c_ares;
+    pub export const Bun__versions_libdeflate: [*:0]const u8 = bun.Global.versions.libdeflate;
     pub export const Bun__versions_usockets: [*:0]const u8 = bun.Environment.git_sha;
     pub export const Bun__version_sha: [*:0]const u8 = bun.Environment.git_sha;
     pub export const Bun__versions_lshpack: [*:0]const u8 = bun.Global.versions.lshpack;
diff --git a/src/bun.js/rare_data.zig b/src/bun.js/rare_data.zig
index 5782200373..b0c929ea36 100644
--- a/src/bun.js/rare_data.zig
+++ b/src/bun.js/rare_data.zig
@@ -156,7 +156,7 @@ pub const HotMap = struct {
 pub fn filePolls(this: *RareData, vm: *JSC.VirtualMachine) *Async.FilePoll.Store {
     return this.file_polls_ orelse {
         this.file_polls_ = vm.allocator.create(Async.FilePoll.Store) catch unreachable;
-        this.file_polls_.?.* = Async.FilePoll.Store.init(vm.allocator);
+        this.file_polls_.?.* = Async.FilePoll.Store.init();
         return this.file_polls_.?;
     };
 }
@@ -392,3 +392,14 @@ pub fn nodeFSStatWatcherScheduler(rare: *RareData, vm: *JSC.VirtualMachine) *Sta
         return rare.node_fs_stat_watcher_scheduler.?;
     };
 }
+
+pub fn deinit(this: *RareData) void {
+    if (this.temp_pipe_read_buffer) |pipe| {
+        this.temp_pipe_read_buffer = null;
+        bun.default_allocator.destroy(pipe);
+    }
+
+    if (this.boring_ssl_engine) |engine| {
+        _ = bun.BoringSSL.ENGINE_free(engine);
+    }
+}
diff --git a/src/bun.js/test/diff_format.zig b/src/bun.js/test/diff_format.zig
index 5d28d2532c..c907d16fd4 100644
--- a/src/bun.js/test/diff_format.zig
+++ b/src/bun.js/test/diff_format.zig
@@ -148,15 +148,15 @@ pub const DiffFormatter = struct {
                 var formatter = ConsoleObject.Formatter{ .globalThis = this.globalThis, .quote_strings = true };
                 if (Output.enable_ansi_colors) {
                     try writer.print(Output.prettyFmt(fmt, true), .{
-                        expected.toFmt(this.globalThis, &formatter),
-                        received.toFmt(this.globalThis, &formatter),
+                        expected.toFmt(&formatter),
+                        received.toFmt(&formatter),
                     });
                     return;
                 }
 
                 try writer.print(Output.prettyFmt(fmt, true), .{
-                    expected.toFmt(this.globalThis, &formatter),
-                    received.toFmt(this.globalThis, &formatter),
+                    expected.toFmt(&formatter),
+                    received.toFmt(&formatter),
                 });
                 return;
             },
diff --git a/src/bun.js/test/expect.zig b/src/bun.js/test/expect.zig
index e4c8a1fa0d..5047e27039 100644
--- a/src/bun.js/test/expect.zig
+++ b/src/bun.js/test/expect.zig
@@ -228,7 +228,7 @@ pub const Expect = struct {
                                 if (!silent) {
                                     var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
                                     const message = "Expected promise that rejects<r>\nReceived promise that resolved: <red>{any}<r>\n";
-                                    throwPrettyMatcherError(globalThis, custom_label, matcher_name, matcher_params, flags, message, .{value.toFmt(globalThis, &formatter)});
+                                    throwPrettyMatcherError(globalThis, custom_label, matcher_name, matcher_params, flags, message, .{value.toFmt(&formatter)});
                                 }
                                 return null;
                             },
@@ -240,7 +240,7 @@ pub const Expect = struct {
                                 if (!silent) {
                                     var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
                                     const message = "Expected promise that resolves<r>\nReceived promise that rejected: <red>{any}<r>\n";
-                                    throwPrettyMatcherError(globalThis, custom_label, matcher_name, matcher_params, flags, message, .{value.toFmt(globalThis, &formatter)});
+                                    throwPrettyMatcherError(globalThis, custom_label, matcher_name, matcher_params, flags, message, .{value.toFmt(&formatter)});
                                 }
                                 return null;
                             },
@@ -255,7 +255,7 @@ pub const Expect = struct {
                     if (!silent) {
                         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
                         const message = "Expected promise<r>\nReceived: <red>{any}<r>\n";
-                        throwPrettyMatcherError(globalThis, custom_label, matcher_name, matcher_params, flags, message, .{value.toFmt(globalThis, &formatter)});
+                        throwPrettyMatcherError(globalThis, custom_label, matcher_name, matcher_params, flags, message, .{value.toFmt(&formatter)});
                     }
                     return null;
                 }
@@ -534,7 +534,7 @@ pub const Expect = struct {
             inline else => |has_custom_label| {
                 if (not) {
                     const signature = comptime getSignature("toBe", "<green>expected<r>", true);
-                    this.throw(globalThis, signature, "\n\nExpected: not <green>{any}<r>\n", .{right.toFmt(globalThis, &formatter)});
+                    this.throw(globalThis, signature, "\n\nExpected: not <green>{any}<r>\n", .{right.toFmt(&formatter)});
                     return .zero;
                 }
 
@@ -544,7 +544,7 @@ pub const Expect = struct {
                         (if (!has_custom_label) "\n\n<d>If this test should pass, replace \"toBe\" with \"toEqual\" or \"toStrictEqual\"<r>" else "") ++
                         "\n\nExpected: <green>{any}<r>\n" ++
                         "Received: serializes to the same string\n";
-                    this.throw(globalThis, signature, fmt, .{right.toFmt(globalThis, &formatter)});
+                    this.throw(globalThis, signature, fmt, .{right.toFmt(&formatter)});
                     return .zero;
                 }
 
@@ -560,8 +560,8 @@ pub const Expect = struct {
                 }
 
                 this.throw(globalThis, signature, "\n\nExpected: <green>{any}<r>\nReceived: <red>{any}<r>\n", .{
-                    right.toFmt(globalThis, &formatter),
-                    left.toFmt(globalThis, &formatter),
+                    right.toFmt(&formatter),
+                    left.toFmt(&formatter),
                 });
                 return .zero;
             },
@@ -590,20 +590,20 @@ pub const Expect = struct {
 
         if (!value.isObject() and !value.isString()) {
             var fmt = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-            globalThis.throw("Received value does not have a length property: {any}", .{value.toFmt(globalThis, &fmt)});
+            globalThis.throw("Received value does not have a length property: {any}", .{value.toFmt(&fmt)});
             return .zero;
         }
 
         if (!expected.isNumber()) {
             var fmt = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-            globalThis.throw("Expected value must be a non-negative integer: {any}", .{expected.toFmt(globalThis, &fmt)});
+            globalThis.throw("Expected value must be a non-negative integer: {any}", .{expected.toFmt(&fmt)});
             return .zero;
         }
 
         const expected_length: f64 = expected.asNumber();
         if (@round(expected_length) != expected_length or std.math.isInf(expected_length) or std.math.isNan(expected_length) or expected_length < 0) {
             var fmt = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-            globalThis.throw("Expected value must be a non-negative integer: {any}", .{expected.toFmt(globalThis, &fmt)});
+            globalThis.throw("Expected value must be a non-negative integer: {any}", .{expected.toFmt(&fmt)});
             return .zero;
         }
 
@@ -614,7 +614,7 @@ pub const Expect = struct {
 
         if (actual_length == std.math.inf(f64)) {
             var fmt = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-            globalThis.throw("Received value does not have a length property: {any}", .{value.toFmt(globalThis, &fmt)});
+            globalThis.throw("Received value does not have a length property: {any}", .{value.toFmt(&fmt)});
             return .zero;
         } else if (std.math.isNan(actual_length)) {
             globalThis.throw("Received value has non-number length property: {}", .{actual_length});
@@ -712,10 +712,10 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = list_value.toFmt(globalThis, &formatter);
-        const expected_fmt = expected.toFmt(globalThis, &formatter);
+        const value_fmt = list_value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
         if (not) {
-            const received_fmt = list_value.toFmt(globalThis, &formatter);
+            const received_fmt = list_value.toFmt(&formatter);
             const expected_line = "Expected to not be one of: <green>{any}<r>\nReceived: <red>{any}<r>\n";
             const signature = comptime getSignature("toBeOneOf", "<green>expected<r>", true);
             this.throw(globalThis, signature, "\n\n" ++ expected_line, .{ received_fmt, expected_fmt });
@@ -810,10 +810,10 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
-        const expected_fmt = expected.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
         if (not) {
-            const received_fmt = value.toFmt(globalThis, &formatter);
+            const received_fmt = value.toFmt(&formatter);
             const expected_line = "Expected to not contain: <green>{any}<r>\nReceived: <red>{any}<r>\n";
             const signature = comptime getSignature("toContain", "<green>expected<r>", true);
             this.throw(globalThis, signature, "\n\n" ++ expected_line, .{ expected_fmt, received_fmt });
@@ -851,10 +851,7 @@ pub const Expect = struct {
 
         const not = this.flags.not;
         if (!value.isObject()) {
-            const err = globalThis.createTypeErrorInstance("Expected value must be an object\nReceived: {}", .{value.toFmt(
-                globalThis,
-                &formatter,
-            )});
+            const err = globalThis.createTypeErrorInstance("Expected value must be an object\nReceived: {}", .{value.toFmt(&formatter)});
             globalThis.throwValue(err);
             return .zero;
         }
@@ -870,10 +867,10 @@ pub const Expect = struct {
 
         // handle failure
 
-        const value_fmt = value.toFmt(globalThis, &formatter);
-        const expected_fmt = expected.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
         if (not) {
-            const received_fmt = value.toFmt(globalThis, &formatter);
+            const received_fmt = value.toFmt(&formatter);
             const expected_line = "Expected to not contain: <green>{any}<r>\nReceived: <red>{any}<r>\n";
             const signature = comptime getSignature("toContainKey", "<green>expected<r>", true);
             this.throw(globalThis, signature, "\n\n" ++ expected_line, .{ expected_fmt, received_fmt });
@@ -943,10 +940,10 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
-        const expected_fmt = expected.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
         if (not) {
-            const received_fmt = value.toFmt(globalThis, &formatter);
+            const received_fmt = value.toFmt(&formatter);
             const expected_line = "Expected to not contain: <green>{any}<r>\nReceived: <red>{any}<r>\n";
             const signature = comptime getSignature("toContainKeys", "<green>expected<r>", true);
             this.throw(globalThis, signature, "\n\n" ++ expected_line, .{ expected_fmt, received_fmt });
@@ -1011,10 +1008,10 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalObject, .quote_strings = true };
-        const value_fmt = keys.toFmt(globalObject, &formatter);
-        const expected_fmt = expected.toFmt(globalObject, &formatter);
+        const value_fmt = keys.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
         if (not) {
-            const received_fmt = keys.toFmt(globalObject, &formatter);
+            const received_fmt = keys.toFmt(&formatter);
             const expected_line = "Expected to not contain all keys: <green>{any}<r>\nReceived: <red>{any}<r>\n";
             const fmt = "\n\n" ++ expected_line;
             this.throw(globalObject, comptime getSignature("toContainAllKeys", "<green>expected<r>", true), fmt, .{ expected_fmt, received_fmt });
@@ -1079,10 +1076,10 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
-        const expected_fmt = expected.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
         if (not) {
-            const received_fmt = value.toFmt(globalThis, &formatter);
+            const received_fmt = value.toFmt(&formatter);
             const expected_line = "Expected to not contain: <green>{any}<r>\nReceived: <red>{any}<r>\n";
             const signature = comptime getSignature("toContainAnyKeys", "<green>expected<r>", true);
             this.throw(globalThis, signature, "\n\n" ++ expected_line, .{ expected_fmt, received_fmt });
@@ -1136,10 +1133,10 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalObject, .quote_strings = true };
-        const value_fmt = value.toFmt(globalObject, &formatter);
-        const expected_fmt = expected.toFmt(globalObject, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
         if (not) {
-            const received_fmt = value.toFmt(globalObject, &formatter);
+            const received_fmt = value.toFmt(&formatter);
             const expected_line = "Expected to not contain: <green>{any}<r>\nReceived: <red>{any}<r>\n";
             const fmt = "\n\n" ++ expected_line;
             this.throw(globalObject, comptime getSignature("toContainValue", "<green>expected<r>", true), fmt, .{ expected_fmt, received_fmt });
@@ -1203,10 +1200,10 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalObject, .quote_strings = true };
-        const value_fmt = value.toFmt(globalObject, &formatter);
-        const expected_fmt = expected.toFmt(globalObject, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
         if (not) {
-            const received_fmt = value.toFmt(globalObject, &formatter);
+            const received_fmt = value.toFmt(&formatter);
             const expected_line = "Expected to not contain: <green>{any}<r>\nReceived: <red>{any}<r>\n";
             const fmt = "\n\n" ++ expected_line;
             this.throw(globalObject, comptime getSignature("toContainValues", "<green>expected<r>", true), fmt, .{ expected_fmt, received_fmt });
@@ -1276,10 +1273,10 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalObject, .quote_strings = true };
-        const value_fmt = value.toFmt(globalObject, &formatter);
-        const expected_fmt = expected.toFmt(globalObject, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
         if (not) {
-            const received_fmt = value.toFmt(globalObject, &formatter);
+            const received_fmt = value.toFmt(&formatter);
             const expected_line = "Expected to not contain all values: <green>{any}<r>\nReceived: <red>{any}<r>\n";
             const fmt = "\n\n" ++ expected_line;
             this.throw(globalObject, comptime getSignature("toContainAllValues", "<green>expected<r>", true), fmt, .{ expected_fmt, received_fmt });
@@ -1343,10 +1340,10 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalObject, .quote_strings = true };
-        const value_fmt = value.toFmt(globalObject, &formatter);
-        const expected_fmt = expected.toFmt(globalObject, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
         if (not) {
-            const received_fmt = value.toFmt(globalObject, &formatter);
+            const received_fmt = value.toFmt(&formatter);
             const expected_line = "Expected to not contain any of the following values: <green>{any}<r>\nReceived: <red>{any}<r>\n";
             const fmt = "\n\n" ++ expected_line;
             this.throw(globalObject, comptime getSignature("toContainAnyValues", "<green>expected<r>", true), fmt, .{ expected_fmt, received_fmt });
@@ -1450,8 +1447,8 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
-        const expected_fmt = expected.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
         if (not) {
             const expected_line = "Expected to not contain: <green>{any}<r>\n";
             const signature = comptime getSignature("toContainEqual", "<green>expected<r>", true);
@@ -1484,7 +1481,7 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
         if (not) {
             const received_line = "Received: <red>{any}<r>\n";
             const signature = comptime getSignature("toBeTruthy", "", true);
@@ -1514,7 +1511,7 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
         if (not) {
             const received_line = "Received: <red>{any}<r>\n";
             const signature = comptime getSignature("toBeUndefined", "", true);
@@ -1548,7 +1545,7 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
         if (not) {
             const received_line = "Received: <red>{any}<r>\n";
             const signature = comptime getSignature("toBeNaN", "", true);
@@ -1577,7 +1574,7 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
         if (not) {
             const received_line = "Received: <red>{any}<r>\n";
             const signature = comptime getSignature("toBeNull", "", true);
@@ -1606,7 +1603,7 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
         if (not) {
             const received_line = "Received: <red>{any}<r>\n";
             const signature = comptime getSignature("toBeDefined", "", true);
@@ -1640,7 +1637,7 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
         if (not) {
             const received_line = "Received: <red>{any}<r>\n";
             const signature = comptime getSignature("toBeFalsy", "", true);
@@ -1785,8 +1782,8 @@ pub const Expect = struct {
                 const signature = comptime getSignature("toHaveProperty", "<green>path<r><d>, <r><green>value<r>", true);
                 if (!received_property.isEmpty()) {
                     this.throw(globalThis, signature, "\n\nExpected path: <green>{any}<r>\n\nExpected value: not <green>{any}<r>\n", .{
-                        expected_property_path.toFmt(globalThis, &formatter),
-                        expected_property.?.toFmt(globalThis, &formatter),
+                        expected_property_path.toFmt(&formatter),
+                        expected_property.?.toFmt(&formatter),
                     });
                     return .zero;
                 }
@@ -1794,8 +1791,8 @@ pub const Expect = struct {
 
             const signature = comptime getSignature("toHaveProperty", "<green>path<r>", true);
             this.throw(globalThis, signature, "\n\nExpected path: not <green>{any}<r>\n\nReceived value: <red>{any}<r>\n", .{
-                expected_property_path.toFmt(globalThis, &formatter),
-                received_property.toFmt(globalThis, &formatter),
+                expected_property_path.toFmt(&formatter),
+                received_property.toFmt(&formatter),
             });
             return .zero;
         }
@@ -1817,14 +1814,14 @@ pub const Expect = struct {
             const fmt = "\n\nExpected path: <green>{any}<r>\n\nExpected value: <green>{any}<r>\n\n" ++
                 "Unable to find property\n";
             this.throw(globalThis, signature, fmt, .{
-                expected_property_path.toFmt(globalThis, &formatter),
-                expected_property.?.toFmt(globalThis, &formatter),
+                expected_property_path.toFmt(&formatter),
+                expected_property.?.toFmt(&formatter),
             });
             return .zero;
         }
 
         const signature = comptime getSignature("toHaveProperty", "<green>path<r>", false);
-        this.throw(globalThis, signature, "\n\nExpected path: <green>{any}<r>\n\nUnable to find property\n", .{expected_property_path.toFmt(globalThis, &formatter)});
+        this.throw(globalThis, signature, "\n\nExpected path: <green>{any}<r>\n\nUnable to find property\n", .{expected_property_path.toFmt(&formatter)});
         return .zero;
     }
 
@@ -1868,7 +1865,7 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
         if (not) {
             const received_line = "Received: <red>{any}<r>\n";
             const signature = comptime getSignature("toBeEven", "", true);
@@ -1928,8 +1925,8 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
-        const expected_fmt = other_value.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = other_value.toFmt(&formatter);
         if (not) {
             const expected_line = "Expected: not \\> <green>{any}<r>\n";
             const received_line = "Received: <red>{any}<r>\n";
@@ -1991,8 +1988,8 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
-        const expected_fmt = other_value.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = other_value.toFmt(&formatter);
         if (not) {
             const expected_line = "Expected: not \\>= <green>{any}<r>\n";
             const received_line = "Received: <red>{any}<r>\n";
@@ -2054,8 +2051,8 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
-        const expected_fmt = other_value.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = other_value.toFmt(&formatter);
         if (not) {
             const expected_line = "Expected: not \\< <green>{any}<r>\n";
             const received_line = "Received: <red>{any}<r>\n";
@@ -2117,8 +2114,8 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
-        const expected_fmt = other_value.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = other_value.toFmt(&formatter);
         if (not) {
             const expected_line = "Expected: not \\<= <green>{any}<r>\n";
             const received_line = "Received: <red>{any}<r>\n";
@@ -2195,8 +2192,8 @@ pub const Expect = struct {
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
 
-        const expected_fmt = expected_.toFmt(globalThis, &formatter);
-        const received_fmt = received_.toFmt(globalThis, &formatter);
+        const expected_fmt = expected_.toFmt(&formatter);
+        const received_fmt = received_.toFmt(&formatter);
 
         const expected_line = "Expected: <green>{any}<r>\n";
         const received_line = "Received: <red>{any}<r>\n";
@@ -2255,7 +2252,7 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
         if (not) {
             const received_line = "Received: <red>{any}<r>\n";
             const signature = comptime getSignature("toBeOdd", "", true);
@@ -2282,8 +2279,14 @@ pub const Expect = struct {
             const value = arguments[0];
             if (value.isEmptyOrUndefinedOrNull() or !value.isObject() and !value.isString()) {
                 var fmt = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-                globalThis.throw("Expected value must be string or Error: {any}", .{value.toFmt(globalThis, &fmt)});
+                globalThis.throw("Expected value must be string or Error: {any}", .{value.toFmt(&fmt)});
                 return .zero;
+            } else if (value.isObject()) {
+                if (ExpectAny.fromJSDirect(value)) |_| {
+                    if (ExpectAny.constructorValueGetCached(value)) |innerConstructorValue| {
+                        break :brk innerConstructorValue;
+                    }
+                }
             }
             break :brk value;
         } else .zero;
@@ -2313,7 +2316,7 @@ pub const Expect = struct {
             const prev_unhandled_pending_rejection_to_capture = vm.unhandled_pending_rejection_to_capture;
             vm.unhandled_pending_rejection_to_capture = &return_value;
             vm.onUnhandledRejection = &VirtualMachine.onQuietUnhandledRejectionHandlerCaptureValue;
-            const return_value_from_fucntion: JSValue = value.call(globalThis, &.{});
+            const return_value_from_fucntion: JSValue = value.call(globalThis, .undefined, &.{});
             vm.unhandled_pending_rejection_to_capture = prev_unhandled_pending_rejection_to_capture;
 
             vm.global.handleRejectedPromises();
@@ -2369,15 +2372,15 @@ pub const Expect = struct {
                     const message = err.getTruthyComptime(globalThis, "message") orelse JSValue.undefined;
                     const fmt = signature_no_args ++ "\n\nError name: <red>{any}<r>\nError message: <red>{any}<r>\n";
                     globalThis.throwPretty(fmt, .{
-                        name.toFmt(globalThis, &formatter),
-                        message.toFmt(globalThis, &formatter),
+                        name.toFmt(&formatter),
+                        message.toFmt(&formatter),
                     });
                     return .zero;
                 }
 
                 // non error thrown
                 const fmt = signature_no_args ++ "\n\nThrown value: <red>{any}<r>\n";
-                globalThis.throwPretty(fmt, .{result.toFmt(globalThis, &formatter)});
+                globalThis.throwPretty(fmt, .{result.toFmt(&formatter)});
                 return .zero;
             }
 
@@ -2395,8 +2398,8 @@ pub const Expect = struct {
                 }
 
                 this.throw(globalThis, signature, "\n\nExpected substring: not <green>{any}<r>\nReceived message: <red>{any}<r>\n", .{
-                    expected_value.toFmt(globalThis, &formatter),
-                    received_message.toFmt(globalThis, &formatter),
+                    expected_value.toFmt(&formatter),
+                    received_message.toFmt(&formatter),
                 });
                 return .zero;
             }
@@ -2406,13 +2409,13 @@ pub const Expect = struct {
 
                 // TODO: REMOVE THIS GETTER! Expose a binding to call .test on the RegExp object directly.
                 if (expected_value.get(globalThis, "test")) |test_fn| {
-                    const matches = test_fn.callWithThis(globalThis, expected_value, &.{received_message});
+                    const matches = test_fn.call(globalThis, expected_value, &.{received_message});
                     if (!matches.toBooleanSlow(globalThis)) return .undefined;
                 }
 
                 this.throw(globalThis, signature, "\n\nExpected pattern: not <green>{any}<r>\nReceived message: <red>{any}<r>\n", .{
-                    expected_value.toFmt(globalThis, &formatter),
-                    received_message.toFmt(globalThis, &formatter),
+                    expected_value.toFmt(&formatter),
+                    received_message.toFmt(&formatter),
                 });
                 return .zero;
             }
@@ -2422,7 +2425,7 @@ pub const Expect = struct {
                 // no partial match for this case
                 if (!expected_message.isSameValue(received_message, globalThis)) return .undefined;
 
-                this.throw(globalThis, signature, "\n\nExpected message: not <green>{any}<r>\n", .{expected_message.toFmt(globalThis, &formatter)});
+                this.throw(globalThis, signature, "\n\nExpected message: not <green>{any}<r>\n", .{expected_message.toFmt(&formatter)});
                 return .zero;
             }
 
@@ -2431,7 +2434,7 @@ pub const Expect = struct {
             var expected_class = ZigString.Empty;
             expected_value.getClassName(globalThis, &expected_class);
             const received_message = result.fastGet(globalThis, .message) orelse .undefined;
-            this.throw(globalThis, signature, "\n\nExpected constructor: not <green>{s}<r>\n\nReceived message: <red>{any}<r>\n", .{ expected_class, received_message.toFmt(globalThis, &formatter) });
+            this.throw(globalThis, signature, "\n\nExpected constructor: not <green>{s}<r>\n\nReceived message: <red>{any}<r>\n", .{ expected_class, received_message.toFmt(&formatter) });
             return .zero;
         }
 
@@ -2467,14 +2470,14 @@ pub const Expect = struct {
                 const signature = comptime getSignature("toThrow", "<green>expected<r>", false);
 
                 if (_received_message) |received_message| {
-                    const expected_value_fmt = expected_value.toFmt(globalThis, &formatter);
-                    const received_message_fmt = received_message.toFmt(globalThis, &formatter);
+                    const expected_value_fmt = expected_value.toFmt(&formatter);
+                    const received_message_fmt = received_message.toFmt(&formatter);
                     this.throw(globalThis, signature, "\n\n" ++ "Expected substring: <green>{any}<r>\nReceived message: <red>{any}<r>\n", .{ expected_value_fmt, received_message_fmt });
                     return .zero;
                 }
 
-                const expected_fmt = expected_value.toFmt(globalThis, &formatter);
-                const received_fmt = result.toFmt(globalThis, &formatter);
+                const expected_fmt = expected_value.toFmt(&formatter);
+                const received_fmt = result.toFmt(&formatter);
                 this.throw(globalThis, signature, "\n\n" ++ "Expected substring: <green>{any}<r>\nReceived value: <red>{any}<r>", .{ expected_fmt, received_fmt });
 
                 return .zero;
@@ -2484,7 +2487,7 @@ pub const Expect = struct {
                 if (_received_message) |received_message| {
                     // TODO: REMOVE THIS GETTER! Expose a binding to call .test on the RegExp object directly.
                     if (expected_value.get(globalThis, "test")) |test_fn| {
-                        const matches = test_fn.callWithThis(globalThis, expected_value, &.{received_message});
+                        const matches = test_fn.call(globalThis, expected_value, &.{received_message});
                         if (matches.toBooleanSlow(globalThis)) return .undefined;
                     }
                 }
@@ -2493,8 +2496,8 @@ pub const Expect = struct {
                 var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
 
                 if (_received_message) |received_message| {
-                    const expected_value_fmt = expected_value.toFmt(globalThis, &formatter);
-                    const received_message_fmt = received_message.toFmt(globalThis, &formatter);
+                    const expected_value_fmt = expected_value.toFmt(&formatter);
+                    const received_message_fmt = received_message.toFmt(&formatter);
                     const signature = comptime getSignature("toThrow", "<green>expected<r>", false);
 
                     this.throw(globalThis, signature, "\n\n" ++ "Expected pattern: <green>{any}<r>\nReceived message: <red>{any}<r>\n", .{ expected_value_fmt, received_message_fmt });
@@ -2502,8 +2505,8 @@ pub const Expect = struct {
                     return .zero;
                 }
 
-                const expected_fmt = expected_value.toFmt(globalThis, &formatter);
-                const received_fmt = result.toFmt(globalThis, &formatter);
+                const expected_fmt = expected_value.toFmt(&formatter);
+                const received_fmt = result.toFmt(&formatter);
                 const signature = comptime getSignature("toThrow", "<green>expected<r>", false);
                 this.throw(globalThis, signature, "\n\n" ++ "Expected pattern: <green>{any}<r>\nReceived value: <red>{any}<r>", .{ expected_fmt, received_fmt });
                 return .zero;
@@ -2523,14 +2526,14 @@ pub const Expect = struct {
                 var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
 
                 if (_received_message) |received_message| {
-                    const expected_fmt = expected_message.toFmt(globalThis, &formatter);
-                    const received_fmt = received_message.toFmt(globalThis, &formatter);
+                    const expected_fmt = expected_message.toFmt(&formatter);
+                    const received_fmt = received_message.toFmt(&formatter);
                     this.throw(globalThis, signature, "\n\nExpected message: <green>{any}<r>\nReceived message: <red>{any}<r>\n", .{ expected_fmt, received_fmt });
                     return .zero;
                 }
 
-                const expected_fmt = expected_message.toFmt(globalThis, &formatter);
-                const received_fmt = result.toFmt(globalThis, &formatter);
+                const expected_fmt = expected_message.toFmt(&formatter);
+                const received_fmt = result.toFmt(&formatter);
                 this.throw(globalThis, signature, "\n\nExpected message: <green>{any}<r>\nReceived value: <red>{any}<r>\n", .{ expected_fmt, received_fmt });
                 return .zero;
             }
@@ -2548,7 +2551,7 @@ pub const Expect = struct {
 
             if (_received_message) |received_message| {
                 const message_fmt = fmt ++ "Received message: <red>{any}<r>\n";
-                const received_message_fmt = received_message.toFmt(globalThis, &formatter);
+                const received_message_fmt = received_message.toFmt(&formatter);
 
                 globalThis.throwPretty(message_fmt, .{
                     expected_class,
@@ -2558,7 +2561,7 @@ pub const Expect = struct {
                 return .zero;
             }
 
-            const received_fmt = result.toFmt(globalThis, &formatter);
+            const received_fmt = result.toFmt(&formatter);
             const value_fmt = fmt ++ "Received value: <red>{any}<r>\n";
 
             globalThis.throwPretty(value_fmt, .{
@@ -2583,19 +2586,19 @@ pub const Expect = struct {
 
         if (expected_value.isString()) {
             const expected_fmt = "\n\nExpected substring: <green>{any}<r>\n\n" ++ received_line;
-            this.throw(globalThis, signature, expected_fmt, .{expected_value.toFmt(globalThis, &formatter)});
+            this.throw(globalThis, signature, expected_fmt, .{expected_value.toFmt(&formatter)});
             return .zero;
         }
 
         if (expected_value.isRegExp()) {
             const expected_fmt = "\n\nExpected pattern: <green>{any}<r>\n\n" ++ received_line;
-            this.throw(globalThis, signature, expected_fmt, .{expected_value.toFmt(globalThis, &formatter)});
+            this.throw(globalThis, signature, expected_fmt, .{expected_value.toFmt(&formatter)});
             return .zero;
         }
 
         if (expected_value.fastGet(globalThis, .message)) |expected_message| {
             const expected_fmt = "\n\nExpected message: <green>{any}<r>\n\n" ++ received_line;
-            this.throw(globalThis, signature, expected_fmt, .{expected_message.toFmt(globalThis, &formatter)});
+            this.throw(globalThis, signature, expected_fmt, .{expected_message.toFmt(&formatter)});
             return .zero;
         }
 
@@ -2673,7 +2676,7 @@ pub const Expect = struct {
                     "\n\nReceived: {any}\n";
 
                 var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis };
-                globalThis.throwPretty(fmt, .{value.toFmt(globalThis, &formatter)});
+                globalThis.throwPretty(fmt, .{value.toFmt(&formatter)});
                 return .zero;
             }
         }
@@ -2686,7 +2689,7 @@ pub const Expect = struct {
                 error.FailedToMakeSnapshotDirectory => globalThis.throw("Failed to make snapshot directory for test file: {s}", .{test_file_path}),
                 error.FailedToWriteSnapshotFile => globalThis.throw("Failed write to snapshot file: {s}", .{test_file_path}),
                 error.ParseError => globalThis.throw("Failed to parse snapshot file for: {s}", .{test_file_path}),
-                else => globalThis.throw("Failed to snapshot value: {any}", .{value.toFmt(globalThis, &formatter)}),
+                else => globalThis.throw("Failed to snapshot value: {any}", .{value.toFmt(&formatter)}),
             }
             return .zero;
         };
@@ -2695,7 +2698,7 @@ pub const Expect = struct {
             var pretty_value: MutableString = MutableString.init(default_allocator, 0) catch unreachable;
             value.jestSnapshotPrettyFormat(&pretty_value, globalThis) catch {
                 var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis };
-                globalThis.throw("Failed to pretty format value: {s}", .{value.toFmt(globalThis, &formatter)});
+                globalThis.throw("Failed to pretty format value: {s}", .{value.toFmt(&formatter)});
                 return .zero;
             };
             defer pretty_value.deinit();
@@ -2763,7 +2766,7 @@ pub const Expect = struct {
                 const signature = comptime getSignature("toBeEmpty", "", false);
                 const fmt = signature ++ "\n\nExpected value to be a string, object, or iterable" ++
                     "\n\nReceived: <red>{any}<r>\n";
-                globalThis.throwPretty(fmt, .{value.toFmt(globalThis, &formatter)});
+                globalThis.throwPretty(fmt, .{value.toFmt(&formatter)});
                 return .zero;
             }
         } else if (std.math.isNan(actual_length)) {
@@ -2777,7 +2780,7 @@ pub const Expect = struct {
             const signature = comptime getSignature("toBeEmpty", "", true);
             const fmt = signature ++ "\n\nExpected value <b>not<r> to be a string, object, or iterable" ++
                 "\n\nReceived: <red>{any}<r>\n";
-            globalThis.throwPretty(fmt, .{value.toFmt(globalThis, &formatter)});
+            globalThis.throwPretty(fmt, .{value.toFmt(&formatter)});
             return .zero;
         }
 
@@ -2788,14 +2791,14 @@ pub const Expect = struct {
             const signature = comptime getSignature("toBeEmpty", "", true);
             const fmt = signature ++ "\n\nExpected value <b>not<r> to be empty" ++
                 "\n\nReceived: <red>{any}<r>\n";
-            globalThis.throwPretty(fmt, .{value.toFmt(globalThis, &formatter)});
+            globalThis.throwPretty(fmt, .{value.toFmt(&formatter)});
             return .zero;
         }
 
         const signature = comptime getSignature("toBeEmpty", "", false);
         const fmt = signature ++ "\n\nExpected value to be empty" ++
             "\n\nReceived: <red>{any}<r>\n";
-        globalThis.throwPretty(fmt, .{value.toFmt(globalThis, &formatter)});
+        globalThis.throwPretty(fmt, .{value.toFmt(&formatter)});
         return .zero;
     }
 
@@ -2814,7 +2817,7 @@ pub const Expect = struct {
         if (pass) return thisValue;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeEmptyObject", "", true);
@@ -2841,7 +2844,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeNil", "", true);
@@ -2868,7 +2871,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeArray", "", true);
@@ -2912,7 +2915,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeArrayOfSize", "", true);
@@ -2939,7 +2942,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeBoolean", "", true);
@@ -3015,8 +3018,8 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
-        const expected_str = expected.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
+        const expected_str = expected.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeTypeOf", "", true);
@@ -3043,7 +3046,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeTrue", "", true);
@@ -3070,7 +3073,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeFalse", "", true);
@@ -3097,7 +3100,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeNumber", "", true);
@@ -3124,7 +3127,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeInteger", "", true);
@@ -3151,7 +3154,7 @@ pub const Expect = struct {
         if (pass) return thisValue;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeObject", "", true);
@@ -3184,7 +3187,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeFinite", "", true);
@@ -3217,7 +3220,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBePositive", "", true);
@@ -3250,7 +3253,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeNegative", "", true);
@@ -3307,9 +3310,9 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const start_fmt = startValue.toFmt(globalThis, &formatter);
-        const end_fmt = endValue.toFmt(globalThis, &formatter);
-        const received_fmt = value.toFmt(globalThis, &formatter);
+        const start_fmt = startValue.toFmt(&formatter);
+        const end_fmt = endValue.toFmt(&formatter);
+        const received_fmt = value.toFmt(&formatter);
 
         if (not) {
             const expected_line = "Expected: not between <green>{any}<r> <d>(inclusive)<r> and <green>{any}<r> <d>(exclusive)<r>\n";
@@ -3394,8 +3397,8 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const expected_fmt = expected.toFmt(globalThis, &formatter);
-        const value_fmt = value.toFmt(globalThis, &formatter);
+        const expected_fmt = expected.toFmt(&formatter);
+        const value_fmt = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toEqualIgnoringWhitespace", "<green>expected<r>", true);
@@ -3422,7 +3425,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeSymbol", "", true);
@@ -3449,7 +3452,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeFunction", "", true);
@@ -3476,7 +3479,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeDate", "", true);
@@ -3504,7 +3507,7 @@ pub const Expect = struct {
         if (pass) return thisValue;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeValidDate", "", true);
@@ -3531,7 +3534,7 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received = value.toFmt(globalThis, &formatter);
+        const received = value.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toBeString", "", true);
@@ -3583,8 +3586,8 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
-        const expected_fmt = expected.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
 
         if (not) {
             const expected_line = "Expected to not include: <green>{any}<r>\n";
@@ -3671,9 +3674,9 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const expect_string_fmt = expect_string.toFmt(globalThis, &formatter);
-        const substring_fmt = substring.toFmt(globalThis, &formatter);
-        const times_fmt = count.toFmt(globalThis, &formatter);
+        const expect_string_fmt = expect_string.toFmt(&formatter);
+        const substring_fmt = substring.toFmt(&formatter);
+        const times_fmt = count.toFmt(&formatter);
 
         const received_line = "Received: <red>{any}<r>\n";
 
@@ -3740,7 +3743,7 @@ pub const Expect = struct {
         };
         value.ensureStillAlive();
 
-        const result = predicate.call(globalThis, &.{value});
+        const result = predicate.call(globalThis, .undefined, &.{value});
 
         if (result.toError()) |err| {
             var errors: [1]*anyopaque = undefined;
@@ -3762,15 +3765,15 @@ pub const Expect = struct {
 
         if (not) {
             const signature = comptime getSignature("toSatisfy", "<green>expected<r>", true);
-            this.throw(globalThis, signature, "\n\nExpected: not <green>{any}<r>\n", .{predicate.toFmt(globalThis, &formatter)});
+            this.throw(globalThis, signature, "\n\nExpected: not <green>{any}<r>\n", .{predicate.toFmt(&formatter)});
             return .zero;
         }
 
         const signature = comptime getSignature("toSatisfy", "<green>expected<r>", false);
 
         this.throw(globalThis, signature, "\n\nExpected: <green>{any}<r>\nReceived: <red>{any}<r>\n", .{
-            predicate.toFmt(globalThis, &formatter),
-            value.toFmt(globalThis, &formatter),
+            predicate.toFmt(&formatter),
+            value.toFmt(&formatter),
         });
 
         return .zero;
@@ -3815,8 +3818,8 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
-        const expected_fmt = expected.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
 
         if (not) {
             const expected_line = "Expected to not start with: <green>{any}<r>\n";
@@ -3872,8 +3875,8 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const value_fmt = value.toFmt(globalThis, &formatter);
-        const expected_fmt = expected.toFmt(globalThis, &formatter);
+        const value_fmt = value.toFmt(&formatter);
+        const expected_fmt = expected.toFmt(&formatter);
 
         if (not) {
             const expected_line = "Expected to not end with: <green>{any}<r>\n";
@@ -3907,7 +3910,7 @@ pub const Expect = struct {
 
         const expected_value = arguments[0];
         if (!expected_value.isConstructor()) {
-            globalThis.throw("Expected value must be a function: {any}", .{expected_value.toFmt(globalThis, &formatter)});
+            globalThis.throw("Expected value must be a function: {any}", .{expected_value.toFmt(&formatter)});
             return .zero;
         }
         expected_value.ensureStillAlive();
@@ -3920,8 +3923,8 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         // handle failure
-        const expected_fmt = expected_value.toFmt(globalThis, &formatter);
-        const value_fmt = value.toFmt(globalThis, &formatter);
+        const expected_fmt = expected_value.toFmt(&formatter);
+        const value_fmt = value.toFmt(&formatter);
         if (not) {
             const expected_line = "Expected constructor: not <green>{any}<r>\n";
             const received_line = "Received value: <red>{any}<r>\n";
@@ -3957,7 +3960,7 @@ pub const Expect = struct {
 
         const expected_value = arguments[0];
         if (!expected_value.isString() and !expected_value.isRegExp()) {
-            globalThis.throw("Expected value must be a string or regular expression: {any}", .{expected_value.toFmt(globalThis, &formatter)});
+            globalThis.throw("Expected value must be a string or regular expression: {any}", .{expected_value.toFmt(&formatter)});
             return .zero;
         }
         expected_value.ensureStillAlive();
@@ -3965,7 +3968,7 @@ pub const Expect = struct {
         const value: JSValue = this.getValue(globalThis, thisValue, "toMatch", "<green>expected<r>") orelse return .zero;
 
         if (!value.isString()) {
-            globalThis.throw("Received value must be a string: {any}", .{value.toFmt(globalThis, &formatter)});
+            globalThis.throw("Received value must be a string: {any}", .{value.toFmt(&formatter)});
             return .zero;
         }
 
@@ -3983,8 +3986,8 @@ pub const Expect = struct {
         if (pass) return .undefined;
 
         // handle failure
-        const expected_fmt = expected_value.toFmt(globalThis, &formatter);
-        const value_fmt = value.toFmt(globalThis, &formatter);
+        const expected_fmt = expected_value.toFmt(&formatter);
+        const value_fmt = value.toFmt(&formatter);
 
         if (not) {
             const expected_line = "Expected substring or pattern: not <green>{any}<r>\n";
@@ -4253,7 +4256,7 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received_fmt = lastCallValue.toFmt(globalThis, &formatter);
+        const received_fmt = lastCallValue.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toHaveBeenLastCalledWith", "<green>expected<r>", true);
@@ -4321,7 +4324,7 @@ pub const Expect = struct {
 
         // handle failure
         var formatter = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-        const received_fmt = nthCallValue.toFmt(globalThis, &formatter);
+        const received_fmt = nthCallValue.toFmt(&formatter);
 
         if (not) {
             const signature = comptime getSignature("toHaveBeenNthCalledWith", "<green>expected<r>", true);
@@ -4416,7 +4419,7 @@ pub const Expect = struct {
                 .globalThis = globalThis,
                 .quote_strings = true,
             };
-            globalThis.throwPretty(fmt, .{times_value.get(globalThis, "value").?.toFmt(globalThis, &formatter)});
+            globalThis.throwPretty(fmt, .{times_value.get(globalThis, "value").?.toFmt(&formatter)});
             return .zero;
         }
 
@@ -4592,7 +4595,7 @@ pub const Expect = struct {
             "  {{message?: string | function, pass: boolean}}\n" ++
             "'{any}' was returned";
         const err = switch (Output.enable_ansi_colors) {
-            inline else => |colors| globalThis.createErrorInstance(Output.prettyFmt(fmt, colors), .{ matcher_name, result.toFmt(globalThis, &formatter) }),
+            inline else => |colors| globalThis.createErrorInstance(Output.prettyFmt(fmt, colors), .{ matcher_name, result.toFmt(&formatter) }),
         };
         err.put(globalThis, ZigString.static("name"), ZigString.init("InvalidMatcherError").toJS(globalThis));
         globalThis.throwValue(err);
@@ -4612,7 +4615,7 @@ pub const Expect = struct {
         matcher_context_jsvalue.ensureStillAlive();
 
         // call the custom matcher implementation
-        var result = matcher_fn.callWithThis(globalThis, matcher_context_jsvalue, args);
+        var result = matcher_fn.call(globalThis, matcher_context_jsvalue, args);
         assert(!result.isEmpty());
         if (result.toError()) |err| {
             globalThis.throwValue(err);
@@ -4699,7 +4702,7 @@ pub const Expect = struct {
                 };
                 globalThis.throw(
                     "Expected custom matcher message to return a string, but got: {}",
-                    .{message_result.toFmt(globalThis, &formatter)},
+                    .{message_result.toFmt(&formatter)},
                 );
                 return false;
             }
@@ -4802,14 +4805,14 @@ pub const Expect = struct {
 
         if (!expected.isNumber()) {
             var fmt = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-            globalThis.throw("Expected value must be a non-negative integer: {any}", .{expected.toFmt(globalThis, &fmt)});
+            globalThis.throw("Expected value must be a non-negative integer: {any}", .{expected.toFmt(&fmt)});
             return .zero;
         }
 
         const expected_assertions: f64 = expected.asNumber();
         if (@round(expected_assertions) != expected_assertions or std.math.isInf(expected_assertions) or std.math.isNan(expected_assertions) or expected_assertions < 0) {
             var fmt = JSC.ConsoleObject.Formatter{ .globalThis = globalThis, .quote_strings = true };
-            globalThis.throw("Expected value must be a non-negative integer: {any}", .{expected.toFmt(globalThis, &fmt)});
+            globalThis.throw("Expected value must be a non-negative integer: {any}", .{expected.toFmt(&fmt)});
             return .zero;
         }
 
@@ -5365,7 +5368,7 @@ pub const ExpectCustomAsymmetricMatcher = struct {
                     args.appendAssumeCapacity(arg);
                 }
 
-                var result = matcher_fn.callWithThis(globalThis, thisValue, args.items);
+                var result = matcher_fn.call(globalThis, thisValue, args.items);
                 if (result.toError()) |err| {
                     if (dontThrow) {
                         return false;
@@ -5480,7 +5483,7 @@ pub const ExpectMatcherUtils = struct {
             .globalThis = globalThis,
             .quote_strings = true,
         };
-        try writer.print("{}", .{value.toFmt(globalThis, &formatter)});
+        try writer.print("{}", .{value.toFmt(&formatter)});
 
         if (comptime color_or_null) |_| {
             if (Output.enable_ansi_colors) {
diff --git a/src/bun.js/test/jest.zig b/src/bun.js/test/jest.zig
index fd587b3c71..a04806e597 100644
--- a/src/bun.js/test/jest.zig
+++ b/src/bun.js/test/jest.zig
@@ -1674,7 +1674,7 @@ inline fn createScope(
         Jest.runner.?.setOnly();
         tag_to_use = .only;
     } else if (is_test and Jest.runner.?.only and parent.tag != .only) {
-        return .zero;
+        return .undefined;
     }
 
     var is_skip = tag == .skip or
@@ -1781,9 +1781,9 @@ fn consumeArg(
     if (should_write) {
         const owned_slice = arg.toSliceOrNull(globalThis) orelse return error.Failed;
         defer owned_slice.deinit();
-        try array_list.appendSlice(allocator, owned_slice.slice());
+        array_list.appendSlice(allocator, owned_slice.slice()) catch bun.outOfMemory();
     } else {
-        try array_list.appendSlice(allocator, fallback);
+        array_list.appendSlice(allocator, fallback) catch bun.outOfMemory();
     }
     str_idx.* += 1;
     args_idx.* += 1;
@@ -1794,7 +1794,7 @@ fn formatLabel(globalThis: *JSGlobalObject, label: string, function_args: []JSVa
     const allocator = getAllocator(globalThis);
     var idx: usize = 0;
     var args_idx: usize = 0;
-    var list = try std.ArrayListUnmanaged(u8).initCapacity(allocator, label.len);
+    var list = std.ArrayListUnmanaged(u8).initCapacity(allocator, label.len) catch bun.outOfMemory();
 
     while (idx < label.len) {
         const char = label[idx];
@@ -1818,9 +1818,9 @@ fn formatLabel(globalThis: *JSGlobalObject, label: string, function_args: []JSVa
                     var str = bun.String.empty;
                     defer str.deref();
                     current_arg.jsonStringify(globalThis, 0, &str);
-                    const owned_slice = try str.toOwnedSlice(allocator);
+                    const owned_slice = str.toOwnedSlice(allocator) catch bun.outOfMemory();
                     defer allocator.free(owned_slice);
-                    try list.appendSlice(allocator, owned_slice);
+                    list.appendSlice(allocator, owned_slice) catch bun.outOfMemory();
                     idx += 1;
                     args_idx += 1;
                 },
@@ -1829,28 +1829,28 @@ fn formatLabel(globalThis: *JSGlobalObject, label: string, function_args: []JSVa
                         .globalThis = globalThis,
                         .quote_strings = true,
                     };
-                    const value_fmt = current_arg.toFmt(globalThis, &formatter);
-                    const test_index_str = try std.fmt.allocPrint(allocator, "{any}", .{value_fmt});
+                    const value_fmt = current_arg.toFmt(&formatter);
+                    const test_index_str = std.fmt.allocPrint(allocator, "{any}", .{value_fmt}) catch bun.outOfMemory();
                     defer allocator.free(test_index_str);
-                    try list.appendSlice(allocator, test_index_str);
+                    list.appendSlice(allocator, test_index_str) catch bun.outOfMemory();
                     idx += 1;
                     args_idx += 1;
                 },
                 '#' => {
-                    const test_index_str = try std.fmt.allocPrint(allocator, "{d}", .{test_idx});
+                    const test_index_str = std.fmt.allocPrint(allocator, "{d}", .{test_idx}) catch bun.outOfMemory();
                     defer allocator.free(test_index_str);
-                    try list.appendSlice(allocator, test_index_str);
+                    list.appendSlice(allocator, test_index_str) catch bun.outOfMemory();
                     idx += 1;
                 },
                 '%' => {
-                    try list.append(allocator, '%');
+                    list.append(allocator, '%') catch bun.outOfMemory();
                     idx += 1;
                 },
                 else => {
                     // ignore unrecognized fmt
                 },
             }
-        } else try list.append(allocator, char);
+        } else list.append(allocator, char) catch bun.outOfMemory();
         idx += 1;
     }
 
@@ -1918,14 +1918,14 @@ fn eachBind(
         const allocator = getAllocator(globalThis);
         const each_data = bun.cast(*EachData, data);
         JSC.setFunctionData(callee, null);
-        const array = each_data.*.strong.get() orelse return .zero;
+        const array = each_data.*.strong.get() orelse return .undefined;
         defer {
             each_data.*.strong.deinit();
             allocator.destroy(each_data);
         }
 
         if (array.isUndefinedOrNull() or !array.jsType().isArray()) {
-            return .zero;
+            return .undefined;
         }
 
         var iter = array.arrayIterator(globalThis);
@@ -1996,7 +1996,7 @@ fn eachBind(
                 function.unprotect();
             } else if (each_data.is_test) {
                 if (Jest.runner.?.only and tag != .only) {
-                    return .zero;
+                    return .undefined;
                 } else {
                     function.protect();
                     parent.tests.append(allocator, TestScope{
@@ -2026,7 +2026,7 @@ fn eachBind(
         }
     }
 
-    return .zero;
+    return .undefined;
 }
 
 inline fn createEach(
@@ -2069,7 +2069,7 @@ fn callJSFunctionForTestRunner(vm: *JSC.VirtualMachine, globalObject: *JSGlobalO
     }
 
     globalObject.clearTerminationException();
-    const result = function.call(globalObject, args);
+    const result = function.call(globalObject, .undefined, args);
     result.ensureStillAlive();
 
     return result;
diff --git a/src/bun.js/test/pretty_format.zig b/src/bun.js/test/pretty_format.zig
index 66f5cdd5a1..c571ee533f 100644
--- a/src/bun.js/test/pretty_format.zig
+++ b/src/bun.js/test/pretty_format.zig
@@ -1243,7 +1243,7 @@ pub const JestPrettyFormat = struct {
                             .Object,
                             Writer,
                             writer_,
-                            toJSONFunction.callWithThis(this.globalThis, value, &.{}),
+                            toJSONFunction.call(this.globalThis, value, &.{}),
                             .Object,
                             enable_ansi_colors,
                         );
diff --git a/src/bun.js/web_worker.zig b/src/bun.js/web_worker.zig
index 28a5dbdf6d..ae0a6ac0f0 100644
--- a/src/bun.js/web_worker.zig
+++ b/src/bun.js/web_worker.zig
@@ -421,6 +421,7 @@ pub const WebWorker = struct {
         var arena = this.arena;
 
         WebWorker__dispatchExit(globalObject, cpp_worker, exit_code);
+        bun.uws.onThreadExit();
         this.deinit();
 
         if (vm_to_deinit) |vm| {
diff --git a/src/bun.js/webcore.zig b/src/bun.js/webcore.zig
index a8c6faeb80..48109d21c5 100644
--- a/src/bun.js/webcore.zig
+++ b/src/bun.js/webcore.zig
@@ -512,7 +512,7 @@ pub const Crypto = struct {
             // i don't think its a real scenario, but just in case
             buf = globalThis.allocator().alloc(u8, keylen) catch {
                 globalThis.throw("Failed to allocate memory", .{});
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             };
             needs_deinit = true;
         } else {
@@ -570,25 +570,25 @@ pub const Crypto = struct {
 
         if (arguments.len < 2) {
             globalThis.throwInvalidArguments("Expected 2 typed arrays but got nothing", .{});
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         const array_buffer_a = arguments[0].asArrayBuffer(globalThis) orelse {
             globalThis.throwInvalidArguments("Expected typed array but got {s}", .{@tagName(arguments[0].jsType())});
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         };
         const a = array_buffer_a.byteSlice();
 
         const array_buffer_b = arguments[1].asArrayBuffer(globalThis) orelse {
             globalThis.throwInvalidArguments("Expected typed array but got {s}", .{@tagName(arguments[1].jsType())});
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         };
         const b = array_buffer_b.byteSlice();
 
         const len = a.len;
         if (b.len != len) {
             globalThis.throw("Input buffers must have the same byte length", .{});
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
         return JSC.jsBoolean(len == 0 or bun.BoringSSL.CRYPTO_memcmp(a.ptr, b.ptr, len) == 0);
     }
@@ -619,12 +619,12 @@ pub const Crypto = struct {
         const arguments = callframe.arguments(1).slice();
         if (arguments.len == 0) {
             globalThis.throwInvalidArguments("Expected typed array but got nothing", .{});
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         var array_buffer = arguments[0].asArrayBuffer(globalThis) orelse {
             globalThis.throwInvalidArguments("Expected typed array but got {s}", .{@tagName(arguments[0].jsType())});
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         };
         const slice = array_buffer.byteSlice();
 
diff --git a/src/bun.js/webcore/blob/WriteFile.zig b/src/bun.js/webcore/blob/WriteFile.zig
index 06ba8e92e1..1700f476dc 100644
--- a/src/bun.js/webcore/blob/WriteFile.zig
+++ b/src/bun.js/webcore/blob/WriteFile.zig
@@ -507,9 +507,11 @@ pub const WriteFileWindows = struct {
     fn onMkdirpComplete(this: *WriteFileWindows) void {
         this.event_loop.unrefConcurrently();
 
-        if (this.err) |err| {
-            this.throw(err);
-            bun.default_allocator.free(err.path);
+        const err = this.err;
+        this.err = null;
+        if (err) |err_| {
+            this.throw(err_);
+            bun.default_allocator.free(err_.path);
             return;
         }
 
diff --git a/src/bun.js/webcore/body.zig b/src/bun.js/webcore/body.zig
index 6bb0d6b831..ead8eb7bad 100644
--- a/src/bun.js/webcore/body.zig
+++ b/src/bun.js/webcore/body.zig
@@ -220,7 +220,7 @@ pub const Body = struct {
 
                                 break :brk globalThis.readableStreamToFormData(readable.value, switch (form_data.?.encoding) {
                                     .Multipart => |multipart| bun.String.init(multipart).toJS(globalThis),
-                                    .URLEncoded => JSC.JSValue.jsUndefined(),
+                                    .URLEncoded => .undefined,
                                 });
                             },
                             else => unreachable,
@@ -310,6 +310,8 @@ pub const Body = struct {
         Error: JSValue,
         Null: void,
 
+        pub const heap_breakdown_label = "BodyValue";
+
         pub fn toBlobIfPossible(this: *Value) void {
             if (this.* == .WTFStringImpl) {
                 if (this.WTFStringImpl.toUTF8IfNeeded(bun.default_allocator)) |bytes| {
@@ -861,7 +863,7 @@ pub const Body = struct {
             error_instance.ensureStillAlive();
             if (this.* == .Locked) {
                 var locked = this.Locked;
-
+                // will be unprotected by body value deinit
                 error_instance.protect();
                 this.* = .{ .Error = error_instance };
 
diff --git a/src/bun.js/webcore/encoding.zig b/src/bun.js/webcore/encoding.zig
index f8f800ff2b..b1bb409f9d 100644
--- a/src/bun.js/webcore/encoding.zig
+++ b/src/bun.js/webcore/encoding.zig
@@ -198,7 +198,7 @@ pub const TextEncoder = struct {
         array.ensureStillAlive();
 
         if (encoder.any_non_ascii) {
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         if (array.isEmpty()) {
diff --git a/src/bun.js/webcore/request.zig b/src/bun.js/webcore/request.zig
index 64e72373d1..6d5d3a40dd 100644
--- a/src/bun.js/webcore/request.zig
+++ b/src/bun.js/webcore/request.zig
@@ -49,22 +49,13 @@ const Body = JSC.WebCore.Body;
 const Blob = JSC.WebCore.Blob;
 const Response = JSC.WebCore.Response;
 
-const body_value_pool_size: u16 = 256;
-pub const BodyValueRef = bun.HiveRef(Body.Value, body_value_pool_size);
-const BodyValueHiveAllocator = bun.HiveArray(BodyValueRef, body_value_pool_size).Fallback;
-
-var body_value_hive_allocator = BodyValueHiveAllocator.init(bun.default_allocator);
-
-pub fn InitRequestBodyValue(value: Body.Value) !*BodyValueRef {
-    return try BodyValueRef.init(value, &body_value_hive_allocator);
-}
 // https://developer.mozilla.org/en-US/docs/Web/API/Request
 pub const Request = struct {
     url: bun.String = bun.String.empty,
     // NOTE(@cirospaciari): renamed to _headers to avoid direct manipulation, use getFetchHeaders, setFetchHeaders, ensureFetchHeaders and hasFetchHeaders instead
     _headers: ?*FetchHeaders = null,
     signal: ?*AbortSignal = null,
-    body: *BodyValueRef,
+    body: *JSC.BodyValueRef,
     method: Method = Method.GET,
     request_context: JSC.API.AnyRequestContext = JSC.API.AnyRequestContext.Null,
     https: bool = false,
@@ -75,6 +66,7 @@ pub const Request = struct {
 
     const RequestMixin = BodyMixin(@This());
     pub usingnamespace JSC.Codegen.JSRequest;
+    pub usingnamespace bun.New(@This());
 
     pub const getText = RequestMixin.getText;
     pub const getBytes = RequestMixin.getBytes;
@@ -101,7 +93,7 @@ pub const Request = struct {
     pub fn init(
         url: bun.String,
         headers: ?*FetchHeaders,
-        body: *BodyValueRef,
+        body: *JSC.BodyValueRef,
         method: Method,
     ) Request {
         return Request{
@@ -299,10 +291,10 @@ pub const Request = struct {
         }
     }
 
-    pub fn finalize(this: *Request) callconv(.C) void {
+    pub fn finalize(this: *Request) void {
         this.finalizeWithoutDeinit();
         _ = this.body.unref();
-        bun.default_allocator.destroy(this);
+        this.destroy();
     }
 
     pub fn getRedirect(
@@ -477,7 +469,8 @@ pub const Request = struct {
         arguments: []const JSC.JSValue,
     ) ?Request {
         var success = false;
-        const body = InitRequestBodyValue(.{ .Null = {} }) catch {
+        const vm = globalThis.bunVM();
+        const body = vm.initRequestBodyValue(.{ .Null = {} }) catch {
             return null;
         };
         var req = Request{
@@ -709,11 +702,7 @@ pub const Request = struct {
         const request = constructInto(globalThis, arguments) orelse {
             return null;
         };
-        const request_ = getAllocator(globalThis).create(Request) catch {
-            return null;
-        };
-        request_.* = request;
-        return request_;
+        return Request.new(request);
     }
 
     pub fn getBodyValue(
@@ -821,8 +810,8 @@ pub const Request = struct {
     ) void {
         _ = allocator;
         this.ensureURL() catch {};
-
-        const body = InitRequestBodyValue(this.body.value.clone(globalThis)) catch {
+        const vm = globalThis.bunVM();
+        const body = vm.initRequestBodyValue(this.body.value.clone(globalThis)) catch {
             globalThis.throw("Failed to clone request", .{});
             return;
         };
@@ -841,7 +830,7 @@ pub const Request = struct {
     }
 
     pub fn clone(this: *Request, allocator: std.mem.Allocator, globalThis: *JSGlobalObject) *Request {
-        const req = allocator.create(Request) catch unreachable;
+        const req = Request.new(undefined);
         this.cloneInto(req, allocator, globalThis, false);
         return req;
     }
diff --git a/src/bun.js/webcore/response.zig b/src/bun.js/webcore/response.zig
index 496737f1c7..2adcfc127f 100644
--- a/src/bun.js/webcore/response.zig
+++ b/src/bun.js/webcore/response.zig
@@ -713,6 +713,7 @@ pub const Fetch = struct {
     comptime {
         if (!JSC.is_bindgen) {
             _ = Bun__fetch;
+            _ = Bun__fetchPreconnect;
         }
     }
 
@@ -1219,7 +1220,7 @@ pub const Fetch = struct {
                         const js_hostname = hostname.toJS(globalObject);
                         js_hostname.ensureStillAlive();
                         js_cert.ensureStillAlive();
-                        const check_result = check_server_identity.callWithThis(globalObject, JSC.JSValue.jsUndefined(), &[_]JSC.JSValue{ js_hostname, js_cert });
+                        const check_result = check_server_identity.call(globalObject, .undefined, &[_]JSC.JSValue{ js_hostname, js_cert });
                         // if check failed abort the request
                         if (check_result.isAnyError()) {
                             // mark to wait until deinit
@@ -1622,7 +1623,6 @@ pub const Fetch = struct {
                 fetch_options.headers.buf.items,
                 &fetch_tasklet.response_buffer,
                 fetch_tasklet.request_body.slice(),
-                fetch_options.timeout,
                 http.HTTPClientResult.Callback.New(
                     *FetchTasklet,
                     FetchTasklet.callback,
@@ -1680,7 +1680,6 @@ pub const Fetch = struct {
             method: Method,
             headers: Headers,
             body: HTTPRequestBody,
-            timeout: usize,
             disable_timeout: bool,
             disable_keepalive: bool,
             disable_decompression: bool,
@@ -1836,6 +1835,57 @@ pub const Fetch = struct {
         return JSPromise.resolvedPromiseValue(globalThis, response.toJS(globalThis));
     }
 
+    pub export fn Bun__fetchPreconnect(
+        globalObject: *JSC.JSGlobalObject,
+        callframe: *JSC.CallFrame,
+    ) callconv(JSC.conv) JSC.JSValue {
+        const arguments = callframe.arguments(1).slice();
+
+        if (arguments.len < 1) {
+            globalObject.throwNotEnoughArguments("fetch.preconnect", 1, arguments.len);
+            return .zero;
+        }
+
+        var url_str = JSC.URL.hrefFromJS(arguments[0], globalObject);
+        defer url_str.deref();
+
+        if (globalObject.hasException()) {
+            return .zero;
+        }
+
+        if (url_str.tag == .Dead) {
+            globalObject.throwValue(JSC.toTypeError(.ERR_INVALID_ARG_TYPE, "Invalid URL", .{}, globalObject));
+            return .zero;
+        }
+
+        if (url_str.isEmpty()) {
+            globalObject.throwValue(JSC.toTypeError(.ERR_INVALID_ARG_VALUE, fetch_error_blank_url, .{}, globalObject));
+            return .zero;
+        }
+
+        const url = ZigURL.parse(url_str.toOwnedSlice(bun.default_allocator) catch bun.outOfMemory());
+        if (!url.isHTTP() and !url.isHTTPS()) {
+            globalObject.throwInvalidArguments("URL must be HTTP or HTTPS", .{});
+            bun.default_allocator.free(url.href);
+            return .zero;
+        }
+
+        if (url.hostname.len == 0) {
+            globalObject.throwValue(JSC.toTypeError(.ERR_INVALID_ARG_VALUE, fetch_error_blank_url, .{}, globalObject));
+            bun.default_allocator.free(url.href);
+            return .zero;
+        }
+
+        if (!url.hasValidPort()) {
+            globalObject.throwInvalidArguments("Invalid port", .{});
+            bun.default_allocator.free(url.href);
+            return .zero;
+        }
+
+        bun.http.AsyncHTTP.preconnect(url, true);
+        return .undefined;
+    }
+
     pub export fn Bun__fetch(
         ctx: *JSC.JSGlobalObject,
         callframe: *JSC.CallFrame,
@@ -2009,7 +2059,7 @@ pub const Fetch = struct {
                                     hostname = null;
                                 }
                                 // an error was thrown
-                                return JSC.JSValue.jsUndefined();
+                                return .undefined;
                             }
                         } else {
                             body = request.body.value.useAsAnyBlob();
@@ -2322,7 +2372,7 @@ pub const Fetch = struct {
                                     hostname = null;
                                 }
                                 // an error was thrown
-                                return JSC.JSValue.jsUndefined();
+                                return .undefined;
                             }
                         }
 
@@ -2747,7 +2797,6 @@ pub const Fetch = struct {
                     .allocator = allocator,
                 },
                 .body = http_body,
-                .timeout = std.time.ns_per_hour,
                 .disable_keepalive = disable_keepalive,
                 .disable_timeout = disable_timeout,
                 .disable_decompression = disable_decompression,
diff --git a/src/bun.js/webcore/streams.zig b/src/bun.js/webcore/streams.zig
index 4151d10064..9767f055fc 100644
--- a/src/bun.js/webcore/streams.zig
+++ b/src/bun.js/webcore/streams.zig
@@ -481,14 +481,14 @@ pub const StreamStart = union(Tag) {
     pub fn toJS(this: StreamStart, globalThis: *JSGlobalObject) JSC.JSValue {
         switch (this) {
             .empty, .ready => {
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             },
             .chunk_size => |chunk| {
                 return JSC.JSValue.jsNumber(@as(Blob.SizeType, @intCast(chunk)));
             },
             .err => |err| {
                 globalThis.vm().throwError(globalThis, err.toJSC(globalThis));
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             },
             .owned_and_done => |list| {
                 return JSC.ArrayBuffer.fromBytes(list.slice(), .Uint8Array).toJS(globalThis, null);
@@ -497,7 +497,7 @@ pub const StreamStart = union(Tag) {
                 return JSC.ArrayBuffer.create(globalThis, list.slice(), .Uint8Array);
             },
             else => {
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             },
         }
     }
@@ -1633,7 +1633,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
                     .code = bun.String.static(@as(string, @tagName(JSC.Node.ErrorCode.ERR_ILLEGAL_CONSTRUCTOR))),
                 };
                 globalThis.throwValue(err.toErrorInstance(globalThis));
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             }
 
             var allocator = globalThis.bunVM().allocator;
@@ -1641,7 +1641,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
                 globalThis.vm().throwError(globalThis, Syscall.Error.oom.toJSC(
                     globalThis,
                 ));
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             };
             this.sink.construct(allocator);
             return createObject(globalThis, this, 0);
@@ -1685,7 +1685,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
         fn invalidThis(globalThis: *JSGlobalObject) JSValue {
             const err = JSC.toTypeError(JSC.Node.ErrorCode.ERR_INVALID_THIS, "Expected Sink", .{}, globalThis);
             globalThis.vm().throwError(globalThis, err);
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         pub fn unprotect(this: *@This()) void {
@@ -1700,7 +1700,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
             if (comptime @hasDecl(SinkType, "getPendingError")) {
                 if (this.sink.getPendingError()) |err| {
                     globalThis.vm().throwError(globalThis, err);
-                    return JSC.JSValue.jsUndefined();
+                    return .undefined;
                 }
             }
 
@@ -1714,7 +1714,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
                     .{},
                     globalThis,
                 ));
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             }
 
             const arg = args[0];
@@ -1728,7 +1728,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
                     .{},
                     globalThis,
                 ));
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             }
 
             if (arg.asArrayBuffer(globalThis)) |buffer| {
@@ -1747,7 +1747,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
                     .{},
                     globalThis,
                 ));
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             }
 
             const str = arg.getZigString(globalThis);
@@ -1770,7 +1770,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
             if (comptime @hasDecl(SinkType, "getPendingError")) {
                 if (this.sink.getPendingError()) |err| {
                     globalThis.vm().throwError(globalThis, err);
-                    return JSC.JSValue.jsUndefined();
+                    return .undefined;
                 }
             }
 
@@ -1784,7 +1784,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
                     globalThis,
                 );
                 globalThis.vm().throwError(globalThis, err);
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             }
 
             const arg = args[0];
@@ -1808,7 +1808,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
             if (comptime @hasDecl(SinkType, "getPendingError")) {
                 if (this.sink.getPendingError()) |err| {
                     globalThis.vm().throwError(globalThis, err);
-                    return JSC.JSValue.jsUndefined();
+                    return .undefined;
                 }
             }
 
@@ -1823,7 +1823,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
             if (comptime @hasDecl(SinkType, "getPendingError")) {
                 if (this.sink.getPendingError()) |err| {
                     globalThis.vm().throwError(globalThis, err);
-                    return JSC.JSValue.jsUndefined();
+                    return .undefined;
                 }
             }
 
@@ -1842,7 +1842,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
                     .result => |value| value,
                     .err => |err| blk: {
                         globalThis.vm().throwError(globalThis, err.toJSC(globalThis));
-                        break :blk JSC.JSValue.jsUndefined();
+                        break :blk .undefined;
                     },
                 };
             }
@@ -1858,7 +1858,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
             if (comptime @hasDecl(SinkType, "getPendingError")) {
                 if (this.sink.getPendingError()) |err| {
                     globalThis.vm().throwError(globalThis, err);
-                    return JSC.JSValue.jsUndefined();
+                    return .undefined;
                 }
             }
 
@@ -1891,7 +1891,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
             if (comptime @hasDecl(SinkType, "getPendingError")) {
                 if (this.sink.getPendingError()) |err| {
                     globalThis.vm().throwError(globalThis, err);
-                    return JSC.JSValue.jsUndefined();
+                    return .undefined;
                 }
             }
 
@@ -1914,7 +1914,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
             if (comptime @hasDecl(SinkType, "getPendingError")) {
                 if (this.sink.getPendingError()) |err| {
                     globalThis.vm().throwError(globalThis, err);
-                    return JSC.JSValue.jsUndefined();
+                    return .undefined;
                 }
             }
 
@@ -1969,7 +1969,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type {
 //             var this = @ptrCast(*ThisSocket, @alignCast( fromJS(globalThis, callframe.this()) orelse {
 //                 const err = JSC.toTypeError(JSC.Node.ErrorCode.ERR_INVALID_THIS, "Expected Socket", .{}, globalThis);
 //                 globalThis.vm().throwError(globalThis, err);
-//                 return JSC.JSValue.jsUndefined();
+//                 return .undefined;
 //             }));
 //         }
 //     };
@@ -2765,7 +2765,7 @@ pub fn ReadableStreamSource(
                 const view = arguments.ptr[0];
                 view.ensureStillAlive();
                 this.this_jsvalue = this_jsvalue;
-                var buffer = view.asArrayBuffer(globalThis) orelse return JSC.JSValue.jsUndefined();
+                var buffer = view.asArrayBuffer(globalThis) orelse return .undefined;
                 return processResult(
                     this_jsvalue,
                     globalThis,
@@ -2784,7 +2784,7 @@ pub fn ReadableStreamSource(
                     .chunk_size => |size| return JSValue.jsNumber(size),
                     .err => |err| {
                         globalThis.vm().throwError(globalThis, err.toJSC(globalThis));
-                        return JSC.JSValue.jsUndefined();
+                        return .undefined;
                     },
                     else => |rc| {
                         return rc.toJS(globalThis);
@@ -2828,7 +2828,7 @@ pub fn ReadableStreamSource(
                 JSC.markBinding(@src());
                 this.this_jsvalue = callFrame.this();
                 this.cancel();
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             }
 
             pub fn setOnCloseFromJS(this: *ReadableStreamSourceType, globalObject: *JSC.JSGlobalObject, value: JSC.JSValue) bool {
@@ -2894,7 +2894,7 @@ pub fn ReadableStreamSource(
                 const ref_or_unref = callFrame.argument(0).toBooleanSlow(globalObject);
                 this.setRef(ref_or_unref);
 
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             }
 
             fn onClose(ptr: ?*anyopaque) void {
@@ -3248,7 +3248,7 @@ pub const FileSink = struct {
         }
 
         if (this.done) {
-            return .{ .result = JSC.JSValue.jsUndefined() };
+            return .{ .result = .undefined };
         }
 
         const rc = this.writer.flush();
diff --git a/src/bun.zig b/src/bun.zig
index 14bb4cc27c..2d92b4b15c 100644
--- a/src/bun.zig
+++ b/src/bun.zig
@@ -43,6 +43,20 @@ pub const callconv_inline: std.builtin.CallingConvention = if (builtin.mode == .
 /// FileSystem is a singleton.
 pub const fs_allocator = default_allocator;
 
+pub fn typedAllocator(comptime T: type) std.mem.Allocator {
+    if (heap_breakdown.enabled)
+        return heap_breakdown.allocator(comptime T);
+
+    return default_allocator;
+}
+
+pub inline fn namedAllocator(comptime name: [:0]const u8) std.mem.Allocator {
+    if (heap_breakdown.enabled)
+        return heap_breakdown.namedAllocator(name);
+
+    return default_allocator;
+}
+
 pub const C = @import("root").C;
 pub const sha = @import("./sha.zig");
 pub const FeatureFlags = @import("feature_flags.zig");
@@ -1859,8 +1873,9 @@ pub const StringMap = struct {
 };
 
 pub const DotEnv = @import("./env_loader.zig");
-pub const BundleV2 = @import("./bundler/bundle_v2.zig").BundleV2;
-pub const ParseTask = @import("./bundler/bundle_v2.zig").ParseTask;
+pub const bundle_v2 = @import("./bundler/bundle_v2.zig");
+pub const BundleV2 = bundle_v2.BundleV2;
+pub const ParseTask = bundle_v2.ParseTask;
 
 pub const Lock = @import("./lock.zig").Lock;
 pub const UnboundedQueue = @import("./bun.js/unbounded_queue.zig").UnboundedQueue;
@@ -1909,15 +1924,17 @@ pub fn Ref(comptime T: type) type {
 pub fn HiveRef(comptime T: type, comptime capacity: u16) type {
     return struct {
         const HiveAllocator = HiveArray(@This(), capacity).Fallback;
-
         ref_count: u32,
         allocator: *HiveAllocator,
         value: T,
+
         pub fn init(value: T, allocator: *HiveAllocator) !*@This() {
-            var this = try allocator.tryGet();
-            this.allocator = allocator;
-            this.ref_count = 1;
-            this.value = value;
+            const this = try allocator.tryGet();
+            this.* = .{
+                .ref_count = 1,
+                .allocator = allocator,
+                .value = value,
+            };
             return this;
         }
 
@@ -1927,8 +1944,9 @@ pub fn HiveRef(comptime T: type, comptime capacity: u16) type {
         }
 
         pub fn unref(this: *@This()) ?*@This() {
-            this.ref_count -= 1;
-            if (this.ref_count == 0) {
+            const ref_count = this.ref_count;
+            this.ref_count = ref_count - 1;
+            if (ref_count == 1) {
                 if (@hasDecl(T, "deinit")) {
                     this.value.deinit();
                 }
@@ -2329,7 +2347,7 @@ pub const win32 = struct {
             if (exit_code == watcher_reload_exit) {
                 continue;
             } else {
-                Global.exitWide(exit_code);
+                Global.exit(exit_code);
             }
         }
     }
@@ -2934,7 +2952,7 @@ pub const heap_breakdown = @import("./heap_breakdown.zig");
 /// to dump the heap.
 pub inline fn new(comptime T: type, init: T) *T {
     const ptr = if (heap_breakdown.enabled)
-        heap_breakdown.getZone(T).create(T, init)
+        heap_breakdown.getZoneT(T).create(T, init)
     else ptr: {
         const ptr = default_allocator.create(T) catch outOfMemory();
         ptr.* = init;
@@ -2959,8 +2977,8 @@ pub inline fn destroy(ptr: anytype) void {
         logAlloc("destroy({s}) = {*}", .{ meta.typeName(T), ptr });
     }
 
-    if (heap_breakdown.enabled) {
-        heap_breakdown.getZone(T).destroy(T, ptr);
+    if (comptime heap_breakdown.enabled) {
+        heap_breakdown.getZoneT(T).destroy(T, ptr);
     } else {
         default_allocator.destroy(ptr);
     }
@@ -3614,3 +3632,4 @@ pub fn memmove(output: []u8, input: []const u8) void {
 }
 
 pub const hmac = @import("./hmac.zig");
+pub const libdeflate = @import("./deps/libdeflate.zig");
diff --git a/src/bun_js.zig b/src/bun_js.zig
index 91f97accf3..842a8a445f 100644
--- a/src/bun_js.zig
+++ b/src/bun_js.zig
@@ -118,10 +118,38 @@ pub const Run = struct {
         vm.is_main_thread = true;
         JSC.VirtualMachine.is_main_thread_vm = true;
 
+        doPreconnect(ctx.runtime_options.preconnect);
+
         const callback = OpaqueWrap(Run, Run.start);
         vm.global.vm().holdAPILock(&run, callback);
     }
 
+    fn doPreconnect(preconnect: []const string) void {
+        if (preconnect.len == 0) return;
+        bun.HTTPThread.init();
+
+        for (preconnect) |url_str| {
+            const url = bun.URL.parse(url_str);
+
+            if (!url.isHTTP() and !url.isHTTPS()) {
+                Output.errGeneric("preconnect URL must be HTTP or HTTPS: {}", .{bun.fmt.quote(url_str)});
+                Global.exit(1);
+            }
+
+            if (url.hostname.len == 0) {
+                Output.errGeneric("preconnect URL must have a hostname: {}", .{bun.fmt.quote(url_str)});
+                Global.exit(1);
+            }
+
+            if (!url.hasValidPort()) {
+                Output.errGeneric("preconnect URL must have a valid port: {}", .{bun.fmt.quote(url_str)});
+                Global.exit(1);
+            }
+
+            AsyncHTTP.preconnect(url, false);
+        }
+    }
+
     fn bootBunShell(ctx: Command.Context, entry_path: []const u8) !bun.shell.ExitCode {
         @setCold(true);
 
@@ -149,7 +177,7 @@ pub const Run = struct {
         // JSC initialization costs 1-3ms. We skip this if we know it's a shell script.
         if (strings.endsWithComptime(entry_path, ".sh")) {
             const exit_code = try bootBunShell(ctx, entry_path);
-            Global.exitWide(exit_code);
+            Global.exit(exit_code);
             return;
         }
 
@@ -242,6 +270,8 @@ pub const Run = struct {
 
         vm.bundler.env.loadTracy();
 
+        doPreconnect(ctx.runtime_options.preconnect);
+
         const callback = OpaqueWrap(Run, Run.start);
         vm.global.vm().holdAPILock(&run, callback);
     }
@@ -291,7 +321,7 @@ pub const Run = struct {
                             .{Global.unhandled_error_bun_version_string},
                         );
                     }
-                    Global.exit(1);
+                    vm.globalExit();
                 }
             }
 
@@ -324,7 +354,7 @@ pub const Run = struct {
                         .{Global.unhandled_error_bun_version_string},
                     );
                 }
-                Global.exit(1);
+                vm.globalExit();
             }
         }
 
@@ -428,12 +458,10 @@ pub const Run = struct {
                 .{Global.unhandled_error_bun_version_string},
             );
         }
-        const exit_code = this.vm.exit_handler.exit_code;
 
         vm.onExit();
-
         if (!JSC.is_bindgen) JSC.napi.fixDeadCodeElimination();
-        Global.exit(exit_code);
+        vm.globalExit();
     }
 };
 
diff --git a/src/bundler.zig b/src/bundler.zig
index a7f479346c..f1cb5d0d63 100644
--- a/src/bundler.zig
+++ b/src/bundler.zig
@@ -639,7 +639,7 @@ pub const Bundler = struct {
                 framework.resolved = true;
                 this.options.framework = framework.*;
             } else if (!framework.resolved) {
-                Global.panic("directly passing framework path is not implemented yet!", .{});
+                Output.panic("directly passing framework path is not implemented yet!", .{});
             }
         }
     }
@@ -1649,7 +1649,7 @@ pub const Bundler = struct {
                 }
             },
             .css => {},
-            else => Global.panic("Unsupported loader {s} for path: {s}", .{ @tagName(loader), source.path.text }),
+            else => Output.panic("Unsupported loader {s} for path: {s}", .{ @tagName(loader), source.path.text }),
         }
 
         return null;
diff --git a/src/bundler/bundle_v2.zig b/src/bundler/bundle_v2.zig
index 1f8478a90a..74776675ce 100644
--- a/src/bundler/bundle_v2.zig
+++ b/src/bundler/bundle_v2.zig
@@ -126,6 +126,8 @@ const debugTreeShake = Output.scoped(.TreeShake, true);
 const BitSet = bun.bit_set.DynamicBitSetUnmanaged;
 const Async = bun.Async;
 
+const logPartDependencyTree = Output.scoped(.part_dep_tree, false);
+
 fn tracer(comptime src: std.builtin.SourceLocation, comptime name: [:0]const u8) bun.tracy.Ctx {
     return bun.tracy.traceNamed(src, "Bundler." ++ name);
 }
@@ -657,14 +659,13 @@ pub const BundleV2 = struct {
         var result = resolve;
         var path = result.path() orelse return null;
 
-        const loader = this.bundler.options.loaders.get(path.name.ext) orelse .file;
-
         const entry = try this.graph.path_to_source_index_map.getOrPut(this.graph.allocator, hash orelse path.hashKey());
         if (entry.found_existing) {
             return null;
         }
         _ = @atomicRmw(usize, &this.graph.parse_pending, .Add, 1, .monotonic);
         const source_index = Index.source(this.graph.input_files.len);
+        const loader = this.bundler.options.loaders.get(path.name.ext) orelse .file;
 
         if (path.pretty.ptr == path.text.ptr) {
             // TODO: outbase
@@ -1655,17 +1656,11 @@ pub const BundleV2 = struct {
 
         bundler.resolver.opts = bundler.options;
 
-        var this = try BundleV2.init(bundler, allocator, JSC.AnyEventLoop.init(allocator), false, JSC.WorkPool.get(), heap);
+        const this = try BundleV2.init(bundler, allocator, JSC.AnyEventLoop.init(allocator), false, JSC.WorkPool.get(), heap);
         this.plugins = completion.plugins;
         this.completion = completion;
         completion.bundler = this;
 
-        errdefer {
-            var out_log = Logger.Log.init(bun.default_allocator);
-            this.bundler.log.appendToWithRecycled(&out_log, true) catch bun.outOfMemory();
-            completion.log = out_log;
-        }
-
         defer {
             if (this.graph.pool.pool.threadpool_context == @as(?*anyopaque, @ptrCast(this.graph.pool))) {
                 this.graph.pool.pool.threadpool_context = null;
@@ -1675,6 +1670,16 @@ pub const BundleV2 = struct {
             this.deinit();
         }
 
+        errdefer {
+            // Wait for wait groups to finish. There still may be
+            this.linker.source_maps.line_offset_wait_group.wait();
+            this.linker.source_maps.quoted_contents_wait_group.wait();
+
+            var out_log = Logger.Log.init(bun.default_allocator);
+            this.bundler.log.appendToWithRecycled(&out_log, true) catch bun.outOfMemory();
+            completion.log = out_log;
+        }
+
         completion.result = .{
             .value = .{
                 .output_files = try this.runFromJSInNewThread(config),
@@ -3293,6 +3298,8 @@ const AstSourceIDMapping = struct {
 const LinkerGraph = struct {
     const debug = Output.scoped(.LinkerGraph, false);
 
+    /// TODO(@paperdave): remove this. i added it before realizing this is available
+    /// via LinkerContext.parse_graph. it may also be worth removing the other cloned data.
     bundler_graph: *const Graph,
 
     files: File.List = .{},
@@ -3358,7 +3365,7 @@ const LinkerGraph = struct {
     }
 
     pub fn generateNewSymbol(this: *LinkerGraph, source_index: u32, kind: Symbol.Kind, original_name: string) Ref {
-        var source_symbols = &this.symbols.symbols_for_source.slice()[source_index];
+        const source_symbols = &this.symbols.symbols_for_source.slice()[source_index];
 
         var ref = Ref.init(
             @as(Ref.Int, @truncate(source_symbols.len)),
@@ -3748,9 +3755,9 @@ const LinkerGraph = struct {
             }
         }
 
-        const in_resolved_exports: []ResolvedExports = this.meta.items(.resolved_exports);
-        const src_resolved_exports: []js_ast.Ast.NamedExports = this.ast.items(.named_exports);
-        for (src_resolved_exports, in_resolved_exports, 0..) |src, *dest, source_index| {
+        const src_named_exports: []js_ast.Ast.NamedExports = this.ast.items(.named_exports);
+        const dest_resolved_exports: []ResolvedExports = this.meta.items(.resolved_exports);
+        for (src_named_exports, dest_resolved_exports, 0..) |src, *dest, source_index| {
             var resolved = ResolvedExports{};
             resolved.ensureTotalCapacity(this.allocator, src.count()) catch unreachable;
             for (src.keys(), src.values()) |key, value| {
@@ -3803,7 +3810,7 @@ const LinkerGraph = struct {
     };
 };
 
-const LinkerContext = struct {
+pub const LinkerContext = struct {
     const debug = Output.scoped(.LinkerCtx, false);
 
     parse_graph: *Graph = undefined,
@@ -3813,7 +3820,6 @@ const LinkerContext = struct {
 
     resolver: *Resolver = undefined,
     cycle_detector: std.ArrayList(ImportTracker) = undefined,
-    swap_cycle_detector: std.ArrayList(ImportTracker) = undefined,
 
     /// We may need to refer to the "__esm" and/or "__commonJS" runtime symbols
     cjs_runtime_ref: Ref = Ref.None,
@@ -3824,7 +3830,7 @@ const LinkerContext = struct {
 
     options: LinkerOptions = .{},
 
-    wait_group: ThreadPoolLib.WaitGroup = undefined,
+    wait_group: ThreadPoolLib.WaitGroup = .{},
 
     ambiguous_result_pool: std.ArrayList(MatchImport) = undefined,
 
@@ -3862,10 +3868,10 @@ const LinkerContext = struct {
     };
 
     pub const SourceMapData = struct {
-        line_offset_wait_group: sync.WaitGroup = undefined,
+        line_offset_wait_group: sync.WaitGroup = .{},
         line_offset_tasks: []Task = &.{},
 
-        quoted_contents_wait_group: sync.WaitGroup = undefined,
+        quoted_contents_wait_group: sync.WaitGroup = .{},
         quoted_contents_tasks: []Task = &.{},
 
         pub const Task = struct {
@@ -3979,7 +3985,6 @@ const LinkerContext = struct {
 
         this.resolver = &bundle.bundler.resolver;
         this.cycle_detector = std.ArrayList(ImportTracker).init(this.allocator);
-        this.swap_cycle_detector = std.ArrayList(ImportTracker).init(this.allocator);
 
         this.graph.reachable_files = reachable;
 
@@ -4767,7 +4772,7 @@ const LinkerContext = struct {
                 }
             }
 
-            if (comptime Environment.allow_assert) {
+            if (comptime Environment.enable_logs) {
                 var cjs_count: usize = 0;
                 var esm_count: usize = 0;
                 var wrap_cjs_count: usize = 0;
@@ -4861,11 +4866,12 @@ const LinkerContext = struct {
                     const source_index = source_index_.get();
                     const id = source_index;
 
-                    // --
+                    // Expression-style loaders defer code generation until linking. Code
+                    // generation is done here because at this point we know that the
+                    // "ExportsKind" field has its final value and will not be changed.
                     if (ast_flags_list[id].has_lazy_export) {
                         try this.generateCodeForLazyExport(id);
                     }
-                    // --
 
                     // Propagate exports for export star statements
                     const export_star_ids = export_star_import_records[id];
@@ -4883,8 +4889,6 @@ const LinkerContext = struct {
                                 .exports_kind = exports_kind,
                                 .named_exports = this.graph.ast.items(.named_exports),
                             };
-                        } else {
-                            export_star_ctx.?.source_index_stack.clearRetainingCapacity();
                         }
                         export_star_ctx.?.addExports(&resolved_exports[id], source_index);
                     }
@@ -4911,22 +4915,21 @@ const LinkerContext = struct {
                 this.cycle_detector.clearRetainingCapacity();
                 const trace = tracer(@src(), "MatchImportsWithExports");
                 defer trace.end();
-                var wrapper_part_indices = this.graph.meta.items(.wrapper_part_index);
-                var imports_to_bind = this.graph.meta.items(.imports_to_bind);
+                const wrapper_part_indices = this.graph.meta.items(.wrapper_part_index);
+                const imports_to_bind = this.graph.meta.items(.imports_to_bind);
                 for (reachable) |source_index_| {
                     const source_index = source_index_.get();
-                    const id = source_index;
 
                     // not a JS ast or empty
-                    if (id >= named_imports.len) {
+                    if (source_index >= named_imports.len) {
                         continue;
                     }
 
-                    var named_imports_ = &named_imports[id];
+                    const named_imports_ = &named_imports[source_index];
                     if (named_imports_.count() > 0) {
                         this.matchImportsWithExportsForFile(
                             named_imports_,
-                            &imports_to_bind[id],
+                            &imports_to_bind[source_index],
                             source_index,
                         );
 
@@ -4934,8 +4937,8 @@ const LinkerContext = struct {
                             return error.ImportResolutionFailed;
                         }
                     }
-                    const export_kind = exports_kind[id];
-                    var flag = flags[id];
+                    const export_kind = exports_kind[source_index];
+                    var flag = flags[source_index];
                     // If we're exporting as CommonJS and this file was originally CommonJS,
                     // then we'll be using the actual CommonJS "exports" and/or "module"
                     // symbols. In that case make sure to mark them as such so they don't
@@ -4944,24 +4947,23 @@ const LinkerContext = struct {
                         entry_point_kinds[source_index].isEntryPoint() and
                         export_kind == .cjs and flag.wrap == .none)
                     {
-                        const exports_ref = symbols.follow(exports_refs[id]);
-                        const module_ref = symbols.follow(module_refs[id]);
+                        const exports_ref = symbols.follow(exports_refs[source_index]);
+                        const module_ref = symbols.follow(module_refs[source_index]);
                         symbols.get(exports_ref).?.kind = .unbound;
                         symbols.get(module_ref).?.kind = .unbound;
                     } else if (flag.force_include_exports_for_entry_point or export_kind != .cjs) {
                         flag.needs_exports_variable = true;
-                        flags[id] = flag;
+                        flags[source_index] = flag;
                     }
 
-                    const wrapped_ref = this.graph.ast.items(.wrapper_ref)[id];
-                    if (wrapped_ref.isNull() or wrapped_ref.isEmpty()) continue;
+                    const wrapped_ref = this.graph.ast.items(.wrapper_ref)[source_index];
 
                     // Create the wrapper part for wrapped files. This is needed by a later step.
                     this.createWrapperForFile(
                         flag.wrap,
                         // if this one is null, the AST does not need to be wrapped.
                         wrapped_ref,
-                        &wrapper_part_indices[id],
+                        &wrapper_part_indices[source_index],
                         source_index,
                     );
                 }
@@ -5014,7 +5016,6 @@ const LinkerContext = struct {
 
                 const module_ref = module_refs[id];
 
-                // TODO: see if counting and batching into a single large allocation instead of per-file improves perf
                 const string_buffer_len: usize = brk: {
                     var count: usize = 0;
                     if (is_entry_point and this.options.output_format == .esm) {
@@ -5028,7 +5029,7 @@ const LinkerContext = struct {
                     else
                         std.fmt.count("{}", .{source.fmtIdentifier()});
 
-                    if (wrap == .esm) {
+                    if (wrap == .esm and wrapper_refs[id].isValid()) {
                         count += "init_".len + ident_fmt_len;
                     }
 
@@ -5064,14 +5065,15 @@ const LinkerContext = struct {
 
                 // Use "init_*" for ESM wrappers instead of "require_*"
                 if (wrap == .esm) {
-                    const original_name = builder.fmt(
-                        "init_{}",
-                        .{
-                            source.fmtIdentifier(),
-                        },
-                    );
+                    const ref = wrapper_refs[id];
+                    if (ref.isValid()) {
+                        const original_name = builder.fmt(
+                            "init_{}",
+                            .{source.fmtIdentifier()},
+                        );
 
-                    this.graph.symbols.get(wrapper_refs[id]).?.original_name = original_name;
+                        this.graph.symbols.get(ref).?.original_name = original_name;
+                    }
                 }
 
                 // If this isn't CommonJS, then rename the unused "exports" and "module"
@@ -5121,19 +5123,19 @@ const LinkerContext = struct {
                 var imports_to_bind_list: []RefImportData = this.graph.meta.items(.imports_to_bind);
                 var parts_list: []js_ast.Part.List = ast_fields.items(.parts);
 
-                var imports_to_bind = &imports_to_bind_list[id];
                 var parts: []js_ast.Part = parts_list[id].slice();
 
-                for (0..imports_to_bind.count()) |i| {
-                    const ref = imports_to_bind.keys()[i];
-                    const import = imports_to_bind.values()[i];
+                const imports_to_bind = &imports_to_bind_list[id];
+                for (imports_to_bind.keys(), imports_to_bind.values()) |ref_untyped, import_untyped| {
+                    const ref: Ref = ref_untyped; // ZLS
+                    const import: ImportData = import_untyped; // ZLS
 
                     const import_source_index = import.data.source_index.get();
 
                     if (named_imports[id].get(ref)) |named_import| {
                         for (named_import.local_parts_with_uses.slice()) |part_index| {
                             var part: *js_ast.Part = &parts[part_index];
-                            const parts_declaring_symbol: []const u32 = this.graph.topLevelSymbolToParts(import_source_index, ref);
+                            const parts_declaring_symbol: []const u32 = this.graph.topLevelSymbolToParts(import_source_index, import.data.import_ref);
 
                             const total_len = parts_declaring_symbol.len + @as(usize, import.re_exports.len) + @as(usize, part.dependencies.len);
                             if (part.dependencies.cap < total_len) {
@@ -5145,12 +5147,10 @@ const LinkerContext = struct {
 
                             // Depend on the file containing the imported symbol
                             for (parts_declaring_symbol) |resolved_part_index| {
-                                part.dependencies.appendAssumeCapacity(
-                                    .{
-                                        .source_index = Index.source(import_source_index),
-                                        .part_index = resolved_part_index,
-                                    },
-                                );
+                                part.dependencies.appendAssumeCapacity(.{
+                                    .source_index = Index.source(import_source_index),
+                                    .part_index = resolved_part_index,
+                                });
                             }
 
                             // Also depend on any files that re-exported this symbol in between the
@@ -5166,40 +5166,38 @@ const LinkerContext = struct {
                 if (is_entry_point) {
                     const force_include_exports = flag.force_include_exports_for_entry_point;
                     const add_wrapper = wrap != .none;
-                    var dependencies = std.ArrayList(js_ast.Dependency).initCapacity(
-                        this.allocator,
-                        @as(usize, @intFromBool(force_include_exports)) + @as(usize, @intFromBool(add_wrapper)),
-                    ) catch unreachable;
+
+                    const extra_count = @as(usize, @intFromBool(force_include_exports)) +
+                        @as(usize, @intFromBool(add_wrapper));
+
+                    var dependencies = std.ArrayList(js_ast.Dependency).initCapacity(this.allocator, extra_count) catch bun.outOfMemory();
+
                     var resolved_exports_list: *ResolvedExports = &this.graph.meta.items(.resolved_exports)[id];
                     for (aliases) |alias| {
-                        var export_ = resolved_exports_list.get(alias).?;
-                        var target_source_index = export_.data.source_index.get();
-                        var target_id = target_source_index;
-                        var target_ref = export_.data.import_ref;
+                        const exp = resolved_exports_list.get(alias).?;
+                        var target_source_index = exp.data.source_index;
+                        var target_ref = exp.data.import_ref;
 
                         // If this is an import, then target what the import points to
-
-                        if (imports_to_bind.get(target_ref)) |import_data| {
-                            target_source_index = import_data.data.source_index.get();
-                            target_id = target_source_index;
+                        if (imports_to_bind_list[target_source_index.get()].get(target_ref)) |import_data| {
+                            target_source_index = import_data.data.source_index;
                             target_ref = import_data.data.import_ref;
-                            dependencies.appendSlice(import_data.re_exports.slice()) catch unreachable;
+
+                            dependencies.appendSlice(import_data.re_exports.slice()) catch bun.outOfMemory();
                         }
 
-                        const top_to_parts = this.topLevelSymbolsToParts(target_id, target_ref);
-                        dependencies.ensureUnusedCapacity(top_to_parts.len) catch unreachable;
                         // Pull in all declarations of this symbol
+                        const top_to_parts = this.topLevelSymbolsToParts(target_source_index.get(), target_ref);
+                        dependencies.ensureUnusedCapacity(top_to_parts.len) catch bun.outOfMemory();
                         for (top_to_parts) |part_index| {
-                            dependencies.appendAssumeCapacity(
-                                .{
-                                    .source_index = Index.source(target_source_index),
-                                    .part_index = part_index,
-                                },
-                            );
+                            dependencies.appendAssumeCapacity(.{
+                                .source_index = target_source_index,
+                                .part_index = part_index,
+                            });
                         }
                     }
 
-                    dependencies.ensureUnusedCapacity(@as(usize, @intFromBool(force_include_exports)) + @as(usize, @intFromBool(add_wrapper))) catch unreachable;
+                    dependencies.ensureUnusedCapacity(extra_count) catch bun.outOfMemory();
 
                     // Ensure "exports" is included if the current output format needs it
                     if (force_include_exports) {
@@ -5208,6 +5206,7 @@ const LinkerContext = struct {
                         );
                     }
 
+                    // Include the wrapper if present
                     if (add_wrapper) {
                         dependencies.appendAssumeCapacity(
                             .{
@@ -5224,7 +5223,8 @@ const LinkerContext = struct {
                             .dependencies = js_ast.Dependency.List.fromList(dependencies),
                             .can_be_removed_if_unused = false,
                         },
-                    ) catch unreachable;
+                    ) catch bun.outOfMemory();
+
                     parts = parts_list[id].slice();
                     this.graph.meta.items(.entry_point_part_index)[id] = Index.part(entry_point_part_index);
 
@@ -5315,13 +5315,15 @@ const LinkerContext = struct {
                         if (other_flags.wrap != .none) {
                             // Depend on the automatically-generated require wrapper symbol
                             const wrapper_ref = wrapper_refs[other_id];
-                            this.graph.generateSymbolImportAndUse(
-                                source_index,
-                                @as(u32, @intCast(part_index)),
-                                wrapper_ref,
-                                1,
-                                Index.source(other_source_index),
-                            ) catch unreachable;
+                            if (wrapper_ref.isValid()) {
+                                this.graph.generateSymbolImportAndUse(
+                                    source_index,
+                                    @as(u32, @intCast(part_index)),
+                                    wrapper_ref,
+                                    1,
+                                    Index.source(other_source_index),
+                                ) catch unreachable;
+                            }
 
                             // This is an ES6 import of a CommonJS module, so it needs the
                             // "__toESM" wrapper as long as it's not a bare "require()"
@@ -5462,7 +5464,7 @@ const LinkerContext = struct {
 
     pub fn createExportsForFile(
         c: *LinkerContext,
-        allocator_: std.mem.Allocator,
+        allocator: std.mem.Allocator,
         id: u32,
         resolved_exports: *ResolvedExports,
         imports_to_bind: []RefImportData,
@@ -5481,10 +5483,10 @@ const LinkerContext = struct {
 
         // 1 property per export
         var properties = std.ArrayList(js_ast.G.Property)
-            .initCapacity(allocator_, export_aliases.len) catch unreachable;
+            .initCapacity(allocator, export_aliases.len) catch bun.outOfMemory();
 
         var ns_export_symbol_uses = js_ast.Part.SymbolUseMap{};
-        ns_export_symbol_uses.ensureTotalCapacity(allocator_, export_aliases.len) catch unreachable;
+        ns_export_symbol_uses.ensureTotalCapacity(allocator, export_aliases.len) catch bun.outOfMemory();
 
         const needs_exports_variable = c.graph.meta.items(.flags)[id].needs_exports_variable;
 
@@ -5496,35 +5498,34 @@ const LinkerContext = struct {
             // + 1 if we need to inject the exports variable
             @as(usize, @intFromBool(needs_exports_variable));
 
-        var stmts = js_ast.Stmt.Batcher.init(allocator_, stmts_count) catch unreachable;
+        var stmts = js_ast.Stmt.Batcher.init(allocator, stmts_count) catch bun.outOfMemory();
         defer stmts.done();
         const loc = Logger.Loc.Empty;
         // todo: investigate if preallocating this array is faster
-        var ns_export_dependencies = std.ArrayList(js_ast.Dependency).initCapacity(allocator_, re_exports_count) catch unreachable;
+        var ns_export_dependencies = std.ArrayList(js_ast.Dependency).initCapacity(allocator, re_exports_count) catch bun.outOfMemory();
         for (export_aliases) |alias| {
-            var export_ = resolved_exports.getPtr(alias).?;
-
-            const other_id = export_.data.source_index.get();
+            var exp = resolved_exports.getPtr(alias).?.*;
 
             // If this is an export of an import, reference the symbol that the import
             // was eventually resolved to. We need to do this because imports have
             // already been resolved by this point, so we can't generate a new import
             // and have that be resolved later.
-            if (imports_to_bind[other_id].get(export_.data.import_ref)) |import_data| {
-                export_.data = import_data.data;
-                ns_export_dependencies.appendSlice(import_data.re_exports.slice()) catch unreachable;
+            if (imports_to_bind[exp.data.source_index.get()].get(exp.data.import_ref)) |import_data| {
+                exp.data.import_ref = import_data.data.import_ref;
+                exp.data.source_index = import_data.data.source_index;
+                ns_export_dependencies.appendSlice(import_data.re_exports.slice()) catch bun.outOfMemory();
             }
 
             // Exports of imports need EImportIdentifier in case they need to be re-
             // written to a property access later on
             // note: this is stack allocated
             const value: js_ast.Expr = brk: {
-                if (c.graph.symbols.getConst(export_.data.import_ref)) |symbol| {
+                if (c.graph.symbols.getConst(exp.data.import_ref)) |symbol| {
                     if (symbol.namespace_alias != null) {
                         break :brk js_ast.Expr.init(
                             js_ast.E.ImportIdentifier,
                             js_ast.E.ImportIdentifier{
-                                .ref = export_.data.import_ref,
+                                .ref = exp.data.import_ref,
                             },
                             loc,
                         );
@@ -5534,7 +5535,7 @@ const LinkerContext = struct {
                 break :brk js_ast.Expr.init(
                     js_ast.E.Identifier,
                     js_ast.E.Identifier{
-                        .ref = export_.data.import_ref,
+                        .ref = exp.data.import_ref,
                     },
                     loc,
                 );
@@ -5543,7 +5544,7 @@ const LinkerContext = struct {
             const fn_body = js_ast.G.FnBody{
                 .stmts = stmts.eat1(
                     js_ast.Stmt.allocate(
-                        allocator_,
+                        allocator,
                         js_ast.S.Return,
                         .{ .value = value },
                         loc,
@@ -5551,42 +5552,38 @@ const LinkerContext = struct {
                 ),
                 .loc = loc,
             };
-            properties.appendAssumeCapacity(
-                .{
-                    .key = js_ast.Expr.allocate(
-                        allocator_,
-                        js_ast.E.String,
-                        .{
-                            // TODO: test emoji work as expected
-                            // relevant for WASM exports
-                            .data = alias,
-                        },
-                        loc,
-                    ),
-                    .value = js_ast.Expr.allocate(
-                        allocator_,
-                        js_ast.E.Arrow,
-                        .{ .prefer_expr = true, .body = fn_body },
-                        loc,
-                    ),
-                },
-            );
-            ns_export_symbol_uses.putAssumeCapacity(export_.data.import_ref, .{ .count_estimate = 1 });
+            properties.appendAssumeCapacity(.{
+                .key = js_ast.Expr.allocate(
+                    allocator,
+                    js_ast.E.String,
+                    .{
+                        // TODO: test emoji work as expected
+                        // relevant for WASM exports
+                        .data = alias,
+                    },
+                    loc,
+                ),
+                .value = js_ast.Expr.allocate(
+                    allocator,
+                    js_ast.E.Arrow,
+                    .{ .prefer_expr = true, .body = fn_body },
+                    loc,
+                ),
+            });
+            ns_export_symbol_uses.putAssumeCapacity(exp.data.import_ref, .{ .count_estimate = 1 });
 
             // Make sure the part that declares the export is included
-            const parts = c.topLevelSymbolsToParts(other_id, export_.data.import_ref);
+            const parts = c.topLevelSymbolsToParts(exp.data.source_index.get(), exp.data.import_ref);
             ns_export_dependencies.ensureUnusedCapacity(parts.len) catch unreachable;
-            var ptr = ns_export_dependencies.items.ptr + ns_export_dependencies.items.len;
-            ns_export_dependencies.items.len += parts.len;
-
-            for (parts, ptr[0..parts.len]) |part_id, *dependency| {
+            for (parts, ns_export_dependencies.unusedCapacitySlice()[0..parts.len]) |part_id, *dest| {
                 // Use a non-local dependency since this is likely from a different
                 // file if it came in through an export star
-                dependency.* = .{
-                    .source_index = export_.data.source_index,
+                dest.* = .{
+                    .source_index = exp.data.source_index,
                     .part_index = part_id,
                 };
             }
+            ns_export_dependencies.items.len += parts.len;
         }
 
         var declared_symbols = js_ast.DeclaredSymbol.List{};
@@ -5598,19 +5595,19 @@ const LinkerContext = struct {
 
         // Prefix this part with "var exports = {}" if this isn't a CommonJS entry point
         if (needs_exports_variable) {
-            var decls = allocator_.alloc(js_ast.G.Decl, 1) catch unreachable;
+            var decls = allocator.alloc(js_ast.G.Decl, 1) catch unreachable;
             decls[0] = .{
                 .binding = js_ast.Binding.alloc(
-                    allocator_,
+                    allocator,
                     js_ast.B.Identifier{
                         .ref = exports_ref,
                     },
                     loc,
                 ),
-                .value = js_ast.Expr.allocate(allocator_, js_ast.E.Object, .{}, loc),
+                .value = js_ast.Expr.allocate(allocator, js_ast.E.Object, .{}, loc),
             };
             remaining_stmts[0] = js_ast.Stmt.allocate(
-                allocator_,
+                allocator,
                 js_ast.S.Local,
                 .{
                     .decls = G.Decl.List.init(decls),
@@ -5618,24 +5615,24 @@ const LinkerContext = struct {
                 loc,
             );
             remaining_stmts = remaining_stmts[1..];
-            declared_symbols.append(allocator_, .{ .ref = exports_ref, .is_top_level = true }) catch unreachable;
+            declared_symbols.append(allocator, .{ .ref = exports_ref, .is_top_level = true }) catch unreachable;
         }
 
         // "__export(exports, { foo: () => foo })"
         var export_ref = Ref.None;
         if (properties.items.len > 0) {
             export_ref = c.graph.ast.items(.module_scope)[Index.runtime.get()].members.get("__export").?.ref;
-            var args = allocator_.alloc(js_ast.Expr, 2) catch unreachable;
+            var args = allocator.alloc(js_ast.Expr, 2) catch unreachable;
             args[0..2].* = [_]js_ast.Expr{
                 js_ast.Expr.initIdentifier(exports_ref, loc),
-                js_ast.Expr.allocate(allocator_, js_ast.E.Object, .{ .properties = js_ast.G.Property.List.fromList(properties) }, loc),
+                js_ast.Expr.allocate(allocator, js_ast.E.Object, .{ .properties = js_ast.G.Property.List.fromList(properties) }, loc),
             };
             remaining_stmts[0] = js_ast.Stmt.allocate(
-                allocator_,
+                allocator,
                 js_ast.S.SExpr,
                 .{
                     .value = js_ast.Expr.allocate(
-                        allocator_,
+                        allocator,
                         js_ast.E.Call,
                         .{
                             .target = js_ast.Expr.initIdentifier(export_ref, loc),
@@ -5804,10 +5801,12 @@ const LinkerContext = struct {
                                 }
 
                                 if (!found_non_inlined_enum) {
-                                    _ = part.symbol_uses.swapRemove(ref);
+                                    if (use.count_estimate == 0) {
+                                        _ = part.symbol_uses.swapRemove(ref);
+                                    }
+                                    continue;
                                 }
                             }
-                            continue;
                         }
                     }
                 }
@@ -5871,7 +5870,7 @@ const LinkerContext = struct {
                 const other_parts = c.topLevelSymbolsToParts(id, ref);
 
                 for (other_parts) |other_part_index| {
-                    const local = local_dependencies.getOrPut(@as(u32, @intCast(other_part_index))) catch unreachable;
+                    const local = local_dependencies.getOrPut(other_part_index) catch unreachable;
                     if (!local.found_existing or local.value_ptr.* != part_index) {
                         local.value_ptr.* = @as(u32, @intCast(part_index));
                         // note: if we crash on append, it is due to threadlocal heaps in mimalloc
@@ -5887,7 +5886,7 @@ const LinkerContext = struct {
 
                 // Also map from imports to parts that use them
                 if (named_imports.getPtr(ref)) |existing| {
-                    existing.local_parts_with_uses.push(allocator, @as(u32, @intCast(part_index))) catch unreachable;
+                    existing.local_parts_with_uses.push(allocator, @intCast(part_index)) catch unreachable;
                 }
             }
         }
@@ -6058,26 +6057,28 @@ const LinkerContext = struct {
 
                     const used_refs = part.symbol_uses.keys();
 
-                    for (used_refs) |ref_| {
+                    // Record each symbol used in this part. This will later be matched up
+                    // with our map of which chunk a given symbol is declared in to
+                    // determine if the symbol needs to be imported from another chunk.
+                    for (used_refs) |ref| {
                         const ref_to_use = brk: {
-                            var ref = ref_;
-                            var symbol = deps.symbols.getConst(ref).?;
+                            var ref_to_use = ref;
+                            var symbol = deps.symbols.getConst(ref_to_use).?;
 
                             // Ignore unbound symbols
                             if (symbol.kind == .unbound)
                                 continue;
 
                             // Ignore symbols that are going to be replaced by undefined
-                            if (symbol.import_item_status == .missing) {
+                            if (symbol.import_item_status == .missing)
                                 continue;
-                            }
 
                             // If this is imported from another file, follow the import
                             // reference and reference the symbol in that file instead
-                            if (imports_to_bind.get(ref)) |import_data| {
-                                ref = import_data.data.import_ref;
-                                symbol = deps.symbols.getConst(ref).?;
-                            } else if (wrap == .cjs and ref.eql(wrapper_ref)) {
+                            if (imports_to_bind.get(ref_to_use)) |import_data| {
+                                ref_to_use = import_data.data.import_ref;
+                                symbol = deps.symbols.getConst(ref_to_use).?;
+                            } else if (wrap == .cjs and ref_to_use.eql(wrapper_ref)) {
                                 // The only internal symbol that wrapped CommonJS files export
                                 // is the wrapper itself.
                                 continue;
@@ -6088,9 +6089,9 @@ const LinkerContext = struct {
                             // identifier. In that case we want to pull in the namespace symbol
                             // instead. The namespace symbol stores the result of "require()".
                             if (symbol.namespace_alias) |*namespace_alias| {
-                                ref = namespace_alias.namespace_ref;
+                                ref_to_use = namespace_alias.namespace_ref;
                             }
-                            break :brk ref;
+                            break :brk ref_to_use;
                         };
 
                         if (comptime Environment.allow_assert)
@@ -6713,6 +6714,17 @@ const LinkerContext = struct {
         defer ctx.wg.finish();
         var worker = ThreadPool.Worker.get(@fieldParentPtr("linker", ctx.c));
         defer worker.unget();
+
+        const prev_action = if (Environment.isDebug) bun.crash_handler.current_action;
+        defer if (Environment.isDebug) {
+            bun.crash_handler.current_action = prev_action;
+        };
+        if (Environment.isDebug) bun.crash_handler.current_action = .{ .bundle_generate_chunk = .{
+            .chunk = ctx.chunk,
+            .context = ctx.c,
+            .part_range = &part_range.part_range,
+        } };
+
         ctx.chunk.compile_results_for_chunk[part_range.i] = generateCompileResultForJSChunk_(worker, ctx.c, ctx.chunk, part_range.part_range);
     }
 
@@ -7341,7 +7353,7 @@ const LinkerContext = struct {
                         ) catch unreachable;
                     },
                     else => {
-                        if (flags.wrap == .esm) {
+                        if (flags.wrap == .esm and ast.wrapper_ref.isValid()) {
                             if (flags.is_async_or_has_async_dependency) {
                                 // "await init_foo();"
                                 stmts.append(
@@ -7877,33 +7889,21 @@ const LinkerContext = struct {
             .cjs => {
                 // Replace the statement with a call to "require()" if this module is not wrapped
                 try stmts.inside_wrapper_prefix.append(
-                    Stmt.alloc(
-                        S.Local,
-                        S.Local{
-                            .decls = try G.Decl.List.fromSlice(
-                                allocator,
-                                &.{
-                                    .{
-                                        .binding = Binding.alloc(
-                                            allocator,
-                                            B.Identifier{
-                                                .ref = namespace_ref,
-                                            },
-                                            loc,
-                                        ),
-                                        .value = Expr.init(
-                                            E.RequireString,
-                                            E.RequireString{
-                                                .import_record_index = import_record_index,
-                                            },
-                                            loc,
-                                        ),
-                                    },
+                    Stmt.alloc(S.Local, .{
+                        .decls = try G.Decl.List.fromSlice(
+                            allocator,
+                            &.{
+                                .{
+                                    .binding = Binding.alloc(allocator, B.Identifier{
+                                        .ref = namespace_ref,
+                                    }, loc),
+                                    .value = Expr.init(E.RequireString, .{
+                                        .import_record_index = import_record_index,
+                                    }, loc),
                                 },
-                            ),
-                        },
-                        loc,
-                    ),
+                            },
+                        ),
+                    }, loc),
                 );
             },
             .esm => {
@@ -7914,43 +7914,36 @@ const LinkerContext = struct {
                     return true;
                 }
 
+                const wrapper_ref = c.graph.ast.items(.wrapper_ref)[record.source_index.get()];
+                if (wrapper_ref.isEmpty()) {
+                    return true;
+                }
+
                 // Replace the statement with a call to "init()"
                 const value: Expr = brk: {
-                    const default = Expr.init(
-                        E.Call,
-                        E.Call{
-                            .target = Expr.initIdentifier(
-                                c.graph.ast.items(.wrapper_ref)[record.source_index.get()],
-                                loc,
-                            ),
-                        },
-                        loc,
-                    );
+                    const default = Expr.init(E.Call, .{
+                        .target = Expr.initIdentifier(
+                            wrapper_ref,
+                            loc,
+                        ),
+                    }, loc);
 
                     if (other_flags.is_async_or_has_async_dependency) {
                         // This currently evaluates sibling dependencies in serial instead of in
                         // parallel, which is incorrect. This should be changed to store a promise
                         // and await all stored promises after all imports but before any code.
-                        break :brk Expr.init(
-                            E.Await,
-                            E.Await{
-                                .value = default,
-                            },
-                            loc,
-                        );
+                        break :brk Expr.init(E.Await, .{
+                            .value = default,
+                        }, loc);
                     }
 
                     break :brk default;
                 };
 
                 try stmts.inside_wrapper_prefix.append(
-                    Stmt.alloc(
-                        S.SExpr,
-                        S.SExpr{
-                            .value = value,
-                        },
-                        loc,
-                    ),
+                    Stmt.alloc(S.SExpr, .{
+                        .value = value,
+                    }, loc),
                 );
             },
         }
@@ -7967,12 +7960,12 @@ const LinkerContext = struct {
     ///
     ///      prefix - outer
     ///      ...
-    ///      init_esm = () => {
+    ///      var init_foo = __esm(() => {
     ///          prefix - inner
     ///          ...
     ///          suffix - inenr
-    ///       };
-    ///       ...
+    ///      });
+    ///      ...
     ///      suffix - outer
     ///
     /// Keep in mind that we may need to wrap ES modules in some cases too
@@ -8162,27 +8155,20 @@ const LinkerContext = struct {
                         } else {
                             if (record.source_index.isValid()) {
                                 const flag = flags[record.source_index.get()];
-                                if (flag.wrap == .esm) {
+                                const wrapper_ref = c.graph.ast.items(.wrapper_ref)[record.source_index.get()];
+                                if (flag.wrap == .esm and wrapper_ref.isValid()) {
                                     try stmts.inside_wrapper_prefix.append(
-                                        Stmt.alloc(
-                                            S.SExpr,
-                                            .{
-                                                .value = Expr.init(
-                                                    E.Call,
-                                                    E.Call{
-                                                        .target = Expr.init(
-                                                            E.Identifier,
-                                                            E.Identifier{
-                                                                .ref = c.graph.ast.items(.wrapper_ref)[record.source_index.get()],
-                                                            },
-                                                            stmt.loc,
-                                                        ),
+                                        Stmt.alloc(S.SExpr, .{
+                                            .value = Expr.init(E.Call, .{
+                                                .target = Expr.init(
+                                                    E.Identifier,
+                                                    E.Identifier{
+                                                        .ref = wrapper_ref,
                                                     },
                                                     stmt.loc,
                                                 ),
-                                            },
-                                            stmt.loc,
-                                        ),
+                                            }, stmt.loc),
+                                        }, stmt.loc),
                                     );
                                 }
                             }
@@ -8253,7 +8239,6 @@ const LinkerContext = struct {
 
                     .s_export_from => |s| {
                         // "export {foo} from 'path'"
-
                         if (try c.shouldRemoveImportExportStmt(
                             stmts,
                             stmt.loc,
@@ -8301,7 +8286,6 @@ const LinkerContext = struct {
 
                         if (shouldStripExports) {
                             // Remove export statements entirely
-
                             continue;
                         }
 
@@ -8806,13 +8790,16 @@ const LinkerContext = struct {
                     // isn't async because then calling "require()" on that module would
                     // swallow any exceptions thrown during module initialization.
                     const is_async = flags.is_async_or_has_async_dependency;
-                    const Hoisty = struct {
-                        decls: std.ArrayList(G.Decl),
+
+                    const ExportHoist = struct {
+                        decls: std.ArrayListUnmanaged(G.Decl),
                         allocator: std.mem.Allocator,
+                        next_value: ?Expr = null,
 
                         pub fn wrapIdentifier(w: *@This(), loc: Logger.Loc, ref: Ref) Expr {
                             w.decls.append(
-                                G.Decl{
+                                w.allocator,
+                                .{
                                     .binding = Binding.alloc(
                                         w.allocator,
                                         B.Identifier{
@@ -8820,113 +8807,119 @@ const LinkerContext = struct {
                                         },
                                         loc,
                                     ),
+                                    .value = w.next_value,
                                 },
-                            ) catch unreachable;
-                            return Expr.init(
-                                E.Identifier,
-                                E.Identifier{
-                                    .ref = ref,
-                                },
-                                loc,
-                            );
+                            ) catch bun.outOfMemory();
+
+                            return Expr.initIdentifier(ref, loc);
                         }
                     };
-                    var hoisty = Hoisty{
-                        .decls = std.ArrayList(G.Decl).init(temp_allocator),
+
+                    var hoist = ExportHoist{
+                        .decls = .{},
                         .allocator = temp_allocator,
                     };
+
                     var inner_stmts = stmts.all_stmts.items;
+
                     // Hoist all top-level "var" and "function" declarations out of the closure
                     {
                         var end: usize = 0;
-                        for (stmts.all_stmts.items) |stmt_| {
-                            var stmt: Stmt = stmt_;
-                            switch (stmt.data) {
-                                .s_local => |local| {
-                                    if (local.was_commonjs_export or ast.commonjs_named_exports.count() == 0) {
-                                        var value: Expr = Expr.init(E.Missing, E.Missing{}, Logger.Loc.Empty);
-                                        for (local.decls.slice()) |*decl| {
-                                            const binding = decl.binding.toExpr(&hoisty);
-                                            if (decl.value) |other| {
+                        for (stmts.all_stmts.items) |stmt| {
+                            const transformed = switch (stmt.data) {
+                                .s_local => |local| stmt: {
+                                    // Convert the declarations to assignments
+                                    var value = Expr.empty;
+                                    for (local.decls.slice()) |*decl| {
+                                        if (decl.value) |initializer| {
+                                            const can_be_moved = initializer.canBeMoved();
+                                            hoist.next_value = if (can_be_moved) initializer else null;
+                                            const binding = decl.binding.toExpr(&hoist);
+                                            if (!can_be_moved) {
                                                 value = value.joinWithComma(
-                                                    binding.assign(
-                                                        other,
-                                                    ),
+                                                    binding.assign(initializer),
                                                     temp_allocator,
                                                 );
                                             }
+                                        } else {
+                                            _ = decl.binding.toExpr(&hoist);
                                         }
-
-                                        if (value.isEmpty()) {
-                                            continue;
-                                        }
-                                        stmt = Stmt.alloc(
-                                            S.SExpr,
-                                            S.SExpr{
-                                                .value = value,
-                                            },
-                                            stmt.loc,
-                                        );
                                     }
+
+                                    if (value.isEmpty()) {
+                                        continue;
+                                    }
+
+                                    break :stmt Stmt.allocateExpr(temp_allocator, value);
                                 },
-                                .s_class, .s_function => {
-                                    stmts.outside_wrapper_prefix.append(stmt) catch unreachable;
+                                .s_function => {
+                                    stmts.outside_wrapper_prefix.append(stmt) catch bun.outOfMemory();
                                     continue;
                                 },
-                                else => {},
-                            }
-                            inner_stmts[end] = stmt;
+                                .s_class => |class| stmt: {
+                                    if (class.class.canBeMoved()) {
+                                        stmts.outside_wrapper_prefix.append(stmt) catch bun.outOfMemory();
+                                        continue;
+                                    }
+
+                                    hoist.next_value = null;
+
+                                    break :stmt Stmt.allocateExpr(
+                                        temp_allocator,
+                                        Expr.assign(hoist.wrapIdentifier(
+                                            class.class.class_name.?.loc,
+                                            class.class.class_name.?.ref.?,
+                                        ), .{
+                                            .data = .{ .e_class = &class.class },
+                                            .loc = stmt.loc,
+                                        }),
+                                    );
+                                },
+                                else => stmt,
+                            };
+
+                            inner_stmts[end] = transformed;
                             end += 1;
                         }
                         inner_stmts.len = end;
                     }
 
-                    if (hoisty.decls.items.len > 0) {
+                    if (hoist.decls.items.len > 0) {
                         stmts.outside_wrapper_prefix.append(
                             Stmt.alloc(
                                 S.Local,
                                 S.Local{
-                                    .decls = G.Decl.List.fromList(hoisty.decls),
+                                    .decls = G.Decl.List.fromList(hoist.decls),
                                 },
                                 Logger.Loc.Empty,
                             ),
                         ) catch unreachable;
-                        hoisty.decls.items.len = 0;
+                        hoist.decls.items.len = 0;
                     }
 
-                    // "__esm(() => { ... })"
-                    var esm_args = temp_allocator.alloc(Expr, 1) catch unreachable;
-                    esm_args[0] = Expr.init(
-                        E.Arrow,
-                        E.Arrow{
+                    if (inner_stmts.len > 0) {
+                        // See the comment in needsWrapperRef for why the symbol
+                        // is sometimes not generated.
+                        bun.assert(!ast.wrapper_ref.isEmpty()); // js_parser's needsWrapperRef thought wrapper was not needed
+
+                        // "__esm(() => { ... })"
+                        var esm_args = temp_allocator.alloc(Expr, 1) catch bun.outOfMemory();
+                        esm_args[0] = Expr.init(E.Arrow, .{
                             .args = &.{},
                             .is_async = is_async,
                             .body = .{
                                 .stmts = inner_stmts,
                                 .loc = Logger.Loc.Empty,
                             },
-                        },
-                        Logger.Loc.Empty,
-                    );
+                        }, Logger.Loc.Empty);
 
-                    // "var init_foo = __esm(...);"
-                    {
-                        const value = Expr.init(
-                            E.Call,
-                            E.Call{
-                                .target = Expr.init(
-                                    E.Identifier,
-                                    E.Identifier{
-                                        .ref = c.esm_runtime_ref,
-                                    },
-                                    Logger.Loc.Empty,
-                                ),
-                                .args = bun.BabyList(Expr).init(esm_args),
-                            },
-                            Logger.Loc.Empty,
-                        );
+                        // "var init_foo = __esm(...);"
+                        const value = Expr.init(E.Call, .{
+                            .target = Expr.initIdentifier(c.esm_runtime_ref, Logger.Loc.Empty),
+                            .args = bun.BabyList(Expr).init(esm_args),
+                        }, Logger.Loc.Empty);
 
-                        var decls = temp_allocator.alloc(G.Decl, 1) catch unreachable;
+                        var decls = temp_allocator.alloc(G.Decl, 1) catch bun.outOfMemory();
                         decls[0] = G.Decl{
                             .binding = Binding.alloc(
                                 temp_allocator,
@@ -8939,14 +8932,53 @@ const LinkerContext = struct {
                         };
 
                         stmts.outside_wrapper_prefix.append(
-                            Stmt.alloc(
-                                S.Local,
-                                S.Local{
-                                    .decls = G.Decl.List.init(decls),
+                            Stmt.alloc(S.Local, .{
+                                .decls = G.Decl.List.init(decls),
+                            }, Logger.Loc.Empty),
+                        ) catch bun.outOfMemory();
+                    } else {
+                        // // If this fails, then there will be places we reference
+                        // // `init_foo` without it actually existing.
+                        // bun.assert(ast.wrapper_ref.isEmpty());
+
+                        // TODO: the edge case where we are wrong is when there
+                        // are references to other ESM modules, but those get
+                        // fully hoisted. The look like side effects, but they
+                        // are removed.
+                        //
+                        // It is too late to retroactively delete the
+                        // wrapper_ref, since printing has already begun.  The
+                        // most we can do to salvage the situation is to print
+                        // an empty arrow function.
+                        //
+                        // This is marked as a TODO, because this can be solved
+                        // via a count of external modules, decremented during
+                        // linking.
+                        if (!ast.wrapper_ref.isEmpty()) {
+                            const value = Expr.init(E.Arrow, .{
+                                .args = &.{},
+                                .is_async = is_async,
+                                .body = .{
+                                    .stmts = inner_stmts,
+                                    .loc = Logger.Loc.Empty,
                                 },
-                                Logger.Loc.Empty,
-                            ),
-                        ) catch unreachable;
+                            }, Logger.Loc.Empty);
+
+                            stmts.outside_wrapper_prefix.append(
+                                Stmt.alloc(S.Local, .{
+                                    .decls = G.Decl.List.fromSlice(temp_allocator, &.{.{
+                                        .binding = Binding.alloc(
+                                            temp_allocator,
+                                            B.Identifier{
+                                                .ref = ast.wrapper_ref,
+                                            },
+                                            Logger.Loc.Empty,
+                                        ),
+                                        .value = value,
+                                    }}) catch bun.outOfMemory(),
+                                }, Logger.Loc.Empty),
+                            ) catch bun.outOfMemory();
+                        }
                     }
                 },
                 else => {},
@@ -9085,6 +9117,7 @@ const LinkerContext = struct {
                 wait_group.deinit();
                 c.allocator.destroy(wait_group);
             }
+            errdefer wait_group.wait();
             {
                 var total_count: usize = 0;
                 for (chunks, chunk_contexts) |*chunk, *chunk_ctx| {
@@ -9577,9 +9610,14 @@ const LinkerContext = struct {
                         from_chunk_dir = "";
 
                     const additional_files: []AdditionalFile = c.graph.bundler_graph.input_files.items(.additional_files)[piece.index.index].slice();
-                    bun.assert(additional_files.len == 1);
-                    const path = c.graph.bundler_graph.additional_output_files.items[additional_files[0].output_file].dest_path;
-                    hash.write(bun.path.relativePlatform(from_chunk_dir, path, .posix, false));
+                    bun.assert(additional_files.len > 0);
+                    switch (additional_files[0]) {
+                        .output_file => |output_file_id| {
+                            const path = c.graph.bundler_graph.additional_output_files.items[output_file_id].dest_path;
+                            hash.write(bun.path.relativePlatform(from_chunk_dir, path, .posix, false));
+                        },
+                        .source_index => {},
+                    }
                 }
             },
             else => {},
@@ -10069,40 +10107,43 @@ const LinkerContext = struct {
         import_records: []bun.BabyList(bun.ImportRecord),
         entry_point_kinds: []EntryPoint.Kind,
     ) void {
-        if (comptime bun.Environment.allow_assert)
-            debugTreeShake(
-                "markFileLiveForTreeShaking({d}, {s}) = {s}",
-                .{
-                    source_index,
-                    c.parse_graph.input_files.get(source_index).source.path.text,
-                    if (c.graph.files_live.isSet(source_index)) "seen" else "not seen",
-                },
-            );
+        if (comptime bun.Environment.allow_assert) {
+            debugTreeShake("markFileLiveForTreeShaking({d}, {s}) = {s}", .{
+                source_index,
+                c.parse_graph.input_files.get(source_index).source.path.text,
+                if (c.graph.files_live.isSet(source_index)) "seen" else "not seen",
+            });
+        }
 
-        if (c.graph.files_live.isSet(source_index))
+        defer if (Environment.allow_assert) {
+            debugTreeShake("end()", .{});
+        };
+
+        if (c.graph.files_live.isSet(source_index)) {
+            if (Environment.allow_assert) {
+                debugTreeShake("already set", .{});
+            }
             return;
-
+        }
         c.graph.files_live.set(source_index);
 
-        // TODO: CSS source index
-
-        const id = source_index;
-        if (@as(usize, id) >= c.graph.ast.len)
+        if (source_index >= c.graph.ast.len) {
+            bun.assert(false);
             return;
-        const _parts = parts[id].slice();
-        for (_parts, 0..) |part, part_index| {
+        }
+
+        for (parts[source_index].slice(), 0..) |part, part_index| {
             var can_be_removed_if_unused = part.can_be_removed_if_unused;
 
             if (can_be_removed_if_unused and part.tag == .commonjs_named_export) {
-                if (c.graph.meta.items(.flags)[id].wrap == .cjs) {
+                if (c.graph.meta.items(.flags)[source_index].wrap == .cjs) {
                     can_be_removed_if_unused = false;
                 }
             }
 
             // Also include any statement-level imports
-            for (part.import_record_indices.slice()) |import_record_Index| {
-                var record: *ImportRecord = &import_records[source_index].slice()[import_record_Index];
-
+            for (part.import_record_indices.slice()) |import_index| {
+                const record = import_records[source_index].at(import_index);
                 if (record.kind != .stmt)
                     continue;
 
@@ -10111,7 +10152,11 @@ const LinkerContext = struct {
 
                     // Don't include this module for its side effects if it can be
                     // considered to have no side effects
-                    if (side_effects[other_source_index] != .has_side_effects and !c.options.ignore_dce_annotations) {
+                    const se = side_effects[other_source_index];
+
+                    if (se != .has_side_effects and
+                        !c.options.ignore_dce_annotations)
+                    {
                         continue;
                     }
 
@@ -10139,11 +10184,11 @@ const LinkerContext = struct {
             if (!can_be_removed_if_unused or
                 (!part.force_tree_shaking and
                 !c.options.tree_shaking and
-                entry_point_kinds[id].isEntryPoint()))
+                entry_point_kinds[source_index].isEntryPoint()))
             {
-                _ = c.markPartLiveForTreeShaking(
-                    @as(u32, @intCast(part_index)),
-                    id,
+                c.markPartLiveForTreeShaking(
+                    @intCast(part_index),
+                    source_index,
                     side_effects,
                     parts,
                     import_records,
@@ -10156,39 +10201,57 @@ const LinkerContext = struct {
     pub fn markPartLiveForTreeShaking(
         c: *LinkerContext,
         part_index: Index.Int,
-        id: Index.Int,
+        source_index: Index.Int,
         side_effects: []_resolver.SideEffects,
         parts: []bun.BabyList(js_ast.Part),
         import_records: []bun.BabyList(bun.ImportRecord),
         entry_point_kinds: []EntryPoint.Kind,
-    ) bool {
-        var part: *js_ast.Part = &parts[id].slice()[part_index];
+    ) void {
+        const part: *js_ast.Part = &parts[source_index].slice()[part_index];
+
         // only once
         if (part.is_live) {
-            return false;
+            return;
         }
-
         part.is_live = true;
-        if (comptime bun.Environment.allow_assert)
+
+        if (comptime bun.Environment.isDebug) {
             debugTreeShake("markPartLiveForTreeShaking({d}): {s}:{d} = {d}, {s}", .{
-                id,
-                c.parse_graph.input_files.get(id).source.path.text,
+                source_index,
+                c.parse_graph.input_files.get(source_index).source.path.text,
                 part_index,
                 if (part.stmts.len > 0) part.stmts[0].loc.start else Logger.Loc.Empty.start,
                 if (part.stmts.len > 0) @tagName(part.stmts[0].data) else @tagName(Stmt.empty().data),
             });
+        }
+
+        defer if (Environment.allow_assert) {
+            debugTreeShake("end()", .{});
+        };
 
         // Include the file containing this part
         c.markFileLiveForTreeShaking(
-            id,
+            source_index,
             side_effects,
             parts,
             import_records,
             entry_point_kinds,
         );
 
+        if (Environment.enable_logs and part.dependencies.slice().len == 0) {
+            logPartDependencyTree("markPartLiveForTreeShaking {d}:{d} | EMPTY", .{
+                source_index, part_index,
+            });
+        }
+
         for (part.dependencies.slice()) |dependency| {
-            _ = c.markPartLiveForTreeShaking(
+            if (Environment.enable_logs and source_index != 0 and dependency.source_index.get() != 0) {
+                logPartDependencyTree("markPartLiveForTreeShaking: {d}:{d} --> {d}:{d}\n", .{
+                    source_index, part_index, dependency.source_index.get(), dependency.part_index,
+                });
+            }
+
+            c.markPartLiveForTreeShaking(
                 dependency.part_index,
                 dependency.source_index.get(),
                 side_effects,
@@ -10197,18 +10260,20 @@ const LinkerContext = struct {
                 entry_point_kinds,
             );
         }
-
-        return true;
     }
 
     pub fn matchImportWithExport(
         c: *LinkerContext,
-        init_tracker: *ImportTracker,
+        init_tracker: ImportTracker,
         re_exports: *std.ArrayList(js_ast.Dependency),
     ) MatchImport {
+        const cycle_detector_top = c.cycle_detector.items.len;
+        defer c.cycle_detector.shrinkRetainingCapacity(cycle_detector_top);
+
         var tracker = init_tracker;
         var ambiguous_results = std.ArrayList(MatchImport).init(c.allocator);
         defer ambiguous_results.clearAndFree();
+
         var result: MatchImport = MatchImport{};
         const named_imports = c.graph.ast.items(.named_imports);
 
@@ -10222,30 +10287,26 @@ const LinkerContext = struct {
             //
             // This uses a O(n^2) array scan instead of a O(n) map because the vast
             // majority of cases have one or two elements
-            for (c.cycle_detector.items) |prev_tracker| {
-                if (std.meta.eql(tracker.*, prev_tracker)) {
+            for (c.cycle_detector.items[cycle_detector_top..]) |prev_tracker| {
+                if (std.meta.eql(tracker, prev_tracker)) {
                     result = .{ .kind = .cycle };
                     break :loop;
                 }
             }
 
-            const prev_import_ref = tracker.import_ref;
-
             if (tracker.source_index.isInvalid()) {
                 // External
                 break;
             }
 
             const prev_source_index = tracker.source_index.get();
-            c.cycle_detector.append(tracker.*) catch unreachable;
+            c.cycle_detector.append(tracker) catch bun.outOfMemory();
 
             // Resolve the import by one step
-            var advanced = c.advanceImportTracker(tracker);
-            advanced.tracker.* = advanced.value;
-            const next_tracker = advanced.tracker.*;
+            const advanced = c.advanceImportTracker(&tracker);
+            const next_tracker = advanced.value;
             const status = advanced.status;
             const potentially_ambiguous_export_star_refs = advanced.import_data;
-            const other_id = advanced.value.source_index.get();
 
             switch (status) {
                 .cjs, .cjs_without_exports, .disabled, .external => {
@@ -10259,7 +10320,7 @@ const LinkerContext = struct {
                     // property access. Don't do this if the namespace reference is invalid
                     // though. This is the case for star imports, where the import is the
                     // namespace.
-                    const named_import: js_ast.NamedImport = named_imports[prev_source_index].get(prev_import_ref).?;
+                    const named_import: js_ast.NamedImport = named_imports[prev_source_index].get(tracker.import_ref).?;
 
                     if (named_import.namespace_ref != null and named_import.namespace_ref.?.isValid()) {
                         if (result.kind == .normal) {
@@ -10295,13 +10356,13 @@ const LinkerContext = struct {
                     // if the file was rewritten from CommonJS into ESM
                     // and the developer imported an export that doesn't exist
                     // We don't do a runtime error since that CJS would have returned undefined.
-                    const named_import: js_ast.NamedImport = named_imports[prev_source_index].get(prev_import_ref).?;
+                    const named_import: js_ast.NamedImport = named_imports[prev_source_index].get(tracker.import_ref).?;
 
                     if (named_import.namespace_ref != null and named_import.namespace_ref.?.isValid()) {
-                        const symbol = c.graph.symbols.get(prev_import_ref).?;
+                        const symbol = c.graph.symbols.get(tracker.import_ref).?;
                         symbol.import_item_status = .missing;
                         result.kind = .normal_and_namespace;
-                        result.namespace_ref = prev_import_ref;
+                        result.namespace_ref = tracker.import_ref;
                         result.alias = named_import.alias.?;
                         result.name_loc = named_import.alias_loc orelse Logger.Loc.Empty;
                     }
@@ -10309,7 +10370,7 @@ const LinkerContext = struct {
 
                 .dynamic_fallback => {
                     // If it's a file with dynamic export fallback, rewrite the import to a property access
-                    const named_import: js_ast.NamedImport = named_imports[prev_source_index].get(prev_import_ref).?;
+                    const named_import: js_ast.NamedImport = named_imports[prev_source_index].get(tracker.import_ref).?;
                     if (named_import.namespace_ref != null and named_import.namespace_ref.?.isValid()) {
                         if (result.kind == .normal) {
                             result.kind = .normal_and_namespace;
@@ -10326,8 +10387,8 @@ const LinkerContext = struct {
                 },
                 .no_match => {
                     // Report mismatched imports and exports
-                    const symbol = c.graph.symbols.get(prev_import_ref).?;
-                    const named_import: js_ast.NamedImport = named_imports[prev_source_index].get(prev_import_ref).?;
+                    const symbol = c.graph.symbols.get(tracker.import_ref).?;
+                    const named_import: js_ast.NamedImport = named_imports[prev_source_index].get(tracker.import_ref).?;
                     const source = c.source_(prev_source_index);
 
                     const next_source = c.source_(next_tracker.source_index.get());
@@ -10408,15 +10469,7 @@ const LinkerContext = struct {
                     for (potentially_ambiguous_export_star_refs) |*ambiguous_tracker| {
                         // If this is a re-export of another import, follow the import
                         if (named_imports[ambiguous_tracker.data.source_index.get()].contains(ambiguous_tracker.data.import_ref)) {
-                            c.cycle_detector.clearRetainingCapacity();
-                            c.swap_cycle_detector.clearRetainingCapacity();
-
-                            const old_cycle_detector = c.cycle_detector;
-                            c.cycle_detector = c.swap_cycle_detector;
-                            const ambig = c.matchImportWithExport(&ambiguous_tracker.data, re_exports);
-                            c.cycle_detector.clearRetainingCapacity();
-                            c.swap_cycle_detector = c.cycle_detector;
-                            c.cycle_detector = old_cycle_detector;
+                            const ambig = c.matchImportWithExport(ambiguous_tracker.data, re_exports);
                             ambiguous_results.append(ambig) catch unreachable;
                         } else {
                             ambiguous_results.append(.{
@@ -10443,7 +10496,7 @@ const LinkerContext = struct {
                     // Depend on the statement(s) that declared this import symbol in the
                     // original file
                     {
-                        const deps = c.topLevelSymbolsToParts(other_id, tracker.import_ref);
+                        const deps = c.topLevelSymbolsToParts(prev_source_index, tracker.import_ref);
                         re_exports.ensureUnusedCapacity(deps.len) catch unreachable;
                         for (deps) |dep| {
                             re_exports.appendAssumeCapacity(
@@ -10459,7 +10512,7 @@ const LinkerContext = struct {
                     // iteration of the loop to resolve that import as well
                     const next_id = next_tracker.source_index.get();
                     if (named_imports[next_id].contains(next_tracker.import_ref)) {
-                        tracker.* = next_tracker;
+                        tracker = next_tracker;
                         continue :loop;
                     }
                 },
@@ -10589,7 +10642,10 @@ const LinkerContext = struct {
                 //
                 // This depends on the "__esm" symbol and declares the "init_foo" symbol
                 // for similar reasons to the CommonJS closure above.
-                const esm_parts = c.topLevelSymbolsToPartsForRuntime(c.esm_runtime_ref);
+                const esm_parts = if (wrapper_ref.isValid())
+                    c.topLevelSymbolsToPartsForRuntime(c.esm_runtime_ref)
+                else
+                    &.{};
 
                 // generate a dummy part that depends on the "__esm" symbol
                 const dependencies = c.allocator.alloc(js_ast.Dependency, esm_parts.len) catch unreachable;
@@ -10618,19 +10674,22 @@ const LinkerContext = struct {
                 ) catch unreachable;
                 bun.assert(part_index != js_ast.namespace_export_part_index);
                 wrapper_part_index.* = Index.part(part_index);
-                c.graph.generateSymbolImportAndUse(
-                    source_index,
-                    part_index,
-                    c.esm_runtime_ref,
-                    1,
-                    Index.runtime,
-                ) catch unreachable;
+
+                if (wrapper_ref.isValid()) {
+                    c.graph.generateSymbolImportAndUse(
+                        source_index,
+                        part_index,
+                        c.esm_runtime_ref,
+                        1,
+                        Index.runtime,
+                    ) catch unreachable;
+                }
             },
             else => {},
         }
     }
 
-    pub fn advanceImportTracker(c: *LinkerContext, tracker: *ImportTracker) ImportTracker.Iterator {
+    pub fn advanceImportTracker(c: *LinkerContext, tracker: *const ImportTracker) ImportTracker.Iterator {
         const id = tracker.source_index.get();
         var named_imports: *JSAst.NamedImports = &c.graph.ast.items(.named_imports)[id];
         var import_records = c.graph.ast.items(.import_records)[id];
@@ -10643,7 +10702,6 @@ const LinkerContext = struct {
             return .{
             .value = .{},
             .status = .external,
-            .tracker = tracker,
         };
 
         // Is this an external file?
@@ -10652,7 +10710,6 @@ const LinkerContext = struct {
             return .{
                 .value = .{},
                 .status = .external,
-                .tracker = tracker,
             };
         }
 
@@ -10666,7 +10723,6 @@ const LinkerContext = struct {
                     .source_index = record.source_index,
                 },
                 .status = .disabled,
-                .tracker = tracker,
             };
         }
 
@@ -10688,7 +10744,6 @@ const LinkerContext = struct {
                     .import_ref = Ref.None,
                 },
                 .status = .cjs_without_exports,
-                .tracker = tracker,
             };
         }
         const other_kind = exports_kind[other_id];
@@ -10700,7 +10755,6 @@ const LinkerContext = struct {
                     .import_ref = Ref.None,
                 },
                 .status = .cjs,
-                .tracker = tracker,
             };
         }
 
@@ -10713,7 +10767,6 @@ const LinkerContext = struct {
                     .value = matching_export.data,
                     .status = .found,
                     .import_data = matching_export.potentially_ambiguous_export_star_refs.slice(),
-                    .tracker = tracker,
                 };
             }
         }
@@ -10729,7 +10782,6 @@ const LinkerContext = struct {
                 },
                 .status = .found,
                 .import_data = matching_export.potentially_ambiguous_export_star_refs.slice(),
-                .tracker = tracker,
             };
         }
 
@@ -10745,7 +10797,6 @@ const LinkerContext = struct {
                     .dynamic_fallback_interop_default
                 else
                     .dynamic_fallback,
-                .tracker = tracker,
             };
         }
 
@@ -10755,7 +10806,6 @@ const LinkerContext = struct {
             return .{
                 .value = .{},
                 .status = .probably_typescript_type,
-                .tracker = tracker,
             };
         }
 
@@ -10764,7 +10814,6 @@ const LinkerContext = struct {
                 .source_index = Index.source(other_source_index),
             },
             .status = .no_match,
-            .tracker = tracker,
         };
     }
 
@@ -10798,15 +10847,12 @@ const LinkerContext = struct {
 
             const import_ref = ref;
 
-            var import_tracker = ImportData{
-                .data = .{
+            var re_exports = std.ArrayList(js_ast.Dependency).init(c.allocator);
+            const result = c.matchImportWithExport(
+                .{
                     .source_index = Index.source(source_index),
                     .import_ref = import_ref,
                 },
-            };
-            var re_exports = std.ArrayList(js_ast.Dependency).init(c.allocator);
-            const result = c.matchImportWithExport(
-                &import_tracker.data,
                 &re_exports,
             );
 
@@ -10924,14 +10970,13 @@ const LinkerContext = struct {
                 if (i == source_index)
                     return;
             }
-
-            this.source_index_stack.append(source_index) catch unreachable;
+            this.source_index_stack.append(source_index) catch bun.outOfMemory();
             const stack_end_pos = this.source_index_stack.items.len;
-            const id = source_index;
+            defer this.source_index_stack.shrinkRetainingCapacity(stack_end_pos - 1);
 
-            const import_records = this.import_records_list[id].slice();
+            const import_records = this.import_records_list[source_index].slice();
 
-            for (this.export_star_records[id]) |import_id| {
+            for (this.export_star_records[source_index]) |import_id| {
                 const other_source_index = import_records[import_id].source_index.get();
 
                 const other_id = other_source_index;
@@ -10948,9 +10993,11 @@ const LinkerContext = struct {
                 // re-exports as property accesses off of a generated require() call.
                 if (this.exports_kind[other_id] == .cjs)
                     continue;
+
                 var iter = this.named_exports[other_id].iterator();
                 next_export: while (iter.next()) |entry| {
                     const alias = entry.key_ptr.*;
+                    const name = entry.value_ptr.*;
 
                     // ES6 export star statements ignore exports named "default"
                     if (strings.eqlComptime(alias, "default"))
@@ -10962,34 +11009,35 @@ const LinkerContext = struct {
                             continue :next_export;
                         }
                     }
-                    const ref = entry.value_ptr.ref;
-                    var resolved = resolved_exports.getOrPut(this.allocator, entry.key_ptr.*) catch unreachable;
-                    if (!resolved.found_existing) {
-                        resolved.value_ptr.* = .{
+
+                    const gop = resolved_exports.getOrPut(this.allocator, alias) catch bun.outOfMemory();
+                    if (!gop.found_existing) {
+                        // Initialize the re-export
+                        gop.value_ptr.* = .{
                             .data = .{
-                                .import_ref = ref,
+                                .import_ref = name.ref,
                                 .source_index = Index.source(other_source_index),
-                                .name_loc = entry.value_ptr.alias_loc,
+                                .name_loc = name.alias_loc,
                             },
                         };
 
                         // Make sure the symbol is marked as imported so that code splitting
                         // imports it correctly if it ends up being shared with another chunk
-                        this.imports_to_bind[id].put(this.allocator, entry.value_ptr.ref, .{
+                        this.imports_to_bind[source_index].put(this.allocator, name.ref, .{
                             .data = .{
-                                .import_ref = ref,
+                                .import_ref = name.ref,
                                 .source_index = Index.source(other_source_index),
                             },
-                        }) catch unreachable;
-                    } else if (resolved.value_ptr.data.source_index.get() != other_source_index) {
+                        }) catch bun.outOfMemory();
+                    } else if (gop.value_ptr.data.source_index.get() != other_source_index) {
                         // Two different re-exports colliding makes it potentially ambiguous
-                        resolved.value_ptr.potentially_ambiguous_export_star_refs.push(this.allocator, .{
+                        gop.value_ptr.potentially_ambiguous_export_star_refs.push(this.allocator, .{
                             .data = .{
                                 .source_index = Index.source(other_source_index),
-                                .import_ref = ref,
-                                .name_loc = entry.value_ptr.alias_loc,
+                                .import_ref = name.ref,
+                                .name_loc = name.alias_loc,
                             },
-                        }) catch unreachable;
+                        }) catch bun.outOfMemory();
                     }
                 }
 
@@ -11236,7 +11284,6 @@ pub const ImportTracker = struct {
         status: Status = Status.no_match,
         value: ImportTracker = .{},
         import_data: []ImportData = &.{},
-        tracker: *ImportTracker,
     };
 };
 
diff --git a/src/c.zig b/src/c.zig
index 244172ed03..ff9226a660 100644
--- a/src/c.zig
+++ b/src/c.zig
@@ -104,7 +104,6 @@ pub fn lstat_absolute(path: [:0]const u8) !Stat {
 
 // renameatZ fails when renaming across mount points
 // we assume that this is relatively uncommon
-// TODO: change types to use `bun.FileDescriptor`
 pub fn moveFileZ(from_dir: bun.FileDescriptor, filename: [:0]const u8, to_dir: bun.FileDescriptor, destination: [:0]const u8) !void {
     switch (bun.sys.renameatConcurrentlyWithoutFallback(from_dir, filename, to_dir, destination)) {
         .err => |err| {
diff --git a/src/cli.zig b/src/cli.zig
index 6c74ac63e1..d7135e3612 100644
--- a/src/cli.zig
+++ b/src/cli.zig
@@ -70,6 +70,19 @@ pub const Cli = struct {
     pub threadlocal var is_main_thread: bool = false;
 };
 
+pub const debug_flags = if (Environment.isDebug) struct {
+    var resolve_breakpoints: []const []const u8 = &.{};
+
+    pub fn hasResolveBreakpoint(str: []const u8) bool {
+        for (resolve_breakpoints) |bp| {
+            if (strings.contains(str, bp)) {
+                return true;
+            }
+        }
+        return false;
+    }
+} else @compileError("Do not access this namespace []const u8; in a release build");
+
 const LoaderMatcher = strings.ExactSizeMatcher(4);
 const ColonListType = @import("./cli/colon_list_type.zig").ColonListType;
 pub const LoaderColonList = ColonListType(Api.Loader, Arguments.loader_resolver);
@@ -146,7 +159,7 @@ pub const Arguments = struct {
 
     pub const ParamType = clap.Param(clap.Help);
 
-    const base_params_ = [_]ParamType{
+    const base_params_ = (if (Environment.isDebug) debug_params else [_]ParamType{}) ++ [_]ParamType{
         clap.parseParam("--env-file <STR>...               Load environment variables from the specified file(s)") catch unreachable,
         clap.parseParam("--cwd <STR>                       Absolute path to resolve files & entry points from. This just changes the process' cwd.") catch unreachable,
         clap.parseParam("-c, --config <PATH>?              Specify path to Bun config file. Default <d>$cwd<r>/bunfig.toml") catch unreachable,
@@ -157,6 +170,10 @@ pub const Arguments = struct {
         clap.parseParam("--verbose-error-trace") catch unreachable,
     } else [_]ParamType{};
 
+    const debug_params = [_]ParamType{
+        clap.parseParam("--breakpoint-resolve <STR>...     DEBUG MODE: breakpoint when resolving something that includes this string") catch unreachable,
+    };
+
     const transpiler_params_ = [_]ParamType{
         clap.parseParam("--main-fields <STR>...            Main fields to lookup in package.json. Defaults to --target dependent") catch unreachable,
         clap.parseParam("--extension-order <STR>...        Defaults to: .tsx,.ts,.jsx,.js,.json ") catch unreachable,
@@ -189,6 +206,7 @@ pub const Arguments = struct {
         clap.parseParam("-p, --port <STR>                  Set the default port for Bun.serve") catch unreachable,
         clap.parseParam("-u, --origin <STR>") catch unreachable,
         clap.parseParam("--conditions <STR>...             Pass custom conditions to resolve") catch unreachable,
+        clap.parseParam("--fetch-preconnect <STR>...       Preconnect to a URL while code is loading") catch unreachable,
     };
 
     const auto_or_run_params = [_]ParamType{
@@ -632,6 +650,8 @@ pub const Arguments = struct {
             }
             ctx.runtime_options.if_present = args.flag("--if-present");
             ctx.runtime_options.smol = args.flag("--smol");
+            ctx.runtime_options.preconnect = args.options("--fetch-preconnect");
+
             if (args.option("--inspect")) |inspect_flag| {
                 ctx.runtime_options.debugger = if (inspect_flag.len == 0)
                     Command.Debugger{ .enable = .{} }
@@ -959,6 +979,10 @@ pub const Arguments = struct {
             }
         }
 
+        if (Environment.isDebug) {
+            debug_flags.resolve_breakpoints = args.options("--breakpoint-resolve");
+        }
+
         return opts;
     }
 };
@@ -1045,7 +1069,7 @@ pub const HelpCommand = struct {
         \\  <b><blue>update<r>    <d>{s:<16}<r>     Update outdated dependencies
         \\  <b><blue>link<r>      <d>[\<package\>]<r>          Register or link a local npm package
         \\  <b><blue>unlink<r>                         Unregister a local npm package
-        \\  <b><blue>patch <d>\<pkg\><r>                     Prepare a package for patching
+        \\  <b><blue>patch <d>\<pkg\><r>                    Prepare a package for patching
         \\  <b><blue>pm <d>\<subcommand\><r>                Additional package management utilities
         \\
         \\  <b><yellow>build<r>     <d>./a.ts ./b.jsx<r>       Bundle TypeScript & JavaScript into a single file
@@ -1207,16 +1231,11 @@ pub const Command = struct {
             script: []const u8 = "",
             eval_and_print: bool = false,
         } = .{},
+        preconnect: []const []const u8 = &[_][]const u8{},
     };
 
     var global_cli_ctx: Context = undefined;
-
-    var context_data: ContextData = ContextData{
-        .args = std.mem.zeroes(Api.TransformOptions),
-        .log = undefined,
-        .start_time = 0,
-        .allocator = undefined,
-    };
+    var context_data: ContextData = undefined;
 
     pub const init = ContextData.create;
 
@@ -1260,10 +1279,13 @@ pub const Command = struct {
 
         pub fn create(allocator: std.mem.Allocator, log: *logger.Log, comptime command: Command.Tag) anyerror!Context {
             Cli.cmd = command;
+            context_data = .{
+                .args = std.mem.zeroes(Api.TransformOptions),
+                .log = log,
+                .start_time = start_time,
+                .allocator = allocator,
+            };
             global_cli_ctx = &context_data;
-            global_cli_ctx.log = log;
-            global_cli_ctx.start_time = start_time;
-            global_cli_ctx.allocator = allocator;
 
             if (comptime Command.Tag.uses_global_options.get(command)) {
                 global_cli_ctx.args = try Arguments.parse(allocator, global_cli_ctx, command);
diff --git a/src/cli/create_command.zig b/src/cli/create_command.zig
index aaf2f44cf4..870360f506 100644
--- a/src/cli/create_command.zig
+++ b/src/cli/create_command.zig
@@ -1811,7 +1811,6 @@ pub const Example = struct {
 
     const examples_url: string = "https://registry.npmjs.org/bun-examples-all/latest";
     var url: URL = undefined;
-    pub const timeout: u32 = 6000;
 
     var app_name_buf: [512]u8 = undefined;
     pub fn print(examples: []const Example, default_app_name: ?string) void {
@@ -1977,7 +1976,6 @@ pub const Example = struct {
             headers_buf,
             mutable,
             "",
-            60 * std.time.ns_per_min,
             http_proxy,
             null,
             HTTP.FetchRedirect.follow,
@@ -2055,7 +2053,6 @@ pub const Example = struct {
             "",
             mutable,
             "",
-            60 * std.time.ns_per_min,
             http_proxy,
             null,
             HTTP.FetchRedirect.follow,
@@ -2145,7 +2142,6 @@ pub const Example = struct {
             "",
             mutable,
             "",
-            60 * std.time.ns_per_min,
             http_proxy,
             null,
             HTTP.FetchRedirect.follow,
@@ -2188,7 +2184,6 @@ pub const Example = struct {
             "",
             mutable,
             "",
-            60 * std.time.ns_per_min,
             http_proxy,
             null,
             HTTP.FetchRedirect.follow,
diff --git a/src/cli/exec_command.zig b/src/cli/exec_command.zig
index de51c9c20d..5ea2fd36cc 100644
--- a/src/cli/exec_command.zig
+++ b/src/cli/exec_command.zig
@@ -50,7 +50,7 @@ pub const ExecCommand = struct {
         //         Output.flush();
         //     }
 
-        Global.exitWide(code);
+        Global.exit(code);
         // }
     }
 };
diff --git a/src/cli/package_manager_command.zig b/src/cli/package_manager_command.zig
index 55631722ef..226d59d1c2 100644
--- a/src/cli/package_manager_command.zig
+++ b/src/cli/package_manager_command.zig
@@ -61,7 +61,8 @@ pub const PackageManagerCommand = struct {
         @memcpy(lockfile_buffer[0..lockfile_.len], lockfile_);
         lockfile_buffer[lockfile_.len] = 0;
         const lockfile = lockfile_buffer[0..lockfile_.len :0];
-        var pm = try PackageManager.init(ctx, PackageManager.Subcommand.pm);
+        const cli = try PackageManager.CommandLineArguments.parse(ctx.allocator, .pm);
+        var pm = try PackageManager.init(ctx, cli, PackageManager.Subcommand.pm);
 
         const load_lockfile = pm.lockfile.loadFromDisk(pm, ctx.allocator, ctx.log, lockfile, true);
         handleLoadLockfileErrors(load_lockfile, pm);
@@ -120,8 +121,8 @@ pub const PackageManagerCommand = struct {
     pub fn exec(ctx: Command.Context) !void {
         var args = try std.process.argsAlloc(ctx.allocator);
         args = args[1..];
-
-        var pm = PackageManager.init(ctx, PackageManager.Subcommand.pm) catch |err| {
+        const cli = try PackageManager.CommandLineArguments.parse(ctx.allocator, .pm);
+        var pm = PackageManager.init(ctx, cli, PackageManager.Subcommand.pm) catch |err| {
             if (err == error.MissingPackageJSON) {
                 var cwd_buf: bun.PathBuffer = undefined;
                 if (bun.getcwd(&cwd_buf)) |cwd| {
diff --git a/src/cli/run_command.zig b/src/cli/run_command.zig
index 846c149f06..5e8abbe276 100644
--- a/src/cli/run_command.zig
+++ b/src/cli/run_command.zig
@@ -328,7 +328,7 @@ pub const RunCommand = struct {
                     Output.flush();
                 }
 
-                Global.exitWide(code);
+                Global.exit(code);
             }
 
             return true;
@@ -578,8 +578,7 @@ pub const RunCommand = struct {
                             });
                         }
 
-                        Output.flush();
-                        Global.raiseIgnoringPanicHandler(@intFromEnum(signal));
+                        Global.raiseIgnoringPanicHandler(signal);
                     },
 
                     .exited => |exit_code| {
@@ -592,8 +591,7 @@ pub const RunCommand = struct {
                                 });
                             }
 
-                            Output.flush();
-                            Global.raiseIgnoringPanicHandler(@intFromEnum(exit_code.signal));
+                            Global.raiseIgnoringPanicHandler(exit_code.signal);
                         }
 
                         const code = exit_code.code;
diff --git a/src/cli/test_command.zig b/src/cli/test_command.zig
index ebf9ef5b06..39a3558f41 100644
--- a/src/cli/test_command.zig
+++ b/src/cli/test_command.zig
@@ -598,7 +598,7 @@ const Scanner = struct {
         };
 
         // always ignore node_modules.
-        if (strings.contains(slice, "/" ++ "node_modules" ++ "/")) {
+        if (strings.contains(slice, "/node_modules/") or strings.contains(slice, "\\node_modules\\")) {
             return false;
         }
 
@@ -1105,7 +1105,7 @@ pub const TestCommand = struct {
         if (reporter.summary.fail > 0 or (coverage.enabled and coverage.fractions.failing and coverage.fail_on_low_coverage)) {
             Global.exit(1);
         } else if (reporter.jest.unhandled_errors_between_tests > 0) {
-            Global.exitWide(@intCast(reporter.jest.unhandled_errors_between_tests));
+            Global.exit(reporter.jest.unhandled_errors_between_tests);
         }
     }
 
diff --git a/src/cli/upgrade_command.zig b/src/cli/upgrade_command.zig
index 2f731d6701..0c5ba5c28e 100644
--- a/src/cli/upgrade_command.zig
+++ b/src/cli/upgrade_command.zig
@@ -163,7 +163,6 @@ pub const UpgradeCheckerThread = struct {
 };
 
 pub const UpgradeCommand = struct {
-    pub const timeout: u32 = 30000;
     const default_github_headers: string = "Acceptapplication/vnd.github.v3+json";
     var github_repository_url_buf: bun.PathBuffer = undefined;
     var current_executable_buf: bun.PathBuffer = undefined;
@@ -245,7 +244,6 @@ pub const UpgradeCommand = struct {
             headers_buf,
             &metadata_body,
             "",
-            60 * std.time.ns_per_min,
             http_proxy,
             null,
             HTTP.FetchRedirect.follow,
@@ -528,12 +526,10 @@ pub const UpgradeCommand = struct {
                 "",
                 zip_file_buffer,
                 "",
-                timeout,
                 http_proxy,
                 null,
                 HTTP.FetchRedirect.follow,
             );
-            async_http.client.timeout = timeout;
             async_http.client.progress_node = progress;
             async_http.client.reject_unauthorized = env_loader.getTLSRejectUnauthorized();
 
diff --git a/src/codegen/bundle-functions.ts b/src/codegen/bundle-functions.ts
index dfc66b8368..79f4d2e956 100644
--- a/src/codegen/bundle-functions.ts
+++ b/src/codegen/bundle-functions.ts
@@ -8,13 +8,19 @@
 // library, instead of RegExp hacks.
 //
 // For explanation on this, please nag @paperdave to write documentation on how everything works.
+//
+// The output is intended to be similar to what WebCore does internally with a couple differences:
+//
+// - We concatenate all the sources into one big string, which then createsa
+// single JSC::SourceProvider and pass start/end positions to each function's
+// JSC::SourceCode. JSC does this, but WebCore does not seem to.
 import { readdirSync, rmSync } from "fs";
 import path from "path";
 import { sliceSourceCode } from "./builtin-parser";
-import { applyGlobalReplacements, define } from "./replacements";
-import { cap, fmtCPPCharArray, low, writeIfNotChanged } from "./helpers";
 import { createAssertClientJS, createLogClientJS } from "./client-js";
 import { getJS2NativeDTS } from "./generate-js2native";
+import { addCPPCharArray, cap, low, writeIfNotChanged } from "./helpers";
+import { applyGlobalReplacements, define } from "./replacements";
 
 const PARALLEL = false;
 const KEEP_TMP = true;
@@ -52,6 +58,7 @@ interface BundledBuiltin {
   source: string;
   params: string[];
   visibility: string;
+  sourceOffset: number;
 }
 
 /**
@@ -228,6 +235,10 @@ $$capture_start$$(${fn.async ? "async " : ""}${
       constructKind: fn.directives.ConstructKind ?? "None",
       isLinkTimeConstant: !!fn.directives.linkTimeConstant,
       intrinsic: fn.directives.intrinsic ?? "NoIntrinsic",
+
+      // Not known yet.
+      sourceOffset: 0,
+
       overriddenName: fn.directives.getter
         ? `"get ${fn.name}"_s`
         : fn.directives.overriddenName
@@ -275,6 +286,34 @@ export async function bundleBuiltinFunctions({ requireTransformer }: BundleBuilt
     }
   }
 
+  let combinedSourceCodeChars = "";
+  let combinedSourceCodeLength = 0;
+  // Compute source offsets
+  {
+    for (const { basename, functions } of files) {
+      for (const fn of functions) {
+        fn.sourceOffset = combinedSourceCodeLength;
+        combinedSourceCodeLength += fn.source.length;
+        if (combinedSourceCodeChars && !combinedSourceCodeChars.endsWith(",")) {
+          combinedSourceCodeChars += ",";
+        }
+        combinedSourceCodeChars += addCPPCharArray(fn.source, false);
+
+        // If you want to see the individual function sources:
+        // if (true) {
+        //   Bun.write(CODEGEN_DIR + "/functions/" + low(basename) + cap(fn.name) + ".js", fn.source + "\n");
+        // }
+      }
+    }
+  }
+
+  let additionalPrivateNames = new Set();
+
+  function privateName(name) {
+    additionalPrivateNames.add(name);
+    return "builtinNames." + name + "PrivateName()";
+  }
+
   // C++ codegen
   let bundledCPP = `// Generated by ${import.meta.path}
     namespace Zig { class GlobalObject; }
@@ -283,48 +322,78 @@ export async function bundleBuiltinFunctions({ requireTransformer }: BundleBuilt
     #include "JSDOMGlobalObject.h"
     #include "WebCoreJSClientData.h"
     #include <JavaScriptCore/JSObjectInlines.h>
-    
+    #include "BunBuiltinNames.h"
+
     namespace WebCore {
-    
+        static const LChar combinedSourceCodeBuffer[${combinedSourceCodeLength + 1}] = { ${combinedSourceCodeChars}, 0 };
+        static const std::span<const LChar> internalCombinedSource = { combinedSourceCodeBuffer, ${combinedSourceCodeLength} };  
     `;
 
   for (const { basename, functions } of files) {
-    bundledCPP += `/* ${basename}.ts */\n`;
+    bundledCPP += `
+#pragma mark ${basename}
+`;
+
     const lowerBasename = low(basename);
     for (const fn of functions) {
-      const [code, count] = fmtCPPCharArray(fn.source, true);
-      const name = `${lowerBasename}${cap(fn.name)}Code`;
-      bundledCPP += `// ${fn.name}
-    const JSC::ConstructAbility s_${name}ConstructAbility = JSC::ConstructAbility::${fn.constructAbility};
-    const JSC::InlineAttribute s_${name}InlineAttribute = JSC::InlineAttribute::${
-      fn.directives.alwaysInline ? "Always" : "None"
-    };
-    const JSC::ConstructorKind s_${name}ConstructorKind = JSC::ConstructorKind::${fn.constructKind};
-    const JSC::ImplementationVisibility s_${name}ImplementationVisibility = JSC::ImplementationVisibility::${
-      fn.visibility
-    };
-    const int s_${name}Length = ${fn.source.length};
-    const JSC::Intrinsic s_${name}Intrinsic = JSC::NoIntrinsic;
-    const char s_${name}Bytes[${count}] = ${code};
-    const char* s_${name} = s_${name}Bytes;
-    `;
+      const name = `${basename}${cap(fn.name)}`;
+      bundledCPP += `
+JSC::FunctionExecutable* ${lowerBasename}${cap(fn.name)}CodeGenerator(JSC::VM& vm)
+{
+    auto &builtins = static_cast<JSVMClientData*>(vm.clientData)->builtinFunctions().${lowerBasename}Builtins();
+    auto *executable = builtins.${lowerBasename}${cap(fn.name)}CodeExecutable();
+    return executable->link(vm, nullptr, builtins.${lowerBasename}${cap(fn.name)}CodeSource(), std::nullopt, JSC::NoIntrinsic);
+}
+`;
     }
-    bundledCPP += `#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, overriddenName, argumentCount) \\
-    JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \\
-    {\\
-        JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \\
-        return clientData->builtinFunctions().${lowerBasename}Builtins().codeName##Executable()->link(vm, nullptr, clientData->builtinFunctions().${lowerBasename}Builtins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \\
+  }
+
+  const initializeSourceCodeFn = (fn: BundledBuiltin, basename: string) => {
+    const name = `${low(basename)}${cap(fn.name)}CodeSource`;
+    return `m_${name}(SourceCode(sourceProvider.copyRef(), ${fn.sourceOffset}, ${fn.source.length + fn.sourceOffset}, 1, 1))`;
+  };
+  for (const { basename, internal, functions } of files) {
+    bundledCPP += `
+#pragma mark ${basename}
+
+${basename}BuiltinsWrapper::${basename}BuiltinsWrapper(JSC::VM& vm, RefPtr<JSC::SourceProvider> sourceProvider, BunBuiltinNames &builtinNames)
+    : m_vm(vm)`;
+
+    if (internal) {
+      bundledCPP += `, ${functions.map(fn => `m_${fn.name}PrivateName(${privateName(fn.name)})`).join(",\n   ")}`;
     }
-    WEBCORE_FOREACH_${basename.toUpperCase()}_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
-    #undef DEFINE_BUILTIN_GENERATOR
-    
-    `;
+    bundledCPP += `, ${functions.map(fn => initializeSourceCodeFn(fn, basename)).join(",\n   ")} {}
+`;
   }
 
+  bundledCPP += `
+RefPtr<JSC::SourceProvider> createBuiltinsSourceProvider() {
+    return JSC::StringSourceProvider::create(StringImpl::createWithoutCopying(internalCombinedSource), SourceOrigin(), String(), SourceTaintedOrigin());  
+}
+`;
+
+  bundledCPP += `
+JSBuiltinFunctions::JSBuiltinFunctions(JSC::VM& vm, RefPtr<JSC::SourceProvider> provider, BunBuiltinNames& builtinNames) : m_vm(vm), 
+  ${files.map(({ basename }) => `m_${low(basename)}Builtins(vm, provider, builtinNames)`).join(", ")}
+{}
+
+void JSBuiltinFunctions::exportNames() {
+`;
+
+  for (const { basename, internal } of files) {
+    if (internal) {
+      bundledCPP += `     m_${low(basename)}Builtins.exportNames();\n`;
+    }
+  }
+
+  bundledCPP += `    
+}
+
+`;
+
   bundledCPP += `
     
-    JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
-        : m_vm(vm)
+JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm) : m_vm(vm)
     `;
 
   for (const { basename, internal } of files) {
@@ -333,10 +402,9 @@ export async function bundleBuiltinFunctions({ requireTransformer }: BundleBuilt
     }
   }
 
-  bundledCPP += `
-    {
-        UNUSED_PARAM(vm);
-    }
+  bundledCPP += `{
+      UNUSED_PARAM(vm);
+  }
     
     template<typename Visitor>
     void JSBuiltinInternalFunctions::visit(Visitor& visitor)
@@ -417,12 +485,10 @@ export async function bundleBuiltinFunctions({ requireTransformer }: BundleBuilt
       const name = `${lowerBasename}${cap(fn.name)}Code`;
       bundledHeader += `// ${fn.name}
     #define WEBCORE_BUILTIN_${basename.toUpperCase()}_${fn.name.toUpperCase()} 1
-    extern const char* s_${name};
-    extern const int s_${name}Length;
-    extern const JSC::ConstructAbility s_${name}ConstructAbility;
-    extern const JSC::InlineAttribute s_${name}InlineAttribute;
-    extern const JSC::ConstructorKind s_${name}ConstructorKind;
-    extern const JSC::ImplementationVisibility s_${name}ImplementationVisibility;
+    static constexpr JSC::ConstructAbility s_${name}ConstructAbility = JSC::ConstructAbility::${fn.constructAbility};
+    static constexpr JSC::InlineAttribute s_${name}InlineAttribute = JSC::InlineAttribute::${fn.directives.alwaysInline ? "Always" : "None"};
+    static constexpr JSC::ConstructorKind s_${name}ConstructorKind = JSC::ConstructorKind::${fn.constructKind};
+    static constexpr JSC::ImplementationVisibility s_${name}ImplementationVisibility = JSC::ImplementationVisibility::${fn.visibility};
     
     `;
     }
@@ -450,14 +516,7 @@ export async function bundleBuiltinFunctions({ requireTransformer }: BundleBuilt
     
     class ${basename}BuiltinsWrapper : private JSC::WeakHandleOwner {
     public:
-        explicit ${basename}BuiltinsWrapper(JSC::VM& vm)
-            : m_vm(vm)
-            WEBCORE_FOREACH_${basename.toUpperCase()}_BUILTIN_FUNCTION_NAME(INITIALIZE_BUILTIN_NAMES)
-    #define INITIALIZE_BUILTIN_SOURCE_MEMBERS(name, functionName, overriddenName, length) , m_##name##Source(JSC::makeSource(StringImpl::createWithoutCopying({reinterpret_cast<const LChar*>(s_##name), static_cast<size_t>(length)}), { }, JSC::SourceTaintedOrigin::Untainted))
-            WEBCORE_FOREACH_${basename.toUpperCase()}_BUILTIN_CODE(INITIALIZE_BUILTIN_SOURCE_MEMBERS)
-    #undef INITIALIZE_BUILTIN_SOURCE_MEMBERS
-        {
-        }
+        explicit ${basename}BuiltinsWrapper(JSC::VM& vm, RefPtr<JSC::SourceProvider> sourceProvider, BunBuiltinNames &builtinNames);
     
     #define EXPOSE_BUILTIN_EXECUTABLES(name, functionName, overriddenName, length) \\
         JSC::UnlinkedFunctionExecutable* name##Executable(); \\
@@ -544,25 +603,9 @@ export async function bundleBuiltinFunctions({ requireTransformer }: BundleBuilt
   }
   bundledHeader += `class JSBuiltinFunctions {
     public:
-        explicit JSBuiltinFunctions(JSC::VM& vm)
-            : m_vm(vm)
-    `;
-
-  for (const { basename } of files) {
-    bundledHeader += `        , m_${low(basename)}Builtins(m_vm)\n`;
-  }
-
-  bundledHeader += `
-      {
-    `;
-
-  for (const { basename, internal } of files) {
-    if (internal) {
-      bundledHeader += `        m_${low(basename)}Builtins.exportNames();\n`;
-    }
-  }
-
-  bundledHeader += `    }
+        explicit JSBuiltinFunctions(JSC::VM& vm, RefPtr<JSC::SourceProvider> provider, BunBuiltinNames &builtinNames);
+        void exportNames();
+            
     `;
 
   for (const { basename } of files) {
@@ -613,7 +656,53 @@ export async function bundleBuiltinFunctions({ requireTransformer }: BundleBuilt
     
     } // namespace WebCore
     `;
+  // Handle builtin names
+  {
+    const BunBuiltinNamesHeader = require("fs").readFileSync(
+      path.join(import.meta.dir, "../js/builtins/BunBuiltinNames.h"),
+      "utf8",
+    );
+    let definedBuiltinNamesStartI = BunBuiltinNamesHeader.indexOf(
+      "#define BUN_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME",
+    );
+    let definedBuiltinNamesMacroEndI = BunBuiltinNamesHeader.indexOf(
+      "--- END of BUN_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME ---",
+    );
+    const definedBuiltinNames = BunBuiltinNamesHeader.slice(definedBuiltinNamesStartI, definedBuiltinNamesMacroEndI)
+      .split("\n")
+      .map(x => x.trim())
+      .filter(x => x.startsWith("macro("))
+      .map(x => x.slice(x.indexOf("(") + 1, x.indexOf(")")))
+      .map(x => x.trim())
+      .sort();
 
+    const uniqueDefinedBuiltinNames = new Set();
+    for (let name of definedBuiltinNames) {
+      const prevSize = uniqueDefinedBuiltinNames.size;
+      uniqueDefinedBuiltinNames.add(name);
+      if (uniqueDefinedBuiltinNames.size === prevSize) {
+        throw new Error(`Duplicate private name "${name}" in BunBuiltinNames.h`);
+      }
+    }
+    for (let additionalPrivateName of additionalPrivateNames) {
+      if (uniqueDefinedBuiltinNames.has(additionalPrivateName)) {
+        additionalPrivateNames.delete(additionalPrivateName);
+      }
+    }
+
+    let additionalPrivateNamesHeader = `// Generated by ${import.meta.path}
+#pragma once
+
+#ifndef BUN_ADDITIONAL_BUILTIN_NAMES
+#define BUN_ADDITIONAL_BUILTIN_NAMES(macro) \\
+  ${Array.from(additionalPrivateNames)
+    .map(x => `macro(${x})`)
+    .join(" \\\n  ")}
+#endif
+`;
+
+    writeIfNotChanged(path.join(CODEGEN_DIR, "BunBuiltinNames+extras.h"), additionalPrivateNamesHeader);
+  }
   writeIfNotChanged(path.join(CODEGEN_DIR, "WebCoreJSBuiltins.h"), bundledHeader);
   writeIfNotChanged(path.join(CODEGEN_DIR, "WebCoreJSBuiltins.cpp"), bundledCPP);
 
diff --git a/src/codegen/helpers.ts b/src/codegen/helpers.ts
index 04f436c25f..a97007b767 100644
--- a/src/codegen/helpers.ts
+++ b/src/codegen/helpers.ts
@@ -18,7 +18,17 @@ export function fmtCPPCharArray(str: string, nullTerminated: boolean = true) {
       .join(",") +
     (nullTerminated ? ",0" : "") +
     "}";
-  return [chars, normalized.length + (nullTerminated ? 1 : 0)];
+  return [chars, normalized.length + (nullTerminated ? 1 : 0)] as const;
+}
+
+export function addCPPCharArray(str: string, nullTerminated: boolean = true) {
+  const normalized = str.trim() + "\n";
+  return (
+    normalized
+      .split("")
+      .map(a => a.charCodeAt(0))
+      .join(",") + (nullTerminated ? ",0" : "")
+  );
 }
 
 export function declareASCIILiteral(name: string, value: string) {
diff --git a/src/compile_target.zig b/src/compile_target.zig
index 0a8ec3ff79..e3330614e7 100644
--- a/src/compile_target.zig
+++ b/src/compile_target.zig
@@ -153,7 +153,6 @@ pub fn downloadToPath(this: *const CompileTarget, env: *bun.DotEnv.Loader, alloc
         {
             var progress = refresher.start("Downloading", 0);
             defer progress.end();
-            const timeout = 30000;
             const http_proxy: ?bun.URL = env.getHttpProxy(url);
 
             async_http.* = HTTP.AsyncHTTP.initSync(
@@ -164,12 +163,10 @@ pub fn downloadToPath(this: *const CompileTarget, env: *bun.DotEnv.Loader, alloc
                 "",
                 compressed_archive_bytes,
                 "",
-                timeout,
                 http_proxy,
                 null,
                 HTTP.FetchRedirect.follow,
             );
-            async_http.client.timeout = timeout;
             async_http.client.progress_node = progress;
             async_http.client.reject_unauthorized = env.getTLSRejectUnauthorized();
 
@@ -294,8 +291,10 @@ pub fn downloadToPath(this: *const CompileTarget, env: *bun.DotEnv.Loader, alloc
                             const dirname = bun.path.dirname(dest_z, .loose);
                             if (dirname.len > 0) {
                                 std.fs.cwd().makePath(dirname) catch {};
+                                continue;
                             }
-                            continue;
+
+                            // fallthrough, failed for another reason
                         }
                         node.end();
                         Output.err(err, "Failed to move cross-compiled bun binary into cache directory {}", .{bun.fmt.fmtPath(u8, dest_z, .{})});
diff --git a/src/crash_handler.zig b/src/crash_handler.zig
index ee608efef6..26e714efcf 100644
--- a/src/crash_handler.zig
+++ b/src/crash_handler.zig
@@ -51,7 +51,12 @@ var panic_mutex = std.Thread.Mutex{};
 threadlocal var panic_stage: usize = 0;
 
 /// This can be set by various parts of the codebase to indicate a broader
-/// action being taken, for example "Crashed while parsing /path/to/file.js"
+/// action being taken. It is printed when a crash happens, which can help
+/// narrow down what the bug is. Example: "Crashed while parsing /path/to/file.js"
+///
+/// Some of these are enabled in release builds, which may encourage users to
+/// attach the affected files to crash report. Others, which may have low crash
+/// rate or only crash due to assertion failures, are debug-only. See `Action`.
 pub threadlocal var current_action: ?Action = null;
 
 const CPUFeatures = @import("./bun.js/bindings/CPUFeatures.zig").CPUFeatures;
@@ -102,11 +107,54 @@ pub const Action = union(enum) {
     visit: []const u8,
     print: []const u8,
 
+    /// bun.bundle_v2.LinkerContext.generateCompileResultForJSChunk
+    bundle_generate_chunk: if (bun.Environment.isDebug) struct {
+        context: *const anyopaque, // unfortunate dependency loop workaround
+        chunk: *const bun.bundle_v2.Chunk,
+        part_range: *const bun.bundle_v2.PartRange,
+
+        pub fn linkerContext(data: *const @This()) *const bun.bundle_v2.LinkerContext {
+            return @ptrCast(@alignCast(data.context));
+        }
+    } else void,
+
+    resolver: if (bun.Environment.isDebug) struct {
+        source_dir: []const u8,
+        import_path: []const u8,
+        kind: bun.ImportKind,
+    } else void,
+
     pub fn format(act: Action, comptime _: []const u8, _: std.fmt.FormatOptions, writer: anytype) !void {
         switch (act) {
             .parse => |path| try writer.print("parsing {s}", .{path}),
             .visit => |path| try writer.print("visiting {s}", .{path}),
             .print => |path| try writer.print("printing {s}", .{path}),
+            .bundle_generate_chunk => |data| if (bun.Environment.isDebug) {
+                try writer.print(
+                    \\generating bundler chunk
+                    \\  chunk entry point: {s}
+                    \\  source: {s}
+                    \\  part range: {d}..{d}
+                ,
+                    .{
+                        data.linkerContext().graph.bundler_graph.input_files
+                            .items(.source)[data.chunk.entry_point.source_index]
+                            .path.text,
+                        data.linkerContext().graph.bundler_graph.input_files
+                            .items(.source)[data.part_range.source_index.get()]
+                            .path.text,
+                        data.part_range.part_index_begin,
+                        data.part_range.part_index_end,
+                    },
+                );
+            },
+            .resolver => |res| if (bun.Environment.isDebug) {
+                try writer.print("resolving {s} from {s} ({s})", .{
+                    res.import_path,
+                    res.source_dir,
+                    res.kind.label(),
+                });
+            },
         }
     }
 };
@@ -120,10 +168,6 @@ pub fn crashHandler(
 ) noreturn {
     @setCold(true);
 
-    // If a segfault happens while panicking, we want it to actually segfault, not trigger
-    // the handler.
-    resetSegfaultHandler();
-
     if (bun.Environment.isDebug)
         bun.Output.disableScopedDebugWriter();
 
@@ -149,7 +193,7 @@ pub fn crashHandler(
                 const writer = std.io.getStdErr().writer();
 
                 // The format of the panic trace is slightly different in debug
-                // builds Mainly, we demangle the backtrace immediately instead
+                // builds. Mainly, we demangle the backtrace immediately instead
                 // of using a trace string.
                 //
                 // To make the release-mode behavior easier to demo, debug mode
@@ -160,6 +204,9 @@ pub fn crashHandler(
                             break :check_flag false;
                         }
                     }
+                    // Act like release build when explicitly enabling reporting
+                    if (isReportingEnabled()) break :check_flag false;
+
                     break :check_flag true;
                 };
 
@@ -175,11 +222,10 @@ pub fn crashHandler(
                     }
                     writer.writeAll("oh no") catch std.posix.abort();
                     if (Output.enable_ansi_colors) {
-                        writer.writeAll(Output.prettyFmt("<r><d>: ", true)) catch std.posix.abort();
+                        writer.writeAll(Output.prettyFmt("<r><d>: multiple threads are crashing<r>\n", true)) catch std.posix.abort();
                     } else {
-                        writer.writeAll(Output.prettyFmt(": ", true)) catch std.posix.abort();
+                        writer.writeAll(Output.prettyFmt(": multiple threads are crashing\n", true)) catch std.posix.abort();
                     }
-                    writer.writeAll("multiple threads are crashing") catch std.posix.abort();
                 }
 
                 if (reason != .out_of_memory or debug_trace) {
@@ -234,6 +280,8 @@ pub fn crashHandler(
                 };
 
                 if (debug_trace) {
+                    has_printed_message = true;
+
                     dumpStackTrace(trace.*);
 
                     trace_str_buf.writer().print("{}", .{TraceString{
@@ -294,12 +342,22 @@ pub fn crashHandler(
                     writer.writeAll("\n") catch std.posix.abort();
                 }
             }
+
             // Be aware that this function only lets one thread return from it.
             // This is important so that we do not try to run the following reload logic twice.
             waitForOtherThreadToFinishPanicking();
 
             report(trace_str_buf.slice());
 
+            // At this point, the crash handler has performed it's job. Reset the segfault handler
+            // so that a crash will actually crash. We need this because we want the process to
+            // exit with a signal, and allow tools to be able to gather core dumps.
+            //
+            // This is done so late (in comparison to the Zig Standard Library's panic handler)
+            // because if multiple threads segfault (more often the case on Windows), we don't
+            // want another thread to interrupt the crashing of the first one.
+            resetSegfaultHandler();
+
             if (bun.auto_reload_on_crash and
                 // Do not reload if the panic arose FROM the reload function.
                 !bun.isProcessReloadInProgressOnAnotherThread())
@@ -319,6 +377,8 @@ pub fn crashHandler(
         inline 1, 2 => |t| {
             if (t == 1) {
                 panic_stage = 2;
+
+                resetSegfaultHandler();
                 Output.flush();
             }
             panic_stage = 3;
@@ -332,6 +392,7 @@ pub fn crashHandler(
         },
         3 => {
             // Panicked while printing "Panicked during a panic."
+            panic_stage = 4;
         },
         else => {
             // Panicked or otherwise looped into the panic handler while trying to exit.
@@ -721,6 +782,8 @@ pub fn init() void {
 }
 
 pub fn resetSegfaultHandler() void {
+    if (!enable) return;
+
     if (bun.Environment.os == .windows) {
         if (windows_segfault_handle) |handle| {
             const rc = windows.kernel32.RemoveVectoredExceptionHandler(handle);
@@ -851,6 +914,22 @@ fn waitForOtherThreadToFinishPanicking() void {
     }
 }
 
+/// This is to be called by any thread that is attempting to exit the process.
+/// If another thread is panicking, this will sleep this thread forever, under
+/// the assumption that the crash handler will terminate the program.
+///
+/// There have been situations in the past where a bundler thread starts
+/// panicking, but the main thread ends up marking a test as passing and then
+/// exiting with code zero before the crash handler can finish the crash.
+pub fn sleepForeverIfAnotherThreadIsCrashing() void {
+    if (panicking.load(.acquire) > 0) {
+        // Sleep forever without hammering the CPU
+        var futex = std.atomic.Value(u32).init(0);
+        while (true) std.Thread.Futex.wait(&futex, 0);
+        comptime unreachable;
+    }
+}
+
 /// Each platform is encoded as a single character. It is placed right after the
 /// slash after the version, so someone just reading the trace string can tell
 /// what platform it came from. L, M, and W are for Linux, macOS, and Windows,
@@ -1511,6 +1590,7 @@ pub const js_bindings = struct {
             .{ "panic", jsPanic },
             .{ "rootError", jsRootError },
             .{ "outOfMemory", jsOutOfMemory },
+            .{ "raiseIgnoringPanicHandler", jsRaiseIgnoringPanicHandler },
         }) |tuple| {
             const name = JSC.ZigString.static(tuple[0]);
             obj.put(global, name, JSC.createCallback(global, name, 1, tuple[1]));
@@ -1548,11 +1628,15 @@ pub const js_bindings = struct {
         bun.outOfMemory();
     }
 
+    pub fn jsRaiseIgnoringPanicHandler(_: *JSC.JSGlobalObject, _: *JSC.CallFrame) JSC.JSValue {
+        bun.Global.raiseIgnoringPanicHandler(.SIGSEGV);
+    }
+
     pub fn jsGetFeaturesAsVLQ(global: *JSC.JSGlobalObject, _: *JSC.CallFrame) JSC.JSValue {
         const bits = bun.Analytics.packedFeatures();
         var buf = std.BoundedArray(u8, 16){};
         writeU64AsTwoVLQs(buf.writer(), @bitCast(bits)) catch {
-            // there is definetly enough space in the bounded array
+            // there is definitely enough space in the bounded array
             unreachable;
         };
         return bun.String.createLatin1(buf.slice()).toJS(global);
diff --git a/src/darwin_c.zig b/src/darwin_c.zig
index 075b6c1852..a5b3a8721a 100644
--- a/src/darwin_c.zig
+++ b/src/darwin_c.zig
@@ -415,6 +415,75 @@ pub const SystemErrno = enum(u8) {
     };
 };
 
+pub const UV_E2BIG: i32 = @intFromEnum(SystemErrno.E2BIG);
+pub const UV_EACCES: i32 = @intFromEnum(SystemErrno.EACCES);
+pub const UV_EADDRINUSE: i32 = @intFromEnum(SystemErrno.EADDRINUSE);
+pub const UV_EADDRNOTAVAIL: i32 = @intFromEnum(SystemErrno.EADDRNOTAVAIL);
+pub const UV_EAFNOSUPPORT: i32 = @intFromEnum(SystemErrno.EAFNOSUPPORT);
+pub const UV_EAGAIN: i32 = @intFromEnum(SystemErrno.EAGAIN);
+pub const UV_EALREADY: i32 = @intFromEnum(SystemErrno.EALREADY);
+pub const UV_EBADF: i32 = @intFromEnum(SystemErrno.EBADF);
+pub const UV_EBUSY: i32 = @intFromEnum(SystemErrno.EBUSY);
+pub const UV_ECANCELED: i32 = @intFromEnum(SystemErrno.ECANCELED);
+pub const UV_ECHARSET: i32 = -bun.windows.libuv.UV__ECHARSET;
+pub const UV_ECONNABORTED: i32 = @intFromEnum(SystemErrno.ECONNABORTED);
+pub const UV_ECONNREFUSED: i32 = @intFromEnum(SystemErrno.ECONNREFUSED);
+pub const UV_ECONNRESET: i32 = @intFromEnum(SystemErrno.ECONNRESET);
+pub const UV_EDESTADDRREQ: i32 = @intFromEnum(SystemErrno.EDESTADDRREQ);
+pub const UV_EEXIST: i32 = @intFromEnum(SystemErrno.EEXIST);
+pub const UV_EFAULT: i32 = @intFromEnum(SystemErrno.EFAULT);
+pub const UV_EHOSTUNREACH: i32 = @intFromEnum(SystemErrno.EHOSTUNREACH);
+pub const UV_EINTR: i32 = @intFromEnum(SystemErrno.EINTR);
+pub const UV_EINVAL: i32 = @intFromEnum(SystemErrno.EINVAL);
+pub const UV_EIO: i32 = @intFromEnum(SystemErrno.EIO);
+pub const UV_EISCONN: i32 = @intFromEnum(SystemErrno.EISCONN);
+pub const UV_EISDIR: i32 = @intFromEnum(SystemErrno.EISDIR);
+pub const UV_ELOOP: i32 = @intFromEnum(SystemErrno.ELOOP);
+pub const UV_EMFILE: i32 = @intFromEnum(SystemErrno.EMFILE);
+pub const UV_EMSGSIZE: i32 = @intFromEnum(SystemErrno.EMSGSIZE);
+pub const UV_ENAMETOOLONG: i32 = @intFromEnum(SystemErrno.ENAMETOOLONG);
+pub const UV_ENETDOWN: i32 = @intFromEnum(SystemErrno.ENETDOWN);
+pub const UV_ENETUNREACH: i32 = @intFromEnum(SystemErrno.ENETUNREACH);
+pub const UV_ENFILE: i32 = @intFromEnum(SystemErrno.ENFILE);
+pub const UV_ENOBUFS: i32 = @intFromEnum(SystemErrno.ENOBUFS);
+pub const UV_ENODEV: i32 = @intFromEnum(SystemErrno.ENODEV);
+pub const UV_ENOENT: i32 = @intFromEnum(SystemErrno.ENOENT);
+pub const UV_ENOMEM: i32 = @intFromEnum(SystemErrno.ENOMEM);
+pub const UV_ENONET: i32 = -bun.windows.libuv.UV_ENONET;
+pub const UV_ENOSPC: i32 = @intFromEnum(SystemErrno.ENOSPC);
+pub const UV_ENOSYS: i32 = @intFromEnum(SystemErrno.ENOSYS);
+pub const UV_ENOTCONN: i32 = @intFromEnum(SystemErrno.ENOTCONN);
+pub const UV_ENOTDIR: i32 = @intFromEnum(SystemErrno.ENOTDIR);
+pub const UV_ENOTEMPTY: i32 = @intFromEnum(SystemErrno.ENOTEMPTY);
+pub const UV_ENOTSOCK: i32 = @intFromEnum(SystemErrno.ENOTSOCK);
+pub const UV_ENOTSUP: i32 = @intFromEnum(SystemErrno.ENOTSUP);
+pub const UV_EPERM: i32 = @intFromEnum(SystemErrno.EPERM);
+pub const UV_EPIPE: i32 = @intFromEnum(SystemErrno.EPIPE);
+pub const UV_EPROTO: i32 = @intFromEnum(SystemErrno.EPROTO);
+pub const UV_EPROTONOSUPPORT: i32 = @intFromEnum(SystemErrno.EPROTONOSUPPORT);
+pub const UV_EPROTOTYPE: i32 = @intFromEnum(SystemErrno.EPROTOTYPE);
+pub const UV_EROFS: i32 = @intFromEnum(SystemErrno.EROFS);
+pub const UV_ESHUTDOWN: i32 = @intFromEnum(SystemErrno.ESHUTDOWN);
+pub const UV_ESPIPE: i32 = @intFromEnum(SystemErrno.ESPIPE);
+pub const UV_ESRCH: i32 = @intFromEnum(SystemErrno.ESRCH);
+pub const UV_ETIMEDOUT: i32 = @intFromEnum(SystemErrno.ETIMEDOUT);
+pub const UV_ETXTBSY: i32 = @intFromEnum(SystemErrno.ETXTBSY);
+pub const UV_EXDEV: i32 = @intFromEnum(SystemErrno.EXDEV);
+pub const UV_EFBIG: i32 = @intFromEnum(SystemErrno.EFBIG);
+pub const UV_ENOPROTOOPT: i32 = @intFromEnum(SystemErrno.ENOPROTOOPT);
+pub const UV_ERANGE: i32 = @intFromEnum(SystemErrno.ERANGE);
+pub const UV_ENXIO: i32 = @intFromEnum(SystemErrno.ENXIO);
+pub const UV_EMLINK: i32 = @intFromEnum(SystemErrno.EMLINK);
+pub const UV_EHOSTDOWN: i32 = @intFromEnum(SystemErrno.EHOSTDOWN);
+pub const UV_EREMOTEIO: i32 = -bun.windows.libuv.UV_EREMOTEIO;
+pub const UV_ENOTTY: i32 = @intFromEnum(SystemErrno.ENOTTY);
+pub const UV_EFTYPE: i32 = @intFromEnum(SystemErrno.EFTYPE);
+pub const UV_EILSEQ: i32 = @intFromEnum(SystemErrno.EILSEQ);
+pub const UV_EOVERFLOW: i32 = @intFromEnum(SystemErrno.EOVERFLOW);
+pub const UV_ESOCKTNOSUPPORT: i32 = @intFromEnum(SystemErrno.ESOCKTNOSUPPORT);
+pub const UV_ENODATA: i32 = @intFromEnum(SystemErrno.ENODATA);
+pub const UV_EUNATCH: i32 = -bun.windows.libuv.UV_EUNATCH;
+
 // Courtesy of https://github.com/nodejs/node/blob/master/deps/uv/src/unix/darwin-stub.h
 pub const struct_CFArrayCallBacks = opaque {};
 pub const CFIndex = c_long;
diff --git a/src/defines.zig b/src/defines.zig
index 2974547b7c..296bd987a4 100644
--- a/src/defines.zig
+++ b/src/defines.zig
@@ -66,8 +66,8 @@ pub const DefineData = struct {
         };
     }
 
-    pub fn from_mergable_input(defines: RawDefines, user_defines: *UserDefines, log: *logger.Log, allocator: std.mem.Allocator) !void {
-        try user_defines.ensureUnusedCapacity(@as(u32, @truncate(defines.count())));
+    pub fn fromMergeableInput(defines: RawDefines, user_defines: *UserDefines, log: *logger.Log, allocator: std.mem.Allocator) !void {
+        try user_defines.ensureUnusedCapacity(@truncate(defines.count()));
         var iter = defines.iterator();
         while (iter.next()) |entry| {
             var keySplitter = std.mem.split(u8, entry.key_ptr.*, ".");
@@ -85,42 +85,33 @@ pub const DefineData = struct {
             // check for nested identifiers
             var valueSplitter = std.mem.split(u8, entry.value_ptr.*, ".");
             var isIdent = true;
+
             while (valueSplitter.next()) |part| {
                 if (!js_lexer.isIdentifier(part) or js_lexer.Keywords.has(part)) {
                     isIdent = false;
                     break;
                 }
             }
-            if (isIdent) {
 
+            if (isIdent) {
                 // Special-case undefined. it's not an identifier here
                 // https://github.com/evanw/esbuild/issues/1407
-                if (strings.eqlComptime(entry.value_ptr.*, "undefined")) {
-                    user_defines.putAssumeCapacity(
-                        entry.key_ptr.*,
-                        DefineData{
-                            .value = js_ast.Expr.Data{ .e_undefined = js_ast.E.Undefined{} },
-                            .original_name = entry.value_ptr.*,
-                            .can_be_removed_if_unused = true,
-                        },
-                    );
-                } else {
-                    const ident = js_ast.E.Identifier{ .ref = Ref.None, .can_be_removed_if_unused = true };
+                const value = if (strings.eqlComptime(entry.value_ptr.*, "undefined"))
+                    js_ast.Expr.Data{ .e_undefined = js_ast.E.Undefined{} }
+                else
+                    js_ast.Expr.Data{ .e_identifier = .{
+                        .ref = Ref.None,
+                        .can_be_removed_if_unused = true,
+                    } };
 
-                    user_defines.putAssumeCapacity(
-                        entry.key_ptr.*,
-                        DefineData{
-                            .value = js_ast.Expr.Data{ .e_identifier = ident },
-                            .original_name = entry.value_ptr.*,
-                            .can_be_removed_if_unused = true,
-                        },
-                    );
-                }
-
-                // user_defines.putAssumeCapacity(
-                //     entry.key_ptr,
-                //     DefineData{ .value = js_ast.Expr.Data{.e_identifier = } },
-                // );
+                user_defines.putAssumeCapacity(
+                    entry.key_ptr.*,
+                    DefineData{
+                        .value = value,
+                        .original_name = entry.value_ptr.*,
+                        .can_be_removed_if_unused = true,
+                    },
+                );
                 continue;
             }
             const _log = log;
@@ -129,47 +120,18 @@ pub const DefineData = struct {
                 .path = defines_path,
                 .key_path = fs.Path.initWithNamespace("defines", "internal"),
             };
-            var expr = try json_parser.ParseEnvJSON(&source, _log, allocator);
-            var data: js_ast.Expr.Data = undefined;
-            switch (expr.data) {
-                .e_missing => {
-                    data = .{ .e_missing = js_ast.E.Missing{} };
-                },
-                // We must copy so we don't recycle
-                .e_string => {
-                    data = .{ .e_string = try allocator.create(js_ast.E.String) };
-                    data.e_string.* = try expr.data.e_string.clone(allocator);
-                },
-                .e_null, .e_boolean, .e_number => {
-                    data = expr.data;
-                },
-                // We must copy so we don't recycle
-                .e_object => |obj| {
-                    expr.data.e_object = try allocator.create(js_ast.E.Object);
-                    expr.data.e_object.* = obj.*;
-                    data = expr.data;
-                },
-                // We must copy so we don't recycle
-                .e_array => |obj| {
-                    expr.data.e_array = try allocator.create(js_ast.E.Array);
-                    expr.data.e_array.* = obj.*;
-                    data = expr.data;
-                },
-                else => {
-                    continue;
-                },
-            }
-
+            const expr = try json_parser.ParseEnvJSON(&source, _log, allocator);
+            const cloned = try expr.data.deepClone(allocator);
             user_defines.putAssumeCapacity(entry.key_ptr.*, DefineData{
-                .value = data,
-                .can_be_removed_if_unused = @as(js_ast.Expr.Tag, data).isPrimitiveLiteral(),
+                .value = cloned,
+                .can_be_removed_if_unused = expr.isPrimitiveLiteral(),
             });
         }
     }
 
-    pub fn from_input(defines: RawDefines, log: *logger.Log, allocator: std.mem.Allocator) !UserDefines {
+    pub fn fromInput(defines: RawDefines, log: *logger.Log, allocator: std.mem.Allocator) !UserDefines {
         var user_defines = UserDefines.init(allocator);
-        try from_mergable_input(defines, &user_defines, log, allocator);
+        try fromMergeableInput(defines, &user_defines, log, allocator);
 
         return user_defines;
     }
diff --git a/src/deps/c_ares.zig b/src/deps/c_ares.zig
index 06871361cc..e009a2ab54 100644
--- a/src/deps/c_ares.zig
+++ b/src/deps/c_ares.zig
@@ -315,7 +315,7 @@ pub const struct_nameinfo = extern struct {
             const node_slice = this.node[0..node_len];
             array.putIndex(globalThis, 0, JSC.ZigString.fromUTF8(node_slice).toJS(globalThis));
         } else {
-            array.putIndex(globalThis, 0, JSC.JSValue.jsUndefined());
+            array.putIndex(globalThis, 0, .undefined);
         }
 
         if (this.service != null) {
@@ -323,7 +323,7 @@ pub const struct_nameinfo = extern struct {
             const service_slice = this.service[0..service_len];
             array.putIndex(globalThis, 1, JSC.ZigString.fromUTF8(service_slice).toJS(globalThis));
         } else {
-            array.putIndex(globalThis, 1, JSC.JSValue.jsUndefined());
+            array.putIndex(globalThis, 1, .undefined);
         }
 
         return array;
@@ -1579,7 +1579,7 @@ pub export fn Bun__canonicalizeIP(
         const addr_slice = addr.toSlice(bun.default_allocator);
         const addr_str = addr_slice.slice();
         if (addr_str.len >= INET6_ADDRSTRLEN) {
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
 
         var ip_std_text: [INET6_ADDRSTRLEN + 1]u8 = undefined;
@@ -1593,12 +1593,12 @@ pub export fn Bun__canonicalizeIP(
         if (ares_inet_pton(af, &ip_addr, &ip_std_text) != 1) {
             af = AF.INET6;
             if (ares_inet_pton(af, &ip_addr, &ip_std_text) != 1) {
-                return JSC.JSValue.jsUndefined();
+                return .undefined;
             }
         }
         // ip_addr will contain the null-terminated string of the cannonicalized IP
         if (ares_inet_ntop(af, &ip_std_text, &ip_addr, @sizeOf(@TypeOf(ip_addr))) == null) {
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         }
         // use the null-terminated size to return the string
         const size = bun.len(bun.cast([*:0]u8, &ip_addr));
diff --git a/src/deps/libdeflate b/src/deps/libdeflate
new file mode 160000
index 0000000000..dc76454a39
--- /dev/null
+++ b/src/deps/libdeflate
@@ -0,0 +1 @@
+Subproject commit dc76454a39e7e83b68c3704b6e3784654f8d5ac5
diff --git a/src/deps/libdeflate.zig b/src/deps/libdeflate.zig
new file mode 100644
index 0000000000..d38d6dcb9f
--- /dev/null
+++ b/src/deps/libdeflate.zig
@@ -0,0 +1,149 @@
+const std = @import("std");
+const bun = @import("root").bun;
+pub const Options = extern struct {
+    sizeof_options: usize = @sizeOf(Options),
+    malloc_func: ?*const fn (usize) callconv(.C) ?*anyopaque = @import("std").mem.zeroes(?*const fn (usize) callconv(.C) ?*anyopaque),
+    free_func: ?*const fn (?*anyopaque) callconv(.C) void = @import("std").mem.zeroes(?*const fn (?*anyopaque) callconv(.C) void),
+};
+pub extern fn libdeflate_alloc_compressor(compression_level: c_int) ?*Compressor;
+pub extern fn libdeflate_alloc_compressor_ex(compression_level: c_int, options: ?*const Options) ?*Compressor;
+pub extern fn libdeflate_deflate_compress(compressor: *Compressor, in: ?*const anyopaque, in_nbytes: usize, out: ?*anyopaque, out_nbytes_avail: usize) usize;
+pub extern fn libdeflate_deflate_compress_bound(compressor: *Compressor, in_nbytes: usize) usize;
+pub extern fn libdeflate_zlib_compress(compressor: *Compressor, in: ?*const anyopaque, in_nbytes: usize, out: ?*anyopaque, out_nbytes_avail: usize) usize;
+pub extern fn libdeflate_zlib_compress_bound(compressor: *Compressor, in_nbytes: usize) usize;
+pub extern fn libdeflate_gzip_compress(compressor: *Compressor, in: ?*const anyopaque, in_nbytes: usize, out: ?*anyopaque, out_nbytes_avail: usize) usize;
+pub extern fn libdeflate_gzip_compress_bound(compressor: *Compressor, in_nbytes: usize) usize;
+pub extern fn libdeflate_free_compressor(compressor: *Compressor) void;
+
+fn load_once() void {
+    libdeflate_set_memory_allocator(bun.Mimalloc.mi_malloc, bun.Mimalloc.mi_free);
+}
+
+var loaded_once = std.once(load_once);
+
+pub fn load() void {
+    loaded_once.call();
+}
+
+pub const Compressor = opaque {
+    pub fn alloc(compression_level: c_int) ?*Compressor {
+        return libdeflate_alloc_compressor(compression_level);
+    }
+
+    pub fn alloc_ex(compression_level: c_int, options: ?*const Options) ?*Compressor {
+        return libdeflate_alloc_compressor_ex(compression_level, options);
+    }
+
+    pub fn deinit(this: *Compressor) void {
+        return libdeflate_free_compressor(this);
+    }
+
+    /// Compresses `input` into `output` and returns the number of bytes written.
+    pub fn inflate(this: *Compressor, input: []const u8, output: []u8) Result {
+        const written = libdeflate_deflate_compress(this, input.ptr, input.len, output.ptr, output.len);
+        return Result{ .read = input.len, .written = written, .status = Status.success };
+    }
+
+    pub fn maxBytesNeeded(this: *Compressor, input: []const u8, encoding: Encoding) usize {
+        return switch (encoding) {
+            Encoding.deflate => return libdeflate_deflate_compress_bound(this, input.len),
+            Encoding.zlib => return libdeflate_zlib_compress_bound(this, input.len),
+            Encoding.gzip => return libdeflate_gzip_compress_bound(this, input.len),
+        };
+    }
+
+    pub fn compress(this: *Compressor, input: []const u8, output: []u8, encoding: Encoding) Result {
+        switch (encoding) {
+            Encoding.deflate => return this.inflate(input, output),
+            Encoding.zlib => return this.zlib(input, output),
+            Encoding.gzip => return this.gzip(input, output),
+        }
+    }
+
+    pub fn zlib(this: *Compressor, input: []const u8, output: []u8) Result {
+        const result = libdeflate_zlib_compress(this, input.ptr, input.len, output.ptr, output.len);
+        return Result{ .read = input.len, .written = result, .status = Status.success };
+    }
+
+    pub fn gzip(this: *Compressor, input: []const u8, output: []u8) Result {
+        const result = libdeflate_gzip_compress(this, input.ptr, input.len, output.ptr, output.len);
+        return Result{ .read = input.len, .written = result, .status = Status.success };
+    }
+};
+
+pub const Decompressor = opaque {
+    pub fn alloc() ?*Decompressor {
+        return libdeflate_alloc_decompressor();
+    }
+
+    pub fn deinit(this: *Decompressor) void {
+        return libdeflate_free_decompressor(this);
+    }
+
+    pub fn deflate(this: *Decompressor, input: []const u8, output: []u8) Result {
+        var actual_in_bytes_ret: usize = input.len;
+        var actual_out_bytes_ret: usize = output.len;
+        const result = libdeflate_deflate_decompress_ex(this, input.ptr, input.len, output.ptr, output.len, &actual_in_bytes_ret, &actual_out_bytes_ret);
+        return Result{ .read = actual_in_bytes_ret, .written = actual_out_bytes_ret, .status = result };
+    }
+
+    pub fn zlib(this: *Decompressor, input: []const u8, output: []u8) Result {
+        var actual_in_bytes_ret: usize = input.len;
+        var actual_out_bytes_ret: usize = output.len;
+        const result = libdeflate_zlib_decompress_ex(this, input.ptr, input.len, output.ptr, output.len, &actual_in_bytes_ret, &actual_out_bytes_ret);
+        return Result{ .read = actual_in_bytes_ret, .written = actual_out_bytes_ret, .status = result };
+    }
+
+    pub fn gzip(this: *Decompressor, input: []const u8, output: []u8) Result {
+        var actual_in_bytes_ret: usize = input.len;
+        var actual_out_bytes_ret: usize = output.len;
+        const result = libdeflate_gzip_decompress_ex(this, input.ptr, input.len, output.ptr, output.len, &actual_in_bytes_ret, &actual_out_bytes_ret);
+        return Result{ .read = actual_in_bytes_ret, .written = actual_out_bytes_ret, .status = result };
+    }
+
+    pub fn decompress(this: *Decompressor, input: []const u8, output: []u8, encoding: Encoding) Result {
+        switch (encoding) {
+            Encoding.deflate => return this.deflate(input, output),
+            Encoding.zlib => return this.zlib(input, output),
+            Encoding.gzip => return this.gzip(input, output),
+        }
+    }
+};
+
+pub const Result = struct {
+    read: usize,
+    written: usize,
+    status: Status,
+};
+
+pub const Encoding = enum {
+    deflate,
+    zlib,
+    gzip,
+};
+
+pub extern fn libdeflate_alloc_decompressor() ?*Decompressor;
+pub extern fn libdeflate_alloc_decompressor_ex(options: ?*const Options) ?*Decompressor;
+pub const LIBDEFLATE_SUCCESS = 0;
+pub const LIBDEFLATE_BAD_DATA = 1;
+pub const LIBDEFLATE_SHORT_OUTPUT = 2;
+pub const LIBDEFLATE_INSUFFICIENT_SPACE = 3;
+pub const Status = enum(c_uint) {
+    success = LIBDEFLATE_SUCCESS,
+    bad_data = LIBDEFLATE_BAD_DATA,
+    short_output = LIBDEFLATE_SHORT_OUTPUT,
+    insufficient_space = LIBDEFLATE_INSUFFICIENT_SPACE,
+};
+pub extern fn libdeflate_deflate_decompress(decompressor: *Decompressor, in: ?*const anyopaque, in_nbytes: usize, out: ?*anyopaque, out_nbytes_avail: usize, actual_out_nbytes_ret: *usize) Status;
+pub extern fn libdeflate_deflate_decompress_ex(decompressor: *Decompressor, in: ?*const anyopaque, in_nbytes: usize, out: ?*anyopaque, out_nbytes_avail: usize, actual_in_nbytes_ret: *usize, actual_out_nbytes_ret: *usize) Status;
+pub extern fn libdeflate_zlib_decompress(decompressor: *Decompressor, in: ?*const anyopaque, in_nbytes: usize, out: ?*anyopaque, out_nbytes_avail: usize, actual_out_nbytes_ret: *usize) Status;
+pub extern fn libdeflate_zlib_decompress_ex(decompressor: *Decompressor, in: ?*const anyopaque, in_nbytes: usize, out: ?*anyopaque, out_nbytes_avail: usize, actual_in_nbytes_ret: *usize, actual_out_nbytes_ret: *usize) Status;
+pub extern fn libdeflate_gzip_decompress(decompressor: *Decompressor, in: ?*const anyopaque, in_nbytes: usize, out: ?*anyopaque, out_nbytes_avail: usize, actual_out_nbytes_ret: *usize) Status;
+pub extern fn libdeflate_gzip_decompress_ex(decompressor: *Decompressor, in: ?*const anyopaque, in_nbytes: usize, out: ?*anyopaque, out_nbytes_avail: usize, actual_in_nbytes_ret: *usize, actual_out_nbytes_ret: *usize) Status;
+pub extern fn libdeflate_free_decompressor(decompressor: *Decompressor) void;
+pub extern fn libdeflate_adler32(adler: u32, buffer: ?*const anyopaque, len: usize) u32;
+pub extern fn libdeflate_crc32(crc: u32, buffer: ?*const anyopaque, len: usize) u32;
+pub extern fn libdeflate_set_memory_allocator(malloc_func: ?*const fn (usize) callconv(.C) ?*anyopaque, free_func: ?*const fn (?*anyopaque) callconv(.C) void) void;
+pub const libdeflate_compressor = Compressor;
+pub const libdeflate_options = Options;
+pub const libdeflate_decompressor = Decompressor;
diff --git a/src/deps/libuwsockets.cpp b/src/deps/libuwsockets.cpp
index c1af335cd7..26da8228b2 100644
--- a/src/deps/libuwsockets.cpp
+++ b/src/deps/libuwsockets.cpp
@@ -1224,14 +1224,14 @@ extern "C"
     if (ssl)
     {
       uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
-      uwsRes->onWritable([handler, res, opcional_data](uint64_t a)
-                         { return handler(res, a, opcional_data); });
+      auto onWritable = reinterpret_cast<bool (*)(uWS::HttpResponse<true>*, uint64_t, void*)>(handler);
+      uwsRes->onWritable(opcional_data, onWritable);
     }
     else
     {
       uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
-      uwsRes->onWritable([handler, res, opcional_data](uint64_t a)
-                         { return handler(res, a, opcional_data); });
+      auto onWritable = reinterpret_cast<bool (*)(uWS::HttpResponse<false>*, uint64_t, void*)>(handler);
+      uwsRes->onWritable(opcional_data, onWritable);
     }
   }
   
@@ -1252,11 +1252,10 @@ extern "C"
     if (ssl)
     {
       uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
+      auto* onAborted = reinterpret_cast<void (*)(uWS::HttpResponse<true>*, void*)>(handler);
       if (handler)
       {
-        uwsRes->onAborted(
-            [handler, res, opcional_data]
-            { handler(res, opcional_data); });
+        uwsRes->onAborted(opcional_data, onAborted);
       }
       else
       {
@@ -1266,11 +1265,10 @@ extern "C"
     else
     {
       uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
+      auto* onAborted = reinterpret_cast<void (*)(uWS::HttpResponse<false>*, void*)>(handler);
       if (handler)
       {
-        uwsRes->onAborted(
-            [handler, res, opcional_data]
-            { handler(res, opcional_data); });
+        uwsRes->onAborted(opcional_data, onAborted);
       }
       else
       {
@@ -1288,21 +1286,21 @@ extern "C"
     if (ssl)
     {
       uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
+      auto onData = reinterpret_cast<void (*)(uWS::HttpResponse<true>* response, const char* chunk, size_t chunk_length, bool, void*)>(handler);
       if (handler) {
-        uwsRes->onData([handler, res, opcional_data](auto chunk, bool is_end)
-                       { handler(res, chunk.data(), chunk.length(), is_end, opcional_data); });
+        uwsRes->onData(opcional_data, onData);
       } else {
-        uwsRes->onData(nullptr);
+        uwsRes->onData(opcional_data, nullptr);
       }
     }
     else
     {
       uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
+      auto onData = reinterpret_cast<void (*)(uWS::HttpResponse<false>* response, const char* chunk, size_t chunk_length, bool, void*)>(handler);
       if (handler) {
-        uwsRes->onData([handler, res, opcional_data](auto chunk, bool is_end)
-                       { handler(res, chunk.data(), chunk.length(), is_end, opcional_data); });
+        uwsRes->onData(opcional_data, onData);
       } else {
-        uwsRes->onData(nullptr);
+        uwsRes->onData(opcional_data, nullptr);
       }
     }
   }
@@ -1632,4 +1630,9 @@ extern "C"
       return strlen(*dest);
     }
   }
+
+  // we need to manually call this at thread exit
+  extern "C" void bun_clear_loop_at_thread_exit() {
+      uWS::Loop::clearLoopAtThreadExit();
+  }
 }
diff --git a/src/deps/uws.zig b/src/deps/uws.zig
index c630dbaf93..4878d8dfad 100644
--- a/src/deps/uws.zig
+++ b/src/deps/uws.zig
@@ -1086,7 +1086,7 @@ pub const Timer = opaque {
 
 pub const SocketContext = opaque {
     pub fn getNativeHandle(this: *SocketContext, comptime ssl: bool) *anyopaque {
-        return us_socket_context_get_native_handle(comptime @as(i32, @intFromBool(ssl)), this).?;
+        return us_socket_context_get_native_handle(@intFromBool(ssl), this).?;
     }
 
     fn _deinit_ssl(this: *SocketContext) void {
@@ -1143,10 +1143,7 @@ pub const SocketContext = opaque {
     }
 
     fn getLoop(this: *SocketContext, ssl: bool) ?*Loop {
-        if (ssl) {
-            return us_socket_context_loop(@as(i32, 1), this);
-        }
-        return us_socket_context_loop(@as(i32, 0), this);
+        return us_socket_context_loop(@intFromBool(ssl), this);
     }
 
     /// closes and deinit the SocketContexts
@@ -1164,7 +1161,7 @@ pub const SocketContext = opaque {
 
     pub fn close(this: *SocketContext, ssl: bool) void {
         debug("us_socket_context_close({d})", .{@intFromPtr(this)});
-        us_socket_context_close(@as(i32, @intFromBool(ssl)), this);
+        us_socket_context_close(@intFromBool(ssl), this);
     }
 
     pub fn ext(this: *SocketContext, ssl: bool, comptime ContextType: type) ?*ContextType {
@@ -3090,3 +3087,8 @@ pub const udp = struct {
     extern fn us_udp_packet_buffer_payload(buf: ?*PacketBuffer, index: c_int) [*]u8;
     extern fn us_udp_packet_buffer_payload_length(buf: ?*PacketBuffer, index: c_int) c_int;
 };
+
+extern fn bun_clear_loop_at_thread_exit() void;
+pub fn onThreadExit() void {
+    bun_clear_loop_at_thread_exit();
+}
diff --git a/src/fd.zig b/src/fd.zig
index 27e9745e2e..b8c7fec50e 100644
--- a/src/fd.zig
+++ b/src/fd.zig
@@ -272,7 +272,6 @@ pub const FDImpl = packed struct {
         if (env.isDebug) {
             if (result) |err| {
                 if (err.errno == @intFromEnum(posix.E.BADF)) {
-                    // TODO(@paperdave): Zig Compiler Bug, if you remove `this` from the log. An error is correctly printed, but with the wrong reference trace
                     bun.Output.debugWarn("close({s}) = EBADF. This is an indication of a file descriptor UAF", .{this_fmt});
                 } else {
                     log("close({s}) = {}", .{ this_fmt, err });
diff --git a/src/feature_flags.zig b/src/feature_flags.zig
index 7b2e14dbbe..8bd8141608 100644
--- a/src/feature_flags.zig
+++ b/src/feature_flags.zig
@@ -155,8 +155,7 @@ pub const export_star_redirect = false;
 
 pub const streaming_file_uploads_for_http_client = true;
 
-// TODO: fix concurrent transpiler on Windows
-pub const concurrent_transpiler = !env.isWindows;
+pub const concurrent_transpiler = true;
 
 // https://github.com/oven-sh/bun/issues/5426#issuecomment-1813865316
 pub const disable_auto_js_to_ts_in_node_modules = true;
@@ -181,3 +180,17 @@ pub const breaking_changes_1_2 = false;
 pub const nonblocking_stdout_and_stderr_on_posix = false;
 
 pub const postgresql = env.is_canary or env.isDebug;
+
+// TODO: fix Windows-only test failures in fetch-preconnect.test.ts
+pub const is_fetch_preconnect_supported = env.isPosix;
+
+pub const libdeflate_supported = env.isNative;
+
+// Mostly exists as a way to turn it off later, if necessary.
+pub fn isLibdeflateEnabled() bool {
+    if (!libdeflate_supported) {
+        return false;
+    }
+
+    return !bun.getRuntimeFeatureFlag("BUN_FEATURE_FLAG_NO_LIBDEFLATE");
+}
diff --git a/src/fmt.zig b/src/fmt.zig
index 8bb95896be..938469c277 100644
--- a/src/fmt.zig
+++ b/src/fmt.zig
@@ -534,140 +534,78 @@ pub const QuickAndDirtyJavaScriptSyntaxHighlighter = struct {
 
         pub fn colorCode(this: Keyword) ColorCode {
             return switch (this) {
-                Keyword.abstract => ColorCode.blue,
-                Keyword.as => ColorCode.blue,
-                Keyword.@"async" => ColorCode.magenta,
-                Keyword.@"await" => ColorCode.magenta,
-                Keyword.case => ColorCode.magenta,
-                Keyword.@"catch" => ColorCode.magenta,
-                Keyword.class => ColorCode.magenta,
-                Keyword.@"const" => ColorCode.magenta,
-                Keyword.@"continue" => ColorCode.magenta,
-                Keyword.debugger => ColorCode.magenta,
-                Keyword.default => ColorCode.magenta,
-                Keyword.delete => ColorCode.red,
-                Keyword.do => ColorCode.magenta,
-                Keyword.@"else" => ColorCode.magenta,
-                Keyword.@"break" => ColorCode.magenta,
-                Keyword.undefined => ColorCode.orange,
-                Keyword.@"enum" => ColorCode.blue,
-                Keyword.@"export" => ColorCode.magenta,
-                Keyword.extends => ColorCode.magenta,
-                Keyword.false => ColorCode.orange,
-                Keyword.finally => ColorCode.magenta,
-                Keyword.@"for" => ColorCode.magenta,
-                Keyword.function => ColorCode.magenta,
-                Keyword.@"if" => ColorCode.magenta,
-                Keyword.implements => ColorCode.blue,
-                Keyword.import => ColorCode.magenta,
-                Keyword.in => ColorCode.magenta,
-                Keyword.instanceof => ColorCode.magenta,
-                Keyword.interface => ColorCode.blue,
-                Keyword.let => ColorCode.magenta,
-                Keyword.new => ColorCode.magenta,
-                Keyword.null => ColorCode.orange,
-                Keyword.package => ColorCode.magenta,
-                Keyword.private => ColorCode.blue,
-                Keyword.protected => ColorCode.blue,
-                Keyword.public => ColorCode.blue,
-                Keyword.@"return" => ColorCode.magenta,
-                Keyword.static => ColorCode.magenta,
-                Keyword.super => ColorCode.magenta,
-                Keyword.@"switch" => ColorCode.magenta,
-                Keyword.this => ColorCode.orange,
-                Keyword.throw => ColorCode.magenta,
-                Keyword.true => ColorCode.orange,
-                Keyword.@"try" => ColorCode.magenta,
-                Keyword.type => ColorCode.blue,
-                Keyword.typeof => ColorCode.magenta,
-                Keyword.@"var" => ColorCode.magenta,
-                Keyword.void => ColorCode.magenta,
-                Keyword.@"while" => ColorCode.magenta,
-                Keyword.with => ColorCode.magenta,
-                Keyword.yield => ColorCode.magenta,
-                Keyword.string => ColorCode.blue,
-                Keyword.number => ColorCode.blue,
-                Keyword.boolean => ColorCode.blue,
-                Keyword.symbol => ColorCode.blue,
-                Keyword.any => ColorCode.blue,
-                Keyword.object => ColorCode.blue,
-                Keyword.unknown => ColorCode.blue,
-                Keyword.never => ColorCode.blue,
-                Keyword.namespace => ColorCode.blue,
-                Keyword.declare => ColorCode.blue,
-                Keyword.readonly => ColorCode.blue,
+                .abstract => .blue,
+                .as => .blue,
+                .@"async" => .magenta,
+                .@"await" => .magenta,
+                .case => .magenta,
+                .@"catch" => .magenta,
+                .class => .magenta,
+                .@"const" => .magenta,
+                .@"continue" => .magenta,
+                .debugger => .magenta,
+                .default => .magenta,
+                .delete => .red,
+                .do => .magenta,
+                .@"else" => .magenta,
+                .@"break" => .magenta,
+                .undefined => .orange,
+                .@"enum" => .blue,
+                .@"export" => .magenta,
+                .extends => .magenta,
+                .false => .orange,
+                .finally => .magenta,
+                .@"for" => .magenta,
+                .function => .magenta,
+                .@"if" => .magenta,
+                .implements => .blue,
+                .import => .magenta,
+                .in => .magenta,
+                .instanceof => .magenta,
+                .interface => .blue,
+                .let => .magenta,
+                .new => .magenta,
+                .null => .orange,
+                .package => .magenta,
+                .private => .blue,
+                .protected => .blue,
+                .public => .blue,
+                .@"return" => .magenta,
+                .static => .magenta,
+                .super => .magenta,
+                .@"switch" => .magenta,
+                .this => .orange,
+                .throw => .magenta,
+                .true => .orange,
+                .@"try" => .magenta,
+                .type => .blue,
+                .typeof => .magenta,
+                .@"var" => .magenta,
+                .void => .magenta,
+                .@"while" => .magenta,
+                .with => .magenta,
+                .yield => .magenta,
+                .string => .blue,
+                .number => .blue,
+                .boolean => .blue,
+                .symbol => .blue,
+                .any => .blue,
+                .object => .blue,
+                .unknown => .blue,
+                .never => .blue,
+                .namespace => .blue,
+                .declare => .blue,
+                .readonly => .blue,
             };
         }
     };
 
-    pub const Keywords = ComptimeStringMap(Keyword, .{
-        .{ "abstract", Keyword.abstract },
-        .{ "any", Keyword.any },
-        .{ "as", Keyword.as },
-        .{ "async", Keyword.@"async" },
-        .{ "await", Keyword.@"await" },
-        .{ "boolean", Keyword.boolean },
-        .{ "break", Keyword.@"break" },
-        .{ "case", Keyword.case },
-        .{ "catch", Keyword.@"catch" },
-        .{ "class", Keyword.class },
-        .{ "const", Keyword.@"const" },
-        .{ "continue", Keyword.@"continue" },
-        .{ "debugger", Keyword.debugger },
-        .{ "declare", Keyword.declare },
-        .{ "default", Keyword.default },
-        .{ "delete", Keyword.delete },
-        .{ "do", Keyword.do },
-        .{ "else", Keyword.@"else" },
-        .{ "enum", Keyword.@"enum" },
-        .{ "export", Keyword.@"export" },
-        .{ "extends", Keyword.extends },
-        .{ "false", Keyword.false },
-        .{ "finally", Keyword.finally },
-        .{ "for", Keyword.@"for" },
-        .{ "function", Keyword.function },
-        .{ "if", Keyword.@"if" },
-        .{ "implements", Keyword.implements },
-        .{ "import", Keyword.import },
-        .{ "in", Keyword.in },
-        .{ "instanceof", Keyword.instanceof },
-        .{ "interface", Keyword.interface },
-        .{ "let", Keyword.let },
-        .{ "namespace", Keyword.namespace },
-        .{ "never", Keyword.never },
-        .{ "new", Keyword.new },
-        .{ "null", Keyword.null },
-        .{ "number", Keyword.number },
-        .{ "object", Keyword.object },
-        .{ "package", Keyword.package },
-        .{ "private", Keyword.private },
-        .{ "protected", Keyword.protected },
-        .{ "public", Keyword.public },
-        .{ "readonly", Keyword.readonly },
-        .{ "return", Keyword.@"return" },
-        .{ "static", Keyword.static },
-        .{ "string", Keyword.string },
-        .{ "super", Keyword.super },
-        .{ "switch", Keyword.@"switch" },
-        .{ "symbol", Keyword.symbol },
-        .{ "this", Keyword.this },
-        .{ "throw", Keyword.throw },
-        .{ "true", Keyword.true },
-        .{ "try", Keyword.@"try" },
-        .{ "type", Keyword.type },
-        .{ "typeof", Keyword.typeof },
-        .{ "undefined", Keyword.undefined },
-        .{ "unknown", Keyword.unknown },
-        .{ "var", Keyword.@"var" },
-        .{ "void", Keyword.void },
-        .{ "while", Keyword.@"while" },
-        .{ "with", Keyword.with },
-        .{ "yield", Keyword.yield },
-    });
+    pub const Keywords = bun.ComptimeEnumMap(Keyword);
 
-    pub fn format(this: @This(), comptime _: []const u8, _: fmt.FormatOptions, writer: anytype) !void {
-        const text = this.text;
+    pub fn format(this: @This(), comptime unused_fmt: []const u8, _: fmt.FormatOptions, writer: anytype) !void {
+        comptime bun.assert(unused_fmt.len == 0);
 
+        var text = this.text;
         if (this.limited) {
             if (!this.enable_colors or text.len > 2048 or text.len == 0 or !strings.isAllASCII(text)) {
                 try writer.writeAll(text);
@@ -675,22 +613,21 @@ pub const QuickAndDirtyJavaScriptSyntaxHighlighter = struct {
             }
         }
 
-        var remain = text;
         var prev_keyword: ?Keyword = null;
 
-        outer: while (remain.len > 0) {
-            if (js_lexer.isIdentifierStart(remain[0])) {
+        outer: while (text.len > 0) {
+            if (js_lexer.isIdentifierStart(text[0])) {
                 var i: usize = 1;
 
-                while (i < remain.len and js_lexer.isIdentifierContinue(remain[i])) {
+                while (i < text.len and js_lexer.isIdentifierContinue(text[i])) {
                     i += 1;
                 }
 
-                if (Keywords.get(remain[0..i])) |keyword| {
+                if (Keywords.get(text[0..i])) |keyword| {
                     if (keyword != .as)
                         prev_keyword = keyword;
                     const code = keyword.colorCode();
-                    try writer.print(Output.prettyFmt("<r>{s}{s}<r>", true), .{ code.color(), remain[0..i] });
+                    try writer.print(Output.prettyFmt("<r>{s}{s}<r>", true), .{ code.color(), text[0..i] });
                 } else {
                     write: {
                         if (prev_keyword) |prev| {
@@ -698,20 +635,20 @@ pub const QuickAndDirtyJavaScriptSyntaxHighlighter = struct {
                                 .new => {
                                     prev_keyword = null;
 
-                                    if (i < remain.len and remain[i] == '(') {
-                                        try writer.print(Output.prettyFmt("<r><b>{s}<r>", true), .{remain[0..i]});
+                                    if (i < text.len and text[i] == '(') {
+                                        try writer.print(Output.prettyFmt("<r><b>{s}<r>", true), .{text[0..i]});
                                         break :write;
                                     }
                                 },
                                 .abstract, .namespace, .declare, .type, .interface => {
-                                    try writer.print(Output.prettyFmt("<r><b><blue>{s}<r>", true), .{remain[0..i]});
+                                    try writer.print(Output.prettyFmt("<r><b><blue>{s}<r>", true), .{text[0..i]});
                                     prev_keyword = null;
                                     break :write;
                                 },
                                 .import => {
-                                    if (strings.eqlComptime(remain[0..i], "from")) {
+                                    if (strings.eqlComptime(text[0..i], "from")) {
                                         const code = ColorCode.magenta;
-                                        try writer.print(Output.prettyFmt("<r>{s}{s}<r>", true), .{ code.color(), remain[0..i] });
+                                        try writer.print(Output.prettyFmt("<r>{s}{s}<r>", true), .{ code.color(), text[0..i] });
                                         prev_keyword = null;
 
                                         break :write;
@@ -721,25 +658,25 @@ pub const QuickAndDirtyJavaScriptSyntaxHighlighter = struct {
                             }
                         }
 
-                        try writer.writeAll(remain[0..i]);
+                        try writer.writeAll(text[0..i]);
                     }
                 }
-                remain = remain[i..];
+                text = text[i..];
             } else {
-                switch (remain[0]) {
+                switch (text[0]) {
                     '0'...'9' => {
                         prev_keyword = null;
                         var i: usize = 1;
-                        if (remain.len > 1 and remain[0] == '0' and remain[1] == 'x') {
+                        if (text.len > 1 and text[0] == '0' and text[1] == 'x') {
                             i += 1;
-                            while (i < remain.len and switch (remain[i]) {
+                            while (i < text.len and switch (text[i]) {
                                 '0'...'9', 'a'...'f', 'A'...'F' => true,
                                 else => false,
                             }) {
                                 i += 1;
                             }
                         } else {
-                            while (i < remain.len and switch (remain[i]) {
+                            while (i < text.len and switch (text[i]) {
                                 '0'...'9', '.', 'e', 'E', 'x', 'X', 'b', 'B', 'o', 'O' => true,
                                 else => false,
                             }) {
@@ -747,30 +684,30 @@ pub const QuickAndDirtyJavaScriptSyntaxHighlighter = struct {
                             }
                         }
 
-                        try writer.print(Output.prettyFmt("<r><yellow>{s}<r>", true), .{remain[0..i]});
-                        remain = remain[i..];
+                        try writer.print(Output.prettyFmt("<r><yellow>{s}<r>", true), .{text[0..i]});
+                        text = text[i..];
                     },
                     inline '`', '"', '\'' => |char| {
                         prev_keyword = null;
 
                         var i: usize = 1;
-                        while (i < remain.len and remain[i] != char) {
-                            if (comptime char == '`') {
-                                if (remain[i] == '$' and i + 1 < remain.len and remain[i + 1] == '{') {
+                        while (i < text.len and text[i] != char) {
+                            if (char == '`') {
+                                if (text[i] == '$' and i + 1 < text.len and text[i + 1] == '{') {
                                     const curly_start = i;
                                     i += 2;
 
-                                    while (i < remain.len and remain[i] != '}') {
-                                        if (remain[i] == '\\') {
+                                    while (i < text.len and text[i] != '}') {
+                                        if (text[i] == '\\') {
                                             i += 1;
                                         }
                                         i += 1;
                                     }
 
-                                    try writer.print(Output.prettyFmt("<r><green>{s}<r>", true), .{remain[0..curly_start]});
+                                    try writer.print(Output.prettyFmt("<r><green>{s}<r>", true), .{text[0..curly_start]});
                                     try writer.writeAll("${");
                                     const curly_remain = QuickAndDirtyJavaScriptSyntaxHighlighter{
-                                        .text = remain[curly_start + 2 .. i],
+                                        .text = text[curly_start + 2 .. i],
                                         .enable_colors = this.enable_colors,
                                         .limited = false,
                                     };
@@ -779,22 +716,22 @@ pub const QuickAndDirtyJavaScriptSyntaxHighlighter = struct {
                                         try curly_remain.format("", .{}, writer);
                                     }
 
-                                    if (i < remain.len and remain[i] == '}') {
+                                    if (i < text.len and text[i] == '}') {
                                         i += 1;
                                     }
                                     try writer.writeAll("}");
-                                    remain = remain[i..];
+                                    text = text[i..];
                                     i = 0;
-                                    if (remain.len > 0 and remain[0] == char) {
+                                    if (text.len > 0 and text[0] == char) {
                                         try writer.writeAll(Output.prettyFmt("<r><green>`<r>", true));
-                                        remain = remain[1..];
+                                        text = text[1..];
                                         continue :outer;
                                     }
                                     continue;
                                 }
                             }
 
-                            if (i + 1 < remain.len and remain[i] == '\\') {
+                            if (i + 1 < text.len and text[i] == '\\') {
                                 i += 1;
                             }
 
@@ -802,58 +739,58 @@ pub const QuickAndDirtyJavaScriptSyntaxHighlighter = struct {
                         }
 
                         // Include the trailing quote, if any
-                        i += @as(usize, @intFromBool(i > 1 and i < remain.len and remain[i] == char));
+                        i += @intFromBool(i < text.len);
 
-                        try writer.print(Output.prettyFmt("<r><green>{s}<r>", true), .{remain[0..i]});
-                        remain = remain[i..];
+                        try writer.print(Output.prettyFmt("<r><green>{s}<r>", true), .{text[0..i]});
+                        text = text[i..];
                     },
                     '/' => {
                         prev_keyword = null;
                         var i: usize = 1;
 
                         // the start of a line comment
-                        if (i < remain.len and remain[i] == '/') {
-                            while (i < remain.len and remain[i] != '\n') {
+                        if (i < text.len and text[i] == '/') {
+                            while (i < text.len and text[i] != '\n') {
                                 i += 1;
                             }
 
-                            const remain_to_print = remain[0..i];
-                            if (i < remain.len and remain[i] == '\n') {
+                            const remain_to_print = text[0..i];
+                            if (i < text.len and text[i] == '\n') {
                                 i += 1;
                             }
 
-                            if (i < remain.len and remain[i] == '\r') {
+                            if (i < text.len and text[i] == '\r') {
                                 i += 1;
                             }
 
                             try writer.print(Output.prettyFmt("<r><d>{s}<r>", true), .{remain_to_print});
-                            remain = remain[i..];
+                            text = text[i..];
                             continue;
                         }
 
                         as_multiline_comment: {
-                            if (i < remain.len and remain[i] == '*') {
+                            if (i < text.len and text[i] == '*') {
                                 i += 1;
 
-                                while (i + 2 < remain.len and !strings.eqlComptime(remain[i..][0..2], "*/")) {
+                                while (i + 2 < text.len and !strings.eqlComptime(text[i..][0..2], "*/")) {
                                     i += 1;
                                 }
 
-                                if (i + 2 < remain.len and strings.eqlComptime(remain[i..][0..2], "*/")) {
+                                if (i + 2 < text.len and strings.eqlComptime(text[i..][0..2], "*/")) {
                                     i += 2;
                                 } else {
                                     i = 1;
                                     break :as_multiline_comment;
                                 }
 
-                                try writer.print(Output.prettyFmt("<r><d>{s}<r>", true), .{remain[0..i]});
-                                remain = remain[i..];
+                                try writer.print(Output.prettyFmt("<r><d>{s}<r>", true), .{text[0..i]});
+                                text = text[i..];
                                 continue;
                             }
                         }
 
-                        try writer.writeAll(remain[0..i]);
-                        remain = remain[i..];
+                        try writer.writeAll(text[0..i]);
+                        text = text[i..];
                     },
                     '}', '{' => {
                         // support potentially highlighting "from" in an import statement
@@ -861,39 +798,39 @@ pub const QuickAndDirtyJavaScriptSyntaxHighlighter = struct {
                             prev_keyword = null;
                         }
 
-                        try writer.writeAll(remain[0..1]);
-                        remain = remain[1..];
+                        try writer.writeAll(text[0..1]);
+                        text = text[1..];
                     },
                     '[', ']' => {
                         prev_keyword = null;
-                        try writer.writeAll(remain[0..1]);
-                        remain = remain[1..];
+                        try writer.writeAll(text[0..1]);
+                        text = text[1..];
                     },
                     ';' => {
                         prev_keyword = null;
                         try writer.print(Output.prettyFmt("<r><d>;<r>", true), .{});
-                        remain = remain[1..];
+                        text = text[1..];
                     },
                     '.' => {
                         prev_keyword = null;
                         var i: usize = 1;
-                        if (remain.len > 1 and (js_lexer.isIdentifierStart(remain[1]) or remain[1] == '#')) {
+                        if (text.len > 1 and (js_lexer.isIdentifierStart(text[1]) or text[1] == '#')) {
                             i = 2;
 
-                            while (i < remain.len and js_lexer.isIdentifierContinue(remain[i])) {
+                            while (i < text.len and js_lexer.isIdentifierContinue(text[i])) {
                                 i += 1;
                             }
 
-                            if (i < remain.len and (remain[i] == '(')) {
-                                try writer.print(Output.prettyFmt("<r><i><b>{s}<r>", true), .{remain[0..i]});
-                                remain = remain[i..];
+                            if (i < text.len and (text[i] == '(')) {
+                                try writer.print(Output.prettyFmt("<r><i><b>{s}<r>", true), .{text[0..i]});
+                                text = text[i..];
                                 continue;
                             }
                             i = 1;
                         }
 
-                        try writer.writeAll(remain[0..1]);
-                        remain = remain[1..];
+                        try writer.writeAll(text[0..1]);
+                        text = text[1..];
                     },
 
                     '<' => {
@@ -901,44 +838,44 @@ pub const QuickAndDirtyJavaScriptSyntaxHighlighter = struct {
 
                         // JSX
                         jsx: {
-                            if (remain.len > 1 and remain[0] == '/') {
+                            if (text.len > 1 and text[0] == '/') {
                                 i = 2;
                             }
                             prev_keyword = null;
 
-                            while (i < remain.len and js_lexer.isIdentifierContinue(remain[i])) {
+                            while (i < text.len and js_lexer.isIdentifierContinue(text[i])) {
                                 i += 1;
                             } else {
                                 i = 1;
                                 break :jsx;
                             }
 
-                            while (i < remain.len and remain[i] != '>') {
+                            while (i < text.len and text[i] != '>') {
                                 i += 1;
 
-                                if (i < remain.len and remain[i] == '<') {
+                                if (i < text.len and text[i] == '<') {
                                     i = 1;
                                     break :jsx;
                                 }
                             }
 
-                            if (i < remain.len and remain[i] == '>') {
+                            if (i < text.len and text[i] == '>') {
                                 i += 1;
-                                try writer.print(Output.prettyFmt("<r><cyan>{s}<r>", true), .{remain[0..i]});
-                                remain = remain[i..];
+                                try writer.print(Output.prettyFmt("<r><cyan>{s}<r>", true), .{text[0..i]});
+                                text = text[i..];
                                 continue;
                             }
 
                             i = 1;
                         }
 
-                        try writer.print(Output.prettyFmt("<r>{s}<r>", true), .{remain[0..i]});
-                        remain = remain[i..];
+                        try writer.print(Output.prettyFmt("<r>{s}<r>", true), .{text[0..i]});
+                        text = text[i..];
                     },
 
                     else => {
-                        try writer.writeAll(remain[0..1]);
-                        remain = remain[1..];
+                        try writer.writeAll(text[0..1]);
+                        text = text[1..];
                     },
                 }
             }
diff --git a/src/generated_versions_list.zig b/src/generated_versions_list.zig
index 6a39381135..a2dbf7bd8c 100644
--- a/src/generated_versions_list.zig
+++ b/src/generated_versions_list.zig
@@ -4,11 +4,12 @@ pub const boringssl = "29a2cd359458c9384694b75456026e4b57e3e567";
 pub const libarchive = "898dc8319355b7e985f68a9819f182aaed61b53a";
 pub const mimalloc = "4c283af60cdae205df5a872530c77e2a6a307d43";
 pub const picohttpparser = "066d2b1e9ab820703db0837a7255d92d30f0c9f5";
-pub const webkit = "b49be549da59347762aa83f849a65158d2a0d724";
+pub const webkit = "f9a0fda2d2b2fd001a00bfcf8e7917a56b382516";
 pub const zig = @import("std").fmt.comptimePrint("{}", .{@import("builtin").zig_version});
 pub const zlib = "886098f3f339617b4243b286f5ed364b9989e245";
 pub const tinycc = "ab631362d839333660a265d3084d8ff060b96753";
 pub const lolhtml = "8d4c273ded322193d017042d1f48df2766b0f88b";
 pub const c_ares = "d1722e6e8acaf10eb73fa995798a9cd421d9f85e";
+pub const libdeflate = "dc76454a39e7e83b68c3704b6e3784654f8d5ac5";
 pub const zstd = "794ea1b0afca0f020f4e57b6732332231fb23c70";
 pub const lshpack = "3d0f1fc1d6e66a642e7a98c55deb38aa986eb4b0";
diff --git a/src/heap_breakdown.zig b/src/heap_breakdown.zig
index 747d2a769d..d77b12917a 100644
--- a/src/heap_breakdown.zig
+++ b/src/heap_breakdown.zig
@@ -6,44 +6,46 @@ const vm_size_t = usize;
 
 pub const enabled = Environment.allow_assert and Environment.isMac;
 
-pub fn allocator(comptime T: type) std.mem.Allocator {
-    return getZone(T).allocator();
+fn heapLabel(comptime T: type) [:0]const u8 {
+    const base_name = if (@hasDecl(T, "heap_label"))
+        T.heap_label
+    else
+        bun.meta.typeBaseName(@typeName(T));
+    return "Bun__" ++ base_name;
 }
 
-pub fn getZone(comptime T: type) *Zone {
+pub fn allocator(comptime T: type) std.mem.Allocator {
+    return namedAllocator(comptime heapLabel(T));
+}
+pub fn namedAllocator(comptime name: [:0]const u8) std.mem.Allocator {
+    return getZone(name).allocator();
+}
+
+pub fn getZoneT(comptime T: type) *Zone {
+    return getZone(comptime heapLabel(T));
+}
+
+pub fn getZone(comptime name: [:0]const u8) *Zone {
     comptime bun.assert(enabled);
 
     const static = struct {
-        pub var zone: std.atomic.Value(?*Zone) = .{ .raw = null };
-        pub var lock: bun.Lock = bun.Lock.init();
-    };
-
-    return static.zone.load(.monotonic) orelse brk: {
-        static.lock.lock();
-        defer static.lock.unlock();
-
-        if (static.zone.load(.monotonic)) |z| {
-            break :brk z;
+        pub var zone: *Zone = undefined;
+        pub fn initOnce() void {
+            zone = Zone.init(name);
         }
 
-        const z = Zone.init(T);
-        static.zone.store(z, .monotonic);
-        break :brk z;
+        pub var once = std.once(initOnce);
     };
+
+    static.once.call();
+    return static.zone;
 }
 
 pub const Zone = opaque {
-    pub fn init(comptime T: type) *Zone {
+    pub fn init(comptime name: [:0]const u8) *Zone {
         const zone = malloc_create_zone(0, 0);
 
-        const title: [:0]const u8 = comptime title: {
-            const base_name = if (@hasDecl(T, "heap_label"))
-                T.heap_label
-            else
-                bun.meta.typeBaseName(@typeName(T));
-            break :title "Bun__" ++ base_name;
-        };
-        malloc_set_zone_name(zone, title.ptr);
+        malloc_set_zone_name(zone, name.ptr);
 
         return zone;
     }
@@ -78,8 +80,8 @@ pub const Zone = opaque {
         return false;
     }
 
-    fn rawFree(zone: *anyopaque, buf: [*]u8, _: u8, _: usize) void {
-        malloc_zone_free(@ptrCast(zone), @ptrCast(buf));
+    fn rawFree(zone: *anyopaque, buf: []u8, _: u8, _: usize) void {
+        malloc_zone_free(@ptrCast(zone), @ptrCast(buf.ptr));
     }
 
     pub const vtable = std.mem.Allocator.VTable{
@@ -97,8 +99,10 @@ pub const Zone = opaque {
 
     /// Create a single-item pointer with initialized data.
     pub inline fn create(zone: *Zone, comptime T: type, data: T) *T {
+        const align_of_t: usize = @alignOf(T);
+        const log2_align_of_t = @ctz(align_of_t);
         const ptr: *T = @alignCast(@ptrCast(
-            rawAlloc(zone, @sizeOf(T), @alignOf(T), @returnAddress()) orelse bun.outOfMemory(),
+            rawAlloc(zone, @sizeOf(T), log2_align_of_t, @returnAddress()) orelse bun.outOfMemory(),
         ));
         ptr.* = data;
         return ptr;
diff --git a/src/hive_array.zig b/src/hive_array.zig
index 0f1ee8d8e5..c3479da816 100644
--- a/src/hive_array.zig
+++ b/src/hive_array.zig
@@ -67,7 +67,7 @@ pub fn HiveArray(comptime T: type, comptime capacity: u16) type {
         }
 
         pub const Fallback = struct {
-            hive: HiveArray(T, capacity),
+            hive: if (capacity > 0) HiveArray(T, capacity) else void,
             allocator: std.mem.Allocator,
 
             pub const This = @This();
@@ -75,37 +75,53 @@ pub fn HiveArray(comptime T: type, comptime capacity: u16) type {
             pub fn init(allocator: std.mem.Allocator) This {
                 return .{
                     .allocator = allocator,
-                    .hive = HiveArray(T, capacity).init(),
+                    .hive = if (capacity > 0) HiveArray(T, capacity).init() else {},
                 };
             }
 
             pub fn get(self: *This) *T {
-                if (self.hive.get()) |value| {
-                    return value;
+                if (comptime capacity > 0) {
+                    if (self.hive.get()) |value| {
+                        return value;
+                    }
                 }
 
                 return self.allocator.create(T) catch unreachable;
             }
 
             pub fn getAndSeeIfNew(self: *This, new: *bool) *T {
-                if (self.hive.get()) |value| {
-                    new.* = false;
-                    return value;
+                if (comptime capacity > 0) {
+                    if (self.hive.get()) |value| {
+                        new.* = false;
+                        return value;
+                    }
                 }
 
                 return self.allocator.create(T) catch unreachable;
             }
 
             pub fn tryGet(self: *This) !*T {
-                if (self.hive.get()) |value| {
-                    return value;
+                if (comptime capacity > 0) {
+                    if (self.hive.get()) |value| {
+                        return value;
+                    }
                 }
 
                 return try self.allocator.create(T);
             }
 
+            pub fn in(self: *const This, value: *const T) bool {
+                if (comptime capacity > 0) {
+                    if (self.hive.in(value)) return true;
+                }
+
+                return false;
+            }
+
             pub fn put(self: *This, value: *T) void {
-                if (self.hive.put(value)) return;
+                if (comptime capacity > 0) {
+                    if (self.hive.put(value)) return;
+                }
 
                 self.allocator.destroy(value);
             }
diff --git a/src/http.zig b/src/http.zig
index 187ae3d31d..5e461392eb 100644
--- a/src/http.zig
+++ b/src/http.zig
@@ -350,6 +350,11 @@ fn NewHTTPContext(comptime ssl: bool) type {
             socket.close(.failure);
         }
 
+        fn closeSocket(socket: HTTPSocket) void {
+            markSocketAsDead(socket);
+            socket.close(.normal);
+        }
+
         fn getTagged(ptr: *anyopaque) ActiveSocket {
             return ActiveSocket.from(bun.cast(**anyopaque, ptr).*);
         }
@@ -472,8 +477,7 @@ fn NewHTTPContext(comptime ssl: bool) type {
                 }
             }
 
-            markSocketAsDead(socket);
-            socket.close(.normal);
+            closeSocket(socket);
         }
 
         pub const Handler = struct {
@@ -487,7 +491,7 @@ fn NewHTTPContext(comptime ssl: bool) type {
                 }
 
                 if (active.get(PooledSocket)) |pooled| {
-                    assert(context().pending_sockets.put(pooled));
+                    addMemoryBackToPool(pooled);
                     return;
                 }
 
@@ -523,33 +527,43 @@ fn NewHTTPContext(comptime ssl: bool) type {
                         if (!client.checkServerIdentity(comptime ssl, socket, handshake_error)) {
                             client.did_have_handshaking_error = true;
 
+                            if (!socket.isClosed()) terminateSocket(socket);
                             return;
                         }
 
                         return client.firstCall(comptime ssl, socket);
                     } else {
                         // if authorized it self is false, this means that the connection was rejected
-                        markSocketAsDead(socket);
+                        terminateSocket(socket);
                         if (client.state.stage != .done and client.state.stage != .fail)
                             client.fail(error.ConnectionRefused);
                         return;
                     }
                 }
 
-                // we can reach here if we are aborted
-                if (!socket.isClosed()) {
+                if (socket.isClosed()) {
+                    markSocketAsDead(socket);
                     if (active.get(PooledSocket)) |pooled| {
-                        assert(context().pending_sockets.put(pooled));
-                        return;
+                        addMemoryBackToPool(pooled);
                     }
 
-                    terminateSocket(socket);
-                } else {
-                    if (active.get(PooledSocket)) |pooled| {
-                        assert(context().pending_sockets.put(pooled));
+                    return;
+                }
+
+                if (authorized) {
+                    if (active.is(PooledSocket)) {
+                        // Allow pooled sockets to be reused if the handshake was successful.
+                        socket.setTimeout(0);
+                        socket.setTimeoutMinutes(5);
                         return;
                     }
                 }
+
+                if (active.get(PooledSocket)) |pooled| {
+                    addMemoryBackToPool(pooled);
+                }
+
+                terminateSocket(socket);
             }
             pub fn onClose(
                 ptr: *anyopaque,
@@ -565,11 +579,16 @@ fn NewHTTPContext(comptime ssl: bool) type {
                 }
 
                 if (tagged.get(PooledSocket)) |pooled| {
-                    assert(context().pending_sockets.put(pooled));
+                    addMemoryBackToPool(pooled);
                 }
 
                 return;
             }
+
+            fn addMemoryBackToPool(pooled: *PooledSocket) void {
+                assert(context().pending_sockets.put(pooled));
+            }
+
             pub fn onData(
                 ptr: *anyopaque,
                 socket: HTTPSocket,
@@ -620,14 +639,12 @@ fn NewHTTPContext(comptime ssl: bool) type {
                 socket: HTTPSocket,
             ) void {
                 const tagged = getTagged(ptr);
-
                 if (tagged.get(HTTPClient)) |client| {
-                    return client.onTimeout(
-                        comptime ssl,
-                        socket,
-                    );
+                    return client.onTimeout(comptime ssl, socket);
                 } else if (tagged.get(PooledSocket)) |pooled| {
-                    assert(context().pending_sockets.put(pooled));
+                    // If a socket has been sitting around for 5 minutes
+                    // Let's close it and remove it from the pool.
+                    addMemoryBackToPool(pooled);
                 }
 
                 terminateSocket(socket);
@@ -640,23 +657,23 @@ fn NewHTTPContext(comptime ssl: bool) type {
                 const tagged = getTagged(ptr);
                 markSocketAsDead(socket);
                 if (tagged.get(HTTPClient)) |client| {
-                    return client.onConnectError(
-                        comptime ssl,
-                        socket,
-                    );
+                    client.onConnectError();
                 } else if (tagged.get(PooledSocket)) |pooled| {
-                    assert(context().pending_sockets.put(pooled));
+                    addMemoryBackToPool(pooled);
                 }
-
-                if (comptime Environment.isDebug)
-                    // caller should already have closed it.
-                    bun.debugAssert(socket.isClosed());
+                // us_connecting_socket_close is always called internally by uSockets
             }
             pub fn onEnd(
                 _: *anyopaque,
                 socket: HTTPSocket,
             ) void {
-                // TCP fin gets closed immediately.
+                // TCP fin must be closed, but we must keep the original tagged
+                // pointer so that their onClose callback is called.
+                //
+                // Three possible states:
+                // 1. HTTP Keep-Alive socket: it must be removed from the pool
+                // 2. HTTP Client socket: it might need to be retried
+                // 3. Dead socket: it is already marked as dead
                 socket.close(.failure);
             }
         };
@@ -760,6 +777,8 @@ pub const HTTPThread = struct {
     has_awoken: std.atomic.Value(bool) = std.atomic.Value(bool).init(false),
     timer: std.time.Timer,
 
+    lazy_libdeflater: ?*LibdeflateState = null,
+
     const ShutdownMessage = struct {
         async_http_id: u32,
         is_tls: bool,
@@ -767,6 +786,23 @@ pub const HTTPThread = struct {
 
     const threadlog = Output.scoped(.HTTPThread, true);
 
+    pub const LibdeflateState = struct {
+        decompressor: *bun.libdeflate.Decompressor = undefined,
+        shared_buffer: [512 * 1024]u8 = undefined,
+
+        pub usingnamespace bun.New(@This());
+    };
+
+    pub fn deflater(this: *@This()) *LibdeflateState {
+        if (this.lazy_libdeflater == null) {
+            this.lazy_libdeflater = LibdeflateState.new(.{
+                .decompressor = bun.libdeflate.Decompressor.alloc() orelse bun.outOfMemory(),
+            });
+        }
+
+        return this.lazy_libdeflater.?;
+    }
+
     fn initOnce() void {
         http_thread = .{
             .loop = undefined,
@@ -778,7 +814,7 @@ pub const HTTPThread = struct {
             },
             .timer = std.time.Timer.start() catch unreachable,
         };
-
+        bun.libdeflate.load();
         const thread = std.Thread.spawn(
             .{
                 .stack_size = bun.default_thread_stack_size,
@@ -889,10 +925,11 @@ pub const HTTPThread = struct {
         }
 
         while (this.queued_tasks.pop()) |http| {
-            var cloned = default_allocator.create(AsyncHTTP) catch unreachable;
-            cloned.* = http.*;
-            cloned.real = http;
-            cloned.onStart();
+            var cloned = ThreadlocalAsyncHTTP.new(.{
+                .async_http = http.*,
+            });
+            cloned.async_http.real = http;
+            cloned.async_http.onStart();
             if (comptime Environment.allow_assert) {
                 count += 1;
             }
@@ -1095,6 +1132,13 @@ pub fn firstCall(
     comptime is_ssl: bool,
     socket: NewHTTPContext(is_ssl).HTTPSocket,
 ) void {
+    if (comptime FeatureFlags.is_fetch_preconnect_supported) {
+        if (client.is_preconnect_only) {
+            client.onPreconnect(is_ssl, socket);
+            return;
+        }
+    }
+
     if (client.state.request_stage == .pending) {
         client.onWritable(true, comptime is_ssl, socket);
     }
@@ -1144,17 +1188,17 @@ pub fn onTimeout(
     comptime is_ssl: bool,
     socket: NewHTTPContext(is_ssl).HTTPSocket,
 ) void {
-    _ = socket;
+    if (client.disable_timeout) return;
     log("Timeout  {s}\n", .{client.url.href});
 
+    defer NewHTTPContext(is_ssl).terminateSocket(socket);
+
     if (client.state.stage != .done and client.state.stage != .fail) {
         client.fail(error.Timeout);
     }
 }
 pub fn onConnectError(
     client: *HTTPClient,
-    comptime is_ssl: bool,
-    _: NewHTTPContext(is_ssl).HTTPSocket,
 ) void {
     log("onConnectError  {s}\n", .{client.url.href});
     if (client.state.stage != .done and client.state.stage != .fail)
@@ -1408,6 +1452,8 @@ pub const InternalState = struct {
     received_last_chunk: bool = false,
     did_set_content_encoding: bool = false,
     is_redirect_pending: bool = false,
+    is_libdeflate_fast_path_disabled: bool = false,
+    resend_request_body_on_redirect: bool = false,
     transfer_encoding: Encoding = Encoding.identity,
     encoding: Encoding = Encoding.identity,
     content_encoding_i: u8 = std.math.maxInt(u8),
@@ -1495,40 +1541,93 @@ pub const InternalState = struct {
         return this.received_last_chunk;
     }
 
-    fn decompressBytes(this: *InternalState, buffer: []const u8, body_out_str: *MutableString) !void {
-        log("Decompressing {d} bytes\n", .{buffer.len});
-
+    fn decompressBytes(this: *InternalState, buffer: []const u8, body_out_str: *MutableString, is_final_chunk: bool) !void {
         defer this.compressed_body.reset();
         var gzip_timer: std.time.Timer = undefined;
 
         if (extremely_verbose)
             gzip_timer = std.time.Timer.start() catch @panic("Timer failure");
 
-        try this.decompressor.updateBuffers(this.encoding, buffer, body_out_str);
-        this.decompressor.readAll(this.isDone()) catch |err| {
-            if (this.isDone() or error.ShortRead != err) {
-                Output.prettyErrorln("<r><red>Decompression error: {s}<r>", .{bun.asByteSlice(@errorName(err))});
-                Output.flush();
-                return err;
+        var still_needs_to_decompress = true;
+
+        if (FeatureFlags.isLibdeflateEnabled()) {
+            // Fast-path: use libdeflate
+            if (is_final_chunk and !this.is_libdeflate_fast_path_disabled and this.encoding.canUseLibDeflate() and this.isDone()) libdeflate: {
+                this.is_libdeflate_fast_path_disabled = true;
+
+                log("Decompressing {d} bytes with libdeflate\n", .{buffer.len});
+                var deflater = http_thread.deflater();
+
+                // gzip stores the size of the uncompressed data in the last 4 bytes of the stream
+                // But it's only valid if the stream is less than 4.7 GB, since it's 4 bytes.
+                // If we know that the stream is going to be larger than our
+                // pre-allocated buffer, then let's dynamically allocate the exact
+                // size.
+                if (this.encoding == Encoding.gzip and buffer.len > 16 and buffer.len < 1024 * 1024 * 1024) {
+                    const estimated_size: u32 = @bitCast(buffer[buffer.len - 4 ..][0..4].*);
+                    // Since this is arbtirary input from the internet, let's set an upper bound of 32 MB for the allocation size.
+                    if (estimated_size > deflater.shared_buffer.len and estimated_size < 32 * 1024 * 1024) {
+                        try body_out_str.list.ensureTotalCapacityPrecise(body_out_str.allocator, estimated_size);
+                        const result = deflater.decompressor.decompress(buffer, body_out_str.list.allocatedSlice(), .gzip);
+
+                        if (result.status == .success) {
+                            body_out_str.list.items.len = result.written;
+                            still_needs_to_decompress = false;
+                        }
+
+                        break :libdeflate;
+                    }
+                }
+
+                const result = deflater.decompressor.decompress(buffer, &deflater.shared_buffer, switch (this.encoding) {
+                    .gzip => .gzip,
+                    .deflate => .deflate,
+                    else => unreachable,
+                });
+
+                if (result.status == .success) {
+                    try body_out_str.list.ensureTotalCapacityPrecise(body_out_str.allocator, result.written);
+                    body_out_str.list.appendSliceAssumeCapacity(deflater.shared_buffer[0..result.written]);
+                    still_needs_to_decompress = false;
+                }
             }
-        };
+        }
+
+        // Slow path, or brotli: use the .decompressor
+        if (still_needs_to_decompress) {
+            log("Decompressing {d} bytes\n", .{buffer.len});
+            if (body_out_str.list.capacity == 0) {
+                const min = @min(@ceil(@as(f64, @floatFromInt(buffer.len)) * 1.5), @as(f64, 1024 * 1024 * 2));
+                try body_out_str.growBy(@max(@as(usize, @intFromFloat(min)), 32));
+            }
+
+            try this.decompressor.updateBuffers(this.encoding, buffer, body_out_str);
+
+            this.decompressor.readAll(this.isDone()) catch |err| {
+                if (this.isDone() or error.ShortRead != err) {
+                    Output.prettyErrorln("<r><red>Decompression error: {s}<r>", .{bun.asByteSlice(@errorName(err))});
+                    Output.flush();
+                    return err;
+                }
+            };
+        }
 
         if (extremely_verbose)
             this.gzip_elapsed = gzip_timer.read();
     }
 
-    fn decompress(this: *InternalState, buffer: MutableString, body_out_str: *MutableString) !void {
-        try this.decompressBytes(buffer.list.items, body_out_str);
+    fn decompress(this: *InternalState, buffer: MutableString, body_out_str: *MutableString, is_final_chunk: bool) !void {
+        try this.decompressBytes(buffer.list.items, body_out_str, is_final_chunk);
     }
 
-    pub fn processBodyBuffer(this: *InternalState, buffer: MutableString) !bool {
+    pub fn processBodyBuffer(this: *InternalState, buffer: MutableString, is_final_chunk: bool) !bool {
         if (this.is_redirect_pending) return false;
 
         var body_out_str = this.body_out_str.?;
 
         switch (this.encoding) {
             Encoding.brotli, Encoding.gzip, Encoding.deflate => {
-                try this.decompress(buffer, body_out_str);
+                try this.decompress(buffer, body_out_str, is_final_chunk);
             },
             else => {
                 if (!body_out_str.owns(buffer.list.items)) {
@@ -1566,7 +1665,6 @@ remaining_redirect_count: i8 = default_redirect_count,
 allow_retry: bool = false,
 redirect_type: FetchRedirect = FetchRedirect.follow,
 redirect: []u8 = &.{},
-timeout: usize = 0,
 progress_node: ?*Progress.Node = null,
 disable_timeout: bool = false,
 disable_keepalive: bool = false,
@@ -1591,8 +1689,8 @@ signals: Signals = .{},
 async_http_id: u32 = 0,
 hostname: ?[]u8 = null,
 reject_unauthorized: bool = true,
-
 unix_socket_path: JSC.ZigString.Slice = JSC.ZigString.Slice.empty,
+is_preconnect_only: bool = false,
 
 pub fn deinit(this: *HTTPClient) void {
     if (this.redirect.len > 0) {
@@ -1672,6 +1770,13 @@ pub const Encoding = enum {
     brotli,
     chunked,
 
+    pub fn canUseLibDeflate(this: Encoding) bool {
+        return switch (this) {
+            .gzip, .deflate => true,
+            else => false,
+        };
+    }
+
     pub fn isCompressed(this: Encoding) bool {
         return switch (this) {
             .brotli, .gzip, .deflate => true,
@@ -1744,8 +1849,6 @@ pub const AsyncHTTP = struct {
     task: ThreadPool.Task = ThreadPool.Task{ .callback = &startAsyncHTTP },
     result_callback: HTTPClientResult.Callback = undefined,
 
-    /// Timeout in nanoseconds
-    timeout: usize = 0,
     redirected: bool = false,
 
     response_encoding: Encoding = Encoding.identity,
@@ -1833,6 +1936,51 @@ pub const AsyncHTTP = struct {
         tls_props: ?*SSLConfig = null,
     };
 
+    const Preconnect = struct {
+        async_http: AsyncHTTP,
+        response_buffer: MutableString,
+        url: bun.URL,
+        is_url_owned: bool,
+
+        pub usingnamespace bun.New(@This());
+
+        pub fn onResult(this: *Preconnect, _: *AsyncHTTP, _: HTTPClientResult) void {
+            this.response_buffer.deinit();
+            this.async_http.clearData();
+            this.async_http.client.deinit();
+            if (this.is_url_owned) {
+                bun.default_allocator.free(this.url.href);
+            }
+
+            this.destroy();
+        }
+    };
+
+    pub fn preconnect(
+        url: URL,
+        is_url_owned: bool,
+    ) void {
+        if (!FeatureFlags.is_fetch_preconnect_supported) {
+            if (is_url_owned) {
+                bun.default_allocator.free(url.href);
+            }
+
+            return;
+        }
+
+        var this = Preconnect.new(.{
+            .async_http = undefined,
+            .response_buffer = MutableString{ .allocator = default_allocator, .list = .{} },
+            .url = url,
+            .is_url_owned = is_url_owned,
+        });
+
+        this.async_http = AsyncHTTP.init(bun.default_allocator, .GET, url, .{}, "", &this.response_buffer, "", HTTPClientResult.Callback.New(*Preconnect, Preconnect.onResult).init(this), .manual, .{});
+        this.async_http.client.is_preconnect_only = true;
+
+        http_thread.schedule(Batch.from(&this.async_http.task));
+    }
+
     pub fn init(
         allocator: std.mem.Allocator,
         method: Method,
@@ -1841,7 +1989,6 @@ pub const AsyncHTTP = struct {
         headers_buf: string,
         response_buffer: *MutableString,
         request_body: []const u8,
-        timeout: usize,
         callback: HTTPClientResult.Callback,
         redirect_type: FetchRedirect,
         options: Options,
@@ -1858,7 +2005,6 @@ pub const AsyncHTTP = struct {
             .http_proxy = options.http_proxy,
             .signals = options.signals orelse .{},
             .async_http_id = if (options.signals != null and options.signals.?.aborted != null) async_http_id.fetchAdd(1, .monotonic) else 0,
-            .timeout = timeout,
         };
 
         this.client = .{
@@ -1870,7 +2016,6 @@ pub const AsyncHTTP = struct {
             .hostname = options.hostname,
             .signals = options.signals orelse this.signals,
             .async_http_id = this.async_http_id,
-            .timeout = timeout,
             .http_proxy = this.http_proxy,
             .redirect_type = redirect_type,
         };
@@ -1956,20 +2101,17 @@ pub const AsyncHTTP = struct {
         return this;
     }
 
-    pub fn initSync(allocator: std.mem.Allocator, method: Method, url: URL, headers: Headers.Entries, headers_buf: string, response_buffer: *MutableString, request_body: []const u8, timeout: usize, http_proxy: ?URL, hostname: ?[]u8, redirect_type: FetchRedirect) AsyncHTTP {
-        return @This().init(allocator, method, url, headers, headers_buf, response_buffer, request_body, timeout, undefined, redirect_type, .{
+    pub fn initSync(allocator: std.mem.Allocator, method: Method, url: URL, headers: Headers.Entries, headers_buf: string, response_buffer: *MutableString, request_body: []const u8, http_proxy: ?URL, hostname: ?[]u8, redirect_type: FetchRedirect) AsyncHTTP {
+        return @This().init(allocator, method, url, headers, headers_buf, response_buffer, request_body, undefined, redirect_type, .{
             .http_proxy = http_proxy,
             .hostname = hostname,
         });
     }
 
     fn reset(this: *AsyncHTTP) !void {
-        const timeout = this.timeout;
         const aborted = this.client.aborted;
         this.client = try HTTPClient.init(this.allocator, this.method, this.client.url, this.client.header_entries, this.client.header_buf, aborted);
-        this.client.timeout = timeout;
         this.client.http_proxy = this.http_proxy;
-        this.timeout = timeout;
 
         if (this.http_proxy) |proxy| {
             //TODO: need to understand how is possible to reuse Proxy with TSL, so disable keepalive if url is HTTPS
@@ -2087,12 +2229,23 @@ pub const AsyncHTTP = struct {
             this.state.store(State.fail, .monotonic);
         }
 
+        if (comptime Environment.enable_logs) {
+            if (socket_async_http_abort_tracker.count() > 0) {
+                log("socket_async_http_abort_tracker count: {d}", .{socket_async_http_abort_tracker.count()});
+            }
+        }
+
+        if (socket_async_http_abort_tracker.capacity() > 10_000 and socket_async_http_abort_tracker.count() < 100) {
+            socket_async_http_abort_tracker.shrinkAndFree(socket_async_http_abort_tracker.count());
+        }
+
         if (result.has_more) {
             callback.function(callback.ctx, async_http, result);
         } else {
             {
                 this.client.deinit();
-                defer default_allocator.destroy(this);
+                var threadlocal_http: *ThreadlocalAsyncHTTP = @fieldParentPtr("async_http", async_http);
+                defer threadlocal_http.destroy();
                 log("onAsyncHTTPCallback: {any}", .{bun.fmt.fmtDuration(this.elapsed)});
                 callback.function(callback.ctx, async_http, result);
             }
@@ -2236,13 +2389,22 @@ pub fn buildRequest(this: *HTTPClient, body_len: usize) picohttp.Request {
     };
 }
 
-pub fn doRedirect(this: *HTTPClient, comptime is_ssl: bool, ctx: *NewHTTPContext(is_ssl), socket: NewHTTPContext(is_ssl).HTTPSocket) void {
+pub fn doRedirect(
+    this: *HTTPClient,
+    comptime is_ssl: bool,
+    ctx: *NewHTTPContext(is_ssl),
+    socket: NewHTTPContext(is_ssl).HTTPSocket,
+) void {
     this.unix_socket_path.deinit();
     this.unix_socket_path = JSC.ZigString.Slice.empty;
+    const request_body = if (this.state.resend_request_body_on_redirect and this.state.original_request_body == .bytes)
+        this.state.original_request_body.bytes
+    else
+        "";
 
     this.state.response_message_buffer.deinit();
+
     // we need to clean the client reference before closing the socket because we are going to reuse the same ref in a another request
-    socket.ext(**anyopaque).* = bun.cast(**anyopaque, NewHTTPContext(is_ssl).ActiveSocket.init(&dead_socket).ptr());
     if (this.isKeepAlivePossible()) {
         assert(this.connected_url.hostname.len > 0);
         ctx.releaseSocket(
@@ -2252,8 +2414,7 @@ pub fn doRedirect(this: *HTTPClient, comptime is_ssl: bool, ctx: *NewHTTPContext
             this.connected_url.getPortAuto(),
         );
     } else {
-        NewHTTPContext(is_ssl).markSocketAsDead(socket);
-        socket.close(.normal);
+        NewHTTPContext(is_ssl).closeSocket(socket);
     }
 
     this.connected_url = URL{};
@@ -2278,7 +2439,8 @@ pub fn doRedirect(this: *HTTPClient, comptime is_ssl: bool, ctx: *NewHTTPContext
     if (this.signals.aborted != null) {
         _ = socket_async_http_abort_tracker.swapRemove(this.async_http_id);
     }
-    return this.start(.{ .bytes = "" }, body_out_str);
+
+    return this.start(.{ .bytes = request_body }, body_out_str);
 }
 pub fn isHTTPS(this: *HTTPClient) bool {
     if (this.http_proxy) |proxy| {
@@ -2326,6 +2488,7 @@ fn start_(this: *HTTPClient, comptime is_ssl: bool) void {
     };
 
     if (socket.isClosed() and (this.state.response_stage != .done and this.state.response_stage != .fail)) {
+        NewHTTPContext(is_ssl).markSocketAsDead(socket);
         this.fail(error.ConnectionClosed);
         assert(this.state.fail != null);
         return;
@@ -2368,12 +2531,38 @@ fn printResponse(response: picohttp.Response) void {
     Output.flush();
 }
 
+pub fn onPreconnect(this: *HTTPClient, comptime is_ssl: bool, socket: NewHTTPContext(is_ssl).HTTPSocket) void {
+    log("onPreconnect({})", .{this.url});
+    _ = socket_async_http_abort_tracker.swapRemove(this.async_http_id);
+    const ctx = if (comptime is_ssl) &http_thread.https_context else &http_thread.http_context;
+    ctx.releaseSocket(
+        socket,
+        this.did_have_handshaking_error and !this.reject_unauthorized,
+        this.url.hostname,
+        this.url.getPortAuto(),
+    );
+
+    this.state.reset(this.allocator);
+    this.state.response_stage = .done;
+    this.state.request_stage = .done;
+    this.state.stage = .done;
+    this.proxy_tunneling = false;
+    this.result_callback.run(@fieldParentPtr("client", this), HTTPClientResult{ .fail = null, .metadata = null, .has_more = false });
+}
+
 pub fn onWritable(this: *HTTPClient, comptime is_first_call: bool, comptime is_ssl: bool, socket: NewHTTPContext(is_ssl).HTTPSocket) void {
     if (this.signals.get(.aborted)) {
         this.closeAndAbort(is_ssl, socket);
         return;
     }
 
+    if (comptime FeatureFlags.is_fetch_preconnect_supported) {
+        if (this.is_preconnect_only) {
+            this.onPreconnect(is_ssl, socket);
+            return;
+        }
+    }
+
     switch (this.state.request_stage) {
         .pending, .headers => {
             var stack_fallback = std.heap.stackFallback(16384, default_allocator);
@@ -2656,8 +2845,7 @@ pub fn closeAndFail(this: *HTTPClient, err: anyerror, comptime is_ssl: bool, soc
     if (this.state.stage != .fail and this.state.stage != .done) {
         log("closeAndFail: {s}", .{@errorName(err)});
         if (!socket.isClosed()) {
-            socket.ext(**anyopaque).* = bun.cast(**anyopaque, NewHTTPContext(is_ssl).ActiveSocket.init(&dead_socket).ptr());
-            socket.close(.failure);
+            NewHTTPContext(is_ssl).terminateSocket(socket);
         }
         this.fail(err);
     }
@@ -2787,7 +2975,6 @@ pub fn onData(this: *HTTPClient, comptime is_ssl: bool, incoming_data: []const u
                 }
                 return;
             }
-
             const should_continue = this.handleResponseMetadata(
                 &response,
             ) catch |err| {
@@ -3075,8 +3262,7 @@ pub fn progressUpdate(this: *HTTPClient, comptime is_ssl: bool, ctx: *NewHTTPCon
                     this.connected_url.getPortAuto(),
                 );
             } else if (!socket.isClosed()) {
-                NewHTTPContext(is_ssl).markSocketAsDead(socket);
-                socket.close(.normal);
+                NewHTTPContext(is_ssl).closeSocket(socket);
             }
 
             this.state.reset(this.allocator);
@@ -3234,14 +3420,7 @@ fn handleResponseBodyFromSinglePacket(this: *HTTPClient, incoming_data: []const
     if (this.state.is_redirect_pending) return;
 
     if (this.state.encoding.isCompressed()) {
-        var body_buffer = this.state.body_out_str.?;
-        if (body_buffer.list.capacity == 0) {
-            const min = @min(@ceil(@as(f64, @floatFromInt(incoming_data.len)) * 1.5), @as(f64, 1024 * 1024 * 2));
-            try body_buffer.growBy(@max(@as(usize, @intFromFloat(min)), 32));
-        }
-
-        // assert(!body_buffer.owns(b));
-        try this.state.decompressBytes(incoming_data, body_buffer);
+        try this.state.decompressBytes(incoming_data, this.state.body_out_str.?, true);
     } else {
         try this.state.getBodyBuffer().appendSliceExact(incoming_data);
     }
@@ -3289,7 +3468,12 @@ fn handleResponseBodyFromMultiplePackets(this: *HTTPClient, incoming_data: []con
     // done or streaming
     const is_done = content_length != null and this.state.total_body_received >= content_length.?;
     if (is_done or this.signals.get(.body_streaming) or content_length == null) {
-        const processed = try this.state.processBodyBuffer(buffer.*);
+        const is_final_chunk = is_done;
+        const processed = try this.state.processBodyBuffer(buffer.*, is_final_chunk);
+
+        // We can only use the libdeflate fast path when we are not streaming
+        // If we ever call processBodyBuffer again, it cannot go through the fast path.
+        this.state.is_libdeflate_fast_path_disabled = true;
 
         if (this.progress_node) |progress| {
             progress.activate();
@@ -3354,7 +3538,9 @@ fn handleResponseBodyChunkedEncodingFromMultiplePackets(
             }
             // streaming chunks
             if (this.signals.get(.body_streaming)) {
-                return try this.state.processBodyBuffer(buffer);
+                // If we're streaming, we cannot use the libdeflate fast path
+                this.state.is_libdeflate_fast_path_disabled = true;
+                return try this.state.processBodyBuffer(buffer, false);
             }
 
             return false;
@@ -3364,6 +3550,7 @@ fn handleResponseBodyChunkedEncodingFromMultiplePackets(
             this.state.received_last_chunk = true;
             _ = try this.state.processBodyBuffer(
                 buffer,
+                true,
             );
 
             if (this.progress_node) |progress| {
@@ -3432,7 +3619,10 @@ fn handleResponseBodyChunkedEncodingFromSinglePacket(
 
             // streaming chunks
             if (this.signals.get(.body_streaming)) {
-                return try this.state.processBodyBuffer(body_buffer.*);
+                // If we're streaming, we cannot use the libdeflate fast path
+                this.state.is_libdeflate_fast_path_disabled = true;
+
+                return try this.state.processBodyBuffer(body_buffer.*, true);
             }
 
             return false;
@@ -3440,7 +3630,6 @@ fn handleResponseBodyChunkedEncodingFromSinglePacket(
         // Done
         else => {
             this.state.received_last_chunk = true;
-
             try this.handleResponseBodyFromSinglePacket(buffer);
             assert(this.state.body_out_str.?.list.items.ptr != buffer.ptr);
             if (this.progress_node) |progress| {
@@ -3785,6 +3974,9 @@ pub fn handleResponseMetadata(
                     }
 
                     this.state.is_redirect_pending = true;
+                    if (this.method.hasRequestBody()) {
+                        this.state.resend_request_body_on_redirect = true;
+                    }
                 },
                 else => {},
             }
@@ -3810,3 +4002,9 @@ pub fn handleResponseMetadata(
 }
 
 const assert = bun.assert;
+
+// Exists for heap stats reasons.
+const ThreadlocalAsyncHTTP = struct {
+    async_http: AsyncHTTP,
+    pub usingnamespace bun.New(@This());
+};
diff --git a/src/import_record.zig b/src/import_record.zig
index 93e18c124d..c21e2223c8 100644
--- a/src/import_record.zig
+++ b/src/import_record.zig
@@ -7,7 +7,6 @@ const Index = @import("ast/base.zig").Index;
 const Api = @import("./api/schema.zig").Api;
 
 pub const ImportKind = enum(u8) {
-
     // An entry point provided by the user
     entry_point,
 
diff --git a/src/install/extract_tarball.zig b/src/install/extract_tarball.zig
index fc740cb479..53ba80c0d0 100644
--- a/src/install/extract_tarball.zig
+++ b/src/install/extract_tarball.zig
@@ -160,7 +160,13 @@ threadlocal var json_path_buf: bun.PathBuffer = undefined;
 fn extract(this: *const ExtractTarball, tgz_bytes: []const u8) !Install.ExtractData {
     const tmpdir = this.temp_dir;
     var tmpname_buf: if (Environment.isWindows) bun.WPathBuffer else bun.PathBuffer = undefined;
-    const name = this.name.slice();
+    const name = if (this.name.slice().len > 0) this.name.slice() else brk: {
+        // Not sure where this case hits yet.
+        // BUN-2WQ
+        Output.warn("Extracting nameless packages is not supported yet. Please open an issue on GitHub with reproduction steps.", .{});
+        bun.debugAssert(false);
+        break :brk "unnamed-package";
+    };
     const basename = brk: {
         var tmp = name;
         if (tmp[0] == '@') {
@@ -175,10 +181,6 @@ fn extract(this: *const ExtractTarball, tgz_bytes: []const u8) !Install.ExtractD
             }
         }
 
-        if (comptime Environment.allow_assert) {
-            bun.assert(tmp.len > 0);
-        }
-
         break :brk tmp;
     };
 
@@ -198,28 +200,70 @@ fn extract(this: *const ExtractTarball, tgz_bytes: []const u8) !Install.ExtractD
 
         defer extract_destination.close();
 
-        if (PackageManager.verbose_install) {
-            Output.prettyErrorln("[{s}] Start extracting {s}<r>", .{ name, tmpname });
-            Output.flush();
-        }
-
         const Archive = @import("../libarchive/libarchive.zig").Archive;
         const Zlib = @import("../zlib.zig");
         var zlib_pool = Npm.Registry.BodyPool.get(default_allocator);
         zlib_pool.data.reset();
         defer Npm.Registry.BodyPool.release(zlib_pool);
 
-        var zlib_entry = try Zlib.ZlibReaderArrayList.init(tgz_bytes, &zlib_pool.data.list, default_allocator);
-        zlib_entry.readAll() catch |err| {
-            this.package_manager.log.addErrorFmt(
-                null,
-                logger.Loc.Empty,
-                this.package_manager.allocator,
-                "{s} decompressing \"{s}\" to \"{}\"",
-                .{ @errorName(err), name, bun.fmt.fmtPath(u8, std.mem.span(tmpname), .{}) },
-            ) catch unreachable;
-            return error.InstallFailed;
-        };
+        var esimated_output_size: usize = 0;
+
+        const time_started_for_verbose_logs: u64 = if (PackageManager.verbose_install) bun.getRoughTickCount().ns() else 0;
+
+        {
+            // Last 4 bytes of a gzip-compressed file are the uncompressed size.
+            if (tgz_bytes.len > 16) {
+                // If the file claims to be larger than 16 bytes and smaller than 64 MB, we'll preallocate the buffer.
+                // If it's larger than that, we'll do it incrementally. We want to avoid OOMing.
+                const last_4_bytes: u32 = @bitCast(tgz_bytes[tgz_bytes.len - 4 ..][0..4].*);
+                if (last_4_bytes > 16 and last_4_bytes < 64 * 1024 * 1024) {
+                    // It's okay if this fails. We will just allocate as we go and that will error if we run out of memory.
+                    esimated_output_size = last_4_bytes;
+                    if (zlib_pool.data.list.capacity == 0) {
+                        zlib_pool.data.list.ensureTotalCapacityPrecise(zlib_pool.data.allocator, last_4_bytes) catch {};
+                    } else {
+                        zlib_pool.data.ensureUnusedCapacity(last_4_bytes) catch {};
+                    }
+                }
+            }
+        }
+
+        var needs_to_decompress = true;
+        if (bun.FeatureFlags.isLibdeflateEnabled() and zlib_pool.data.list.capacity > 16 and esimated_output_size > 0) use_libdeflate: {
+            const decompressor = bun.libdeflate.Decompressor.alloc() orelse break :use_libdeflate;
+            defer decompressor.deinit();
+
+            const result = decompressor.gzip(tgz_bytes, zlib_pool.data.list.allocatedSlice());
+
+            if (result.status == .success) {
+                zlib_pool.data.list.items.len = result.written;
+                needs_to_decompress = false;
+            }
+
+            // If libdeflate fails for any reason, fallback to zlib.
+        }
+
+        if (needs_to_decompress) {
+            zlib_pool.data.list.clearRetainingCapacity();
+            var zlib_entry = try Zlib.ZlibReaderArrayList.init(tgz_bytes, &zlib_pool.data.list, default_allocator);
+            zlib_entry.readAll() catch |err| {
+                this.package_manager.log.addErrorFmt(
+                    null,
+                    logger.Loc.Empty,
+                    this.package_manager.allocator,
+                    "{s} decompressing \"{s}\" to \"{}\"",
+                    .{ @errorName(err), name, bun.fmt.fmtPath(u8, std.mem.span(tmpname), .{}) },
+                ) catch unreachable;
+                return error.InstallFailed;
+            };
+        }
+
+        if (PackageManager.verbose_install) {
+            const decompressing_ended_at: u64 = bun.getRoughTickCount().ns();
+            const elapsed = decompressing_ended_at - time_started_for_verbose_logs;
+            Output.prettyErrorln("[{s}] Extract {s}<r> (decompressed {} tgz file in {})", .{ name, tmpname, bun.fmt.size(tgz_bytes.len), bun.fmt.fmtDuration(elapsed) });
+        }
+
         switch (this.resolution.tag) {
             .github => {
                 const DirnameReader = struct {
@@ -278,7 +322,8 @@ fn extract(this: *const ExtractTarball, tgz_bytes: []const u8) !Install.ExtractD
         }
 
         if (PackageManager.verbose_install) {
-            Output.prettyErrorln("[{s}] Extracted<r>", .{name});
+            const elapsed = bun.getRoughTickCount().ns() - time_started_for_verbose_logs;
+            Output.prettyErrorln("[{s}] Extracted to {s} ({})<r>", .{ name, tmpname, bun.fmt.fmtDuration(elapsed) });
             Output.flush();
         }
     }
diff --git a/src/install/install.zig b/src/install/install.zig
index 00e4a06480..8d6bb0a0bf 100644
--- a/src/install/install.zig
+++ b/src/install/install.zig
@@ -426,7 +426,7 @@ const NetworkTask = struct {
         this.allocator = allocator;
 
         const url = URL.parse(this.url_buf);
-        this.http = AsyncHTTP.init(allocator, .GET, url, header_builder.entries, header_builder.content.ptr.?[0..header_builder.content.len], &this.response_buffer, "", 0, this.getCompletionCallback(), HTTP.FetchRedirect.follow, .{
+        this.http = AsyncHTTP.init(allocator, .GET, url, header_builder.entries, header_builder.content.ptr.?[0..header_builder.content.len], &this.response_buffer, "", this.getCompletionCallback(), HTTP.FetchRedirect.follow, .{
             .http_proxy = this.package_manager.httpProxy(url),
         });
         this.http.client.reject_unauthorized = this.package_manager.tlsRejectUnauthorized();
@@ -510,7 +510,7 @@ const NetworkTask = struct {
 
         const url = URL.parse(this.url_buf);
 
-        this.http = AsyncHTTP.init(allocator, .GET, url, header_builder.entries, header_buf, &this.response_buffer, "", 0, this.getCompletionCallback(), HTTP.FetchRedirect.follow, .{
+        this.http = AsyncHTTP.init(allocator, .GET, url, header_builder.entries, header_buf, &this.response_buffer, "", this.getCompletionCallback(), HTTP.FetchRedirect.follow, .{
             .http_proxy = this.package_manager.httpProxy(url),
         });
         this.http.client.reject_unauthorized = this.package_manager.tlsRejectUnauthorized();
@@ -6167,19 +6167,21 @@ pub const PackageManager = struct {
                         }
                     }
 
-                    const response = task.http.response orelse {
+                    if (!has_network_error and task.http.response == null) {
+                        has_network_error = true;
+                        const min = manager.options.min_simultaneous_requests;
+                        const max = AsyncHTTP.max_simultaneous_requests.load(.monotonic);
+                        if (max > min) {
+                            AsyncHTTP.max_simultaneous_requests.store(@max(min, max / 2), .monotonic);
+                        }
+                    }
+
+                    // Handle retry-able errors.
+                    if (task.http.response == null or task.http.response.?.status_code > 499) {
                         const err = task.http.err orelse error.HTTPError;
 
                         if (task.retried < manager.options.max_retry_count) {
                             task.retried += 1;
-                            if (!has_network_error) {
-                                has_network_error = true;
-                                const min = manager.options.min_simultaneous_requests;
-                                const max = AsyncHTTP.max_simultaneous_requests.load(.monotonic);
-                                if (max > min) {
-                                    AsyncHTTP.max_simultaneous_requests.store(@max(min, max / 2), .monotonic);
-                                }
-                            }
                             manager.enqueueNetworkTask(task);
 
                             if (manager.options.log_level.isVerbose()) {
@@ -6187,13 +6189,18 @@ pub const PackageManager = struct {
                                     null,
                                     logger.Loc.Empty,
                                     manager.allocator,
-                                    "{s} downloading package manifest <b>{s}<r>",
-                                    .{ bun.span(@errorName(err)), name.slice() },
+                                    "{s} downloading package manifest <b>{s}<r>. Retry {d}/{d}...",
+                                    .{ bun.span(@errorName(err)), name.slice(), task.retried, manager.options.max_retry_count },
                                 ) catch unreachable;
                             }
 
                             continue;
                         }
+                    }
+
+                    const response = task.http.response orelse {
+                        // Handle non-retry-able errors.
+                        const err = task.http.err orelse error.HTTPError;
 
                         if (@TypeOf(callbacks.onPackageManifestError) != void) {
                             callbacks.onPackageManifestError(
@@ -6336,19 +6343,20 @@ pub const PackageManager = struct {
                     manager.task_batch.push(ThreadPool.Batch.from(manager.enqueueParseNPMPackage(task.task_id, name, task)));
                 },
                 .extract => |*extract| {
-                    const response = task.http.response orelse {
+                    if (!has_network_error and task.http.response == null) {
+                        has_network_error = true;
+                        const min = manager.options.min_simultaneous_requests;
+                        const max = AsyncHTTP.max_simultaneous_requests.load(.monotonic);
+                        if (max > min) {
+                            AsyncHTTP.max_simultaneous_requests.store(@max(min, max / 2), .monotonic);
+                        }
+                    }
+
+                    if (task.http.response == null or task.http.response.?.status_code > 499) {
                         const err = task.http.err orelse error.TarballFailedToDownload;
 
                         if (task.retried < manager.options.max_retry_count) {
                             task.retried += 1;
-                            if (!has_network_error) {
-                                has_network_error = true;
-                                const min = manager.options.min_simultaneous_requests;
-                                const max = AsyncHTTP.max_simultaneous_requests.load(.monotonic);
-                                if (max > min) {
-                                    AsyncHTTP.max_simultaneous_requests.store(@max(min, max / 2), .monotonic);
-                                }
-                            }
                             manager.enqueueNetworkTask(task);
 
                             if (manager.options.log_level.isVerbose()) {
@@ -6356,17 +6364,23 @@ pub const PackageManager = struct {
                                     null,
                                     logger.Loc.Empty,
                                     manager.allocator,
-                                    "<r><yellow>warn:<r> {s} downloading tarball <b>{s}@{s}<r>",
+                                    "<r><yellow>warn:<r> {s} downloading tarball <b>{s}@{s}<r>. Retrying {d}/{d}...",
                                     .{
                                         bun.span(@errorName(err)),
                                         extract.name.slice(),
                                         extract.resolution.fmt(manager.lockfile.buffers.string_bytes.items, .auto),
+                                        task.retried,
+                                        manager.options.max_retry_count,
                                     },
                                 ) catch unreachable;
                             }
 
                             continue;
                         }
+                    }
+
+                    const response = task.http.response orelse {
+                        const err = task.http.err orelse error.TarballFailedToDownload;
 
                         if (@TypeOf(callbacks.onPackageDownloadError) != void) {
                             const package_id = manager.lockfile.buffers.resolutions.items[extract.dependency_id];
@@ -6485,7 +6499,7 @@ pub const PackageManager = struct {
                     if (comptime log_level.isVerbose()) {
                         Output.prettyError("    ", .{});
                         Output.printElapsed(@as(f64, @floatCast(@as(f64, @floatFromInt(task.http.elapsed)) / std.time.ns_per_ms)));
-                        Output.prettyError("<d>Downloaded <r><green>{s}<r> tarball\n", .{extract.name.slice()});
+                        Output.prettyError("<d> Downloaded <r><green>{s}<r> tarball\n", .{extract.name.slice()});
                         Output.flush();
                     }
 
@@ -8186,15 +8200,10 @@ pub const PackageManager = struct {
         }
     };
 
-    pub fn init(ctx: Command.Context, comptime subcommand: Subcommand) !*PackageManager {
-        const cli = try CommandLineArguments.parse(ctx.allocator, subcommand);
-        return initWithCLI(ctx, cli, subcommand);
-    }
-
-    fn initWithCLI(
+    pub fn init(
         ctx: Command.Context,
         cli: CommandLineArguments,
-        comptime subcommand: Subcommand,
+        subcommand: Subcommand,
     ) !*PackageManager {
         // assume that spawning a thread will take a lil so we do that asap
         HTTP.HTTPThread.init();
@@ -8286,7 +8295,7 @@ pub const PackageManager = struct {
                     };
                 }
 
-                if (comptime subcommand == .install) {
+                if (subcommand == .install) {
                     if (cli.positionals.len > 1) {
                         // this is `bun add <package>`.
                         //
@@ -8312,7 +8321,7 @@ pub const PackageManager = struct {
 
             // Check if this is a workspace; if so, use root package
             var found = false;
-            if (comptime subcommand != .link) {
+            if (subcommand != .link) {
                 if (!created_package_json) {
                     while (std.fs.path.dirname(this_cwd)) |parent| : (this_cwd = parent) {
                         const parent_without_trailing_slash = strings.withoutTrailingSlash(parent);
@@ -8680,29 +8689,29 @@ pub const PackageManager = struct {
     // parse dependency of positional arg string (may include name@version for example)
     // get the precise version from the lockfile (there may be multiple)
     // copy the contents into a temp folder
-    pub inline fn patch(ctx: Command.Context) !void {
+    pub fn patch(ctx: Command.Context) !void {
         try updatePackageJSONAndInstallCatchError(ctx, .patch);
     }
 
-    pub inline fn patchCommit(ctx: Command.Context) !void {
+    pub fn patchCommit(ctx: Command.Context) !void {
         try updatePackageJSONAndInstallCatchError(ctx, .@"patch-commit");
     }
 
-    pub inline fn update(ctx: Command.Context) !void {
+    pub fn update(ctx: Command.Context) !void {
         try updatePackageJSONAndInstallCatchError(ctx, .update);
     }
 
-    pub inline fn add(ctx: Command.Context) !void {
+    pub fn add(ctx: Command.Context) !void {
         try updatePackageJSONAndInstallCatchError(ctx, .add);
     }
 
-    pub inline fn remove(ctx: Command.Context) !void {
+    pub fn remove(ctx: Command.Context) !void {
         try updatePackageJSONAndInstallCatchError(ctx, .remove);
     }
 
     pub fn updatePackageJSONAndInstallCatchError(
         ctx: Command.Context,
-        comptime subcommand: Subcommand,
+        subcommand: Subcommand,
     ) !void {
         updatePackageJSONAndInstall(ctx, subcommand) catch |err| {
             switch (err) {
@@ -8719,11 +8728,12 @@ pub const PackageManager = struct {
         };
     }
 
-    pub inline fn link(ctx: Command.Context) !void {
-        var manager = PackageManager.init(ctx, .link) catch |err| brk: {
+    pub fn link(ctx: Command.Context) !void {
+        const cli = try CommandLineArguments.parse(ctx.allocator, .link);
+        var manager = PackageManager.init(ctx, cli, .link) catch |err| brk: {
             if (err == error.MissingPackageJSON) {
                 try attemptToCreatePackageJSON();
-                break :brk try PackageManager.init(ctx, .link);
+                break :brk try PackageManager.init(ctx, cli, .link);
             }
 
             return err;
@@ -8900,11 +8910,12 @@ pub const PackageManager = struct {
         }
     }
 
-    pub inline fn unlink(ctx: Command.Context) !void {
-        var manager = PackageManager.init(ctx, .unlink) catch |err| brk: {
+    pub fn unlink(ctx: Command.Context) !void {
+        const cli = try PackageManager.CommandLineArguments.parse(ctx.allocator, .unlink);
+        var manager = PackageManager.init(ctx, cli, .unlink) catch |err| brk: {
             if (err == error.MissingPackageJSON) {
                 try attemptToCreatePackageJSON();
-                break :brk try PackageManager.init(ctx, .unlink);
+                break :brk try PackageManager.init(ctx, cli, .unlink);
             }
 
             return err;
@@ -9056,54 +9067,54 @@ pub const PackageManager = struct {
         clap.parseParam("-h, --help                            Print this help menu") catch unreachable,
     };
 
-    pub const install_params = install_params_ ++ [_]ParamType{
+    pub const install_params: []const ParamType = &(install_params_ ++ [_]ParamType{
         clap.parseParam("-d, --dev                 Add dependency to \"devDependencies\"") catch unreachable,
         clap.parseParam("-D, --development") catch unreachable,
         clap.parseParam("--optional                        Add dependency to \"optionalDependencies\"") catch unreachable,
         clap.parseParam("-E, --exact                  Add the exact version instead of the ^range") catch unreachable,
         clap.parseParam("<POS> ...                         ") catch unreachable,
-    };
+    });
 
-    pub const update_params = install_params_ ++ [_]ParamType{
+    pub const update_params: []const ParamType = &(install_params_ ++ [_]ParamType{
         clap.parseParam("--latest                              Update packages to their latest versions") catch unreachable,
         clap.parseParam("<POS> ...                         \"name\" of packages to update") catch unreachable,
-    };
+    });
 
-    pub const pm_params = install_params_ ++ [_]ParamType{
+    pub const pm_params: []const ParamType = &(install_params_ ++ [_]ParamType{
         clap.parseParam("-a, --all") catch unreachable,
         clap.parseParam("<POS> ...                         ") catch unreachable,
-    };
+    });
 
-    pub const add_params = install_params_ ++ [_]ParamType{
+    pub const add_params: []const ParamType = &(install_params_ ++ [_]ParamType{
         clap.parseParam("-d, --dev                 Add dependency to \"devDependencies\"") catch unreachable,
         clap.parseParam("-D, --development") catch unreachable,
         clap.parseParam("--optional                        Add dependency to \"optionalDependencies\"") catch unreachable,
         clap.parseParam("-E, --exact                  Add the exact version instead of the ^range") catch unreachable,
         clap.parseParam("<POS> ...                         \"name\" or \"name@version\" of package(s) to install") catch unreachable,
-    };
+    });
 
-    pub const remove_params = install_params_ ++ [_]ParamType{
+    pub const remove_params: []const ParamType = &(install_params_ ++ [_]ParamType{
         clap.parseParam("<POS> ...                         \"name\" of package(s) to remove from package.json") catch unreachable,
-    };
+    });
 
-    pub const link_params = install_params_ ++ [_]ParamType{
+    pub const link_params: []const ParamType = &(install_params_ ++ [_]ParamType{
         clap.parseParam("<POS> ...                         \"name\" install package as a link") catch unreachable,
-    };
+    });
 
-    pub const unlink_params = install_params_ ++ [_]ParamType{
+    pub const unlink_params: []const ParamType = &(install_params_ ++ [_]ParamType{
         clap.parseParam("<POS> ...                         \"name\" uninstall package as a link") catch unreachable,
-    };
+    });
 
-    const patch_params = install_params_ ++ [_]ParamType{
+    const patch_params: []const ParamType = &(install_params_ ++ [_]ParamType{
         clap.parseParam("<POS> ...                         \"name\" of the package to patch") catch unreachable,
         clap.parseParam("--commit                         Install a package containing modifications in `dir`") catch unreachable,
         clap.parseParam("--patches-dir <dir>                    The directory to put the patch file in (only if --commit is used)") catch unreachable,
-    };
+    });
 
-    const patch_commit_params = install_params_ ++ [_]ParamType{
+    const patch_commit_params: []const ParamType = &(install_params_ ++ [_]ParamType{
         clap.parseParam("<POS> ...                         \"dir\" containing changes to a package") catch unreachable,
         clap.parseParam("--patches-dir <dir>                    The directory to put the patch file") catch unreachable,
-    };
+    });
 
     pub const CommandLineArguments = struct {
         registry: string = "",
@@ -9169,7 +9180,7 @@ pub const PackageManager = struct {
             }
         };
 
-        pub fn printHelp(comptime subcommand: Subcommand) void {
+        pub fn printHelp(subcommand: Subcommand) void {
             switch (subcommand) {
                 // fall back to HelpCommand.printWithReason
                 Subcommand.install => {
@@ -9192,7 +9203,7 @@ pub const PackageManager = struct {
                     Output.flush();
                     Output.pretty("\n\n<b>Flags:<r>", .{});
                     Output.flush();
-                    clap.simpleHelp(&PackageManager.install_params);
+                    clap.simpleHelp(PackageManager.install_params);
                     Output.pretty("\n\n" ++ outro_text ++ "\n", .{});
                     Output.flush();
                 },
@@ -9219,7 +9230,7 @@ pub const PackageManager = struct {
                     Output.flush();
                     Output.pretty("\n<b>Flags:<r>", .{});
                     Output.flush();
-                    clap.simpleHelp(&PackageManager.update_params);
+                    clap.simpleHelp(PackageManager.update_params);
                     Output.pretty("\n\n" ++ outro_text ++ "\n", .{});
                     Output.flush();
                 },
@@ -9235,7 +9246,7 @@ pub const PackageManager = struct {
                     Output.flush();
                     Output.pretty("\n<b>Flags:<r>", .{});
                     Output.flush();
-                    clap.simpleHelp(&PackageManager.patch_params);
+                    clap.simpleHelp(PackageManager.patch_params);
                     // Output.pretty("\n\n" ++ outro_text ++ "\n", .{});
                     Output.flush();
                 },
@@ -9260,7 +9271,7 @@ pub const PackageManager = struct {
                     Output.flush();
                     Output.pretty("\n<b>Flags:<r>", .{});
                     Output.flush();
-                    clap.simpleHelp(&PackageManager.patch_params);
+                    clap.simpleHelp(PackageManager.patch_params);
                     // Output.pretty("\n\n" ++ outro_text ++ "\n", .{});
                     Output.flush();
                 },
@@ -9290,7 +9301,7 @@ pub const PackageManager = struct {
                     Output.flush();
                     Output.pretty("\n\n<b>Flags:<r>", .{});
                     Output.flush();
-                    clap.simpleHelp(&PackageManager.add_params);
+                    clap.simpleHelp(PackageManager.add_params);
                     Output.pretty("\n\n" ++ outro_text ++ "\n", .{});
                     Output.flush();
                 },
@@ -9312,7 +9323,7 @@ pub const PackageManager = struct {
                     Output.flush();
                     Output.pretty("\n<b>Flags:<r>", .{});
                     Output.flush();
-                    clap.simpleHelp(&PackageManager.remove_params);
+                    clap.simpleHelp(PackageManager.remove_params);
                     Output.pretty("\n\n" ++ outro_text ++ "\n", .{});
                     Output.flush();
                 },
@@ -9336,7 +9347,7 @@ pub const PackageManager = struct {
                     Output.flush();
                     Output.pretty("\n<b>Flags:<r>", .{});
                     Output.flush();
-                    clap.simpleHelp(&PackageManager.link_params);
+                    clap.simpleHelp(PackageManager.link_params);
                     Output.pretty("\n\n" ++ outro_text ++ "\n", .{});
                     Output.flush();
                 },
@@ -9357,7 +9368,7 @@ pub const PackageManager = struct {
                     Output.flush();
                     Output.pretty("\n<b>Flags:<r>", .{});
                     Output.flush();
-                    clap.simpleHelp(&PackageManager.unlink_params);
+                    clap.simpleHelp(PackageManager.unlink_params);
                     Output.pretty("\n\n" ++ outro_text ++ "\n", .{});
                     Output.flush();
                 },
@@ -9367,7 +9378,7 @@ pub const PackageManager = struct {
         pub fn parse(allocator: std.mem.Allocator, comptime subcommand: Subcommand) !CommandLineArguments {
             Output.is_verbose = Output.isVerbose();
 
-            const params: []const ParamType = &switch (subcommand) {
+            const params: []const ParamType = switch (subcommand) {
                 .install => install_params,
                 .update => update_params,
                 .pm => pm_params,
@@ -9681,9 +9692,12 @@ pub const PackageManager = struct {
 
     fn updatePackageJSONAndInstall(
         ctx: Command.Context,
-        comptime subcommand: Subcommand,
+        subcommand: Subcommand,
     ) !void {
-        var manager = init(ctx, subcommand) catch |err| brk: {
+        const cli = switch (subcommand) {
+            inline else => |cmd| try PackageManager.CommandLineArguments.parse(ctx.allocator, cmd),
+        };
+        var manager = init(ctx, cli, subcommand) catch |err| brk: {
             if (err == error.MissingPackageJSON) {
                 switch (subcommand) {
                     .update => {
@@ -9700,7 +9714,7 @@ pub const PackageManager = struct {
                     },
                     else => {
                         try attemptToCreatePackageJSON();
-                        break :brk try PackageManager.init(ctx, subcommand);
+                        break :brk try PackageManager.init(ctx, cli, subcommand);
                     },
                 }
             }
@@ -9709,7 +9723,7 @@ pub const PackageManager = struct {
         };
 
         if (manager.options.shouldPrintCommandName()) {
-            Output.prettyErrorln("<r><b>bun " ++ @tagName(subcommand) ++ " <r><d>v" ++ Global.package_json_version_with_sha ++ "<r>\n", .{});
+            Output.prettyErrorln("<r><b>bun {s} <r><d>v" ++ Global.package_json_version_with_sha ++ "<r>\n", .{@tagName(subcommand)});
             Output.flush();
         }
 
@@ -9882,21 +9896,19 @@ pub const PackageManager = struct {
             &[_]UpdateRequest{}
         else
             UpdateRequest.parse(ctx.allocator, ctx.log, manager.options.positionals[1..], &update_requests, manager.subcommand);
-        switch (manager.subcommand) {
-            inline else => |subcommand| try manager.updatePackageJSONAndInstallWithManagerWithUpdates(
-                ctx,
-                updates,
-                subcommand,
-                log_level,
-            ),
-        }
+        try manager.updatePackageJSONAndInstallWithManagerWithUpdates(
+            ctx,
+            updates,
+            manager.subcommand,
+            log_level,
+        );
     }
 
     fn updatePackageJSONAndInstallWithManagerWithUpdates(
         manager: *PackageManager,
         ctx: Command.Context,
         updates: []UpdateRequest,
-        comptime subcommand: Subcommand,
+        subcommand: Subcommand,
         comptime log_level: Options.LogLevel,
     ) !void {
         if (manager.log.errors > 0) {
@@ -9950,17 +9962,17 @@ pub const PackageManager = struct {
 
         if (subcommand == .remove) {
             if (current_package_json.root.data != .e_object) {
-                Output.errGeneric("package.json is not an Object {{}}, so there's nothing to " ++ @tagName(subcommand) ++ "!", .{});
+                Output.errGeneric("package.json is not an Object {{}}, so there's nothing to {s}!", .{@tagName(subcommand)});
                 Global.crash();
             } else if (current_package_json.root.data.e_object.properties.len == 0) {
-                Output.errGeneric("package.json is empty {{}}, so there's nothing to " ++ @tagName(subcommand) ++ "!", .{});
+                Output.errGeneric("package.json is empty {{}}, so there's nothing to {s}!", .{@tagName(subcommand)});
                 Global.crash();
             } else if (current_package_json.root.asProperty("devDependencies") == null and
                 current_package_json.root.asProperty("dependencies") == null and
                 current_package_json.root.asProperty("optionalDependencies") == null and
                 current_package_json.root.asProperty("peerDependencies") == null)
             {
-                Output.prettyErrorln("package.json doesn't have dependencies, there's nothing to " ++ @tagName(subcommand) ++ "!", .{});
+                Output.prettyErrorln("package.json doesn't have dependencies, there's nothing to {s}!", .{@tagName(subcommand)});
                 Global.exit(0);
             }
         }
@@ -11443,8 +11455,9 @@ pub const PackageManager = struct {
     var package_json_cwd_buf: bun.PathBuffer = undefined;
     pub var package_json_cwd: string = "";
 
-    pub inline fn install(ctx: Command.Context) !void {
-        var manager = try init(ctx, .install);
+    pub fn install(ctx: Command.Context) !void {
+        const cli = try CommandLineArguments.parse(ctx.allocator, .install);
+        var manager = try init(ctx, cli, .install);
 
         // switch to `bun add <package>`
         if (manager.options.positionals.len > 1) {
diff --git a/src/install/lifecycle_script_runner.zig b/src/install/lifecycle_script_runner.zig
index 0d1eeddef3..f9df8bfd63 100644
--- a/src/install/lifecycle_script_runner.zig
+++ b/src/install/lifecycle_script_runner.zig
@@ -353,15 +353,15 @@ pub const LifecycleScriptSubprocess = struct {
             },
             .signaled => |signal| {
                 this.printOutput();
+                const signal_code = bun.SignalCode.from(signal);
+
                 Output.prettyErrorln("<r><red>error<r><d>:<r> <b>{s}<r> script from \"<b>{s}<r>\" terminated by {}<r>", .{
                     this.scriptName(),
                     this.package_name,
-
-                    bun.SignalCode.from(signal).fmt(Output.enable_ansi_colors_stderr),
+                    signal_code.fmt(Output.enable_ansi_colors_stderr),
                 });
-                Global.raiseIgnoringPanicHandler(@intFromEnum(signal));
 
-                return;
+                Global.raiseIgnoringPanicHandler(signal);
             },
             .err => |err| {
                 Output.prettyErrorln("<r><red>error<r>: Failed to run <b>{s}<r> script from \"<b>{s}<r>\" due to\n{}", .{
@@ -372,7 +372,6 @@ pub const LifecycleScriptSubprocess = struct {
                 this.deinit();
                 Output.flush();
                 Global.exit(1);
-                return;
             },
             else => {
                 Output.panic("<r><red>error<r>: Failed to run <b>{s}<r> script from \"<b>{s}<r>\" due to unexpected status\n{any}", .{
diff --git a/src/js/builtins/BunBuiltinNames.h b/src/js/builtins/BunBuiltinNames.h
index 226a340ae3..1ea5e53986 100644
--- a/src/js/builtins/BunBuiltinNames.h
+++ b/src/js/builtins/BunBuiltinNames.h
@@ -14,6 +14,7 @@
 #include <JavaScriptCore/VM.h>
 #include <JavaScriptCore/Identifier.h>
 #include <JavaScriptCore/BuiltinUtils.h>
+#include "BunBuiltinNames+extras.h"
 
 namespace WebCore {
 
@@ -194,7 +195,6 @@ using namespace JSC;
     macro(requireESM) \
     macro(requireMap) \
     macro(requireNativeModule) \
-    macro(resolve) \
     macro(resolveSync) \
     macro(resume) \
     macro(self) \
@@ -250,6 +250,8 @@ using namespace JSC;
     macro(writeRequests) \
     macro(writing) \
     macro(written) \
+    BUN_ADDITIONAL_BUILTIN_NAMES(macro)
+// --- END of BUN_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME ---
 
 class BunBuiltinNames {
 public:
@@ -268,6 +270,8 @@ public:
 
     BUN_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(DECLARE_BUILTIN_IDENTIFIER_ACCESSOR)
 
+    const JSC::Identifier& resolvePublicName() const { return m_vm.propertyNames->resolve;}
+
 private:
     JSC::VM& m_vm;
     BUN_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(DECLARE_BUILTIN_NAMES)
diff --git a/src/js/builtins/ReadableStreamInternals.ts b/src/js/builtins/ReadableStreamInternals.ts
index 2fdc118f34..55eb00fb49 100644
--- a/src/js/builtins/ReadableStreamInternals.ts
+++ b/src/js/builtins/ReadableStreamInternals.ts
@@ -1328,7 +1328,13 @@ export function readableStreamDefaultControllerCallPullIfNeeded(controller) {
 
 export function isReadableStreamLocked(stream) {
   $assert($isReadableStream(stream));
-  return !!$getByIdDirectPrivate(stream, "reader") || stream.$bunNativePtr === -1;
+  return (
+    // Case 1. Is there a reader actively using it?
+    !!$getByIdDirectPrivate(stream, "reader") ||
+    // Case 2. Has the native reader been released?
+    // Case 3. Has it been converted into a Node.js NativeReadable?
+    stream.$bunNativePtr === -1
+  );
 }
 
 export function readableStreamDefaultControllerGetDesiredSize(controller) {
diff --git a/src/js/internal-for-testing.ts b/src/js/internal-for-testing.ts
index 4f6f42231b..9314943ab7 100644
--- a/src/js/internal-for-testing.ts
+++ b/src/js/internal-for-testing.ts
@@ -57,6 +57,7 @@ export const crash_handler = $zig("crash_handler.zig", "js_bindings.generate") a
   panic: () => void;
   rootError: () => void;
   outOfMemory: () => void;
+  raiseIgnoringPanicHandler: () => void;
 };
 
 export const upgrade_test_helpers = $zig("upgrade_command.zig", "upgrade_js_bindings.generate") as {
diff --git a/src/js/internal/errors.ts b/src/js/internal/errors.ts
new file mode 100644
index 0000000000..034f33b457
--- /dev/null
+++ b/src/js/internal/errors.ts
@@ -0,0 +1,4 @@
+export default {
+  ERR_INVALID_ARG_TYPE: $newCppFunction("NodeError.cpp", "jsFunction_ERR_INVALID_ARG_TYPE", 3),
+  ERR_OUT_OF_RANGE: $newCppFunction("NodeError.cpp", "jsFunction_ERR_OUT_OF_RANGE", 3),
+};
diff --git a/src/js/node/dgram.ts b/src/js/node/dgram.ts
index b3fb856096..8762c82b0a 100644
--- a/src/js/node/dgram.ts
+++ b/src/js/node/dgram.ts
@@ -247,6 +247,7 @@ function Socket(type, listener) {
     ipv6Only: options && options.ipv6Only,
     recvBufferSize,
     sendBufferSize,
+    unrefOnBind: false,
   };
 
   if (options?.signal !== undefined) {
@@ -399,6 +400,10 @@ Socket.prototype.bind = function (port_, address_ /* , callback */) {
       },
     }).$then(
       socket => {
+        if (state.unrefOnBind) {
+          socket.unref();
+          state.unrefOnBind = false;
+        }
         state.handle.socket = socket;
         state.receiving = true;
         state.bindState = BIND_STATE_BOUND;
@@ -934,7 +939,11 @@ Socket.prototype.ref = function () {
 Socket.prototype.unref = function () {
   const socket = this[kStateSymbol].handle?.socket;
 
-  if (socket) socket.unref();
+  if (socket) {
+    socket.unref();
+  } else {
+    this[kStateSymbol].unrefOnBind = true;
+  }
 
   return this;
 };
diff --git a/src/js/node/http.ts b/src/js/node/http.ts
index 87e1a47338..45c8efefb8 100644
--- a/src/js/node/http.ts
+++ b/src/js/node/http.ts
@@ -7,10 +7,28 @@ const {
   getHeader,
   setHeader,
   assignHeaders: assignHeadersFast,
-} = $cpp("NodeHTTP.cpp", "createNodeHTTPInternalBinding");
+  Response,
+  Request,
+  Headers,
+  Blob,
+  headersTuple,
+} = $cpp("NodeHTTP.cpp", "createNodeHTTPInternalBinding") as {
+  getHeader: (headers: Headers, name: string) => string | undefined;
+  setHeader: (headers: Headers, name: string, value: string) => void;
+  assignHeaders: (object: any, req: Request, headersTuple: any) => boolean;
+  Response: (typeof globalThis)["Response"];
+  Request: (typeof globalThis)["Request"];
+  Headers: (typeof globalThis)["Headers"];
+  Blob: (typeof globalThis)["Blob"];
+  headersTuple: any;
+};
+
+// TODO: make this more robust.
+function isAbortError(err) {
+  return err?.name === "AbortError";
+}
 
 const ObjectDefineProperty = Object.defineProperty;
-const ObjectSetPrototypeOf = Object.setPrototypeOf;
 
 const GlobalPromise = globalThis.Promise;
 const headerCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
@@ -274,7 +292,7 @@ function Agent(options = kEmptyObject) {
   this.protocol = options.protocol || "http:";
 }
 Agent.prototype = {};
-ObjectSetPrototypeOf(Agent.prototype, EventEmitter.prototype);
+$setPrototypeDirect.$call(Agent.prototype, EventEmitter.prototype);
 
 ObjectDefineProperty(Agent, "globalAgent", {
   get: function () {
@@ -331,21 +349,11 @@ Agent.prototype.destroy = function () {
   $debug(`${NODE_HTTP_WARNING}\n`, "WARN: Agent.destroy is a no-op");
 };
 
-function emitListeningNextTick(self, onListen, err, hostname, port) {
-  if (typeof onListen === "function") {
-    try {
-      onListen.$apply(self, [err, hostname, port]);
-    } catch (err) {
-      self.emit("error", err);
-    }
-  }
-
-  self.listening = !err;
-
-  if (err) {
-    self.emit("error", err);
-  } else {
-    self.emit("listening", hostname, port);
+function emitListeningNextTick(self, hostname, port) {
+  if ((self.listening = !!self[serverSymbol])) {
+    // TODO: remove the arguments
+    // Note does not pass any arguments.
+    self.emit("listening", null, hostname, port);
   }
 }
 
@@ -431,200 +439,220 @@ function Server(options, callback) {
   if (callback) this.on("request", callback);
   return this;
 }
-Object.setPrototypeOf((Server.prototype = {}), EventEmitter.prototype);
-Server.prototype.constructor = Server; // Re-add constructor which got lost when setting prototype
-Object.setPrototypeOf(Server, EventEmitter);
 
-Server.prototype.ref = function () {
-  this._unref = false;
-  this[serverSymbol]?.ref?.();
-  return this;
-};
+Server.prototype = {
+  ref() {
+    this._unref = false;
+    this[serverSymbol]?.ref?.();
+    return this;
+  },
 
-Server.prototype.unref = function () {
-  this._unref = true;
-  this[serverSymbol]?.unref?.();
-  return this;
-};
+  unref() {
+    this._unref = true;
+    this[serverSymbol]?.unref?.();
+    return this;
+  },
 
-Server.prototype.closeAllConnections = function () {
-  const server = this[serverSymbol];
-  if (!server) {
-    return;
-  }
-  this[serverSymbol] = undefined;
-  server.stop(true);
-  this.emit("close");
-};
-
-Server.prototype.closeIdleConnections = function () {
-  // not actually implemented
-};
-
-Server.prototype.close = function (optionalCallback?) {
-  const server = this[serverSymbol];
-  if (!server) {
-    if (typeof optionalCallback === "function") process.nextTick(optionalCallback, new Error("Server is not running"));
-    return;
-  }
-  this[serverSymbol] = undefined;
-  if (typeof optionalCallback === "function") this.once("close", optionalCallback);
-  server.stop();
-  this.emit("close");
-};
-
-Server.prototype[Symbol.asyncDispose] = function () {
-  const { resolve, reject, promise } = Promise.withResolvers();
-  this.close(function (err, ...args) {
-    if (err) reject(err);
-    else resolve(...args);
-  });
-  return promise;
-};
-
-Server.prototype.address = function () {
-  if (!this[serverSymbol]) return null;
-  return this[serverSymbol].address;
-};
-
-Server.prototype.listen = function (port, host, backlog, onListen) {
-  const server = this;
-  let socketPath;
-  if (typeof port == "string" && !Number.isSafeInteger(Number(port))) {
-    socketPath = port;
-  }
-  if (typeof host === "function") {
-    onListen = host;
-    host = undefined;
-  }
-
-  if (typeof port === "function") {
-    onListen = port;
-  } else if (typeof port === "object") {
-    port?.signal?.addEventListener("abort", () => {
-      this.close();
-    });
-
-    host = port?.host;
-    port = port?.port;
-
-    if (typeof port?.callback === "function") onListen = port?.callback;
-  }
-
-  if (typeof backlog === "function") {
-    onListen = backlog;
-  }
-
-  const ResponseClass = this[optionsSymbol].ServerResponse || ServerResponse;
-  const RequestClass = this[optionsSymbol].IncomingMessage || IncomingMessage;
-  let isHTTPS = false;
-
-  try {
-    const tls = this[tlsSymbol];
-    if (tls) {
-      this.serverName = tls.serverName || host || "localhost";
+  closeAllConnections() {
+    const server = this[serverSymbol];
+    if (!server) {
+      return;
     }
-    this[serverSymbol] = Bun.serve<any>({
-      tls,
-      port,
-      hostname: host,
-      unix: socketPath,
-      // Bindings to be used for WS Server
-      websocket: {
-        open(ws) {
-          ws.data.open(ws);
-        },
-        message(ws, message) {
-          ws.data.message(ws, message);
-        },
-        close(ws, code, reason) {
-          ws.data.close(ws, code, reason);
-        },
-        drain(ws) {
-          ws.data.drain(ws);
-        },
-        ping(ws, data) {
-          ws.data.ping(ws, data);
-        },
-        pong(ws, data) {
-          ws.data.pong(ws, data);
-        },
-      },
-      maxRequestBodySize: Number.MAX_SAFE_INTEGER,
-      // Be very careful not to access (web) Request object
-      // properties:
-      // - request.url
-      // - request.headers
-      //
-      // We want to avoid triggering the getter for these properties because
-      // that will cause the data to be cloned twice, which costs memory & performance.
-      fetch(req, _server) {
-        var pendingResponse;
-        var pendingError;
-        var reject = err => {
-          if (pendingError) return;
-          pendingError = err;
-          if (rejectFunction) rejectFunction(err);
-        };
+    this[serverSymbol] = undefined;
+    server.stop(true);
+    process.nextTick(emitCloseNT, this);
+  },
 
-        var reply = function (resp) {
-          if (pendingResponse) return;
-          pendingResponse = resp;
-          if (resolveFunction) resolveFunction(resp);
-        };
+  closeIdleConnections() {
+    // not actually implemented
+  },
 
-        const prevIsNextIncomingMessageHTTPS = isNextIncomingMessageHTTPS;
-        isNextIncomingMessageHTTPS = isHTTPS;
-        const http_req = new RequestClass(req);
-        isNextIncomingMessageHTTPS = prevIsNextIncomingMessageHTTPS;
+  close(optionalCallback?) {
+    const server = this[serverSymbol];
+    if (!server) {
+      if (typeof optionalCallback === "function")
+        process.nextTick(optionalCallback, new Error("Server is not running"));
+      return;
+    }
+    this[serverSymbol] = undefined;
+    if (typeof optionalCallback === "function") this.once("close", optionalCallback);
+    server.stop();
+    process.nextTick(emitCloseNT, this);
+  },
 
-        const upgrade = http_req.headers.upgrade;
-
-        const http_res = new ResponseClass(http_req, reply);
-
-        http_req.socket[kInternalSocketData] = [_server, http_res, req];
-        server.emit("connection", http_req.socket);
-
-        const rejectFn = err => reject(err);
-        http_req.once("error", rejectFn);
-        http_res.once("error", rejectFn);
-
-        if (upgrade) {
-          server.emit("upgrade", http_req, http_req.socket, kEmptyBuffer);
-        } else {
-          server.emit("request", http_req, http_res);
-        }
-
-        if (pendingError) {
-          throw pendingError;
-        }
-
-        if (pendingResponse) {
-          return pendingResponse;
-        }
-
-        var { promise, resolve: resolveFunction, reject: rejectFunction } = $newPromiseCapability(GlobalPromise);
-        return promise;
-      },
+  [Symbol.asyncDispose]() {
+    const { resolve, reject, promise } = Promise.withResolvers();
+    this.close(function (err, ...args) {
+      if (err) reject(err);
+      else resolve(...args);
     });
-    isHTTPS = this[serverSymbol].protocol === "https";
+    return promise;
+  },
 
-    if (this?._unref) {
-      this[serverSymbol]?.unref?.();
+  address() {
+    if (!this[serverSymbol]) return null;
+    return this[serverSymbol].address;
+  },
+
+  listen() {
+    const server = this;
+    let port, host, onListen;
+    let socketPath;
+    let tls = this[tlsSymbol];
+
+    // This logic must align with:
+    // - https://github.com/nodejs/node/blob/2eff28fb7a93d3f672f80b582f664a7c701569fb/lib/net.js#L274-L307
+    if (arguments.length > 0) {
+      if (($isObject(arguments[0]) || $isCallable(arguments[0])) && arguments[0] !== null) {
+        // (options[...][, cb])
+        port = arguments[0].port;
+        host = arguments[0].host;
+        socketPath = arguments[0].path;
+
+        const otherTLS = arguments[0].tls;
+        if (otherTLS && $isObject(otherTLS)) {
+          tls = otherTLS;
+        }
+      } else if (typeof arguments[0] === "string" && !(Number(arguments[0]) >= 0)) {
+        // (path[...][, cb])
+        socketPath = arguments[0];
+      } else {
+        // ([port][, host][...][, cb])
+        port = arguments[0];
+        if (arguments.length > 1 && typeof arguments[1] === "string") {
+          host = arguments[1];
+        }
+      }
     }
 
-    setTimeout(emitListeningNextTick, 1, this, onListen, null, this[serverSymbol].hostname, this[serverSymbol].port);
-  } catch (err) {
-    server.emit("error", err);
-  }
+    // Bun defaults to port 3000.
+    // Node defaults to port 0.
+    if (port === undefined && !socketPath) {
+      port = 0;
+    }
 
-  return this;
-};
+    if ($isCallable(arguments[arguments.length - 1])) {
+      onListen = arguments[arguments.length - 1];
+    }
 
-Server.prototype.setTimeout = function (msecs, callback) {
-  // TODO:
-  return this;
+    const ResponseClass = this[optionsSymbol].ServerResponse || ServerResponse;
+    const RequestClass = this[optionsSymbol].IncomingMessage || IncomingMessage;
+    let isHTTPS = false;
+
+    try {
+      if (tls) {
+        this.serverName = tls.serverName || host || "localhost";
+      }
+      this[serverSymbol] = Bun.serve<any>({
+        tls,
+        port,
+        hostname: host,
+        unix: socketPath,
+        // Bindings to be used for WS Server
+        websocket: {
+          open(ws) {
+            ws.data.open(ws);
+          },
+          message(ws, message) {
+            ws.data.message(ws, message);
+          },
+          close(ws, code, reason) {
+            ws.data.close(ws, code, reason);
+          },
+          drain(ws) {
+            ws.data.drain(ws);
+          },
+          ping(ws, data) {
+            ws.data.ping(ws, data);
+          },
+          pong(ws, data) {
+            ws.data.pong(ws, data);
+          },
+        },
+        maxRequestBodySize: Number.MAX_SAFE_INTEGER,
+        // Be very careful not to access (web) Request object
+        // properties:
+        // - request.url
+        // - request.headers
+        //
+        // We want to avoid triggering the getter for these properties because
+        // that will cause the data to be cloned twice, which costs memory & performance.
+        fetch(req, _server) {
+          var pendingResponse;
+          var pendingError;
+          var reject = err => {
+            if (pendingError) return;
+            pendingError = err;
+            if (rejectFunction) rejectFunction(err);
+          };
+
+          var reply = function (resp) {
+            if (pendingResponse) return;
+            pendingResponse = resp;
+            if (resolveFunction) resolveFunction(resp);
+          };
+
+          const prevIsNextIncomingMessageHTTPS = isNextIncomingMessageHTTPS;
+          isNextIncomingMessageHTTPS = isHTTPS;
+          const http_req = new RequestClass(req);
+          isNextIncomingMessageHTTPS = prevIsNextIncomingMessageHTTPS;
+
+          const upgrade = http_req.headers.upgrade;
+
+          const http_res = new ResponseClass(http_req, reply);
+
+          http_req.socket[kInternalSocketData] = [_server, http_res, req];
+          server.emit("connection", http_req.socket);
+
+          const rejectFn = err => reject(err);
+          http_req.once("error", rejectFn);
+          http_res.once("error", rejectFn);
+
+          if (upgrade) {
+            server.emit("upgrade", http_req, http_req.socket, kEmptyBuffer);
+          } else {
+            server.emit("request", http_req, http_res);
+          }
+
+          if (pendingError) {
+            throw pendingError;
+          }
+
+          if (pendingResponse) {
+            return pendingResponse;
+          }
+
+          var { promise, resolve: resolveFunction, reject: rejectFunction } = $newPromiseCapability(GlobalPromise);
+          return promise;
+        },
+      });
+      isHTTPS = this[serverSymbol].protocol === "https";
+
+      if (this?._unref) {
+        this[serverSymbol]?.unref?.();
+      }
+
+      if ($isCallable(onListen)) {
+        this.once("listening", onListen);
+      }
+
+      setTimeout(emitListeningNextTick, 1, this, this[serverSymbol].hostname, this[serverSymbol].port);
+    } catch (err) {
+      server.emit("error", err);
+    }
+
+    return this;
+  },
+
+  setTimeout(msecs, callback) {
+    // TODO:
+    return this;
+  },
+
+  constructor: Server,
 };
+$setPrototypeDirect.$call(Server.prototype, EventEmitter.prototype);
+$setPrototypeDirect.$call(Server, EventEmitter);
 
 function assignHeadersSlow(object, req) {
   const headers = req.headers;
@@ -664,10 +692,13 @@ function assignHeadersSlow(object, req) {
 
 function assignHeaders(object, req) {
   // This fast path is an 8% speedup for a "hello world" node:http server, and a 7% speedup for a "hello world" express server
-  const tuple = assignHeadersFast(req, object);
-  if (tuple !== null) {
-    object.headers = $getInternalField(tuple, 0);
-    object.rawHeaders = $getInternalField(tuple, 1);
+  if (assignHeadersFast(req, object, headersTuple)) {
+    const headers = $getInternalField(headersTuple, 0);
+    const rawHeaders = $getInternalField(headersTuple, 1);
+    $putInternalField(headersTuple, 0, undefined);
+    $putInternalField(headersTuple, 1, undefined);
+    object.headers = headers;
+    object.rawHeaders = rawHeaders;
     return true;
   } else {
     assignHeadersSlow(object, req);
@@ -738,133 +769,172 @@ function IncomingMessage(req, defaultIncomingOpts) {
   this.complete = !!this[noBodySymbol];
 }
 
-Object.setPrototypeOf((IncomingMessage.prototype = {}), Readable.prototype);
-IncomingMessage.prototype.constructor = IncomingMessage; // Re-add constructor which got lost when setting prototype
-Object.setPrototypeOf(IncomingMessage, Readable);
-
-IncomingMessage.prototype._construct = function (callback) {
-  // TODO: streaming
-  if (this[typeSymbol] === "response" || this[noBodySymbol]) {
-    callback();
-    return;
-  }
-
-  const contentLength = this.headers["content-length"];
-  const length = contentLength ? parseInt(contentLength, 10) : 0;
-  if (length === 0) {
-    this[noBodySymbol] = true;
-    callback();
-    return;
-  }
-
-  callback();
-};
-
-async function consumeStream(self, reader: ReadableStreamDefaultReader) {
-  while (true) {
-    var { done, value } = await reader.readMany();
-    if (self[abortedSymbol]) return;
-    if (done) {
-      self.complete = true;
-      self.push(null);
-      break;
-    }
-    for (var v of value) {
-      self.push(v);
-    }
-  }
-}
-
-IncomingMessage.prototype._read = function (size) {
-  if (this[noBodySymbol]) {
-    this.complete = true;
-    this.push(null);
-  } else if (this[bodyStreamSymbol] == null) {
-    const reader = this[reqSymbol].body?.getReader() as ReadableStreamDefaultReader;
-    if (!reader) {
-      this.complete = true;
-      this.push(null);
+IncomingMessage.prototype = {
+  constructor: IncomingMessage,
+  _construct(callback) {
+    // TODO: streaming
+    if (this[typeSymbol] === "response" || this[noBodySymbol]) {
+      callback();
       return;
     }
-    this[bodyStreamSymbol] = reader;
-    consumeStream(this, reader);
-  }
-};
 
-Object.defineProperty(IncomingMessage.prototype, "aborted", {
-  get() {
+    const contentLength = this.headers["content-length"];
+    const length = contentLength ? parseInt(contentLength, 10) : 0;
+    if (length === 0) {
+      this[noBodySymbol] = true;
+      callback();
+      return;
+    }
+
+    callback();
+  },
+  _read(size) {
+    if (this[noBodySymbol]) {
+      this.complete = true;
+      this.push(null);
+    } else if (this[bodyStreamSymbol] == null) {
+      const reader = this[reqSymbol].body?.getReader() as ReadableStreamDefaultReader;
+      if (!reader) {
+        this.complete = true;
+        this.push(null);
+        return;
+      }
+      this[bodyStreamSymbol] = reader;
+      consumeStream(this, reader);
+    }
+  },
+  _destroy(err, cb) {
+    if (!this.readableEnded || !this.complete) {
+      this[abortedSymbol] = true;
+      // IncomingMessage emits 'aborted'.
+      // Client emits 'abort'.
+      this.emit("aborted");
+    }
+
+    // Suppress "AbortError" from fetch() because we emit this in the 'aborted' event
+    if (isAbortError(err)) {
+      err = undefined;
+    }
+
+    const stream = this[bodyStreamSymbol];
+    this[bodyStreamSymbol] = undefined;
+    const streamState = stream?.$state;
+
+    if (streamState === $streamReadable || streamState === $streamWaiting || streamState === $streamWritable) {
+      stream?.cancel?.().catch(nop);
+    }
+
+    const socket = this[fakeSocketSymbol];
+    if (socket) {
+      socket.destroy(err);
+    }
+
+    if (cb) {
+      emitErrorNextTick(this, err, cb);
+    }
+  },
+  get aborted() {
     return this[abortedSymbol];
   },
-});
-
-Object.defineProperty(IncomingMessage.prototype, "connection", {
-  get() {
+  set aborted(value) {
+    this[abortedSymbol] = value;
+  },
+  get connection() {
     return (this[fakeSocketSymbol] ??= new FakeSocket());
   },
-});
-
-Object.defineProperty(IncomingMessage.prototype, "statusCode", {
-  get() {
+  get statusCode() {
     return this[reqSymbol].status;
   },
-  set(v) {
-    if (!(v in STATUS_CODES)) return;
-    this[reqSymbol].status = v;
+  set statusCode(value) {
+    if (!(value in STATUS_CODES)) return;
+    this[reqSymbol].status = value;
   },
-});
-
-Object.defineProperty(IncomingMessage.prototype, "statusMessage", {
-  get() {
+  get statusMessage() {
     return STATUS_CODES[this[reqSymbol].status];
   },
-  set(v) {
-    //noop
+  set statusMessage(value) {
+    // noop
   },
-});
-
-Object.defineProperty(IncomingMessage.prototype, "httpVersion", {
-  get() {
+  get httpVersion() {
     return "1.1";
   },
-});
-
-Object.defineProperty(IncomingMessage.prototype, "rawTrailers", {
-  get() {
+  set httpVersion(value) {
+    // noop
+  },
+  get httpVersionMajor() {
+    return 1;
+  },
+  set httpVersionMajor(value) {
+    // noop
+  },
+  get httpVersionMinor() {
+    return 1;
+  },
+  set httpVersionMinor(value) {
+    // noop
+  },
+  get rawTrailers() {
     return [];
   },
-});
-
-Object.defineProperty(IncomingMessage.prototype, "httpVersionMajor", {
-  get() {
-    return 1;
+  set rawTrailers(value) {
+    // noop
   },
-});
-
-Object.defineProperty(IncomingMessage.prototype, "httpVersionMinor", {
-  get() {
-    return 1;
-  },
-});
-
-Object.defineProperty(IncomingMessage.prototype, "trailers", {
-  get() {
+  get trailers() {
     return kEmptyObject;
   },
-});
-
-Object.defineProperty(IncomingMessage.prototype, "socket", {
-  get() {
+  set trailers(value) {
+    // noop
+  },
+  setTimeout(msecs, callback) {
+    // noop
+    return this;
+  },
+  get socket() {
     return (this[fakeSocketSymbol] ??= new FakeSocket());
   },
-  set(val) {
-    this[fakeSocketSymbol] = val;
+  set socket(value) {
+    this[fakeSocketSymbol] = value;
   },
-});
-
-IncomingMessage.prototype.setTimeout = function (msecs, callback) {
-  // TODO:
-  return this;
 };
+$setPrototypeDirect.$call(IncomingMessage.prototype, Readable.prototype);
+$setPrototypeDirect.$call(IncomingMessage, Readable);
+
+async function consumeStream(self, reader: ReadableStreamDefaultReader) {
+  var done = false,
+    value,
+    aborted = false;
+  try {
+    while (true) {
+      const result = reader.readMany();
+      if ($isPromise(result)) {
+        ({ done, value } = await result);
+      } else {
+        ({ done, value } = result);
+      }
+
+      if (self.destroyed || (aborted = self[abortedSymbol])) {
+        break;
+      }
+      for (var v of value) {
+        self.push(v);
+      }
+
+      if (self.destroyed || (aborted = self[abortedSymbol]) || done) {
+        break;
+      }
+    }
+  } catch (err) {
+    if (aborted || self.destroyed) return;
+    self.destroy(err);
+  } finally {
+    reader?.cancel?.().catch?.(nop);
+  }
+
+  if (!self.complete) {
+    self.complete = true;
+    self.push(null);
+  }
+}
 
 const headersSymbol = Symbol("headers");
 const finishedSymbol = Symbol("finished");
@@ -879,9 +949,9 @@ function OutgoingMessage(options) {
   this[kAbortController] = null;
 }
 
-Object.setPrototypeOf((OutgoingMessage.prototype = {}), Writable.prototype);
+$setPrototypeDirect.$call((OutgoingMessage.prototype = {}), Writable.prototype);
 OutgoingMessage.prototype.constructor = OutgoingMessage; // Re-add constructor which got lost when setting prototype
-Object.setPrototypeOf(OutgoingMessage, Writable);
+$setPrototypeDirect.$call(OutgoingMessage, Writable);
 
 // Express "compress" package uses this
 OutgoingMessage.prototype._implicitHeader = function () {};
@@ -1083,9 +1153,9 @@ function ServerResponse(req, reply) {
   // https://github.com/nodejs/node/blob/cf8c6994e0f764af02da4fa70bc5962142181bf3/lib/_http_server.js#L192
   if (req.method === "HEAD") this._hasBody = false;
 }
-Object.setPrototypeOf((ServerResponse.prototype = {}), OutgoingMessage.prototype);
+$setPrototypeDirect.$call((ServerResponse.prototype = {}), OutgoingMessage.prototype);
 ServerResponse.prototype.constructor = ServerResponse; // Re-add constructor which got lost when setting prototype
-Object.setPrototypeOf(ServerResponse, OutgoingMessage);
+$setPrototypeDirect.$call(ServerResponse, OutgoingMessage);
 
 // Express "compress" package uses this
 ServerResponse.prototype._implicitHeader = function () {
@@ -1376,10 +1446,7 @@ class ClientRequest extends OutgoingMessage {
     this.destroyed = true;
     // If request is destroyed we abort the current response
     this[kAbortController]?.abort?.();
-    if (err) {
-      this.emit("error", err);
-    }
-    callback();
+    emitErrorNextTick(this, err, callback);
   }
 
   _ensureTls() {
@@ -1390,11 +1457,16 @@ class ClientRequest extends OutgoingMessage {
   _final(callback) {
     this.#finished = true;
     this[kAbortController] = new AbortController();
-    this[kAbortController].signal.addEventListener("abort", () => {
-      this.emit("abort");
-      this[kClearTimeout]();
-      this.destroy();
-    });
+    this[kAbortController].signal.addEventListener(
+      "abort",
+      () => {
+        this[kClearTimeout]?.();
+        if (this.destroyed) return;
+        this.emit("abort");
+        this.destroy();
+      },
+      { once: true },
+    );
     if (this.#signal?.aborted) {
       this[kAbortController].abort();
     }
@@ -1451,6 +1523,10 @@ class ClientRequest extends OutgoingMessage {
       //@ts-ignore
       this.#fetchRequest = fetch(url, fetchOptions)
         .then(response => {
+          if (this.aborted) {
+            return;
+          }
+
           const prevIsHTTPS = isNextIncomingMessageHTTPS;
           isNextIncomingMessageHTTPS = response.url.startsWith("https:");
           var res = (this.#res = new IncomingMessage(response, {
@@ -1463,7 +1539,7 @@ class ClientRequest extends OutgoingMessage {
         .catch(err => {
           // Node treats AbortError separately.
           // The "abort" listener on the abort controller should have called this
-          if (err?.name === "AbortError") {
+          if (isAbortError(err)) {
             return;
           }
 
@@ -1485,13 +1561,19 @@ class ClientRequest extends OutgoingMessage {
   }
 
   get aborted() {
-    return this.#signal?.aborted || !!this[kAbortController]?.signal.aborted;
+    return this[abortedSymbol] || this.#signal?.aborted || !!this[kAbortController]?.signal.aborted;
+  }
+
+  set aborted(value) {
+    this[abortedSymbol] = value;
   }
 
   abort() {
     if (this.aborted) return;
+    this[abortedSymbol] = true;
+    process.nextTick(emitAbortNextTick, this);
     this[kAbortController]?.abort?.();
-    // TODO: Close stream if body streaming
+    this.destroy();
   }
 
   constructor(input, options, cb) {
@@ -2098,6 +2180,22 @@ function get(url, options, cb) {
   return req;
 }
 
+function onError(self, error, cb) {
+  if (error) {
+    cb(error);
+  } else {
+    cb();
+  }
+}
+
+function emitErrorNextTick(self, err, cb) {
+  process.nextTick(onError, self, err, cb);
+}
+
+function emitAbortNextTick(self) {
+  self.emit("abort");
+}
+
 var globalAgent = new Agent();
 export default {
   Agent,
diff --git a/src/js/node/stream.ts b/src/js/node/stream.ts
index ab4a9dffc1..961bdb7228 100644
--- a/src/js/node/stream.ts
+++ b/src/js/node/stream.ts
@@ -27,6 +27,7 @@ const kPaused = Symbol("kPaused");
 // END moved from require_readable
 
 const StringDecoder = require("node:string_decoder").StringDecoder;
+const transferToNativeReadable = $newCppFunction("ReadableStream.cpp", "jsFunctionTransferToNativeReadableStream", 1);
 
 const ObjectSetPrototypeOf = Object.setPrototypeOf;
 
@@ -5720,7 +5721,7 @@ function createNativeStreamReadable(Readable) {
       ProcessNextTick(() => {
         this.push(null);
       });
-      return view?.byteLength ?? 0 > 0 ? view : undefined;
+      return (view?.byteLength ?? 0 > 0) ? view : undefined;
     } else if ($isTypedArrayView(result)) {
       if (result.byteLength >= this[highWaterMark] && !this[hasResized] && !isClosed) {
         this[_adjustHighWaterMark]();
@@ -5819,9 +5820,13 @@ function getNativeReadableStream(Readable, stream, options) {
   $assert(typeof ptr === "object", "Invalid native ptr");
 
   const NativeReadable = getNativeReadableStreamPrototype(type, Readable);
-  stream.$bunNativePtr = -1;
-  stream.$bunNativeType = 0;
-  stream.$disturbed = true;
+  // https://github.com/oven-sh/bun/pull/12801
+  // https://github.com/oven-sh/bun/issues/9555
+  // There may be a ReadableStream.Strong handle to the ReadableStream.
+  // We can't update those handles to point to the NativeReadable from JS
+  // So we instead mark it as no longer usable, and create a new NativeReadable
+  transferToNativeReadable(stream);
+
   return new NativeReadable(ptr, options);
 }
 
diff --git a/src/js/node/util.ts b/src/js/node/util.ts
index c237a1915f..eb7db12985 100644
--- a/src/js/node/util.ts
+++ b/src/js/node/util.ts
@@ -2,6 +2,11 @@
 const types = require("node:util/types");
 /** @type {import('node-inspect-extracted')} */
 const utl = require("internal/util/inspect");
+const { ERR_INVALID_ARG_TYPE, ERR_OUT_OF_RANGE } = require("internal/errors");
+
+const internalErrorName = $newZigFunction("node_util_binding.zig", "internalErrorName", 1);
+
+const NumberIsSafeInteger = Number.isSafeInteger;
 
 var cjs_exports = {};
 
@@ -280,6 +285,12 @@ function styleText(format, text) {
   return `\u001b[${formatCodes[0]}m${text}\u001b[${formatCodes[1]}m`;
 }
 
+function getSystemErrorName(err: any) {
+  if (typeof err !== "number") throw ERR_INVALID_ARG_TYPE("err", "number", err);
+  if (err >= 0 || !NumberIsSafeInteger(err)) throw ERR_OUT_OF_RANGE("err", "a negative integer", err);
+  return internalErrorName(err);
+}
+
 export default Object.assign(cjs_exports, {
   format,
   formatWithOptions,
@@ -315,4 +326,5 @@ export default Object.assign(cjs_exports, {
   TextEncoder,
   parseArgs,
   styleText,
+  getSystemErrorName,
 });
diff --git a/src/js/node/v8.ts b/src/js/node/v8.ts
index ff1cf471fe..d70a7bc73c 100644
--- a/src/js/node/v8.ts
+++ b/src/js/node/v8.ts
@@ -160,4 +160,6 @@ hideFromStack(
   DefaultDeserializer,
   DefaultSerializer,
   GCProfiler,
+  DefaultDeserializer,
+  DefaultSerializer,
 );
diff --git a/src/js/thirdparty/node-fetch.ts b/src/js/thirdparty/node-fetch.ts
index 788ee6600f..d2b5831690 100644
--- a/src/js/thirdparty/node-fetch.ts
+++ b/src/js/thirdparty/node-fetch.ts
@@ -1,13 +1,13 @@
 import type * as s from "stream";
 
-const {
-  Headers: WebHeaders,
-  Request: WebRequest,
-  Response: WebResponse,
-  Blob,
-  File = Blob,
-  FormData,
-} = globalThis as any;
+// Users may override the global fetch implementation, so we need to ensure these are the originals.
+const bindings = $cpp("NodeFetch.cpp", "createNodeFetchInternalBinding");
+const WebResponse: typeof globalThis.Response = bindings[0];
+const WebRequest: typeof globalThis.Request = bindings[1];
+const Blob: typeof globalThis.Blob = bindings[2];
+const WebHeaders: typeof globalThis.Headers = bindings[3];
+const FormData: typeof globalThis.FormData = bindings[4];
+const File: typeof globalThis.File = bindings[5];
 const nativeFetch = Bun.fetch;
 
 // node-fetch extends from URLSearchParams in their implementation...
diff --git a/src/js/thirdparty/undici.js b/src/js/thirdparty/undici.js
index ec0096ff84..b194df4db5 100644
--- a/src/js/thirdparty/undici.js
+++ b/src/js/thirdparty/undici.js
@@ -7,19 +7,22 @@ const ObjectCreate = Object.create;
 const kEmptyObject = ObjectCreate(null);
 
 var fetch = Bun.fetch;
-var Response = globalThis.Response;
-var Headers = globalThis.Headers;
-var Request = globalThis.Request;
-var URLSearchParams = globalThis.URLSearchParams;
-var URL = globalThis.URL;
-class File extends Blob {}
+const bindings = $cpp("Undici.cpp", "createUndiciInternalBinding");
+const Response = bindings[0];
+const Request = bindings[1];
+const Headers = bindings[2];
+const FormData = bindings[3];
+const File = bindings[4];
+const URL = bindings[5];
+const AbortSignal = bindings[6];
+const URLSearchParams = bindings[7];
+
 class FileReader extends EventTarget {
   constructor() {
     throw new Error("Not implemented yet!");
   }
 }
 
-var FormData = globalThis.FormData;
 function notImplemented() {
   throw new Error("Not implemented in bun");
 }
@@ -301,28 +304,28 @@ Undici.buildConnector =
 Undici.fetch = fetch;
 
 export default {
+  Agent,
+  BalancedPool,
+  Client,
+  connect,
+  Dispatcher,
   fetch,
-  Response,
-  Headers,
-  Request,
-  URLSearchParams,
-  URL,
   File,
   FileReader,
   FormData,
-  request,
-  stream,
-  pipeline,
-  connect,
-  upgrade,
-  MockClient,
-  MockPool,
+  Headers,
   MockAgent,
+  MockClient,
   mockErrors,
-  Dispatcher,
+  MockPool,
+  pipeline,
   Pool,
-  BalancedPool,
-  Client,
-  Agent,
+  request,
+  Request,
+  Response,
+  stream,
   Undici,
+  upgrade,
+  URL,
+  URLSearchParams,
 };
diff --git a/src/js_ast.zig b/src/js_ast.zig
index 8345e07cdb..323ccbda76 100644
--- a/src/js_ast.zig
+++ b/src/js_ast.zig
@@ -776,7 +776,7 @@ pub const G = struct {
                                 switch (val.data) {
                                     .e_arrow, .e_function => {},
                                     else => {
-                                        if (!val.canBeConstValue()) {
+                                        if (!val.canBeMoved()) {
                                             return false;
                                         }
                                     },
@@ -2774,10 +2774,10 @@ pub const E = struct {
 
     pub const Import = struct {
         expr: ExprNodeIndex,
+        options: ExprNodeIndex = Expr.empty,
         import_record_index: u32,
-        // This will be dynamic at some point.
-        type_attribute: TypeAttribute = .none,
 
+        /// TODO:
         /// Comments inside "import()" expressions have special meaning for Webpack.
         /// Preserving comments inside these expressions makes it possible to use
         /// esbuild as a TypeScript-to-JavaScript frontend for Webpack to improve
@@ -2785,30 +2785,43 @@ pub const E = struct {
         /// because esbuild is not Webpack. But we do preserve them since doing so is
         /// harmless, easy to maintain, and useful to people. See the Webpack docs for
         /// more info: https://webpack.js.org/api/module-methods/#magic-comments.
-        /// TODO:
-        leading_interior_comments: []G.Comment = &([_]G.Comment{}),
+        // leading_interior_comments: []G.Comment = &([_]G.Comment{}),
 
         pub fn isImportRecordNull(this: *const Import) bool {
             return this.import_record_index == std.math.maxInt(u32);
         }
 
-        pub const TypeAttribute = enum {
-            none,
-            json,
-            toml,
-            text,
-            file,
+        pub fn importRecordTag(import: *const Import) ?ImportRecord.Tag {
+            const obj = import.options.data.as(.e_object) orelse
+                return null;
+            const with = obj.get("with") orelse obj.get("assert") orelse
+                return null;
+            const with_obj = with.data.as(.e_object) orelse
+                return null;
+            const str = (with_obj.get("type") orelse
+                return null).data.as(.e_string) orelse
+                return null;
 
-            pub fn tag(this: TypeAttribute) ImportRecord.Tag {
-                return switch (this) {
-                    .none => .none,
-                    .json => .with_type_json,
-                    .toml => .with_type_toml,
-                    .text => .with_type_text,
-                    .file => .with_type_file,
+            if (str.eqlComptime("json")) {
+                return .with_type_json;
+            } else if (str.eqlComptime("toml")) {
+                return .with_type_toml;
+            } else if (str.eqlComptime("text")) {
+                return .with_type_text;
+            } else if (str.eqlComptime("file")) {
+                return .with_type_file;
+            } else if (str.eqlComptime("sqlite")) {
+                const embed = brk: {
+                    const embed = with_obj.get("embed") orelse break :brk false;
+                    const embed_str = embed.data.as(.e_string) orelse break :brk false;
+                    break :brk embed_str.eqlComptime("true");
                 };
+
+                return if (embed) .with_type_sqlite_embedded else .with_type_sqlite;
             }
-        };
+
+            return null;
+        }
     };
 };
 
@@ -3018,6 +3031,10 @@ pub const Stmt = struct {
         };
     }
 
+    pub fn allocateExpr(allocator: std.mem.Allocator, expr: Expr) Stmt {
+        return Stmt.allocate(allocator, S.SExpr, S.SExpr{ .value = expr }, expr.loc);
+    }
+
     pub const Tag = enum(u6) {
         s_block,
         s_break,
@@ -3244,10 +3261,15 @@ pub const Expr = struct {
             else => true,
         };
     }
+
     pub fn canBeConstValue(this: Expr) bool {
         return this.data.canBeConstValue();
     }
 
+    pub fn canBeMoved(expr: Expr) bool {
+        return expr.data.canBeMoved();
+    }
+
     pub fn unwrapInlined(expr: Expr) Expr {
         if (expr.data.as(.e_inlined_enum)) |inlined| return inlined.value;
         return expr;
@@ -5461,9 +5483,8 @@ pub const Expr = struct {
                 .e_import => |el| {
                     const item = bun.create(allocator, E.Import, .{
                         .expr = try el.expr.deepClone(allocator),
+                        .options = try el.options.deepClone(allocator),
                         .import_record_index = el.import_record_index,
-                        .type_attribute = el.type_attribute,
-                        .leading_interior_comments = el.leading_interior_comments,
                     });
                     return .{ .e_import = item };
                 },
@@ -5495,9 +5516,17 @@ pub const Expr = struct {
             };
         }
 
+        /// "const values" here refers to expressions that can participate in constant
+        /// inlining, as they have no side effects on instantiation, and there would be
+        /// no observable difference if duplicated. This is a subset of canBeMoved()
         pub fn canBeConstValue(this: Expr.Data) bool {
             return switch (this) {
-                .e_number, .e_boolean, .e_null, .e_undefined => true,
+                .e_number,
+                .e_boolean,
+                .e_null,
+                .e_undefined,
+                .e_inlined_enum,
+                => true,
                 .e_string => |str| str.next == null,
                 .e_array => |array| array.was_originally_macro,
                 .e_object => |object| object.was_originally_macro,
@@ -5505,6 +5534,39 @@ pub const Expr = struct {
             };
         }
 
+        /// Expressions that can be moved are those that do not have side
+        /// effects on their own. This is used to determine what can be moved
+        /// outside of a module wrapper (__esm/__commonJS).
+        pub fn canBeMoved(data: Expr.Data) bool {
+            return switch (data) {
+                .e_class => |class| class.canBeMoved(),
+
+                .e_arrow,
+                .e_function,
+
+                .e_number,
+                .e_boolean,
+                .e_null,
+                .e_undefined,
+                // .e_reg_exp,
+                .e_big_int,
+                .e_string,
+                .e_inlined_enum,
+                .e_import_meta,
+                .e_utf8_string,
+                => true,
+
+                .e_template => |template| template.parts.len == 0,
+
+                .e_array => |array| array.was_originally_macro,
+                .e_object => |object| object.was_originally_macro,
+
+                // TODO: experiment with allowing some e_binary, e_unary, e_if as movable
+
+                else => false,
+            };
+        }
+
         pub fn knownPrimitive(data: Expr.Data) PrimitiveType {
             return switch (data) {
                 .e_big_int => .bigint,
@@ -6045,11 +6107,7 @@ pub const S = struct {
 
         pub fn canBeMoved(self: *const ExportDefault) bool {
             return switch (self.value) {
-                .expr => |e| switch (e.data) {
-                    .e_class => |class| class.canBeMoved(),
-                    .e_arrow, .e_function => true,
-                    else => e.canBeConstValue(),
-                },
+                .expr => |e| e.canBeMoved(),
                 .stmt => |s| switch (s.data) {
                     .s_class => |class| class.class.canBeMoved(),
                     .s_function => true,
diff --git a/src/js_lexer.zig b/src/js_lexer.zig
index 681439daed..7e7a41298e 100644
--- a/src/js_lexer.zig
+++ b/src/js_lexer.zig
@@ -32,7 +32,7 @@ pub const TypeScriptAccessibilityModifier = tables.TypeScriptAccessibilityModifi
 pub const ChildlessJSXTags = tables.ChildlessJSXTags;
 
 fn notimpl() noreturn {
-    Global.panic("not implemented yet!", .{});
+    Output.panic("not implemented yet!", .{});
 }
 
 pub var emptyJavaScriptString = ([_]u16{0});
diff --git a/src/js_parser.zig b/src/js_parser.zig
index 47b46c2e52..5cba46d738 100644
--- a/src/js_parser.zig
+++ b/src/js_parser.zig
@@ -451,36 +451,29 @@ const VisitArgsOpts = struct {
     is_unique_formal_parameters: bool = false,
 };
 
-const BunJSX = struct {
-    pub threadlocal var bun_jsx_identifier: E.Identifier = undefined;
-};
 pub fn ExpressionTransposer(
-    comptime Kontext: type,
-    comptime visitor: fn (ptr: *Kontext, arg: Expr, state: anytype) Expr,
+    comptime ContextType: type,
+    comptime StateType: type,
+    comptime visitor: fn (ptr: *ContextType, arg: Expr, state: StateType) Expr,
 ) type {
     return struct {
-        pub const Context = Kontext;
+        pub const Context = ContextType;
         pub const This = @This();
+
         context: *Context,
 
         pub fn init(c: *Context) This {
-            return This{
-                .context = c,
-            };
+            return .{ .context = c };
         }
 
-        pub fn maybeTransposeIf(self: *This, arg: Expr, state: anytype) Expr {
+        pub fn maybeTransposeIf(self: *This, arg: Expr, state: StateType) Expr {
             switch (arg.data) {
                 .e_if => |ex| {
-                    return Expr.init(
-                        E.If,
-                        E.If{
-                            .yes = self.maybeTransposeIf(ex.yes, state),
-                            .no = self.maybeTransposeIf(ex.no, state),
-                            .test_ = ex.test_,
-                        },
-                        arg.loc,
-                    );
+                    return Expr.init(E.If, .{
+                        .yes = self.maybeTransposeIf(ex.yes, state),
+                        .no = self.maybeTransposeIf(ex.no, state),
+                        .test_ = ex.test_,
+                    }, arg.loc);
                 },
                 else => {
                     return visitor(self.context, arg, state);
@@ -488,16 +481,12 @@ pub fn ExpressionTransposer(
             }
         }
 
-        pub fn transposeKnownToBeIf(self: *This, arg: Expr, state: anytype) Expr {
-            return Expr.init(
-                E.If,
-                E.If{
-                    .yes = self.maybeTransposeIf(arg.data.e_if.yes, state),
-                    .no = self.maybeTransposeIf(arg.data.e_if.no, state),
-                    .test_ = arg.data.e_if.test_,
-                },
-                arg.loc,
-            );
+        pub fn transposeKnownToBeIf(self: *This, arg: Expr, state: StateType) Expr {
+            return Expr.init(E.If, .{
+                .yes = self.maybeTransposeIf(arg.data.e_if.yes, state),
+                .no = self.maybeTransposeIf(arg.data.e_if.no, state),
+                .test_ = arg.data.e_if.test_,
+            }, arg.loc);
         }
     };
 }
@@ -517,7 +506,8 @@ const TransposeState = struct {
     is_then_catch_target: bool = false,
     is_require_immediately_assigned_to_decl: bool = false,
     loc: logger.Loc = logger.Loc.Empty,
-    type_attribute: E.Import.TypeAttribute = .none,
+    import_record_tag: ?ImportRecord.Tag = null,
+    import_options: Expr = Expr.empty,
 };
 
 var true_args = &[_]Expr{
@@ -2746,7 +2736,7 @@ pub const StmtsKind = enum {
 };
 
 fn notimpl() noreturn {
-    Global.panic("Not implemented yet!!", .{});
+    Output.panic("Not implemented yet!!", .{});
 }
 
 const ExprBindingTuple = struct {
@@ -5327,9 +5317,9 @@ fn NewParser_(
             return p.options.bundle and p.source.index.isRuntime();
         }
 
-        pub fn transposeImport(p: *P, arg: Expr, state: anytype) Expr {
+        pub fn transposeImport(p: *P, arg: Expr, state: *const TransposeState) Expr {
             // The argument must be a string
-            if (@as(Expr.Tag, arg.data) == .e_string) {
+            if (arg.data.as(.e_string)) |str| {
                 // Ignore calls to import() if the control flow is provably dead here.
                 // We don't want to spend time scanning the required files if they will
                 // never be used.
@@ -5337,18 +5327,19 @@ fn NewParser_(
                     return p.newExpr(E.Null{}, arg.loc);
                 }
 
-                const import_record_index = p.addImportRecord(.dynamic, arg.loc, arg.data.e_string.slice(p.allocator));
+                const import_record_index = p.addImportRecord(.dynamic, arg.loc, str.slice(p.allocator));
 
-                if (state.type_attribute.tag() != .none) {
-                    p.import_records.items[import_record_index].tag = state.type_attribute.tag();
+                if (state.import_record_tag) |tag| {
+                    p.import_records.items[import_record_index].tag = tag;
                 }
+
                 p.import_records.items[import_record_index].handles_import_errors = (state.is_await_target and p.fn_or_arrow_data_visit.try_body_count != 0) or state.is_then_catch_target;
                 p.import_records_for_current_part.append(p.allocator, import_record_index) catch unreachable;
+
                 return p.newExpr(E.Import{
                     .expr = arg,
-                    .import_record_index = Ref.toInt(import_record_index),
-                    .type_attribute = state.type_attribute,
-                    // .leading_interior_comments = arg.getString().
+                    .import_record_index = @intCast(import_record_index),
+                    .options = state.import_options,
                 }, state.loc);
             }
 
@@ -5360,12 +5351,12 @@ fn NewParser_(
 
             return p.newExpr(E.Import{
                 .expr = arg,
+                .options = state.import_options,
                 .import_record_index = std.math.maxInt(u32),
-                .type_attribute = state.type_attribute,
             }, state.loc);
         }
 
-        pub fn transposeRequireResolve(p: *P, arg: Expr, require_resolve_ref: anytype) Expr {
+        pub fn transposeRequireResolve(p: *P, arg: Expr, require_resolve_ref: Expr) Expr {
             // The argument must be a string
             if (arg.data == .e_string) {
                 return p.transposeRequireResolveKnownString(arg);
@@ -5402,14 +5393,14 @@ fn NewParser_(
 
             return p.newExpr(
                 E.RequireResolveString{
-                    .import_record_index = Ref.toInt(import_record_index),
+                    .import_record_index = import_record_index,
                     // .leading_interior_comments = arg.getString().
                 },
                 arg.loc,
             );
         }
 
-        pub fn transposeRequire(p: *P, arg: Expr, state: anytype) Expr {
+        pub fn transposeRequire(p: *P, arg: Expr, state: *const TransposeState) Expr {
             if (!p.options.features.allow_runtime) {
                 const args = p.allocator.alloc(Expr, 1) catch bun.outOfMemory();
                 args[0] = arg;
@@ -5437,11 +5428,12 @@ fn NewParser_(
 
                     const handles_import_errors = p.fn_or_arrow_data_visit.try_body_count != 0;
 
-                    if (
                     // For unwrapping CommonJS into ESM to fully work
                     // we must also unwrap requires into imports.
-                    (p.unwrap_all_requires or p.options.features.shouldUnwrapRequire(path.packageName() orelse "")) and
+                    const should_unwrap_require = p.unwrap_all_requires or
+                        if (path.packageName()) |pkg| p.options.features.shouldUnwrapRequire(pkg) else false;
 
+                    if (should_unwrap_require and
                         // We cannot unwrap a require wrapped in a try/catch because
                         // import statements cannot be wrapped in a try/catch and
                         // require cannot return a promise.
@@ -5725,9 +5717,9 @@ fn NewParser_(
             }
         }
 
-        const ImportTransposer = ExpressionTransposer(P, P.transposeImport);
-        const RequireTransposer = ExpressionTransposer(P, P.transposeRequire);
-        const RequireResolveTransposer = ExpressionTransposer(P, P.transposeRequireResolve);
+        const ImportTransposer = ExpressionTransposer(P, *const TransposeState, P.transposeImport);
+        const RequireTransposer = ExpressionTransposer(P, *const TransposeState, P.transposeRequire);
+        const RequireResolveTransposer = ExpressionTransposer(P, Expr, P.transposeRequireResolve);
 
         const Binding2ExprWrapper = struct {
             pub const Namespace = Binding.ToExpr(P, P.wrapIdentifierNamespace);
@@ -9482,7 +9474,7 @@ fn NewParser_(
 
             return Ref{
                 .inner_index = inner_index,
-                .source_index = Ref.toInt(p.source.index.get()),
+                .source_index = @intCast(p.source.index.get()),
                 .tag = .symbol,
             };
         }
@@ -11072,7 +11064,6 @@ fn NewParser_(
                     inline .s_namespace, .s_enum => |ns| {
                         if (ns.is_export) {
                             if (p.ref_to_ts_namespace_member.get(ns.name.ref.?)) |member_data| {
-                                bun.assert(member_data == .namespace);
                                 try exported_members.put(
                                     p.allocator,
                                     p.symbols.items[ns.name.ref.?.inner_index].original_name,
@@ -11081,11 +11072,11 @@ fn NewParser_(
                                         .loc = ns.name.loc,
                                     },
                                 );
-                                // try p.ref_to_ts_namespace_member.put(
-                                //     p.allocator,
-                                //     id.ref,
-                                //     member_data,
-                                // );
+                                try p.ref_to_ts_namespace_member.put(
+                                    p.allocator,
+                                    ns.name.ref.?,
+                                    member_data,
+                                );
                             }
                         }
                     },
@@ -11108,8 +11099,7 @@ fn NewParser_(
             // them entirely from the output. That can cause the namespace itself
             // to be considered empty and thus be removed.
             var import_equal_count: usize = 0;
-            const _stmts: []Stmt = stmts.items;
-            for (_stmts) |stmt| {
+            for (stmts.items) |stmt| {
                 switch (stmt.data) {
                     .s_local => |local| {
                         if (local.was_ts_import_equals and !local.is_export) {
@@ -12902,13 +12892,19 @@ fn NewParser_(
             }
 
             if (@intFromPtr(p.source.contents.ptr) <= @intFromPtr(name.ptr) and (@intFromPtr(name.ptr) + name.len) <= (@intFromPtr(p.source.contents.ptr) + p.source.contents.len)) {
-                const start = Ref.toInt(@intFromPtr(name.ptr) - @intFromPtr(p.source.contents.ptr));
-                const end = Ref.toInt(name.len);
-                return Ref.initSourceEnd(.{ .source_index = start, .inner_index = end, .tag = .source_contents_slice });
+                return Ref.initSourceEnd(.{
+                    .source_index = @intCast(@intFromPtr(name.ptr) - @intFromPtr(p.source.contents.ptr)),
+                    .inner_index = @intCast(name.len),
+                    .tag = .source_contents_slice,
+                });
             } else {
-                const inner_index = Ref.toInt(p.allocated_names.items.len);
+                const inner_index: u31 = @intCast(p.allocated_names.items.len);
                 try p.allocated_names.append(p.allocator, name);
-                return Ref.init(inner_index, p.source.index.get(), false);
+                return Ref.init(
+                    inner_index,
+                    p.source.index.get(),
+                    false,
+                );
             }
         }
 
@@ -14909,7 +14905,7 @@ fn NewParser_(
             p.log.level = .verbose;
             p.log.printForLogLevel(panic_stream.writer()) catch unreachable;
 
-            Global.panic(fmt ++ "\n{s}", args ++ .{panic_buffer[0..panic_stream.pos]});
+            Output.panic(fmt ++ "\n{s}", args ++ .{panic_buffer[0..panic_stream.pos]});
         }
 
         pub fn parsePrefix(p: *P, level: Level, errors: ?*DeferredErrors, flags: Expr.EFlags) anyerror!Expr {
@@ -15645,40 +15641,17 @@ fn NewParser_(
 
             const value = try p.parseExpr(.comma);
 
-            var type_attribute = E.Import.TypeAttribute.none;
-
+            var import_options = Expr.empty;
             if (p.lexer.token == .t_comma) {
                 // "import('./foo.json', )"
                 try p.lexer.next();
 
                 if (p.lexer.token != .t_close_paren) {
-                    // for now, we silently strip import assertions
                     // "import('./foo.json', { assert: { type: 'json' } })"
-                    const import_expr = try p.parseExpr(.comma);
-                    if (import_expr.data == .e_object) {
-                        if (import_expr.data.e_object.get("with") orelse import_expr.data.e_object.get("assert")) |with| {
-                            if (with.data == .e_object) {
-                                const with_object = with.data.e_object;
-                                if (with_object.get("type")) |field| {
-                                    if (field.data == .e_string) {
-                                        const str = field.data.e_string;
-                                        if (str.eqlComptime("json")) {
-                                            type_attribute = .json;
-                                        } else if (str.eqlComptime("toml")) {
-                                            type_attribute = .toml;
-                                        } else if (str.eqlComptime("text")) {
-                                            type_attribute = .text;
-                                        } else if (str.eqlComptime("file")) {
-                                            type_attribute = .file;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
+                    import_options = try p.parseExpr(.comma);
 
                     if (p.lexer.token == .t_comma) {
-                        // "import('./foo.json', { assert: { type: 'json' } }, , )"
+                        // "import('./foo.json', { assert: { type: 'json' } }, )"
                         try p.lexer.next();
                     }
                 }
@@ -15694,18 +15667,20 @@ fn NewParser_(
 
                     return p.newExpr(E.Import{
                         .expr = value,
-                        .leading_interior_comments = comments,
+                        // .leading_interior_comments = comments,
                         .import_record_index = import_record_index,
-                        .type_attribute = type_attribute,
+                        .options = import_options,
                     }, loc);
                 }
             }
 
+            _ = comments; // TODO: leading_interior comments
+
             return p.newExpr(E.Import{
                 .expr = value,
-                .type_attribute = type_attribute,
-                .leading_interior_comments = comments,
+                // .leading_interior_comments = comments,
                 .import_record_index = std.math.maxInt(u32),
+                .options = import_options,
             }, loc);
         }
 
@@ -16216,7 +16191,7 @@ fn NewParser_(
                                         }
                                     },
                                     else => {
-                                        Global.panic("Unexpected type in export default: {any}", .{s2});
+                                        Output.panic("Unexpected type in export default: {any}", .{s2});
                                     },
                                 }
                             },
@@ -17511,7 +17486,7 @@ fn NewParser_(
                     var has_proto = false;
                     for (e_.properties.slice()) |*property| {
                         if (property.kind != .spread) {
-                            property.key = p.visitExpr(property.key orelse Global.panic("Expected property key", .{}));
+                            property.key = p.visitExpr(property.key orelse Output.panic("Expected property key", .{}));
                             const key = property.key.?;
                             // Forbid duplicate "__proto__" properties according to the specification
                             if (!property.flags.contains(.is_computed) and
@@ -17568,20 +17543,6 @@ fn NewParser_(
                     }
                 },
                 .e_import => |e_| {
-                    const state = TransposeState{
-                        // we must check that the await_target is an e_import or it will crash
-                        // example from next.js where not checking causes a panic:
-                        // ```
-                        // const {
-                        //     normalizeLocalePath,
-                        //   } = require('../shared/lib/i18n/normalize-locale-path') as typeof import('../shared/lib/i18n/normalize-locale-path')
-                        // ```
-                        .is_await_target = if (p.await_target != null) p.await_target.? == .e_import and p.await_target.?.e_import == e_ else false,
-                        .is_then_catch_target = p.then_catch_chain.has_catch and std.meta.activeTag(p.then_catch_chain.next_target) == .e_import and expr.data.e_import == p.then_catch_chain.next_target.e_import,
-                        .loc = e_.expr.loc,
-                        .type_attribute = e_.type_attribute,
-                    };
-
                     // We want to forcefully fold constants inside of imports
                     // even when minification is disabled, so that if we have an
                     // import based on a string template, it does not cause a
@@ -17595,7 +17556,32 @@ fn NewParser_(
                     p.should_fold_typescript_constant_expressions = true;
 
                     e_.expr = p.visitExpr(e_.expr);
-                    return p.import_transposer.maybeTransposeIf(e_.expr, state);
+                    e_.options = p.visitExpr(e_.options);
+
+                    // Import transposition is able to duplicate the options structure, so
+                    // only perform it if the expression is side effect free.
+                    //
+                    // TODO: make this more like esbuild by emitting warnings that explain
+                    // why this import was not analyzed. (see esbuild 'unsupported-dynamic-import')
+                    if (p.exprCanBeRemovedIfUnused(&e_.options)) {
+                        const state = TransposeState{
+                            .is_await_target = if (p.await_target) |await_target|
+                                await_target == .e_import and await_target.e_import == e_
+                            else
+                                false,
+
+                            .is_then_catch_target = p.then_catch_chain.has_catch and
+                                p.then_catch_chain.next_target == .e_import and
+                                expr.data.e_import == p.then_catch_chain.next_target.e_import,
+
+                            .import_options = e_.options,
+
+                            .loc = e_.expr.loc,
+                            .import_record_tag = e_.importRecordTag(),
+                        };
+
+                        return p.import_transposer.maybeTransposeIf(e_.expr, &state);
+                    }
                 },
                 .e_call => |e_| {
                     p.call_target = e_.target.data;
@@ -17607,8 +17593,8 @@ fn NewParser_(
                     };
 
                     const target_was_identifier_before_visit = e_.target.data == .e_identifier;
-                    e_.target = p.visitExprInOut(e_.target, ExprIn{
-                        .has_chain_parent = (e_.optional_chain orelse js_ast.OptionalChain.start) == .continuation,
+                    e_.target = p.visitExprInOut(e_.target, .{
+                        .has_chain_parent = e_.optional_chain == .continuation,
                     });
 
                     // Copy the call side effect flag over if this is a known target
@@ -17694,17 +17680,18 @@ fn NewParser_(
                         if (e_.args.len == 1) {
                             const first = e_.args.first_();
                             const state = TransposeState{
-                                .is_require_immediately_assigned_to_decl = in.is_immediately_assigned_to_decl and first.data == .e_string,
+                                .is_require_immediately_assigned_to_decl = in.is_immediately_assigned_to_decl and
+                                    first.data == .e_string,
                             };
                             switch (first.data) {
                                 .e_string => {
                                     // require(FOO) => require(FOO)
-                                    return p.transposeRequire(first, state);
+                                    return p.transposeRequire(first, &state);
                                 },
                                 .e_if => {
                                     // require(FOO  ? '123' : '456') => FOO ? require('123') : require('456')
                                     // This makes static analysis later easier
-                                    return p.require_transposer.transposeKnownToBeIf(first, state);
+                                    return p.require_transposer.transposeKnownToBeIf(first, &state);
                                 },
                                 else => {},
                             }
@@ -18666,7 +18653,15 @@ fn NewParser_(
                                 name_loc,
                                 E.Identifier{ .ref = ref },
                                 name,
-                                identifier_opts,
+                                .{
+                                    .assign_target = identifier_opts.assign_target,
+                                    .is_call_target = identifier_opts.is_call_target,
+                                    .is_delete_target = identifier_opts.is_delete_target,
+
+                                    // If this expression is used as the target of a call expression, make
+                                    // sure the value of "this" is preserved.
+                                    .was_originally_identifier = false,
+                                },
                             );
                         }
                     }
@@ -20725,7 +20720,7 @@ fn NewParser_(
                     }
                 },
                 else => {
-                    Global.panic("Unexpected binding type in namespace. This is a bug. {any}", .{binding});
+                    Output.panic("Unexpected binding type in namespace. This is a bug. {any}", .{binding});
                 },
             }
         }
@@ -22082,14 +22077,12 @@ fn NewParser_(
                             },
                             .s_function => |data| {
                                 if (
-                                // Hoist module-level functions when
-                                ((FeatureFlags.unwrap_commonjs_to_esm and p.current_scope == p.module_scope and !data.func.flags.contains(.is_export)) or
-
-                                    // Manually hoist block-level function declarations to preserve semantics.
-                                    // This is only done for function declarations that are not generators
-                                    // or async functions, since this is a backwards-compatibility hack from
-                                    // Annex B of the JavaScript standard.
-                                    !p.current_scope.kindStopsHoisting()) and p.symbols.items[data.func.name.?.ref.?.innerIndex()].kind == .hoisted_function)
+                                // Manually hoist block-level function declarations to preserve semantics.
+                                // This is only done for function declarations that are not generators
+                                // or async functions, since this is a backwards-compatibility hack from
+                                // Annex B of the JavaScript standard.
+                                !p.current_scope.kindStopsHoisting() and
+                                    p.symbols.items[data.func.name.?.ref.?.innerIndex()].kind == .hoisted_function)
                                 {
                                     break :list_getter &before;
                                 }
@@ -22138,11 +22131,11 @@ fn NewParser_(
                                         // Merge the two identifiers back into a single one
                                         p.symbols.items[hoisted_ref.innerIndex()].link = name_ref;
                                     }
-                                    non_fn_stmts.append(stmt) catch unreachable;
+                                    non_fn_stmts.append(stmt) catch bun.outOfMemory();
                                     continue;
                                 }
 
-                                const gpe = fn_stmts.getOrPut(name_ref) catch unreachable;
+                                const gpe = fn_stmts.getOrPut(name_ref) catch bun.outOfMemory();
                                 var index = gpe.value_ptr.*;
                                 if (!gpe.found_existing) {
                                     index = @as(u32, @intCast(let_decls.items.len));
@@ -22167,7 +22160,7 @@ fn NewParser_(
                                                 },
                                                 data.func.name.?.loc,
                                             ),
-                                        }) catch unreachable;
+                                        }) catch bun.outOfMemory();
                                     }
                                 }
 
@@ -23856,17 +23849,15 @@ fn NewParser_(
             }
 
             const wrapper_ref: Ref = brk: {
-                if (p.options.bundle) {
+                if (p.options.bundle and p.needsWrapperRef(parts)) {
                     break :brk p.newSymbol(
                         .other,
                         std.fmt.allocPrint(
                             p.allocator,
                             "require_{any}",
-                            .{
-                                p.source.fmtIdentifier(),
-                            },
-                        ) catch unreachable,
-                    ) catch unreachable;
+                            .{p.source.fmtIdentifier()},
+                        ) catch bun.outOfMemory(),
+                    ) catch bun.outOfMemory();
                 }
 
                 break :brk Ref.None;
@@ -23927,6 +23918,53 @@ fn NewParser_(
             };
         }
 
+        /// The bundler will generate wrappers to contain top-level side effects using
+        /// the '__esm' helper. Example:
+        ///
+        ///     var init_foo = __esm(() => {
+        ///         someExport = Math.random();
+        ///     });
+        ///
+        /// This wrapper can be removed if all of the constructs get moved
+        /// outside of the file. Due to paralleization, we can't retroactively
+        /// delete the `init_foo` symbol, but instead it must be known far in
+        /// advance if the symbol is needed or not.
+        ///
+        /// The logic in this function must be in sync with the hoisting
+        /// logic in `LinkerContext.generateCodeForFileInChunkJS`
+        fn needsWrapperRef(p: *const P, parts: []const js_ast.Part) bool {
+            bun.assert(p.options.bundle);
+            for (parts) |part| {
+                for (part.stmts) |stmt| {
+                    switch (stmt.data) {
+                        .s_function => {},
+                        .s_class => |class| if (!class.class.canBeMoved()) return true,
+                        .s_local => |local| {
+                            if (local.was_commonjs_export or p.commonjs_named_exports.count() == 0) {
+                                for (local.decls.slice()) |decl| {
+                                    if (decl.value) |value|
+                                        if (value.data != .e_missing and !value.canBeMoved())
+                                            return true;
+                                }
+                                continue;
+                            }
+                            return true;
+                        },
+                        .s_export_default => |ed| {
+                            if (!ed.canBeMoved())
+                                return true;
+                        },
+                        .s_export_equals => |e| {
+                            if (!e.value.canBeMoved())
+                                return true;
+                        },
+                        else => return true,
+                    }
+                }
+            }
+            return false;
+        }
+
         pub fn init(
             allocator: Allocator,
             log: *logger.Log,
diff --git a/src/js_printer.zig b/src/js_printer.zig
index 32995d15f3..821177fe04 100644
--- a/src/js_printer.zig
+++ b/src/js_printer.zig
@@ -1105,7 +1105,14 @@ fn NewPrinter(
                 p.print("=");
                 p.printSpaceBeforeIdentifier();
                 if (comptime Statement == void) {
-                    p.printRequireOrImportExpr(import.import_record_index, false, &.{}, Level.lowest, ExprFlag.None());
+                    p.printRequireOrImportExpr(
+                        import.import_record_index,
+                        false,
+                        &.{},
+                        Expr.empty,
+                        Level.lowest,
+                        ExprFlag.None(),
+                    );
                 } else {
                     p.print(statement);
                 }
@@ -1119,7 +1126,14 @@ fn NewPrinter(
                 p.printSymbol(default.ref.?);
                 if (comptime Statement == void) {
                     p.@"print = "();
-                    p.printRequireOrImportExpr(import.import_record_index, false, &.{}, Level.lowest, ExprFlag.None());
+                    p.printRequireOrImportExpr(
+                        import.import_record_index,
+                        false,
+                        &.{},
+                        Expr.empty,
+                        Level.lowest,
+                        ExprFlag.None(),
+                    );
                 } else {
                     p.@"print = "();
                     p.print(statement);
@@ -1161,7 +1175,7 @@ fn NewPrinter(
 
                 if (import.star_name_loc == null and import.default_name == null) {
                     if (comptime Statement == void) {
-                        p.printRequireOrImportExpr(import.import_record_index, false, &.{}, Level.lowest, ExprFlag.None());
+                        p.printRequireOrImportExpr(import.import_record_index, false, &.{}, Expr.empty, Level.lowest, ExprFlag.None());
                     } else {
                         p.print(statement);
                     }
@@ -1916,9 +1930,12 @@ fn NewPrinter(
             import_record_index: u32,
             was_unwrapped_require: bool,
             leading_interior_comments: []G.Comment,
+            import_options: Expr,
             level_: Level,
             flags: ExprFlag.Set,
         ) void {
+            _ = leading_interior_comments; // TODO:
+
             var level = level_;
             const wrap = level.gte(.new) or flags.contains(.forbid_call);
             if (wrap) p.print("(");
@@ -1998,12 +2015,12 @@ fn NewPrinter(
                 }
                 defer if (record.kind == .dynamic) p.printDotThenSuffix();
 
-                // Make sure the comma operator is propertly wrapped
-
-                if (meta.exports_ref.isValid() and level.gte(.comma)) {
-                    p.print("(");
-                }
-                defer if (meta.exports_ref.isValid() and level.gte(.comma)) p.print(")");
+                // Make sure the comma operator is properly wrapped
+                const wrap_comma_operator = meta.exports_ref.isValid() and
+                    meta.wrapper_ref.isValid() and
+                    level.gte(.comma);
+                if (wrap_comma_operator) p.print("(");
+                defer if (wrap_comma_operator) p.print(")");
 
                 // Wrap this with a call to "__toESM()" if this is a CommonJS file
                 const wrap_with_to_esm = record.wrap_with_to_esm;
@@ -2014,17 +2031,20 @@ fn NewPrinter(
                 }
 
                 if (!meta.was_unwrapped_require) {
-
                     // Call the wrapper
-                    p.printSpaceBeforeIdentifier();
-                    p.printSymbol(meta.wrapper_ref);
-                    p.print("()");
+                    if (meta.wrapper_ref.isValid()) {
+                        p.printSpaceBeforeIdentifier();
+                        p.printSymbol(meta.wrapper_ref);
+                        p.print("()");
+
+                        if (meta.exports_ref.isValid()) {
+                            p.print(",");
+                            p.printSpace();
+                        }
+                    }
 
                     // Return the namespace object if this is an ESM file
                     if (meta.exports_ref.isValid()) {
-                        p.print(",");
-                        p.printSpace();
-
                         // Wrap this with a call to "__toCommonJS()" if this is an ESM file
                         const wrap_with_to_cjs = record.wrap_with_to_commonjs;
                         if (wrap_with_to_cjs) {
@@ -2090,14 +2110,14 @@ fn NewPrinter(
             }
 
             // External import()
-            if (leading_interior_comments.len > 0) {
-                p.printNewline();
-                p.indent();
-                for (leading_interior_comments) |comment| {
-                    p.printIndentedComment(comment.text);
-                }
-                p.printIndent();
-            }
+            // if (leading_interior_comments.len > 0) {
+            //     p.printNewline();
+            //     p.indent();
+            //     for (leading_interior_comments) |comment| {
+            //         p.printIndentedComment(comment.text);
+            //     }
+            //     p.printIndent();
+            // }
             p.addSourceMapping(record.range.loc);
 
             p.printSpaceBeforeIdentifier();
@@ -2106,43 +2126,22 @@ fn NewPrinter(
             p.print("import(");
             p.printImportRecordPath(record);
 
-            switch (record.tag) {
-                .with_type_sqlite, .with_type_sqlite_embedded => {
-                    // we do not preserve "embed": "true" since it is not necessary
-                    p.printWhitespacer(ws(", { with: { type: \"sqlite\" } }"));
-                },
-                .with_type_text => {
-                    if (comptime is_bun_platform) {
-                        p.printWhitespacer(ws(", { with: { type: \"text\" } }"));
-                    }
-                },
-                .with_type_json => {
-                    // backwards compatibility: previously, we always stripped type json
-                    if (comptime is_bun_platform) {
-                        p.printWhitespacer(ws(", { with: { type: \"json\" } }"));
-                    }
-                },
-                .with_type_toml => {
-                    // backwards compatibility: previously, we always stripped type
-                    if (comptime is_bun_platform) {
-                        p.printWhitespacer(ws(", { with: { type: \"toml\" } }"));
-                    }
-                },
-                .with_type_file => {
-                    // backwards compatibility: previously, we always stripped type
-                    if (comptime is_bun_platform) {
-                        p.printWhitespacer(ws(", { with: { type: \"file\" } }"));
-                    }
-                },
-                else => {},
+            if (!import_options.isMissing()) {
+                // since we previously stripped type, it is a breaking change to
+                // enable this for non-bun platforms
+                if (is_bun_platform or bun.FeatureFlags.breaking_changes_1_2) {
+                    p.printWhitespacer(ws(", "));
+                    p.printExpr(import_options, .comma, .{});
+                }
             }
+
             p.print(")");
 
-            if (leading_interior_comments.len > 0) {
-                p.printNewline();
-                p.unindent();
-                p.printIndent();
-            }
+            // if (leading_interior_comments.len > 0) {
+            //     p.printNewline();
+            //     p.unindent();
+            //     p.printIndent();
+            // }
 
             return;
         }
@@ -2485,7 +2484,14 @@ fn NewPrinter(
                 },
                 .e_require_string => |e| {
                     if (!rewrite_esm_to_cjs) {
-                        p.printRequireOrImportExpr(e.import_record_index, e.unwrapped_id != std.math.maxInt(u32), &([_]G.Comment{}), level, flags);
+                        p.printRequireOrImportExpr(
+                            e.import_record_index,
+                            e.unwrapped_id != std.math.maxInt(u32),
+                            &([_]G.Comment{}),
+                            Expr.empty,
+                            level,
+                            flags,
+                        );
                     }
                 },
                 .e_require_resolve_string => |e| {
@@ -2514,7 +2520,6 @@ fn NewPrinter(
                     }
                 },
                 .e_import => |e| {
-
                     // Handle non-string expressions
                     if (e.isImportRecordNull()) {
                         const wrap = level.gte(.new) or flags.contains(.forbid_call);
@@ -2525,47 +2530,45 @@ fn NewPrinter(
                         p.printSpaceBeforeIdentifier();
                         p.addSourceMapping(expr.loc);
                         p.print("import(");
-                        if (e.leading_interior_comments.len > 0) {
-                            p.printNewline();
-                            p.indent();
-                            for (e.leading_interior_comments) |comment| {
-                                p.printIndentedComment(comment.text);
-                            }
-                            p.printIndent();
-                        }
+                        // TODO:
+                        // if (e.leading_interior_comments.len > 0) {
+                        //     p.printNewline();
+                        //     p.indent();
+                        //     for (e.leading_interior_comments) |comment| {
+                        //         p.printIndentedComment(comment.text);
+                        //     }
+                        //     p.printIndent();
+                        // }
                         p.printExpr(e.expr, .comma, ExprFlag.None());
 
-                        if (comptime is_bun_platform) {
+                        if (!e.options.isMissing()) {
                             // since we previously stripped type, it is a breaking change to
                             // enable this for non-bun platforms
-                            switch (e.type_attribute) {
-                                .none => {},
-                                .text => {
-                                    p.printWhitespacer(ws(", { with: { type: \"text\" } }"));
-                                },
-                                .json => {
-                                    p.printWhitespacer(ws(", { with: { type: \"json\" } }"));
-                                },
-                                .toml => {
-                                    p.printWhitespacer(ws(", { with: { type: \"toml\" } }"));
-                                },
-                                .file => {
-                                    p.printWhitespacer(ws(", { with: { type: \"file\" } }"));
-                                },
+                            if (is_bun_platform or bun.FeatureFlags.breaking_changes_1_2) {
+                                p.printWhitespacer(ws(", "));
+                                p.printExpr(e.options, .comma, .{});
                             }
                         }
 
-                        if (e.leading_interior_comments.len > 0) {
-                            p.printNewline();
-                            p.unindent();
-                            p.printIndent();
-                        }
+                        // TODO:
+                        // if (e.leading_interior_comments.len > 0) {
+                        //     p.printNewline();
+                        //     p.unindent();
+                        //     p.printIndent();
+                        // }
                         p.print(")");
                         if (wrap) {
                             p.print(")");
                         }
                     } else {
-                        p.printRequireOrImportExpr(e.import_record_index, false, e.leading_interior_comments, level, flags);
+                        p.printRequireOrImportExpr(
+                            e.import_record_index,
+                            false,
+                            &.{}, // e.leading_interior_comments,
+                            e.options,
+                            level,
+                            flags,
+                        );
                     }
                 },
                 .e_dot => |e| {
@@ -2768,7 +2771,7 @@ fn NewPrinter(
                     if (e.func.name) |sym| {
                         p.printSpaceBeforeIdentifier();
                         p.addSourceMapping(sym.loc);
-                        p.printSymbol(sym.ref orelse Global.panic("internal error: expected E.Function's name symbol to have a ref\n{any}", .{e.func}));
+                        p.printSymbol(sym.ref orelse Output.panic("internal error: expected E.Function's name symbol to have a ref\n{any}", .{e.func}));
                     }
 
                     p.printFunc(e.func);
@@ -2789,7 +2792,7 @@ fn NewPrinter(
                     if (e.class_name) |name| {
                         p.print(" ");
                         p.addSourceMapping(name.loc);
-                        p.printSymbol(name.ref orelse Global.panic("internal error: expected E.Class's name symbol to have a ref\n{any}", .{e}));
+                        p.printSymbol(name.ref orelse Output.panic("internal error: expected E.Class's name symbol to have a ref\n{any}", .{e}));
                     }
                     p.printClass(e.*);
                     if (wrap) {
@@ -3881,7 +3884,7 @@ fn NewPrinter(
                     p.print("}");
                 },
                 else => {
-                    Global.panic("Unexpected binding of type {any}", .{binding});
+                    Output.panic("Unexpected binding of type {any}", .{binding});
                 },
             }
         }
@@ -3910,8 +3913,8 @@ fn NewPrinter(
                 .s_function => |s| {
                     p.printIndent();
                     p.printSpaceBeforeIdentifier();
-                    const name = s.func.name orelse Global.panic("Internal error: expected func to have a name ref\n{any}", .{s});
-                    const nameRef = name.ref orelse Global.panic("Internal error: expected func to have a name\n{any}", .{s});
+                    const name = s.func.name orelse Output.panic("Internal error: expected func to have a name ref\n{any}", .{s});
+                    const nameRef = name.ref orelse Output.panic("Internal error: expected func to have a name\n{any}", .{s});
 
                     if (s.func.flags.contains(.is_export)) {
                         if (!rewrite_esm_to_cjs) {
@@ -4035,7 +4038,7 @@ fn NewPrinter(
 
                                     if (class.class.class_name) |name| {
                                         p.print("class ");
-                                        p.printSymbol(name.ref orelse Global.panic("Internal error: Expected class to have a name ref\n{any}", .{class}));
+                                        p.printSymbol(name.ref orelse Output.panic("Internal error: Expected class to have a name ref\n{any}", .{class}));
                                     } else {
                                         p.print("class");
                                     }
@@ -4045,7 +4048,7 @@ fn NewPrinter(
                                     p.printNewline();
                                 },
                                 else => {
-                                    Global.panic("Internal error: unexpected export default stmt data {any}", .{s});
+                                    Output.panic("Internal error: unexpected export default stmt data {any}", .{s});
                                 },
                             }
                         },
@@ -4441,7 +4444,7 @@ fn NewPrinter(
                         p.printIndent();
                     }
                     p.printSpaceBeforeIdentifier();
-                    p.printSymbol(s.name.ref orelse Global.panic("Internal error: expected label to have a name {any}", .{s}));
+                    p.printSymbol(s.name.ref orelse Output.panic("Internal error: expected label to have a name {any}", .{s}));
                     p.print(":");
                     p.printBody(s.stmt);
                 },
@@ -4930,9 +4933,9 @@ fn NewPrinter(
                     const to_print: []const u8 = if (slice.len > 1024) slice[slice.len - 1024 ..] else slice;
 
                     if (to_print.len > 0) {
-                        Global.panic("\n<r><red>voluntary crash<r> while printing:<r>\n{s}\n---This is a <b>bug<r>. Not your fault.\n", .{to_print});
+                        Output.panic("\n<r><red>voluntary crash<r> while printing:<r>\n{s}\n---This is a <b>bug<r>. Not your fault.\n", .{to_print});
                     } else {
-                        Global.panic("\n<r><red>voluntary crash<r> while printing. This is a <b>bug<r>. Not your fault.\n", .{});
+                        Output.panic("\n<r><red>voluntary crash<r> while printing. This is a <b>bug<r>. Not your fault.\n", .{});
                     }
                 },
             }
@@ -5159,7 +5162,7 @@ fn NewPrinter(
                 // for(;)
                 .s_empty => {},
                 else => {
-                    Global.panic("Internal error: Unexpected stmt in for loop {any}", .{initSt});
+                    Output.panic("Internal error: Unexpected stmt in for loop {any}", .{initSt});
                 },
             }
         }
@@ -5668,7 +5671,7 @@ pub fn NewWriter(
         pub inline fn print(writer: *Self, comptime ValueType: type, str: ValueType) void {
             if (FeatureFlags.disable_printing_null) {
                 if (str == 0) {
-                    Global.panic("Attempted to print null char", .{});
+                    Output.panic("Attempted to print null char", .{});
                 }
             }
 
diff --git a/src/json_parser.zig b/src/json_parser.zig
index 87f7ca1ffe..bf46ea15ed 100644
--- a/src/json_parser.zig
+++ b/src/json_parser.zig
@@ -1075,7 +1075,7 @@ fn expectPrintedJSON(_contents: string, expected: string) !void {
     const expr = try ParseJSON(&source, &log, default_allocator);
 
     if (log.msgs.items.len > 0) {
-        Global.panic("--FAIL--\nExpr {s}\nLog: {s}\n--FAIL--", .{ expr, log.msgs.items[0].data.text });
+        Output.panic("--FAIL--\nExpr {s}\nLog: {s}\n--FAIL--", .{ expr, log.msgs.items[0].data.text });
     }
 
     const buffer_writer = try js_printer.BufferWriter.init(default_allocator);
diff --git a/src/linker.lds b/src/linker.lds
index 27c44da312..9aee7b8227 100644
--- a/src/linker.lds
+++ b/src/linker.lds
@@ -5,6 +5,7 @@ BUN_1.1 {
 	extern "C++" {
 		v8::*;
 		node::*;
+		JSC::CallFrame::describeFrame;
 	};
     local:
 	*;
diff --git a/src/linux_c.zig b/src/linux_c.zig
index 5ba1b39b75..46e1b080a0 100644
--- a/src/linux_c.zig
+++ b/src/linux_c.zig
@@ -293,6 +293,75 @@ pub const SystemErrno = enum(u8) {
     };
 };
 
+pub const UV_E2BIG: i32 = @intFromEnum(SystemErrno.E2BIG);
+pub const UV_EACCES: i32 = @intFromEnum(SystemErrno.EACCES);
+pub const UV_EADDRINUSE: i32 = @intFromEnum(SystemErrno.EADDRINUSE);
+pub const UV_EADDRNOTAVAIL: i32 = @intFromEnum(SystemErrno.EADDRNOTAVAIL);
+pub const UV_EAFNOSUPPORT: i32 = @intFromEnum(SystemErrno.EAFNOSUPPORT);
+pub const UV_EAGAIN: i32 = @intFromEnum(SystemErrno.EAGAIN);
+pub const UV_EALREADY: i32 = @intFromEnum(SystemErrno.EALREADY);
+pub const UV_EBADF: i32 = @intFromEnum(SystemErrno.EBADF);
+pub const UV_EBUSY: i32 = @intFromEnum(SystemErrno.EBUSY);
+pub const UV_ECANCELED: i32 = @intFromEnum(SystemErrno.ECANCELED);
+pub const UV_ECHARSET: i32 = -bun.windows.libuv.UV_ECHARSET;
+pub const UV_ECONNABORTED: i32 = @intFromEnum(SystemErrno.ECONNABORTED);
+pub const UV_ECONNREFUSED: i32 = @intFromEnum(SystemErrno.ECONNREFUSED);
+pub const UV_ECONNRESET: i32 = @intFromEnum(SystemErrno.ECONNRESET);
+pub const UV_EDESTADDRREQ: i32 = @intFromEnum(SystemErrno.EDESTADDRREQ);
+pub const UV_EEXIST: i32 = @intFromEnum(SystemErrno.EEXIST);
+pub const UV_EFAULT: i32 = @intFromEnum(SystemErrno.EFAULT);
+pub const UV_EHOSTUNREACH: i32 = @intFromEnum(SystemErrno.EHOSTUNREACH);
+pub const UV_EINTR: i32 = @intFromEnum(SystemErrno.EINTR);
+pub const UV_EINVAL: i32 = @intFromEnum(SystemErrno.EINVAL);
+pub const UV_EIO: i32 = @intFromEnum(SystemErrno.EIO);
+pub const UV_EISCONN: i32 = @intFromEnum(SystemErrno.EISCONN);
+pub const UV_EISDIR: i32 = @intFromEnum(SystemErrno.EISDIR);
+pub const UV_ELOOP: i32 = @intFromEnum(SystemErrno.ELOOP);
+pub const UV_EMFILE: i32 = @intFromEnum(SystemErrno.EMFILE);
+pub const UV_EMSGSIZE: i32 = @intFromEnum(SystemErrno.EMSGSIZE);
+pub const UV_ENAMETOOLONG: i32 = @intFromEnum(SystemErrno.ENAMETOOLONG);
+pub const UV_ENETDOWN: i32 = @intFromEnum(SystemErrno.ENETDOWN);
+pub const UV_ENETUNREACH: i32 = @intFromEnum(SystemErrno.ENETUNREACH);
+pub const UV_ENFILE: i32 = @intFromEnum(SystemErrno.ENFILE);
+pub const UV_ENOBUFS: i32 = @intFromEnum(SystemErrno.ENOBUFS);
+pub const UV_ENODEV: i32 = @intFromEnum(SystemErrno.ENODEV);
+pub const UV_ENOENT: i32 = @intFromEnum(SystemErrno.ENOENT);
+pub const UV_ENOMEM: i32 = @intFromEnum(SystemErrno.ENOMEM);
+pub const UV_ENONET: i32 = @intFromEnum(SystemErrno.ENONET);
+pub const UV_ENOSPC: i32 = @intFromEnum(SystemErrno.ENOSPC);
+pub const UV_ENOSYS: i32 = @intFromEnum(SystemErrno.ENOSYS);
+pub const UV_ENOTCONN: i32 = @intFromEnum(SystemErrno.ENOTCONN);
+pub const UV_ENOTDIR: i32 = @intFromEnum(SystemErrno.ENOTDIR);
+pub const UV_ENOTEMPTY: i32 = @intFromEnum(SystemErrno.ENOTEMPTY);
+pub const UV_ENOTSOCK: i32 = @intFromEnum(SystemErrno.ENOTSOCK);
+pub const UV_ENOTSUP: i32 = @intFromEnum(SystemErrno.ENOTSUP);
+pub const UV_EPERM: i32 = @intFromEnum(SystemErrno.EPERM);
+pub const UV_EPIPE: i32 = @intFromEnum(SystemErrno.EPIPE);
+pub const UV_EPROTO: i32 = @intFromEnum(SystemErrno.EPROTO);
+pub const UV_EPROTONOSUPPORT: i32 = @intFromEnum(SystemErrno.EPROTONOSUPPORT);
+pub const UV_EPROTOTYPE: i32 = @intFromEnum(SystemErrno.EPROTOTYPE);
+pub const UV_EROFS: i32 = @intFromEnum(SystemErrno.EROFS);
+pub const UV_ESHUTDOWN: i32 = @intFromEnum(SystemErrno.ESHUTDOWN);
+pub const UV_ESPIPE: i32 = @intFromEnum(SystemErrno.ESPIPE);
+pub const UV_ESRCH: i32 = @intFromEnum(SystemErrno.ESRCH);
+pub const UV_ETIMEDOUT: i32 = @intFromEnum(SystemErrno.ETIMEDOUT);
+pub const UV_ETXTBSY: i32 = @intFromEnum(SystemErrno.ETXTBSY);
+pub const UV_EXDEV: i32 = @intFromEnum(SystemErrno.EXDEV);
+pub const UV_EFBIG: i32 = @intFromEnum(SystemErrno.EFBIG);
+pub const UV_ENOPROTOOPT: i32 = @intFromEnum(SystemErrno.ENOPROTOOPT);
+pub const UV_ERANGE: i32 = @intFromEnum(SystemErrno.ERANGE);
+pub const UV_ENXIO: i32 = @intFromEnum(SystemErrno.ENXIO);
+pub const UV_EMLINK: i32 = @intFromEnum(SystemErrno.EMLINK);
+pub const UV_EHOSTDOWN: i32 = @intFromEnum(SystemErrno.EHOSTDOWN);
+pub const UV_EREMOTEIO: i32 = @intFromEnum(SystemErrno.EREMOTEIO);
+pub const UV_ENOTTY: i32 = @intFromEnum(SystemErrno.ENOTTY);
+pub const UV_EFTYPE: i32 = -bun.windows.libuv.UV_EFTYPE;
+pub const UV_EILSEQ: i32 = @intFromEnum(SystemErrno.EILSEQ);
+pub const UV_EOVERFLOW: i32 = @intFromEnum(SystemErrno.EOVERFLOW);
+pub const UV_ESOCKTNOSUPPORT: i32 = @intFromEnum(SystemErrno.ESOCKTNOSUPPORT);
+pub const UV_ENODATA: i32 = @intFromEnum(SystemErrno.ENODATA);
+pub const UV_EUNATCH: i32 = @intFromEnum(SystemErrno.EUNATCH);
+
 pub const preallocate_length = 2048 * 1024;
 pub fn preallocate_file(fd: std.posix.fd_t, offset: std.posix.off_t, len: std.posix.off_t) anyerror!void {
     // https://gist.github.com/Jarred-Sumner/b37b93399b63cbfd86e908c59a0a37df
diff --git a/src/logger.zig b/src/logger.zig
index 23c74879f1..70a301c166 100644
--- a/src/logger.zig
+++ b/src/logger.zig
@@ -549,7 +549,7 @@ pub const Msg = struct {
         }
     }
 
-    pub fn formatNoWriter(msg: *const Msg, comptime formatterFunc: @TypeOf(Global.panic)) void {
+    pub fn formatNoWriter(msg: *const Msg, comptime formatterFunc: @TypeOf(Output.panic)) void {
         formatterFunc("\n\n{s}: {s}\n{s}\n{s}:{}:{} ({d})", .{
             msg.kind.string(),
             msg.data.text,
@@ -717,7 +717,7 @@ pub const Log = struct {
 
         const count = @as(u16, @intCast(@min(msgs.len, errors_stack.len)));
         switch (count) {
-            0 => return JSC.JSValue.jsUndefined(),
+            0 => return .undefined,
             1 => {
                 const msg = msgs[0];
                 return switch (msg.metadata) {
diff --git a/src/main.zig b/src/main.zig
index 4488bcb900..8aff3b147f 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -8,7 +8,7 @@ const Environment = bun.Environment;
 
 pub const panic = bun.crash_handler.panic;
 pub const std_options = std.Options{
-    .enable_segfault_handler = !bun.crash_handler.enable,
+    .enable_segfault_handler = false,
 };
 
 pub const io_mode = .blocking;
@@ -72,3 +72,7 @@ pub const overrides = struct {
         }
     };
 };
+
+pub export fn Bun__panic(msg: [*]const u8, len: usize) noreturn {
+    Output.panic("{s}", .{msg[0..len]});
+}
diff --git a/src/napi/napi.zig b/src/napi/napi.zig
index c8fc69d109..4b37c56322 100644
--- a/src/napi/napi.zig
+++ b/src/napi/napi.zig
@@ -648,37 +648,7 @@ pub export fn napi_strict_equals(env: napi_env, lhs: napi_value, rhs: napi_value
     return .ok;
 }
 pub extern fn napi_call_function(env: napi_env, recv: napi_value, func: napi_value, argc: usize, argv: [*c]const napi_value, result: *napi_value) napi_status;
-pub export fn napi_new_instance(env: napi_env, constructor: napi_value, argc: usize, argv: [*c]const napi_value, result_: ?*napi_value) napi_status {
-    log("napi_new_instance", .{});
-    JSC.markBinding(@src());
-
-    if (argc > 0 and argv == null) {
-        return invalidArg();
-    }
-
-    const result = result_ orelse {
-        return invalidArg();
-    };
-
-    var exception = [_]JSC.C.JSValueRef{null};
-    result.* = JSValue.c(
-        JSC.C.JSObjectCallAsConstructor(
-            env.ref(),
-            constructor.asObjectRef(),
-            argc,
-            if (argv != null)
-                @as([*]const JSC.C.JSValueRef, @ptrCast(argv))
-            else
-                null,
-            &exception,
-        ),
-    );
-    if (exception[0] != null) {
-        return genericFailure();
-    }
-
-    return .ok;
-}
+pub extern fn napi_new_instance(env: napi_env, constructor: napi_value, argc: usize, argv: [*c]const napi_value, result_: ?*napi_value) napi_status;
 pub export fn napi_instanceof(env: napi_env, object: napi_value, constructor: napi_value, result_: ?*bool) napi_status {
     log("napi_instanceof", .{});
     const result = result_ orelse {
@@ -750,12 +720,12 @@ pub export fn napi_make_callback(env: napi_env, _: *anyopaque, recv: napi_value,
         return .function_expected;
     }
 
-    const res = func.callWithThis(
+    const res = func.call(
         env,
         if (recv != .zero)
             recv
         else
-            JSC.JSValue.jsUndefined(),
+            .undefined,
         if (arg_count > 0 and args != null)
             @as([*]const JSC.JSValue, @ptrCast(args.?))[0..arg_count]
         else
@@ -972,7 +942,7 @@ pub export fn napi_resolve_deferred(env: napi_env, deferred: napi_deferred, reso
     log("napi_resolve_deferred", .{});
     var prom = deferred.get();
     prom.resolve(env, resolution);
-    deferred.*.strong.deinit();
+    deferred.deinit();
     bun.default_allocator.destroy(deferred);
     return .ok;
 }
@@ -980,7 +950,7 @@ pub export fn napi_reject_deferred(env: napi_env, deferred: napi_deferred, rejec
     log("napi_reject_deferred", .{});
     var prom = deferred.get();
     prom.reject(env, rejection);
-    deferred.*.strong.deinit();
+    deferred.deinit();
     bun.default_allocator.destroy(deferred);
     return .ok;
 }
@@ -990,9 +960,8 @@ pub export fn napi_is_promise(_: napi_env, value: napi_value, is_promise_: ?*boo
         return invalidArg();
     };
 
-    if (value.isEmptyOrUndefinedOrNull()) {
-        is_promise.* = false;
-        return .ok;
+    if (value.isEmpty()) {
+        return invalidArg();
     }
 
     is_promise.* = value.asAnyPromise() != null;
@@ -1214,10 +1183,10 @@ pub export fn napi_fatal_error(location_ptr: ?[*:0]const u8, location_len: usize
 
     const location = napiSpan(location_ptr, location_len);
     if (location.len > 0) {
-        bun.Global.panic("napi: {s}\n  {s}", .{ message, location });
+        bun.Output.panic("napi: {s}\n  {s}", .{ message, location });
     }
 
-    bun.Global.panic("napi: {s}", .{message});
+    bun.Output.panic("napi: {s}", .{message});
 }
 pub export fn napi_create_buffer(env: napi_env, length: usize, data: ?**anyopaque, result: *napi_value) napi_status {
     log("napi_create_buffer: {d}", .{length});
@@ -1336,13 +1305,16 @@ pub export fn napi_get_node_version(_: napi_env, version_: ?**const napi_node_ve
     version.* = &napi_node_version.global;
     return .ok;
 }
-pub export fn napi_get_uv_event_loop(env: napi_env, loop_: ?**JSC.EventLoop) napi_status {
+const napi_event_loop = if (bun.Environment.isWindows) *bun.windows.libuv.Loop else *JSC.EventLoop;
+pub export fn napi_get_uv_event_loop(env: napi_env, loop_: ?*napi_event_loop) napi_status {
     log("napi_get_uv_event_loop", .{});
     const loop = loop_ orelse {
         return invalidArg();
     };
     if (bun.Environment.isWindows) {
-        loop.* = @ptrCast(@alignCast(env.bunVM().uvLoop()));
+        // alignment error is incorrect.
+        @setRuntimeSafety(false);
+        loop.* = JSC.VirtualMachine.get().uvLoop();
     } else {
         // there is no uv event loop on posix, we use our event loop handle.
         loop.* = env.bunVM().eventLoop();
@@ -1419,10 +1391,10 @@ pub const ThreadSafeFunction = struct {
     thread_count: usize = 0,
     owning_thread_lock: Lock = Lock.init(),
     event_loop: *JSC.EventLoop,
+    tracker: JSC.AsyncTaskTracker,
 
     env: napi_env,
 
-    finalizer_task: JSC.AnyTask = undefined,
     finalizer: Finalizer = Finalizer{ .fun = null, .data = null },
     channel: Queue,
 
@@ -1500,18 +1472,30 @@ pub const ThreadSafeFunction = struct {
 
     pub fn call(this: *ThreadSafeFunction) void {
         const task = this.channel.tryReadItem() catch null orelse return;
+        const vm = this.event_loop.virtual_machine;
+        const globalObject = this.env;
+
+        this.tracker.willDispatch(globalObject);
+        defer this.tracker.didDispatch(globalObject);
+
         switch (this.callback) {
             .js => |js_function| {
                 if (js_function.isEmptyOrUndefinedOrNull()) {
                     return;
                 }
-                const err = js_function.call(this.env, &.{});
+                const err = js_function.call(globalObject, .undefined, &.{});
                 if (err.isAnyError()) {
-                    _ = this.env.bunVM().uncaughtException(this.env, err, false);
+                    _ = vm.uncaughtException(globalObject, err, false);
                 }
             },
             .c => |cb| {
-                cb.napi_threadsafe_function_call_js(this.env, cb.js, this.ctx, task);
+                if (comptime bun.Environment.isDebug) {
+                    const str = cb.js.toBunString(globalObject);
+                    defer str.deref();
+                    log("call() {}", .{str});
+                }
+
+                cb.napi_threadsafe_function_call_js(globalObject, cb.js, this.ctx, task);
             },
         }
     }
@@ -1530,6 +1514,8 @@ pub const ThreadSafeFunction = struct {
 
     pub fn finalize(opaq: *anyopaque) void {
         var this = bun.cast(*ThreadSafeFunction, opaq);
+        this.unref();
+
         if (this.finalizer.fun) |fun| {
             fun(this.event_loop.global, this.finalizer.data, this.ctx);
         }
@@ -1581,7 +1567,6 @@ pub const ThreadSafeFunction = struct {
         }
 
         if (mode == .abort or this.thread_count == 0) {
-            this.finalizer_task = JSC.AnyTask{ .ctx = this, .callback = finalize };
             this.event_loop.enqueueTaskConcurrent(JSC.ConcurrentTask.fromCallback(this, finalize));
         }
 
@@ -1615,27 +1600,30 @@ pub export fn napi_create_threadsafe_function(
         func.protect();
     }
 
+    const vm = env.bunVM();
     var function = bun.default_allocator.create(ThreadSafeFunction) catch return genericFailure();
     function.* = .{
-        .event_loop = env.bunVM().eventLoop(),
+        .event_loop = vm.eventLoop(),
         .env = env,
         .callback = if (call_js_cb) |c| .{
             .c = .{
                 .napi_threadsafe_function_call_js = c,
-                .js = if (func == .zero) JSC.JSValue.jsUndefined() else func,
+                .js = if (func == .zero) .undefined else func.withAsyncContextIfNeeded(env),
             },
         } else .{
-            .js = if (func == .zero) JSC.JSValue.jsUndefined() else func,
+            .js = if (func == .zero) .undefined else func.withAsyncContextIfNeeded(env),
         },
         .ctx = context,
         .channel = ThreadSafeFunction.Queue.init(max_queue_size, bun.default_allocator),
         .thread_count = initial_thread_count,
         .poll_ref = Async.KeepAlive.init(),
+        .tracker = JSC.AsyncTaskTracker.init(vm),
     };
 
     function.finalizer = .{ .data = thread_finalize_data, .fun = thread_finalize_cb };
     // nodejs by default keeps the event loop alive until the thread-safe function is unref'd
     function.ref();
+    function.tracker.didSchedule(vm.global);
 
     result.* = function;
     return .ok;
@@ -1670,14 +1658,12 @@ pub export fn napi_release_threadsafe_function(func: napi_threadsafe_function, m
 pub export fn napi_unref_threadsafe_function(env: napi_env, func: napi_threadsafe_function) napi_status {
     log("napi_unref_threadsafe_function", .{});
     bun.assert(func.event_loop.global == env);
-
     func.unref();
     return .ok;
 }
 pub export fn napi_ref_threadsafe_function(env: napi_env, func: napi_threadsafe_function) napi_status {
     log("napi_ref_threadsafe_function", .{});
     bun.assert(func.event_loop.global == env);
-
     func.ref();
     return .ok;
 }
diff --git a/src/options.zig b/src/options.zig
index 23a43b04a7..b2b60949cb 100644
--- a/src/options.zig
+++ b/src/options.zig
@@ -1240,7 +1240,7 @@ pub fn definesFromTransformOptions(
         }
     }
 
-    const resolved_defines = try defines.DefineData.from_input(user_defines, log, allocator);
+    const resolved_defines = try defines.DefineData.fromInput(user_defines, log, allocator);
 
     return try defines.Define.init(
         allocator,
@@ -1545,7 +1545,6 @@ pub const BundleOptions = struct {
         "react-client",
         "react-server",
         "react-refresh",
-        "__bun-test-unwrap-commonjs__",
     };
 
     pub inline fn cssImportBehavior(this: *const BundleOptions) Api.CssInJsBehavior {
diff --git a/src/renamer.zig b/src/renamer.zig
index 3f3b572546..e23d4aba2c 100644
--- a/src/renamer.zig
+++ b/src/renamer.zig
@@ -35,7 +35,7 @@ pub const NoOpRenamer = struct {
         if (renamer.symbols.getConst(resolved)) |symbol| {
             return symbol.original_name;
         } else {
-            Global.panic("Invalid symbol {s} in {s}", .{ ref, renamer.source.path.text });
+            Output.panic("Invalid symbol {s} in {s}", .{ ref, renamer.source.path.text });
         }
     }
 
diff --git a/src/resolver/package_json.zig b/src/resolver/package_json.zig
index c74338ecf7..a5b539403f 100644
--- a/src/resolver/package_json.zig
+++ b/src/resolver/package_json.zig
@@ -37,7 +37,6 @@ const FolderResolver = @import("../install/resolvers/folder_resolver.zig");
 
 const Architecture = @import("../install/npm.zig").Architecture;
 const OperatingSystem = @import("../install/npm.zig").OperatingSystem;
-pub const SideEffectsMap = std.HashMapUnmanaged(bun.StringHashMapUnowned.Key, void, bun.StringHashMapUnowned.Adapter, 80);
 pub const DependencyMap = struct {
     map: HashMap = .{},
     source_buf: []const u8 = "",
@@ -57,6 +56,8 @@ pub const PackageJSON = struct {
         production,
     };
 
+    pub usingnamespace bun.New(@This());
+
     pub fn generateHash(package_json: *PackageJSON) void {
         var hashy: [1024]u8 = undefined;
         @memset(&hashy, 0);
@@ -112,11 +113,7 @@ pub const PackageJSON = struct {
     package_manager_package_id: Install.PackageID = Install.invalid_package_id,
     dependencies: DependencyMap = .{},
 
-    side_effects: union(enum) {
-        unspecified: void,
-        false: void,
-        map: SideEffectsMap,
-    } = .{ .unspecified = {} },
+    side_effects: SideEffects = .unspecified,
 
     // Present if the "browser" field is present. This field is intended to be
     // used by bundlers and lets you redirect the paths of certain 3rd-party
@@ -148,6 +145,33 @@ pub const PackageJSON = struct {
     exports: ?ExportsMap = null,
     imports: ?ExportsMap = null,
 
+    pub const SideEffects = union(enum) {
+        /// either `package.json` is missing "sideEffects", it is true, or some
+        /// other unsupported value. Treat all files as side effects
+        unspecified: void,
+        /// "sideEffects": false
+        false: void,
+        /// "sideEffects": ["file.js", "other.js"]
+        map: Map,
+        // /// "sideEffects": ["side_effects/*.js"]
+        // glob: TODO,
+
+        pub const Map = std.HashMapUnmanaged(
+            bun.StringHashMapUnowned.Key,
+            void,
+            bun.StringHashMapUnowned.Adapter,
+            80,
+        );
+
+        pub fn hasSideEffects(side_effects: SideEffects, path: []const u8) bool {
+            return switch (side_effects) {
+                .unspecified => true,
+                .false => false,
+                .map => |map| map.contains(bun.StringHashMapUnowned.Key.init(path)),
+            };
+        }
+    };
+
     pub inline fn isAppPackage(this: *const PackageJSON) bool {
         return this.hash == 0xDEADBEEF;
     }
@@ -776,7 +800,7 @@ pub const PackageJSON = struct {
                 } else if (side_effects_field.asArray()) |array_| {
                     var array = array_;
                     // TODO: switch to only storing hashes
-                    var map = SideEffectsMap{};
+                    var map = SideEffects.Map{};
                     map.ensureTotalCapacity(allocator, array.array.items.len) catch unreachable;
                     while (array.next()) |item| {
                         if (item.asString(allocator)) |name| {
diff --git a/src/resolver/resolve_path.zig b/src/resolver/resolve_path.zig
index d5ba7a4270..1eb5cac84e 100644
--- a/src/resolver/resolve_path.zig
+++ b/src/resolver/resolve_path.zig
@@ -608,10 +608,10 @@ fn windowsVolumeNameLenT(comptime T: type, path: []const T) struct { usize, usiz
                 }
             }
         } else {
-            if (bun.strings.indexAnyComptimeT(T, path[3..], comptime strings.literal(T, "/\\"))) |idx| {
+            if (bun.strings.indexAnyComptimeT(T, path[3..], strings.literal(T, "/\\"))) |idx| {
                 // TODO: handle input "//abc//def" should be picked up as a unc path
                 if (path.len > idx + 4 and !Platform.windows.isSeparatorT(T, path[idx + 4])) {
-                    if (bun.strings.indexAnyComptimeT(T, path[idx + 4 ..], comptime strings.literal(T, "/\\"))) |idx2| {
+                    if (bun.strings.indexAnyComptimeT(T, path[idx + 4 ..], strings.literal(T, "/\\"))) |idx2| {
                         return .{ idx + idx2 + 4, idx + 3 };
                     } else {
                         return .{ path.len, idx + 3 };
@@ -761,7 +761,7 @@ pub fn normalizeStringGenericTZ(
         //
         // since it is theoretically possible to get here in release
         // we will not do this check in release.
-        assert(!strings.hasPrefixComptimeType(T, path_, comptime strings.literal(T, ":\\")));
+        assert(!strings.hasPrefixComptimeType(T, path_, strings.literal(T, ":\\")));
     }
 
     var buf_i: usize = 0;
@@ -776,16 +776,16 @@ pub fn normalizeStringGenericTZ(
     if (isWindows and !options.allow_above_root) {
         if (volLen > 0) {
             if (options.add_nt_prefix) {
-                @memcpy(buf[buf_i .. buf_i + 4], comptime strings.literal(T, "\\??\\"));
+                @memcpy(buf[buf_i .. buf_i + 4], strings.literal(T, "\\??\\"));
                 buf_i += 4;
             }
             if (path_[1] != ':') {
                 // UNC paths
                 if (options.add_nt_prefix) {
-                    @memcpy(buf[buf_i .. buf_i + 4], comptime strings.literal(T, "UNC" ++ sep_str));
+                    @memcpy(buf[buf_i .. buf_i + 4], strings.literal(T, "UNC" ++ sep_str));
                     buf_i += 2;
                 } else {
-                    @memcpy(buf[buf_i .. buf_i + 2], comptime strings.literal(T, sep_str ++ sep_str));
+                    @memcpy(buf[buf_i .. buf_i + 2], strings.literal(T, sep_str ++ sep_str));
                 }
                 @memcpy(buf[buf_i + 2 .. buf_i + indexOfThirdUNCSlash + 1], path_[2 .. indexOfThirdUNCSlash + 1]);
                 buf[buf_i + indexOfThirdUNCSlash] = options.separator;
@@ -827,7 +827,7 @@ pub fn normalizeStringGenericTZ(
     if (isWindows and options.allow_above_root) {
         if (path_.len >= 2 and path_[1] == ':') {
             if (options.add_nt_prefix) {
-                @memcpy(buf[buf_i .. buf_i + 4], &comptime strings.literalBuf(T, "\\??\\"));
+                @memcpy(buf[buf_i .. buf_i + 4], &strings.literalBuf(T, "\\??\\"));
                 buf_i += 4;
             }
             buf[buf_i] = path_[0];
@@ -884,10 +884,10 @@ pub fn normalizeStringGenericTZ(
                 }
             } else if (options.allow_above_root) {
                 if (buf_i > buf_start) {
-                    buf[buf_i..][0..3].* = (comptime strings.literal(T, sep_str ++ "..")).*;
+                    buf[buf_i..][0..3].* = (strings.literal(T, sep_str ++ "..")).*;
                     buf_i += 3;
                 } else {
-                    buf[buf_i..][0..2].* = (comptime strings.literal(T, "..")).*;
+                    buf[buf_i..][0..2].* = (strings.literal(T, "..")).*;
                     buf_i += 2;
                 }
                 dotdot = buf_i;
@@ -932,7 +932,7 @@ pub fn normalizeStringGenericTZ(
     const result = if (options.zero_terminate) buf[0..buf_i :0] else buf[0..buf_i];
 
     if (bun.Environment.allow_assert and isWindows) {
-        assert(!strings.hasPrefixComptimeType(T, result, comptime strings.literal(T, "\\:\\")));
+        assert(!strings.hasPrefixComptimeType(T, result, strings.literal(T, "\\:\\")));
     }
 
     return result;
@@ -1616,7 +1616,7 @@ pub fn lastIndexOfSeparatorWindows(slice: []const u8) ?usize {
 }
 
 pub fn lastIndexOfSeparatorWindowsT(comptime T: type, slice: []const T) ?usize {
-    return std.mem.lastIndexOfAny(T, slice, comptime strings.literal(T, "\\/"));
+    return std.mem.lastIndexOfAny(T, slice, strings.literal(T, "\\/"));
 }
 
 pub fn lastIndexOfSeparatorPosix(slice: []const u8) ?usize {
diff --git a/src/resolver/resolver.zig b/src/resolver/resolver.zig
index c08f78cc48..bc95d03e52 100644
--- a/src/resolver/resolver.zig
+++ b/src/resolver/resolver.zig
@@ -171,9 +171,9 @@ pub const SideEffects = enum {
     /// known to not have side effects.
     no_side_effects__pure_data,
 
-    // / Same as above but it came from a plugin. We don't want to warn about
-    // / unused imports to these files since running the plugin is a side effect.
-    // / Removing the import would not call the plugin which is observable.
+    // /// Same as above but it came from a plugin. We don't want to warn about
+    // /// unused imports to these files since running the plugin is a side effect.
+    // /// Removing the import would not call the plugin which is observable.
     // no_side_effects__pure_data_from_plugin,
 };
 
@@ -481,13 +481,6 @@ pub fn ResolveWatcher(comptime Context: type, comptime onWatch: anytype) type {
     };
 }
 
-fn isExternalModuleLike(import_path: string) bool {
-    if (strings.startsWith(import_path, ".") or strings.startsWith(import_path, "/") or strings.startsWith(import_path, "..")) {
-        return false;
-    }
-    return true;
-}
-
 pub const Resolver = struct {
     const ThisResolver = @This();
     opts: options.BundleOptions,
@@ -632,7 +625,7 @@ pub const Resolver = struct {
     }
 
     pub fn isExternalPattern(r: *ThisResolver, import_path: string) bool {
-        if (r.opts.packages == .external and isExternalModuleLike(import_path)) {
+        if (r.opts.packages == .external and isPackagePath(import_path)) {
             return true;
         }
         for (r.opts.external.patterns) |pattern| {
@@ -807,6 +800,26 @@ pub const Resolver = struct {
         const tracer = bun.tracy.traceNamed(@src(), "ModuleResolver.resolve");
         defer tracer.end();
 
+        // Only setting 'current_action' in debug mode because module resolution
+        // is done very often, and has a very low crash rate.
+        const prev_action = if (Environment.isDebug) bun.crash_handler.current_action;
+        if (Environment.isDebug) bun.crash_handler.current_action = .{ .resolver = .{
+            .source_dir = source_dir,
+            .import_path = import_path,
+            .kind = kind,
+        } };
+        defer if (Environment.isDebug) {
+            bun.crash_handler.current_action = prev_action;
+        };
+
+        if (Environment.isDebug and bun.CLI.debug_flags.hasResolveBreakpoint(import_path)) {
+            bun.Output.debug("Resolving <green>{s}<r> from <blue>{s}<r>", .{
+                import_path,
+                source_dir,
+            });
+            @breakpoint();
+        }
+
         const original_order = r.extension_order;
         defer r.extension_order = original_order;
         r.extension_order = switch (kind) {
@@ -853,8 +866,10 @@ pub const Resolver = struct {
             }
         }
 
-        // Certain types of URLs default to being external for convenience
-        if (r.isExternalPattern(import_path) or
+        // Certain types of URLs default to being external for convenience,
+        // while these rules should not be applied to the entrypoint as it is never external (#12734)
+        if (kind != .entry_point and
+            (r.isExternalPattern(import_path) or
             // "fill: url(#filter);"
             (kind.isFromCSS() and strings.startsWith(import_path, "#")) or
 
@@ -865,7 +880,7 @@ pub const Resolver = struct {
             strings.startsWith(import_path, "https://") or
 
             // "background: url(//example.com/images/image.png);"
-            strings.startsWith(import_path, "//"))
+            strings.startsWith(import_path, "//")))
         {
             if (r.debug_logs) |*debug| {
                 debug.addNote("Marking this path as implicitly external");
@@ -1143,13 +1158,13 @@ pub const Resolver = struct {
     pub fn resolveWithoutSymlinks(
         r: *ThisResolver,
         source_dir: string,
-        import_path_: string,
+        input_import_path: string,
         kind: ast.ImportKind,
         global_cache: GlobalCache,
     ) Result.Union {
         assert(std.fs.path.isAbsolute(source_dir));
 
-        var import_path = import_path_;
+        var import_path = input_import_path;
 
         // This implements the module resolution algorithm from node.js, which is
         // described here: https://nodejs.org/api/modules.html#modules_all_together
@@ -1375,7 +1390,10 @@ pub const Resolver = struct {
             }
 
             // Check for external packages first
-            if (r.opts.external.node_modules.count() > 0) {
+            if (r.opts.external.node_modules.count() > 0 and
+                // Imports like "process/" need to resolve to the filesystem, not a builtin
+                !strings.hasSuffixComptime(import_path, "/"))
+            {
                 var query = import_path;
                 while (true) {
                     if (r.opts.external.node_modules.contains(query)) {
@@ -2481,7 +2499,7 @@ pub const Resolver = struct {
         const source = logger.Source.initPathString(key_path.text, entry.contents);
         const file_dir = source.path.sourceDir();
 
-        var result = (try TSConfigJSON.parse(bun.fs_allocator, r.log, source, &r.caches.json)) orelse return null;
+        var result = (try TSConfigJSON.parse(bun.default_allocator, r.log, source, &r.caches.json)) orelse return null;
 
         if (result.hasBaseURL()) {
 
@@ -2541,9 +2559,7 @@ pub const Resolver = struct {
             ) orelse return null;
         }
 
-        const _pkg = try bun.default_allocator.create(PackageJSON);
-        _pkg.* = pkg;
-        return _pkg;
+        return PackageJSON.new(pkg);
     }
 
     fn dirInfoCached(
diff --git a/src/resolver/tsconfig_json.zig b/src/resolver/tsconfig_json.zig
index f5a61a0dee..22dd62cdc6 100644
--- a/src/resolver/tsconfig_json.zig
+++ b/src/resolver/tsconfig_json.zig
@@ -57,6 +57,7 @@ pub const TSConfigJSON = struct {
 
     emit_decorator_metadata: bool = false,
 
+    pub usingnamespace bun.New(@This());
     pub fn hasBaseURL(tsconfig: *const TSConfigJSON) bool {
         return tsconfig.base_url.len > 0;
     }
@@ -323,13 +324,7 @@ pub const TSConfigJSON = struct {
             assert(result.base_url.len > 0);
         }
 
-        const _result = allocator.create(TSConfigJSON) catch unreachable;
-        _result.* = result;
-
-        if (Environment.isDebug and has_base_url) {
-            assert(_result.base_url.len > 0);
-        }
-        return _result;
+        return TSConfigJSON.new(result);
     }
 
     pub fn isValidTSConfigPathPattern(text: string, log: *logger.Log, source: *const logger.Source, loc: logger.Loc, allocator: std.mem.Allocator) bool {
diff --git a/src/runtime.js b/src/runtime.js
index 460a1768f7..f1adb2e6c8 100644
--- a/src/runtime.js
+++ b/src/runtime.js
@@ -1,13 +1,17 @@
+// Since runtime.js loads first in the bundler, Ref.none will point at this
+// value. And since it isnt exported, it will always be tree-shaken away.
+var __INVALID__REF__;
+
 var tagSymbol;
 var cjsRequireSymbol;
+// This ordering is deliberate so that the printer does optimizes these into a
+// single destructuring assignment.
 var __create = Object.create;
 var __descs = Object.getOwnPropertyDescriptors;
-var __defProp = Object.defineProperty;
 var __getProtoOf = Object.getPrototypeOf;
+var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-
-// This order is deliberate so that the printer does the {} optimization here
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 
 export var __markAsModule = target => __defProp(target, "__esModule", { value: true, configurable: true });
@@ -63,22 +67,23 @@ export var __toESM = (mod, isNodeMode, target) => {
 // Converts the module from ESM to CommonJS. This clones the input module
 // object with the addition of a non-enumerable "__esModule" property set
 // to "true", which overwrites any existing export named "__esModule".
+var __moduleCache = /* @__PURE__ */ new WeakMap();
 export var __toCommonJS = /* @__PURE__ */ from => {
-  const moduleCache = (__toCommonJS.moduleCache ??= new WeakMap());
-  var cached = moduleCache.get(from);
-  if (cached) return cached;
-  var to = __defProp({}, "__esModule", { value: true });
-  var desc = { enumerable: false };
+  var entry = __moduleCache.get(from),
+    desc;
+  if (entry) return entry;
+  entry = __defProp({}, "__esModule", { value: true });
   if ((from && typeof from === "object") || typeof from === "function")
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key))
-        __defProp(to, key, {
+    __getOwnPropNames(from).map(
+      key =>
+        !__hasOwnProp.call(entry, key) &&
+        __defProp(entry, key, {
           get: () => from[key],
           enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable,
-        });
-
-  moduleCache.set(from, to);
-  return to;
+        }),
+    );
+  __moduleCache.set(from, entry);
+  return entry;
 };
 
 // lazy require to prevent loading one icon from a design system
diff --git a/src/shell/interpreter.zig b/src/shell/interpreter.zig
index dfd6b3a8aa..9c8fe9b615 100644
--- a/src/shell/interpreter.zig
+++ b/src/shell/interpreter.zig
@@ -1664,7 +1664,7 @@ pub const Interpreter = struct {
             this.exit_code = exit_code;
             if (this.this_jsvalue != .zero) {
                 if (JSC.Codegen.JSShellInterpreter.resolveGetCached(this.this_jsvalue)) |resolve| {
-                    _ = resolve.call(this.globalThis, &.{ JSValue.jsNumberFromU16(exit_code), this.getBufferedStdout(), this.getBufferedStderr() });
+                    _ = resolve.call(this.globalThis, .undefined, &.{ JSValue.jsNumberFromU16(exit_code), this.getBufferedStdout(), this.getBufferedStderr() });
                     JSC.Codegen.JSShellInterpreter.resolveSetCached(this.this_jsvalue, this.globalThis, .undefined);
                     JSC.Codegen.JSShellInterpreter.rejectSetCached(this.this_jsvalue, this.globalThis, .undefined);
                 }
@@ -7298,31 +7298,34 @@ pub const Interpreter = struct {
                     return Maybe(void).success;
                 }
 
-                const first_arg = args[0][0..std.mem.len(args[0]) :0];
-                switch (first_arg[0]) {
-                    '-' => {
-                        switch (this.bltn.parentCmd().base.shell.changePrevCwd(this.bltn.parentCmd().base.interpreter)) {
-                            .result => {},
-                            .err => |err| {
-                                return this.handleChangeCwdErr(err, this.bltn.parentCmd().base.shell.prevCwdZ());
-                            },
-                        }
-                    },
-                    '~' => {
-                        const homedir = this.bltn.parentCmd().base.shell.getHomedir();
-                        homedir.deref();
-                        switch (this.bltn.parentCmd().base.shell.changeCwd(this.bltn.parentCmd().base.interpreter, homedir.slice())) {
-                            .result => {},
-                            .err => |err| return this.handleChangeCwdErr(err, homedir.slice()),
-                        }
-                    },
-                    else => {
-                        switch (this.bltn.parentCmd().base.shell.changeCwd(this.bltn.parentCmd().base.interpreter, first_arg)) {
-                            .result => {},
-                            .err => |err| return this.handleChangeCwdErr(err, first_arg),
-                        }
-                    },
+                if (args.len == 1) {
+                    const first_arg = args[0][0..std.mem.len(args[0]) :0];
+                    switch (first_arg[0]) {
+                        '-' => {
+                            switch (this.bltn.parentCmd().base.shell.changePrevCwd(this.bltn.parentCmd().base.interpreter)) {
+                                .result => {},
+                                .err => |err| {
+                                    return this.handleChangeCwdErr(err, this.bltn.parentCmd().base.shell.prevCwdZ());
+                                },
+                            }
+                        },
+                        '~' => {
+                            const homedir = this.bltn.parentCmd().base.shell.getHomedir();
+                            homedir.deref();
+                            switch (this.bltn.parentCmd().base.shell.changeCwd(this.bltn.parentCmd().base.interpreter, homedir.slice())) {
+                                .result => {},
+                                .err => |err| return this.handleChangeCwdErr(err, homedir.slice()),
+                            }
+                        },
+                        else => {
+                            switch (this.bltn.parentCmd().base.shell.changeCwd(this.bltn.parentCmd().base.interpreter, first_arg)) {
+                                .result => {},
+                                .err => |err| return this.handleChangeCwdErr(err, first_arg),
+                            }
+                        },
+                    }
                 }
+
                 this.bltn.done(0);
                 return Maybe(void).success;
             }
diff --git a/src/shell/shell.zig b/src/shell/shell.zig
index ecd520cf9c..19cb9f1d8b 100644
--- a/src/shell/shell.zig
+++ b/src/shell/shell.zig
@@ -4362,7 +4362,7 @@ pub const TestingAPIs = struct {
         var arguments = JSC.Node.ArgumentsSlice.init(globalThis.bunVM(), arguments_.slice());
         const string = arguments.nextEat() orelse {
             globalThis.throw("shellInternals.disabledOnPosix: expected 1 arguments, got 0", .{});
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         };
 
         const bunstr = string.toBunString(globalThis);
@@ -4386,7 +4386,7 @@ pub const TestingAPIs = struct {
         var arguments = JSC.Node.ArgumentsSlice.init(globalThis.bunVM(), arguments_.slice());
         const string_args = arguments.nextEat() orelse {
             globalThis.throw("shell_parse: expected 2 arguments, got 0", .{});
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         };
 
         var arena = std.heap.ArenaAllocator.init(bun.default_allocator);
@@ -4476,7 +4476,7 @@ pub const TestingAPIs = struct {
         var arguments = JSC.Node.ArgumentsSlice.init(globalThis.bunVM(), arguments_.slice());
         const string_args = arguments.nextEat() orelse {
             globalThis.throw("shell_parse: expected 2 arguments, got 0", .{});
-            return JSC.JSValue.jsUndefined();
+            return .undefined;
         };
 
         var arena = bun.ArenaAllocator.init(bun.default_allocator);
diff --git a/src/sql/postgres.zig b/src/sql/postgres.zig
index e9cec3fc81..d88db48535 100644
--- a/src/sql/postgres.zig
+++ b/src/sql/postgres.zig
@@ -2882,7 +2882,7 @@ pub const PostgresSQLConnection = struct {
         if (on_close == .zero) return;
         const instance = this.globalObject.createErrorInstance("{s}", .{message});
         instance.put(this.globalObject, JSC.ZigString.static("code"), String.init(@errorName(err)).toJS(this.globalObject));
-        _ = on_close.callWithThis(
+        _ = on_close.call(
             this.globalObject,
             this.js_value,
             &[_]JSValue{
diff --git a/src/string.zig b/src/string.zig
index 8e65e83ead..31df35dcdd 100644
--- a/src/string.zig
+++ b/src/string.zig
@@ -277,7 +277,7 @@ pub const Tag = enum(u8) {
     /// into a WTF::String.
     /// Can be in either `utf8` or `utf16le` encodings.
     ZigString = 2,
-    /// Static memory that is guarenteed to never be freed. When converted to WTF::String,
+    /// Static memory that is guaranteed to never be freed. When converted to WTF::String,
     /// the memory is not cloned, but instead referenced with WTF::ExternalStringImpl.
     /// Can be in either `utf8` or `utf16le` encodings.
     StaticZigString = 3,
diff --git a/src/string_immutable.zig b/src/string_immutable.zig
index 2f1807ecfc..6e0906156c 100644
--- a/src/string_immutable.zig
+++ b/src/string_immutable.zig
@@ -51,21 +51,19 @@ pub inline fn removeLeadingDotSlash(slice: []const u8) []const u8 {
 pub const w = toUTF16Literal;
 
 pub fn toUTF16Literal(comptime str: []const u8) [:0]const u16 {
-    return comptime literal(u16, str);
+    return literal(u16, str);
 }
 
 pub fn literal(comptime T: type, comptime str: []const u8) *const [literalLength(T, str):0]T {
-    if (!@inComptime()) @compileError("strings.literal() must be called in a comptime context");
-    return comptime switch (T) {
-        u8 => brk: {
-            var data: [str.len:0]u8 = undefined;
-            @memcpy(&data, str);
-            const final = data[0..].*;
-            break :brk &final;
-        },
-        u16 => return std.unicode.utf8ToUtf16LeStringLiteral(str),
-        else => @compileError("unsupported type " ++ @typeName(T) ++ " in strings.literal() call."),
+    const Holder = struct {
+        pub const value = switch (T) {
+            u8 => (str[0..str.len].* ++ .{0})[0..str.len :0],
+            u16 => std.unicode.utf8ToUtf16LeStringLiteral(str),
+            else => @compileError("unsupported type " ++ @typeName(T) ++ " in strings.literal() call."),
+        };
     };
+
+    return Holder.value;
 }
 
 fn literalLength(comptime T: type, comptime str: string) usize {
@@ -174,7 +172,7 @@ pub inline fn containsAny(in: anytype, target: string) bool {
 /// - The name ends up being part of a URL, an argument on the command line, and
 ///   a folder name. Therefore, the name can't contain any non-URL-safe
 ///   characters.
-pub inline fn isNPMPackageName(target: string) bool {
+pub fn isNPMPackageName(target: string) bool {
     if (target.len == 0) return false;
     if (target.len > 214) return false;
 
@@ -208,7 +206,7 @@ pub inline fn isNPMPackageName(target: string) bool {
     return !scoped or slash_index > 0 and slash_index + 1 < target.len;
 }
 
-pub inline fn indexAnyComptime(target: string, comptime chars: string) ?usize {
+pub fn indexAnyComptime(target: string, comptime chars: string) ?usize {
     for (target, 0..) |parent, i| {
         inline for (chars) |char| {
             if (char == parent) return i;
@@ -217,7 +215,7 @@ pub inline fn indexAnyComptime(target: string, comptime chars: string) ?usize {
     return null;
 }
 
-pub inline fn indexAnyComptimeT(comptime T: type, target: []const T, comptime chars: []const T) ?usize {
+pub fn indexAnyComptimeT(comptime T: type, target: []const T, comptime chars: []const T) ?usize {
     for (target, 0..) |parent, i| {
         inline for (chars) |char| {
             if (char == parent) return i;
@@ -226,7 +224,7 @@ pub inline fn indexAnyComptimeT(comptime T: type, target: []const T, comptime ch
     return null;
 }
 
-pub inline fn indexEqualAny(in: anytype, target: string) ?usize {
+pub fn indexEqualAny(in: anytype, target: string) ?usize {
     for (in, 0..) |str, i| if (eqlLong(str, target, true)) return i;
     return null;
 }
@@ -786,8 +784,9 @@ pub fn hasSuffixComptime(self: string, comptime alt: anytype) bool {
     return self.len >= alt.len and eqlComptimeCheckLenWithType(u8, self[self.len - alt.len ..], alt, false);
 }
 
-inline fn eqlComptimeCheckLenU8(a: []const u8, comptime b: []const u8, comptime check_len: bool) bool {
+fn eqlComptimeCheckLenU8(a: []const u8, comptime b: []const u8, comptime check_len: bool) bool {
     @setEvalBranchQuota(9999);
+
     if (comptime check_len) {
         if (a.len != b.len) return false;
     }
@@ -824,7 +823,7 @@ inline fn eqlComptimeCheckLenU8(a: []const u8, comptime b: []const u8, comptime
     return true;
 }
 
-inline fn eqlComptimeCheckLenWithKnownType(comptime Type: type, a: []const Type, comptime b: []const Type, comptime check_len: bool) bool {
+fn eqlComptimeCheckLenWithKnownType(comptime Type: type, a: []const Type, comptime b: []const Type, comptime check_len: bool) bool {
     if (comptime Type != u8) {
         return eqlComptimeCheckLenU8(std.mem.sliceAsBytes(a), comptime std.mem.sliceAsBytes(b), comptime check_len);
     }
@@ -835,18 +834,18 @@ inline fn eqlComptimeCheckLenWithKnownType(comptime Type: type, a: []const Type,
 ///
 ///   strings.eqlComptime(input, "hello world");
 ///   strings.eqlComptime(input, "hai");
-pub inline fn eqlComptimeCheckLenWithType(comptime Type: type, a: []const Type, comptime b: anytype, comptime check_len: bool) bool {
+pub fn eqlComptimeCheckLenWithType(comptime Type: type, a: []const Type, comptime b: anytype, comptime check_len: bool) bool {
     return eqlComptimeCheckLenWithKnownType(comptime Type, a, if (@typeInfo(@TypeOf(b)) != .Pointer) &b else b, comptime check_len);
 }
 
-pub inline fn eqlCaseInsensitiveASCIIIgnoreLength(
+pub fn eqlCaseInsensitiveASCIIIgnoreLength(
     a: string,
     b: string,
 ) bool {
     return eqlCaseInsensitiveASCII(a, b, false);
 }
 
-pub inline fn eqlCaseInsensitiveASCIIICheckLength(
+pub fn eqlCaseInsensitiveASCIIICheckLength(
     a: string,
     b: string,
 ) bool {
@@ -877,7 +876,7 @@ pub fn eqlLong(a_str: string, b_str: string, comptime check_len: bool) bool {
             return false;
         }
     } else {
-        if (comptime Environment.allow_assert) assert(b_str.len == a_str.len);
+        if (comptime Environment.allow_assert) assert(b_str.len <= a_str.len);
     }
 
     const end = b_str.ptr + len;
diff --git a/src/symbols.dyn b/src/symbols.dyn
index 0be0db03ca..2d16df145d 100644
--- a/src/symbols.dyn
+++ b/src/symbols.dyn
@@ -51,6 +51,7 @@
     _napi_define_class;
     _napi_define_properties;
     _napi_delete_async_work;
+    _napi_delete_element;
     _napi_delete_property;
     _napi_delete_reference;
     _napi_detach_arraybuffer;
@@ -67,7 +68,6 @@
     _napi_get_dataview_info;
     _napi_get_date_value;
     _napi_get_element;
-    _napi_delete_element;
     _napi_get_global;
     _napi_get_instance_data;
     _napi_get_last_error_info;
@@ -144,9 +144,15 @@
     _napi_unref_threadsafe_function;
     _napi_unwrap;
     _napi_wrap;
+    _node_api_create_external_string_latin1;
+    _node_api_create_external_string_utf16;
     _node_api_create_syntax_error;
     _node_api_symbol_for;
     _node_api_throw_syntax_error;
-    _node_api_create_external_string_latin1;
-    _node_api_create_external_string_utf16;
+    __ZN2v87Isolate10GetCurrentEv;
+    __ZN2v87Isolate13TryGetCurrentEv;
+    __ZN2v87Isolate17GetCurrentContextEv;
+    __ZN4node25AddEnvironmentCleanupHookEPN2v87IsolateEPFvPvES3_;
+    __ZN4node28RemoveEnvironmentCleanupHookEPN2v87IsolateEPFvPvES3_;
+    __ZN3JSC9CallFrame13describeFrameEv;
 };
\ No newline at end of file
diff --git a/src/symbols.txt b/src/symbols.txt
index 577035fa93..2e24afa1c4 100644
--- a/src/symbols.txt
+++ b/src/symbols.txt
@@ -153,3 +153,4 @@ __ZN2v87Isolate13TryGetCurrentEv
 __ZN2v87Isolate17GetCurrentContextEv
 __ZN4node25AddEnvironmentCleanupHookEPN2v87IsolateEPFvPvES3_
 __ZN4node28RemoveEnvironmentCleanupHookEPN2v87IsolateEPFvPvES3_
+__ZN3JSC9CallFrame13describeFrameEv
\ No newline at end of file
diff --git a/src/sys.zig b/src/sys.zig
index ac93527180..eee32ce408 100644
--- a/src/sys.zig
+++ b/src/sys.zig
@@ -1868,7 +1868,8 @@ pub fn renameatConcurrentlyWithoutFallback(
             var err = switch (bun.sys.renameat2(from_dir_fd, from, to_dir_fd, to, .{
                 .exclude = true,
             })) {
-                .err => |err| err,
+                // if ENOENT don't retry
+                .err => |err| if (err.getErrno() == .NOENT) return .{ .err = err } else err,
                 .result => break :attempt_atomic_rename_and_fallback_to_racy_delete,
             };
 
@@ -1893,8 +1894,12 @@ pub fn renameatConcurrentlyWithoutFallback(
         }
 
         //  sad path: let's try to delete the folder and then rename it
-        var to_dir = to_dir_fd.asDir();
-        to_dir.deleteTree(to) catch {};
+        if (to_dir_fd.isValid()) {
+            var to_dir = to_dir_fd.asDir();
+            to_dir.deleteTree(to) catch {};
+        } else {
+            std.fs.deleteTreeAbsolute(to) catch {};
+        }
         switch (bun.sys.renameat(from_dir_fd, from, to_dir_fd, to)) {
             .err => |err| {
                 return .{ .err = err };
diff --git a/src/thread_pool.zig b/src/thread_pool.zig
index 8d5f859d44..e7e8b8d107 100644
--- a/src/thread_pool.zig
+++ b/src/thread_pool.zig
@@ -134,14 +134,10 @@ pub const Batch = struct {
 pub const WaitGroup = struct {
     mutex: std.Thread.Mutex = .{},
     counter: u32 = 0,
-    event: std.Thread.ResetEvent,
+    event: std.Thread.ResetEvent = .{},
 
     pub fn init(self: *WaitGroup) void {
-        self.* = .{
-            .mutex = .{},
-            .counter = 0,
-            .event = undefined,
-        };
+        self.* = .{};
     }
 
     pub fn deinit(self: *WaitGroup) void {
diff --git a/src/url.zig b/src/url.zig
index 9f4614b3b2..38e3b6aab1 100644
--- a/src/url.zig
+++ b/src/url.zig
@@ -130,7 +130,7 @@ pub const URL = struct {
     }
 
     pub fn hasValidPort(this: *const URL) bool {
-        return (this.getPort() orelse 0) > 1;
+        return (this.getPort() orelse 0) > 0;
     }
 
     pub fn isEmpty(this: *const URL) bool {
diff --git a/src/windows_c.zig b/src/windows_c.zig
index d465ac0ecf..db6a06b8a3 100644
--- a/src/windows_c.zig
+++ b/src/windows_c.zig
@@ -958,6 +958,75 @@ pub const SystemErrno = enum(u16) {
     };
 };
 
+pub const UV_E2BIG = -uv.UV_E2BIG;
+pub const UV_EACCES = -uv.UV_EACCES;
+pub const UV_EADDRINUSE = -uv.UV_EADDRINUSE;
+pub const UV_EADDRNOTAVAIL = -uv.UV_EADDRNOTAVAIL;
+pub const UV_EAFNOSUPPORT = -uv.UV_EAFNOSUPPORT;
+pub const UV_EAGAIN = -uv.UV_EAGAIN;
+pub const UV_EALREADY = -uv.UV_EALREADY;
+pub const UV_EBADF = -uv.UV_EBADF;
+pub const UV_EBUSY = -uv.UV_EBUSY;
+pub const UV_ECANCELED = -uv.UV_ECANCELED;
+pub const UV_ECHARSET = -uv.UV_ECHARSET;
+pub const UV_ECONNABORTED = -uv.UV_ECONNABORTED;
+pub const UV_ECONNREFUSED = -uv.UV_ECONNREFUSED;
+pub const UV_ECONNRESET = -uv.UV_ECONNRESET;
+pub const UV_EDESTADDRREQ = -uv.UV_EDESTADDRREQ;
+pub const UV_EEXIST = -uv.UV_EEXIST;
+pub const UV_EFAULT = -uv.UV_EFAULT;
+pub const UV_EHOSTUNREACH = -uv.UV_EHOSTUNREACH;
+pub const UV_EINTR = -uv.UV_EINTR;
+pub const UV_EINVAL = -uv.UV_EINVAL;
+pub const UV_EIO = -uv.UV_EIO;
+pub const UV_EISCONN = -uv.UV_EISCONN;
+pub const UV_EISDIR = -uv.UV_EISDIR;
+pub const UV_ELOOP = -uv.UV_ELOOP;
+pub const UV_EMFILE = -uv.UV_EMFILE;
+pub const UV_EMSGSIZE = -uv.UV_EMSGSIZE;
+pub const UV_ENAMETOOLONG = -uv.UV_ENAMETOOLONG;
+pub const UV_ENETDOWN = -uv.UV_ENETDOWN;
+pub const UV_ENETUNREACH = -uv.UV_ENETUNREACH;
+pub const UV_ENFILE = -uv.UV_ENFILE;
+pub const UV_ENOBUFS = -uv.UV_ENOBUFS;
+pub const UV_ENODEV = -uv.UV_ENODEV;
+pub const UV_ENOENT = -uv.UV_ENOENT;
+pub const UV_ENOMEM = -uv.UV_ENOMEM;
+pub const UV_ENONET = -uv.UV_ENONET;
+pub const UV_ENOSPC = -uv.UV_ENOSPC;
+pub const UV_ENOSYS = -uv.UV_ENOSYS;
+pub const UV_ENOTCONN = -uv.UV_ENOTCONN;
+pub const UV_ENOTDIR = -uv.UV_ENOTDIR;
+pub const UV_ENOTEMPTY = -uv.UV_ENOTEMPTY;
+pub const UV_ENOTSOCK = -uv.UV_ENOTSOCK;
+pub const UV_ENOTSUP = -uv.UV_ENOTSUP;
+pub const UV_EPERM = -uv.UV_EPERM;
+pub const UV_EPIPE = -uv.UV_EPIPE;
+pub const UV_EPROTO = -uv.UV_EPROTO;
+pub const UV_EPROTONOSUPPORT = -uv.UV_EPROTONOSUPPORT;
+pub const UV_EPROTOTYPE = -uv.UV_EPROTOTYPE;
+pub const UV_EROFS = -uv.UV_EROFS;
+pub const UV_ESHUTDOWN = -uv.UV_ESHUTDOWN;
+pub const UV_ESPIPE = -uv.UV_ESPIPE;
+pub const UV_ESRCH = -uv.UV_ESRCH;
+pub const UV_ETIMEDOUT = -uv.UV_ETIMEDOUT;
+pub const UV_ETXTBSY = -uv.UV_ETXTBSY;
+pub const UV_EXDEV = -uv.UV_EXDEV;
+pub const UV_EFBIG = -uv.UV_EFBIG;
+pub const UV_ENOPROTOOPT = -uv.UV_ENOPROTOOPT;
+pub const UV_ERANGE = -uv.UV_ERANGE;
+pub const UV_ENXIO = -uv.UV_ENXIO;
+pub const UV_EMLINK = -uv.UV_EMLINK;
+pub const UV_EHOSTDOWN = -uv.UV_EHOSTDOWN;
+pub const UV_EREMOTEIO = -uv.UV_EREMOTEIO;
+pub const UV_ENOTTY = -uv.UV_ENOTTY;
+pub const UV_EFTYPE = -uv.UV_EFTYPE;
+pub const UV_EILSEQ = -uv.UV_EILSEQ;
+pub const UV_EOVERFLOW = -uv.UV_EOVERFLOW;
+pub const UV_ESOCKTNOSUPPORT = -uv.UV_ESOCKTNOSUPPORT;
+pub const UV_ENODATA = -uv.UV_ENODATA;
+pub const UV_EUNATCH = -uv.UV_EUNATCH;
+
 pub const off_t = i64;
 pub fn preallocate_file(_: posix.fd_t, _: off_t, _: off_t) !void {}
 
diff --git a/src/work_pool.zig b/src/work_pool.zig
index 5cbad488ff..b9e1bd1573 100644
--- a/src/work_pool.zig
+++ b/src/work_pool.zig
@@ -14,13 +14,23 @@ pub fn NewWorkPool(comptime max_threads: ?usize) type {
             @setCold(true);
 
             pool = ThreadPool.init(.{
-                .max_threads = max_threads orelse @max(@as(u32, @truncate(std.Thread.getCpuCount() catch 0)), 2),
+                .max_threads = max_threads orelse @max(2, max_threads: {
+                    if (bun.getenvZ("GOMAXPROCS")) |max_procs| try_override: {
+                        break :max_threads std.fmt.parseInt(u32, max_procs, 10) catch
+                            break :try_override;
+                    }
+
+                    break :max_threads @as(u32, @truncate(std.Thread.getCpuCount() catch 0));
+                }),
                 .stack_size = ThreadPool.default_thread_stack_size,
             });
             return &pool;
         }
+
+        /// Initialization of WorkPool is not thread-safe, as it is
+        /// assumed a single main thread sets everything up. Calling
+        /// this afterwards is thread-safe.
         pub inline fn get() *ThreadPool {
-            // lil racy
             if (loaded) return &pool;
             loaded = true;
 
diff --git a/src/zlib.zig b/src/zlib.zig
index 7ab99ee6df..b337c9b507 100644
--- a/src/zlib.zig
+++ b/src/zlib.zig
@@ -291,7 +291,7 @@ pub const ZlibError = error{
 const ZlibAllocator = struct {
     pub fn alloc(_: *anyopaque, items: uInt, len: uInt) callconv(.C) *anyopaque {
         if (bun.heap_breakdown.enabled) {
-            const zone = bun.heap_breakdown.getZone(ZlibAllocator);
+            const zone = bun.heap_breakdown.getZone("zlib");
             return zone.malloc_zone_calloc(items, len) orelse bun.outOfMemory();
         }
 
@@ -300,7 +300,7 @@ const ZlibAllocator = struct {
 
     pub fn free(_: *anyopaque, data: *anyopaque) callconv(.C) void {
         if (bun.heap_breakdown.enabled) {
-            const zone = bun.heap_breakdown.getZone(ZlibAllocator);
+            const zone = bun.heap_breakdown.getZone("zlib");
             zone.malloc_zone_free(data);
             return;
         }
diff --git a/test/bun.lockb b/test/bun.lockb
index b3cdc08715..9508f9459a 100755
Binary files a/test/bun.lockb and b/test/bun.lockb differ
diff --git a/test/bundler/__snapshots__/bun-build-api.test.ts.snap b/test/bundler/__snapshots__/bun-build-api.test.ts.snap
index 32cf05e8c8..e17a2204bc 100644
--- a/test/bundler/__snapshots__/bun-build-api.test.ts.snap
+++ b/test/bundler/__snapshots__/bun-build-api.test.ts.snap
@@ -11,7 +11,6 @@ var __export = (target, all) => {
       set: (newValue) => all[name] = () => newValue
     });
 };
-var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
 // test/bundler/fixtures/trivial/fn.js
 var exports_fn = {};
@@ -21,11 +20,9 @@ __export(exports_fn, {
 function fn(a) {
   return a + 42;
 }
-var init_fn = __esm(() => {
-});
 
 // test/bundler/fixtures/trivial/index.js
-var NS = Promise.resolve().then(() => (init_fn(), exports_fn));
+var NS = Promise.resolve().then(() => exports_fn);
 NS.then(({ fn: fn2 }) => {
   console.log(fn2(42));
 });
@@ -43,7 +40,6 @@ var __export = (target, all) => {
       set: (newValue) => all[name] = () => newValue
     });
 };
-var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
 // test/bundler/fixtures/trivial/fn.js
 var exports_fn = {};
@@ -53,22 +49,20 @@ __export(exports_fn, {
 function fn(a) {
   return a + 42;
 }
-var init_fn = __esm(() => {
-});
 
 // test/bundler/fixtures/trivial/index.js
-var NS = Promise.resolve().then(() => (init_fn(), exports_fn));
+var NS = Promise.resolve().then(() => exports_fn);
 NS.then(({ fn: fn2 }) => {
   console.log(fn2(42));
 });
 "
 `;
 
-exports[`Bun.build BuildArtifact properties: hash 1`] = `"cv02d0ez"`;
+exports[`Bun.build BuildArtifact properties: hash 1`] = `"r6c8x1cc"`;
 
-exports[`Bun.build BuildArtifact properties + entry.naming: hash 1`] = `"3v155a0d"`;
+exports[`Bun.build BuildArtifact properties + entry.naming: hash 1`] = `"vanwb97w"`;
 
-exports[`Bun.build BuildArtifact properties sourcemap: hash index.js 1`] = `"cv02d0ez"`;
+exports[`Bun.build BuildArtifact properties sourcemap: hash index.js 1`] = `"r6c8x1cc"`;
 
 exports[`Bun.build BuildArtifact properties sourcemap: hash index.js.map 1`] = `"00000000"`;
 
@@ -83,7 +77,6 @@ var __export = (target, all) => {
       set: (newValue) => all[name] = () => newValue
     });
 };
-var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
 // test/bundler/fixtures/trivial/fn.js
 var exports_fn = {};
@@ -93,11 +86,9 @@ __export(exports_fn, {
 function fn(a) {
   return a + 42;
 }
-var init_fn = __esm(() => {
-});
 
 // test/bundler/fixtures/trivial/index.js
-var NS = Promise.resolve().then(() => (init_fn(), exports_fn));
+var NS = Promise.resolve().then(() => exports_fn);
 NS.then(({ fn: fn2 }) => {
   console.log(fn2(42));
 });
diff --git a/test/bundler/bun-build-api.test.ts b/test/bundler/bun-build-api.test.ts
index 5f5e89634b..586361a9bf 100644
--- a/test/bundler/bun-build-api.test.ts
+++ b/test/bundler/bun-build-api.test.ts
@@ -14,6 +14,43 @@ describe("Bun.build", () => {
     throw new Error("should have thrown");
   });
 
+  // https://github.com/oven-sh/bun/issues/12818
+  test("sourcemap + build error crash case", async () => {
+    const dir = tempDirWithFiles("build", {
+      "/src/file1.ts": `
+        import { A } from './dir';
+        console.log(A);
+      `,
+      "/src/dir/index.ts": `
+        import { B } from "./file3";
+        export const A = [B]
+      `,
+      "/src/dir/file3.ts": `
+        import { C } from "../file1"; // error
+        export const B = C;
+      `,
+      "/src/package.json": `
+        { "type": "module" }
+      `,
+      "/src/tsconfig.json": `
+        {
+          "extends": "../tsconfig.json",
+          "compilerOptions": {
+              "target": "ESNext",
+              "module": "ESNext",
+              "types": []
+          }
+        }
+      `,
+    });
+    const y = await Bun.build({
+      entrypoints: [join(dir, "src/file1.ts")],
+      outdir: join(dir, "out"),
+      sourcemap: "external",
+      external: ["@minecraft"],
+    });
+  });
+
   test("invalid options throws", async () => {
     expect(() => Bun.build({} as any)).toThrow();
     expect(() =>
diff --git a/test/bundler/bundler_cjs2esm.test.ts b/test/bundler/bundler_cjs2esm.test.ts
index 9cfce2d77b..6aff61dfbc 100644
--- a/test/bundler/bundler_cjs2esm.test.ts
+++ b/test/bundler/bundler_cjs2esm.test.ts
@@ -238,19 +238,19 @@ describe("bundler", () => {
       "/entry.js": /* js */ `
         const react = require("react");
         console.log(react.react);
-        
+
         const react1 = (console.log(require("react").react), require("react"));
         console.log(react1.react);
-        
+
         const react2 = (require("react"), console.log(require("react").react));
         console.log(react2);
-        
+
         let x = {};
         x.react = require("react");
         console.log(x.react.react);
-        
+
         console.log(require("react").react);
-        
+
         let y = {};
         y[require("react")] = require("react");
         console.log(y[require("react")].react);
@@ -284,4 +284,27 @@ describe("bundler", () => {
       stdout: "react\nreact\nreact\nreact\nundefined\nreact\nreact\nreact\nreact\nreact\nreact\n1 react\nreact\nreact",
     },
   });
+  itBundled("cjs2esm/ReactSpecificUnwrapping", {
+    files: {
+      "/entry.js": /* js */ `
+        import { renderToReadableStream } from "react";
+        console.log(renderToReadableStream());
+      `,
+      "/node_modules/react/index.js": /* js */ `
+        console.log('side effect');
+        module.exports = require('./main');
+      `,
+      "/node_modules/react/main.js": /* js */ `
+        "use strict";
+        var REACT_ELEMENT_TYPE = Symbol.for("pass");
+        exports.renderToReadableStream = (e, t) => {
+          return REACT_ELEMENT_TYPE;
+        }
+      `,
+    },
+    run: {
+      stdout: "side effect\nSymbol(pass)",
+    },
+    minifySyntax: true,
+  });
 });
diff --git a/test/bundler/bundler_edgecase.test.ts b/test/bundler/bundler_edgecase.test.ts
index 373b382c15..6bc239e3cd 100644
--- a/test/bundler/bundler_edgecase.test.ts
+++ b/test/bundler/bundler_edgecase.test.ts
@@ -668,6 +668,29 @@ describe("bundler", () => {
       "<bun>": ['ModuleNotFound resolving "/entry.js" (entry point)'],
     },
   });
+  itBundled("edgecase/AssetEntryPoint", {
+    files: {
+      "/entry.zig": `
+        const std = @import("std");
+
+        pub fn main() void {
+          std.debug.print("Hello, world!\\n", .{});
+        }
+      `,
+    },
+    outdir: "/out",
+    entryPointsRaw: ["./entry.zig"],
+    runtimeFiles: {
+      "/exec.js": `
+        import assert from 'node:assert';
+        import the_path from './out/entry.js';
+        assert.strictEqual(the_path, './entry-6dhkdck1.zig');
+      `,
+    },
+    run: {
+      file: "./exec.js",
+    },
+  });
   itBundled("edgecase/ExportDefaultUndefined", {
     files: {
       "/entry.ts": /* ts */ `
@@ -1199,6 +1222,19 @@ describe("bundler", () => {
       stdout: "false",
     },
   });
+  itBundled("edgecase/ImportOptionsArgument", {
+    files: {
+      "/entry.js": `
+        import('ext', { with: { get ''() { KEEP } } })
+          .then(function (error) {
+            console.log(error);
+          });
+      `,
+    },
+    dce: true,
+    external: ["ext"],
+    target: "bun",
+  });
   itBundled("edgecase/ConstantFoldingShiftOperations", {
     files: {
       "/entry.ts": `
@@ -1334,6 +1370,27 @@ describe("bundler", () => {
       `,
     },
   });
+  itBundled("edgecase/EntrypointWithoutPrefixSlashOrDotIsNotConsideredExternal#12734", {
+    files: {
+      "/src/entry.ts": /* ts */ `
+        import { helloWorld } from "./second.ts";
+        console.log(helloWorld);
+      `,
+      "/src/second.ts": /* ts */ `
+        export const helloWorld = "Hello World";
+      `,
+    },
+    root: "/src",
+    entryPointsRaw: ["src/entry.ts"],
+    packages: "external",
+    target: "bun",
+    run: {
+      file: "/src/entry.ts",
+      stdout: `
+        Hello World
+      `,
+    },
+  });
   itBundled("edgecase/IntegerUnderflow#12547", {
     files: {
       "/entry.js": `
@@ -1354,6 +1411,362 @@ describe("bundler", () => {
       api.expectFile("/out.js").toBe(`import{a as c}from"external";\n`);
     },
   });
+  itBundled("edgecase/TypeScriptNamespaceSiblingFunction", {
+    files: {
+      "/entry.ts": `
+        namespace X {
+          export function Y() {
+            return 2;
+          }
+          export namespace Y {
+            export const Z = 1;
+          }
+        }
+        console.log(X, X.Y(), X.Y.Z);
+      `,
+    },
+    run: {
+      stdout: "{\n  Y: [Function: Y],\n} 2 1",
+    },
+  });
+  itBundled("edgecase/TypeScriptNamespaceSiblingClass", {
+    files: {
+      "/entry.ts": `
+        namespace X {
+          export class Y {
+            constructor(v) {
+              this.value = v;
+            }
+
+            toJSON() {
+              return this.value;
+            }
+          }
+          export namespace Y {
+            export const Z = 1;
+          }
+        }
+        console.log(X, new X.Y(2).toJSON(), X.Y.Z);
+      `,
+    },
+    run: {
+      stdout: "{\n  Y: [class Y],\n} 2 1",
+    },
+  });
+  itBundled("edgecase/TypeScriptNamespaceSiblingEnum", {
+    files: {
+      "/entry.ts": `
+        namespace X {
+          export enum Y {
+            A,
+            B,
+          }
+          export namespace Y {
+            export const Z = 1;
+          }
+        }
+        console.log(JSON.stringify([X, X.Y.A, X.Y.Z]));
+      `,
+    },
+    run: {
+      stdout: '[{"Y":{"0":"A","1":"B","A":0,"B":1,"Z":1}},0,1]',
+    },
+  });
+  itBundled("edgecase/TypeScriptNamespaceSiblingVariable", {
+    files: {
+      "/entry.ts": `
+        namespace X {
+          export let Y = {};
+          export namespace Y {
+            export const Z = 1;
+          }
+        }
+      `,
+    },
+    bundleErrors: {
+      "/entry.ts": [`"Y" has already been declared`],
+    },
+  });
+  // This specifically only happens with 'export { ... } from ...' syntax
+  itBundled("edgecase/EsmSideEffectsFalseWithSideEffectsExportFrom", {
+    files: {
+      "/file1.js": `
+        import("./file2.js");
+      `,
+      "/file2.js": `
+        export { a } from './file3.js';
+      `,
+      "/file3.js": `
+        export function a(input) {
+          return 42;
+        }
+        console.log('side effect');
+      `,
+      "/package.json": `
+        {
+          "name": "my-package",
+          "sideEffects": false
+        }
+      `,
+    },
+    run: {
+      stdout: "side effect",
+    },
+  });
+  itBundled("edgecase/EsmSideEffectsFalseWithSideEffectsExportFromCodeSplitting", {
+    files: {
+      "/file1.js": `
+        import("./file2.js");
+        console.log('file1');
+      `,
+      "/file1b.js": `
+        import("./file2.js");
+        console.log('file2');
+      `,
+      "/file2.js": `
+        export { a } from './file3.js';
+      `,
+      "/file3.js": `
+        export function a(input) {
+          return 42;
+        }
+        console.log('side effect');
+      `,
+      "/package.json": `
+        {
+          "name": "my-package",
+          "sideEffects": false
+        }
+      `,
+    },
+    splitting: true,
+    outdir: "out",
+    entryPoints: ["./file1.js", "./file1b.js"],
+    run: [
+      {
+        file: "/out/file1.js",
+        stdout: "file1\nside effect",
+      },
+      {
+        file: "/out/file1b.js",
+        stdout: "file2\nside effect",
+      },
+    ],
+  });
+  itBundled("edgecase/RequireSideEffectsFalseWithSideEffectsExportFrom", {
+    files: {
+      "/file1.js": `
+        require("./file2.js");
+      `,
+      "/file2.js": `
+        export { a } from './file3.js';
+      `,
+      "/file3.js": `
+        export function a(input) {
+          return 42;
+        }
+        console.log('side effect');
+      `,
+      "/package.json": `
+        {
+          "name": "my-package",
+          "sideEffects": false
+        }
+      `,
+    },
+    run: {
+      stdout: "side effect",
+    },
+  });
+  itBundled("edgecase/SideEffectsFalseWithSideEffectsExportFrom", {
+    files: {
+      "/file1.js": `
+        import("./file2.js");
+      `,
+      "/file2.js": `
+        import * as foo from './file3.js';
+        export default foo;
+      `,
+      "/file3.js": `
+        export function a(input) {
+          return 42;
+        }
+        console.log('side effect');
+      `,
+      "/package.json": `
+        {
+          "name": "my-package",
+          "sideEffects": false
+        }
+      `,
+    },
+    run: {
+      stdout: "side effect",
+    },
+  });
+  itBundled("edgecase/BuiltinWithTrailingSlash", {
+    files: {
+      "/entry.js": `
+        import * as process from 'process/';
+        console.log(JSON.stringify(process));
+      `,
+      "/node_modules/process/index.js": `
+        export default { hello: 'world' };
+      `,
+    },
+    run: {
+      stdout: `{"default":{"hello":"world"}}`,
+    },
+  });
+  itBundled("edgecase/EsmWrapperClassHoisting", {
+    files: {
+      "/entry.ts": `
+        async function hi() {
+          const { default: MyInherited } = await import('./hello');
+          const myInstance = new MyInherited();
+          console.log(myInstance.greet())
+        }
+
+        hi();
+      `,
+      "/hello.ts": `
+        const MyReassignedSuper = class MySuper {
+          greet() {
+            return 'Hello, world!';
+          }
+        };
+
+        class MyInherited extends MyReassignedSuper {};
+
+        export default MyInherited;
+      `,
+    },
+    run: {
+      stdout: "Hello, world!",
+    },
+  });
+  itBundled("edgecase/EsmWrapperElimination1", {
+    files: {
+      "/entry.ts": `
+        async function load() {
+          return import('./hello');
+        }
+        load().then(({ default: def }) => console.log(def()));
+      `,
+      "/hello.ts": `
+        export var x = 123;
+        export var y = function() { return x; };
+        export function z() { return y(); }
+        function a() { return z(); }
+        export default function c() { return a(); }
+      `,
+    },
+    run: {
+      stdout: "123",
+    },
+  });
+  itBundled("edgecase/TsEnumTreeShakingUseAndInlineClass", {
+    files: {
+      "/entry.ts": `
+        import { TestEnum } from './enum';
+
+        class TestClass {
+          constructor() {
+            console.log(JSON.stringify(TestEnum));
+          }
+
+          testMethod(name: TestEnum) {
+            return name === TestEnum.A;
+          }
+        }
+
+        // This must use wrapper class
+        console.log(new TestClass());
+        // This must inline
+        console.log(TestClass.prototype.testMethod.toString().includes('TestEnum'));
+      `,
+      "/enum.ts": `
+        export enum TestEnum {
+          A,
+          B,
+        }
+      `,
+    },
+    dce: true,
+    run: {
+      stdout: `
+        {"0":"A","1":"B","A":0,"B":1}
+        TestClass {
+          testMethod: [Function: testMethod],
+        }
+        false
+      `,
+    },
+  });
+  // this test checks that visit order doesnt matter (inline then use, above is use then inline)
+  itBundled("edgecase/TsEnumTreeShakingUseAndInlineClass2", {
+    files: {
+      "/entry.ts": `
+        import { TestEnum } from './enum';
+
+        class TestClass {
+          testMethod(name: TestEnum) {
+            return name === TestEnum.A;
+          }
+
+          constructor() {
+            console.log(JSON.stringify(TestEnum));
+          }
+        }
+
+        // This must use wrapper class
+        console.log(new TestClass());
+        // This must inline
+        console.log(TestClass.prototype.testMethod.toString().includes('TestEnum'));
+      `,
+      "/enum.ts": `
+        export enum TestEnum {
+          A,
+          B,
+        }
+      `,
+    },
+    dce: true,
+    run: {
+      stdout: `
+        {"0":"A","1":"B","A":0,"B":1}
+        TestClass {
+          testMethod: [Function: testMethod],
+        }
+        false
+      `,
+    },
+  });
+  itBundled("edgecase/TsEnumTreeShakingUseAndInlineNamespace", {
+    files: {
+      "/entry.ts": `
+        import { TestEnum } from './enum';
+
+        namespace TestClass {
+          console.log(JSON.stringify(TestEnum));
+          console.log((() => TestEnum.A).toString().includes('TestEnum'));
+        }
+      `,
+      "/enum.ts": `
+        export enum TestEnum {
+          A,
+          B,
+        }
+      `,
+    },
+    dce: true,
+    run: {
+      stdout: `
+        {"0":"A","1":"B","A":0,"B":1}
+        false
+      `,
+    },
+  });
 
   // TODO(@paperdave): test every case of this. I had already tested it manually, but it may break later
   const requireTranspilationListESM = [
diff --git a/test/bundler/expectBundled.ts b/test/bundler/expectBundled.ts
index ec6f4b3e6e..195a710cda 100644
--- a/test/bundler/expectBundled.ts
+++ b/test/bundler/expectBundled.ts
@@ -1259,7 +1259,7 @@ for (const [key, blob] of build.outputs) {
         const outfiletext = api.readFile(path.relative(root, outfile ?? outputPaths[0]));
         const regex = /\/\/\s+(.+?)\nvar\s+([a-zA-Z0-9_$]+)\s+=\s+__commonJS/g;
         const matches = [...outfiletext.matchAll(regex)].map(match => ("/" + match[1]).replaceAll("\\", "/"));
-        const expectedMatches = (cjs2esm === true ? [] : cjs2esm.unhandled ?? []).map(a => a.replaceAll("\\", "/"));
+        const expectedMatches = (cjs2esm === true ? [] : (cjs2esm.unhandled ?? [])).map(a => a.replaceAll("\\", "/"));
         try {
           expect(matches.sort()).toEqual(expectedMatches.sort());
         } catch (error) {
diff --git a/test/transpiler/__snapshots__/transpiler.test.js.snap b/test/bundler/transpiler/__snapshots__/transpiler.test.js.snap
similarity index 100%
rename from test/transpiler/__snapshots__/transpiler.test.js.snap
rename to test/bundler/transpiler/__snapshots__/transpiler.test.js.snap
diff --git a/test/transpiler/async-transpiler-entry.js b/test/bundler/transpiler/async-transpiler-entry.js
similarity index 100%
rename from test/transpiler/async-transpiler-entry.js
rename to test/bundler/transpiler/async-transpiler-entry.js
diff --git a/test/transpiler/async-transpiler-imported.js b/test/bundler/transpiler/async-transpiler-imported.js
similarity index 100%
rename from test/transpiler/async-transpiler-imported.js
rename to test/bundler/transpiler/async-transpiler-imported.js
diff --git a/test/transpiler/decorator-export-default-class-fixture-anon.ts b/test/bundler/transpiler/decorator-export-default-class-fixture-anon.ts
similarity index 100%
rename from test/transpiler/decorator-export-default-class-fixture-anon.ts
rename to test/bundler/transpiler/decorator-export-default-class-fixture-anon.ts
diff --git a/test/transpiler/decorator-export-default-class-fixture.ts b/test/bundler/transpiler/decorator-export-default-class-fixture.ts
similarity index 100%
rename from test/transpiler/decorator-export-default-class-fixture.ts
rename to test/bundler/transpiler/decorator-export-default-class-fixture.ts
diff --git a/test/transpiler/decorator-metadata.test.ts b/test/bundler/transpiler/decorator-metadata.test.ts
similarity index 100%
rename from test/transpiler/decorator-metadata.test.ts
rename to test/bundler/transpiler/decorator-metadata.test.ts
diff --git a/test/transpiler/decorators.test.ts b/test/bundler/transpiler/decorators.test.ts
similarity index 100%
rename from test/transpiler/decorators.test.ts
rename to test/bundler/transpiler/decorators.test.ts
diff --git a/test/transpiler/export-default-with-static-initializer.js b/test/bundler/transpiler/export-default-with-static-initializer.js
similarity index 100%
rename from test/transpiler/export-default-with-static-initializer.js
rename to test/bundler/transpiler/export-default-with-static-initializer.js
diff --git a/test/transpiler/export-default.test.js b/test/bundler/transpiler/export-default.test.js
similarity index 100%
rename from test/transpiler/export-default.test.js
rename to test/bundler/transpiler/export-default.test.js
diff --git a/test/transpiler/handlebars.hbs b/test/bundler/transpiler/handlebars.hbs
similarity index 100%
rename from test/transpiler/handlebars.hbs
rename to test/bundler/transpiler/handlebars.hbs
diff --git a/test/transpiler/inline.macro.js b/test/bundler/transpiler/inline.macro.js
similarity index 100%
rename from test/transpiler/inline.macro.js
rename to test/bundler/transpiler/inline.macro.js
diff --git a/test/transpiler/macro-check.js b/test/bundler/transpiler/macro-check.js
similarity index 100%
rename from test/transpiler/macro-check.js
rename to test/bundler/transpiler/macro-check.js
diff --git a/test/transpiler/macro-test.test.ts b/test/bundler/transpiler/macro-test.test.ts
similarity index 100%
rename from test/transpiler/macro-test.test.ts
rename to test/bundler/transpiler/macro-test.test.ts
diff --git a/test/transpiler/macro.ts b/test/bundler/transpiler/macro.ts
similarity index 100%
rename from test/transpiler/macro.ts
rename to test/bundler/transpiler/macro.ts
diff --git a/test/transpiler/property-non-ascii-fixture.js b/test/bundler/transpiler/property-non-ascii-fixture.js
similarity index 100%
rename from test/transpiler/property-non-ascii-fixture.js
rename to test/bundler/transpiler/property-non-ascii-fixture.js
diff --git a/test/transpiler/property.test.ts b/test/bundler/transpiler/property.test.ts
similarity index 100%
rename from test/transpiler/property.test.ts
rename to test/bundler/transpiler/property.test.ts
diff --git a/test/transpiler/runtime-transpiler-fixture-duplicate-keys.json b/test/bundler/transpiler/runtime-transpiler-fixture-duplicate-keys.json
similarity index 100%
rename from test/transpiler/runtime-transpiler-fixture-duplicate-keys.json
rename to test/bundler/transpiler/runtime-transpiler-fixture-duplicate-keys.json
diff --git a/test/transpiler/runtime-transpiler-json-fixture.json b/test/bundler/transpiler/runtime-transpiler-json-fixture.json
similarity index 100%
rename from test/transpiler/runtime-transpiler-json-fixture.json
rename to test/bundler/transpiler/runtime-transpiler-json-fixture.json
diff --git a/test/transpiler/runtime-transpiler.test.ts b/test/bundler/transpiler/runtime-transpiler.test.ts
similarity index 100%
rename from test/transpiler/runtime-transpiler.test.ts
rename to test/bundler/transpiler/runtime-transpiler.test.ts
diff --git a/test/transpiler/template-literal-fixture-test.js b/test/bundler/transpiler/template-literal-fixture-test.js
similarity index 100%
rename from test/transpiler/template-literal-fixture-test.js
rename to test/bundler/transpiler/template-literal-fixture-test.js
diff --git a/test/transpiler/template-literal.test.ts b/test/bundler/transpiler/template-literal.test.ts
similarity index 100%
rename from test/transpiler/template-literal.test.ts
rename to test/bundler/transpiler/template-literal.test.ts
diff --git a/test/transpiler/transpiler-stack-overflow.test.ts b/test/bundler/transpiler/transpiler-stack-overflow.test.ts
similarity index 100%
rename from test/transpiler/transpiler-stack-overflow.test.ts
rename to test/bundler/transpiler/transpiler-stack-overflow.test.ts
diff --git a/test/transpiler/transpiler.test.js b/test/bundler/transpiler/transpiler.test.js
similarity index 99%
rename from test/transpiler/transpiler.test.js
rename to test/bundler/transpiler/transpiler.test.js
index 357925e6ae..581591fb3e 100644
--- a/test/transpiler/transpiler.test.js
+++ b/test/bundler/transpiler/transpiler.test.js
@@ -617,7 +617,7 @@ describe("Bun.Transpiler", () => {
       exp("class Foo<const T extends X> {}", "class Foo {\n}");
       exp("Foo = class <const T> {}", "Foo = class {\n}");
       exp("Foo = class Bar<const T> {}", "Foo = class Bar {\n}");
-      exp("function foo<const T>() {}", "let foo = function() {\n}");
+      exp("function foo<const T>() {}", "function foo() {\n}");
       exp("foo = function <const T>() {}", "foo = function() {\n}");
       exp("foo = function bar<const T>() {}", "foo = function bar() {\n}");
       exp("class Foo { bar<const T>() {} }", "class Foo {\n  bar() {\n  }\n}");
diff --git a/test/transpiler/tsconfig.is-just-a-number.json b/test/bundler/transpiler/tsconfig.is-just-a-number.json
similarity index 100%
rename from test/transpiler/tsconfig.is-just-a-number.json
rename to test/bundler/transpiler/tsconfig.is-just-a-number.json
diff --git a/test/transpiler/tsconfig.with-commas.json b/test/bundler/transpiler/tsconfig.with-commas.json
similarity index 100%
rename from test/transpiler/tsconfig.with-commas.json
rename to test/bundler/transpiler/tsconfig.with-commas.json
diff --git a/test/transpiler/with-statement-works.js b/test/bundler/transpiler/with-statement-works.js
similarity index 100%
rename from test/transpiler/with-statement-works.js
rename to test/bundler/transpiler/with-statement-works.js
diff --git a/test/cli/install/bun-install-retry.test.ts b/test/cli/install/bun-install-retry.test.ts
new file mode 100644
index 0000000000..87735923fd
--- /dev/null
+++ b/test/cli/install/bun-install-retry.test.ts
@@ -0,0 +1,111 @@
+import { file, spawn } from "bun";
+import { afterAll, afterEach, beforeAll, beforeEach, expect, it, setDefaultTimeout } from "bun:test";
+import { bunExe, bunEnv as env, toHaveBins, toBeValidBin, toBeWorkspaceLink, tmpdirSync } from "harness";
+import { access, mkdir, readlink, rm, writeFile, copyFile, appendFile, readFile } from "fs/promises";
+import { join, relative } from "path";
+import {
+  dummyAfterAll,
+  dummyAfterEach,
+  dummyBeforeAll,
+  dummyBeforeEach,
+  dummyRegistry,
+  package_dir,
+  readdirSorted,
+  requested,
+  root_url,
+  setHandler,
+} from "./dummy.registry";
+
+beforeAll(dummyBeforeAll);
+afterAll(dummyAfterAll);
+
+expect.extend({
+  toHaveBins,
+  toBeValidBin,
+  toBeWorkspaceLink,
+});
+
+let port: string;
+let add_dir: string;
+beforeAll(() => {
+  setDefaultTimeout(1000 * 60 * 5);
+  port = new URL(root_url).port;
+});
+
+beforeEach(async () => {
+  add_dir = tmpdirSync();
+  await dummyBeforeEach();
+});
+afterEach(async () => {
+  await dummyAfterEach();
+});
+
+it("retries on 500", async () => {
+  const urls: string[] = [];
+  setHandler(dummyRegistry(urls, undefined, 4));
+  await writeFile(
+    join(package_dir, "package.json"),
+    JSON.stringify({
+      name: "foo",
+      version: "0.0.1",
+    }),
+  );
+  const { stdout, stderr, exited } = spawn({
+    cmd: [bunExe(), "add", "BaR"],
+    cwd: package_dir,
+    stdout: "pipe",
+    stdin: "pipe",
+    stderr: "pipe",
+    env,
+  });
+  const err = await new Response(stderr).text();
+  expect(err).not.toContain("error:");
+  expect(err).toContain("Saved lockfile");
+  const out = await new Response(stdout).text();
+  expect(out.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\r?\n/)).toEqual([
+    "",
+    "installed BaR@0.0.2",
+    "",
+    "1 package installed",
+  ]);
+  expect(await exited).toBe(0);
+  expect(urls.sort()).toEqual([
+    `${root_url}/BaR`,
+    `${root_url}/BaR`,
+    `${root_url}/BaR`,
+    `${root_url}/BaR`,
+    `${root_url}/BaR`,
+    `${root_url}/BaR`,
+    `${root_url}/BaR-0.0.2.tgz`,
+    `${root_url}/BaR-0.0.2.tgz`,
+    `${root_url}/BaR-0.0.2.tgz`,
+    `${root_url}/BaR-0.0.2.tgz`,
+    `${root_url}/BaR-0.0.2.tgz`,
+    `${root_url}/BaR-0.0.2.tgz`,
+  ]);
+  expect(requested).toBe(12);
+  await Promise.all([
+    (async () => expect(await readdirSorted(join(package_dir, "node_modules"))).toEqual([".cache", "BaR"]))(),
+    (async () => expect(await readdirSorted(join(package_dir, "node_modules", "BaR"))).toEqual(["package.json"]))(),
+    (async () =>
+      expect(await file(join(package_dir, "node_modules", "BaR", "package.json")).json()).toEqual({
+        name: "bar",
+        version: "0.0.2",
+      }))(),
+    (async () =>
+      expect(await file(join(package_dir, "package.json")).text()).toEqual(
+        JSON.stringify(
+          {
+            name: "foo",
+            version: "0.0.1",
+            dependencies: {
+              BaR: "^0.0.2",
+            },
+          },
+          null,
+          2,
+        ),
+      ))(),
+    async () => await access(join(package_dir, "bun.lockb")),
+  ]);
+});
diff --git a/test/cli/install/bun-install.test.ts b/test/cli/install/bun-install.test.ts
index 45c60f1465..b75dcd26e1 100644
--- a/test/cli/install/bun-install.test.ts
+++ b/test/cli/install/bun-install.test.ts
@@ -435,7 +435,7 @@ it("should handle @scoped authentication", async () => {
     }
     expect(await request.text()).toBeEmpty();
     urls.push(request.url);
-    return new Response("Feeling lucky?", { status: 555 });
+    return new Response("Feeling lucky?", { status: 422 });
   });
   // workaround against `writeFile(..., { flag: "a" })`
   await writeFile(
@@ -454,7 +454,7 @@ foo = { token = "bar" }
     env,
   });
   const err = await new Response(stderr).text();
-  expect(err.split(/\r?\n/)).toContain(`error: GET ${url} - 555`);
+  expect(err.split(/\r?\n/)).toContain(`error: GET ${url} - 422`);
   expect(await new Response(stdout).text()).toBeEmpty();
   expect(await exited).toBe(1);
   expect(urls.sort()).toEqual([url]);
diff --git a/test/cli/install/dummy.registry.ts b/test/cli/install/dummy.registry.ts
index 0858835b5d..b559f06345 100644
--- a/test/cli/install/dummy.registry.ts
+++ b/test/cli/install/dummy.registry.ts
@@ -24,15 +24,28 @@ let server: Server;
 export let package_dir: string;
 export let requested: number;
 export let root_url: string;
-
-export function dummyRegistry(urls: string[], info: any = { "0.0.2": {} }) {
+export function dummyRegistry(urls: string[], info: any = { "0.0.2": {} }, numberOfTimesTo500PerURL = 0) {
+  let retryCountsByURL = new Map<string, number>();
   const _handler: Handler = async request => {
     urls.push(request.url);
     const url = request.url.replaceAll("%2f", "/");
 
+    let status = 200;
+
+    if (numberOfTimesTo500PerURL > 0) {
+      let currentCount = retryCountsByURL.get(request.url);
+      if (currentCount === undefined) {
+        retryCountsByURL.set(request.url, numberOfTimesTo500PerURL);
+        status = 500;
+      } else {
+        retryCountsByURL.set(request.url, currentCount - 1);
+        status = currentCount > 0 ? 500 : 200;
+      }
+    }
+
     expect(request.method).toBe("GET");
     if (url.endsWith(".tgz")) {
-      return new Response(file(join(import.meta.dir, basename(url).toLowerCase())));
+      return new Response(file(join(import.meta.dir, basename(url).toLowerCase())), { status });
     }
     expect(request.headers.get("accept")).toBe(
       "application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*",
@@ -54,6 +67,7 @@ export function dummyRegistry(urls: string[], info: any = { "0.0.2": {} }) {
         ...info[version],
       };
     }
+
     return new Response(
       JSON.stringify({
         name,
@@ -62,6 +76,9 @@ export function dummyRegistry(urls: string[], info: any = { "0.0.2": {} }) {
           latest: info.latest ?? version,
         },
       }),
+      {
+        status: status,
+      },
     );
   };
   return _handler;
diff --git a/test/cli/run/fixture-crash.js b/test/cli/run/fixture-crash.js
index 9a56452ac7..c90049da5d 100644
--- a/test/cli/run/fixture-crash.js
+++ b/test/cli/run/fixture-crash.js
@@ -11,5 +11,5 @@ const approach = process.argv[2];
 if (approach in crash_handler) {
   crash_handler[approach]();
 } else {
-  console.error("usage: bun fixture-crash.js <segfault|panic|rootError|outOfMemory>");
+  console.error("usage: bun fixture-crash.js <segfault|panic|rootError|outOfMemory|raiseIgnoringPanicHandler>");
 }
diff --git a/test/cli/run/run-crash-handler.test.ts b/test/cli/run/run-crash-handler.test.ts
index 0cc84f40c7..4923c6f06d 100644
--- a/test/cli/run/run-crash-handler.test.ts
+++ b/test/cli/run/run-crash-handler.test.ts
@@ -11,58 +11,74 @@ test.if(process.platform === "darwin")("macOS has the assumed image offset", ()
   expect(getMachOImageZeroOffset()).toBe(0x100000000);
 });
 
+test("raise ignoring panic handler does not trigger the panic handler", async () => {
+  let sent = false;
+
+  using server = Bun.serve({
+    port: 0,
+    fetch(request, server) {
+      sent = true;
+      return new Response("OK");
+    },
+  });
+
+  const proc = Bun.spawn({
+    cmd: [bunExe(), path.join(import.meta.dir, "fixture-crash.js"), "raiseIgnoringPanicHandler"],
+    env: mergeWindowEnvs([
+      bunEnv,
+      {
+        BUN_CRASH_REPORT_URL: server.url.toString(),
+        BUN_ENABLE_CRASH_REPORTING: "1",
+      },
+    ]),
+  });
+
+  expect(proc.exited).resolves.not.toBe(0);
+  expect(sent).toBe(false);
+});
+
 describe("automatic crash reporter", () => {
-  const has_reporting = process.platform !== "linux";
+  for (const approach of ["panic", "segfault", "outOfMemory"]) {
+    test(`${approach} should report`, async () => {
+      let sent = false;
 
-  for (const should_report of has_reporting ? [true, false] : [false]) {
-    for (const approach of ["panic", "segfault"]) {
-      // TODO: this dependency injection no worky. fix later
-      test.todo(`${approach} ${should_report ? "should" : "should not"} report`, async () => {
-        const temp = tempDirWithFiles("crash-handler-path", {
-          "curl": ({ root }) => `#!/usr/bin/env bash
-echo $@ > ${root}/request.out
-`,
-          "powershell.cmd": ({ root }) => `echo true > ${root}\\request.out
-`,
-        });
+      // Self host the crash report backend.
+      using server = Bun.serve({
+        port: 0,
+        fetch(request, server) {
+          expect(request.url).toEndWith("/ack");
+          sent = true;
+          return new Response("OK");
+        },
+      });
 
-        const env: any = mergeWindowEnvs([
+      const proc = Bun.spawn({
+        cmd: [bunExe(), path.join(import.meta.dir, "fixture-crash.js"), approach],
+        env: mergeWindowEnvs([
+          bunEnv,
           {
-            ...bunEnv,
+            BUN_CRASH_REPORT_URL: server.url.toString(),
+            BUN_ENABLE_CRASH_REPORTING: "1",
             GITHUB_ACTIONS: undefined,
             CI: undefined,
           },
-          {
-            PATH: temp + path.delimiter + process.env.PATH,
-          },
-        ]);
-
-        if (!should_report) {
-          env.DO_NOT_TRACK = "1";
-        }
-
-        const result = Bun.spawnSync(
-          [
-            bunExe(),
-            path.join(import.meta.dir, "fixture-crash.js"),
-            approach,
-            "--debug-crash-handler-use-trace-string",
-          ],
-          { env },
-        );
-
-        console.log(result.stderr.toString("utf-8"));
-        try {
-          expect(result.stderr.toString("utf-8")).toInclude("https://bun.report/");
-        } catch (e) {
-          throw e;
-        }
-
-        await Bun.sleep(1000);
-
-        const did_report = existsSync(path.join(temp, "request.out"));
-        expect(did_report).toBe(should_report);
+        ]),
+        stdio: ["ignore", "pipe", "pipe"],
       });
-    }
+      const exitCode = await proc.exited;
+      const stderr = await Bun.readableStreamToText(proc.stderr);
+
+      console.log(stderr);
+
+      expect(exitCode).not.toBe(0);
+      expect(stderr).toContain(server.url.toString());
+      if (approach !== "outOfMemory") {
+        expect(stderr).toContain("oh no: Bun has crashed. This indicates a bug in Bun, not your code");
+      } else {
+        expect(stderr.toLowerCase()).toContain("out of memory");
+        expect(stderr.toLowerCase()).not.toContain("panic");
+      }
+      expect(sent).toBe(true);
+    });
   }
 });
diff --git a/test/cli/test/bun-test.test.ts b/test/cli/test/bun-test.test.ts
index 784bbfbd50..908da6f667 100644
--- a/test/cli/test/bun-test.test.ts
+++ b/test/cli/test/bun-test.test.ts
@@ -891,7 +891,7 @@ function createTest(input?: string | (string | { filename: string; contents: str
   const inputs = Array.isArray(input) ? input : [input ?? ""];
   for (const input of inputs) {
     const contents = typeof input === "string" ? input : input.contents;
-    const name = typeof input === "string" ? filename ?? `bun-test-${Math.random()}.test.ts` : input.filename;
+    const name = typeof input === "string" ? (filename ?? `bun-test-${Math.random()}.test.ts`) : input.filename;
 
     const path = join(cwd, name);
     try {
diff --git a/test/cli/test/coverage.test.ts b/test/cli/test/coverage.test.ts
index d5bb7bdb7a..c598cc7269 100644
--- a/test/cli/test/coverage.test.ts
+++ b/test/cli/test/coverage.test.ts
@@ -54,3 +54,26 @@ export class Y {
   expect(result.signalCode).toBeUndefined();
   expect(readFileSync(path.join(dir, "coverage", "lcov.info"), "utf-8")).toMatchSnapshot();
 });
+
+test("coverage excludes node_modules directory", () => {
+  const dir = tempDirWithFiles("cov", {
+    "node_modules/pi/index.js": `
+    export const pi = 3.14;
+    `,
+    "demo.test.ts": `
+    import { pi } from 'pi';
+    console.log(pi);
+    `,
+  });
+  const result = Bun.spawnSync([bunExe(), "test", "--coverage"], {
+    cwd: dir,
+    env: {
+      ...bunEnv,
+    },
+    stdio: [null, null, "pipe"],
+  });
+  expect(result.stderr.toString("utf-8")).toContain("demo.test.ts");
+  expect(result.stderr.toString("utf-8")).not.toContain("node_modules");
+  expect(result.exitCode).toBe(0);
+  expect(result.signalCode).toBeUndefined();
+});
diff --git a/test/harness.ts b/test/harness.ts
index 9944544ed3..6710381e75 100644
--- a/test/harness.ts
+++ b/test/harness.ts
@@ -142,9 +142,11 @@ export function tempDirWithFiles(basename: string, files: DirectoryTree): string
       const joined = join(base, name);
       if (name.includes("/")) {
         const dir = dirname(name);
-        fs.mkdirSync(join(base, dir), { recursive: true });
+        if (dir !== name && dir !== ".") {
+          fs.mkdirSync(join(base, dir), { recursive: true });
+        }
       }
-      if (typeof contents === "object" && contents && !Buffer.isBuffer(contents)) {
+      if (typeof contents === "object" && contents && typeof contents?.byteLength === "undefined") {
         fs.mkdirSync(joined);
         makeTree(joined, contents);
         continue;
@@ -357,21 +359,21 @@ expect.extend({
       }
     }
   },
-  toRun(cmds: string[], optionalStdout?: string) {
+  toRun(cmds: string[], optionalStdout?: string, expectedCode: number = 0) {
     const result = Bun.spawnSync({
       cmd: [bunExe(), ...cmds],
       env: bunEnv,
       stdio: ["inherit", "pipe", "inherit"],
     });
 
-    if (result.exitCode !== 0) {
+    if (result.exitCode !== expectedCode) {
       return {
         pass: false,
         message: () => `Command ${cmds.join(" ")} failed:` + "\n" + result.stdout.toString("utf-8"),
       };
     }
 
-    if (optionalStdout) {
+    if (optionalStdout != null) {
       return {
         pass: result.stdout.toString("utf-8") === optionalStdout,
         message: () =>
@@ -384,6 +386,43 @@ expect.extend({
       message: () => `Expected ${cmds.join(" ")} to fail`,
     };
   },
+  toThrowWithCode(fn: CallableFunction, cls: CallableFunction, code: string) {
+    try {
+      fn();
+      return {
+        pass: false,
+        message: () => `Received function did not throw`,
+      };
+    } catch (e) {
+      // expect(e).toBeInstanceOf(cls);
+      if (!(e instanceof cls)) {
+        return {
+          pass: false,
+          message: () => `Expected error to be instanceof ${cls.name}; got ${e.__proto__.constructor.name}`,
+        };
+      }
+
+      // expect(e).toHaveProperty("code");
+      if (!("code" in e)) {
+        return {
+          pass: false,
+          message: () => `Expected error to have property 'code'; got ${e}`,
+        };
+      }
+
+      // expect(e.code).toEqual(code);
+      if (e.code !== code) {
+        return {
+          pass: false,
+          message: () => `Expected error to have code '${code}'; got ${e.code}`,
+        };
+      }
+
+      return {
+        pass: true,
+      };
+    }
+  },
 });
 
 export function ospath(path: string) {
@@ -1030,7 +1069,8 @@ interface BunHarnessTestMatchers {
   toBeUTF16String(): void;
   toHaveTestTimedOutAfter(expected: number): void;
   toBeBinaryType(expected: keyof typeof binaryTypes): void;
-  toRun(optionalStdout?: string): void;
+  toRun(optionalStdout?: string, expectedCode?: number): void;
+  toThrowWithCode(cls: CallableFunction, code: string): void;
 }
 
 declare module "bun:test" {
diff --git a/test/integration/next-pages/src/pages/index.tsx b/test/integration/next-pages/src/pages/index.tsx
index 109f5e5e27..b87da9145d 100644
--- a/test/integration/next-pages/src/pages/index.tsx
+++ b/test/integration/next-pages/src/pages/index.tsx
@@ -122,7 +122,7 @@ export async function getStaticProps() {
       bunVersion:
         process.env.NODE_ENV === "production"
           ? "[production needs a constant string]"
-          : process.versions.bun ?? "not in bun",
+          : (process.versions.bun ?? "not in bun"),
     },
   };
 }
diff --git a/test/js/bun/dns/resolve-dns.test.ts b/test/js/bun/dns/resolve-dns.test.ts
index b237d43a3f..747a2aa3a2 100644
--- a/test/js/bun/dns/resolve-dns.test.ts
+++ b/test/js/bun/dns/resolve-dns.test.ts
@@ -107,7 +107,7 @@ describe("dns", () => {
     test.each(malformedHostnames)("'%s'", hostname => {
       // @ts-expect-error
       expect(dns.lookup(hostname, { backend })).rejects.toMatchObject({
-        code: "DNS_ENOTFOUND",
+        code: expect.stringMatching(/^DNS_ENOTFOUND|DNS_ESERVFAIL|DNS_ENOTIMP$/),
         name: "DNSException",
       });
     });
diff --git a/test/js/bun/http/bun-server.test.ts b/test/js/bun/http/bun-server.test.ts
index 4d4cc571ea..30318d15d7 100644
--- a/test/js/bun/http/bun-server.test.ts
+++ b/test/js/bun/http/bun-server.test.ts
@@ -1,4 +1,4 @@
-import type { ServerWebSocket, Server } from "bun";
+import type { ServerWebSocket, Server, Socket } from "bun";
 import { describe, expect, test } from "bun:test";
 import { bunExe, bunEnv, rejectUnauthorizedScope } from "harness";
 import path from "path";
@@ -543,3 +543,83 @@ test("should be able to async upgrade using custom protocol", async () => {
 
   expect(await promise).toBe(true);
 });
+
+test("should be able to abrubtly close a upload request", async () => {
+  const { promise, resolve } = Promise.withResolvers();
+  using server = Bun.serve({
+    port: 0,
+    hostname: "localhost",
+    maxRequestBodySize: 1024 * 1024 * 1024 * 16,
+    async fetch(req) {
+      let total_size = 0;
+      req.signal.addEventListener("abort", resolve);
+
+      for await (const chunk of req.body as ReadableStream) {
+        total_size += chunk.length;
+        if (total_size > 1024 * 1024 * 1024) {
+          return new Response("too big", { status: 413 });
+        }
+      }
+
+      return new Response("Received " + total_size);
+    },
+  });
+  // ~100KB
+  const chunk = Buffer.alloc(1024 * 100, "a");
+  // ~1GB
+  const MAX_PAYLOAD = 1024 * 1024 * 1024;
+  const request = Buffer.from(
+    `POST / HTTP/1.1\r\nHost: ${server.hostname}:${server.port}\r\nContent-Length: ${MAX_PAYLOAD}\r\n\r\n`,
+  );
+
+  type SocketInfo = { state: number; pending: Buffer | null };
+  function tryWritePending(socket: Socket<SocketInfo>) {
+    if (socket.data.pending === null) {
+      // first write
+      socket.data.pending = request;
+    }
+    const data = socket.data.pending as Buffer;
+    const written = socket.write(data);
+    if (written < data.byteLength) {
+      // partial write
+      socket.data.pending = data.slice(0, written);
+      return false;
+    }
+
+    // full write got to next state
+    if (socket.data.state === 0) {
+      // request sent -> send chunk
+      socket.data.pending = chunk;
+    } else {
+      // chunk sent -> delay shutdown
+      setTimeout(() => socket.shutdown(), 100);
+    }
+    socket.data.state++;
+    socket.flush();
+    return true;
+  }
+
+  function trySend(socket: Socket<SocketInfo>) {
+    while (socket.data.state < 2) {
+      if (!tryWritePending(socket)) {
+        return;
+      }
+    }
+    return;
+  }
+  await Bun.connect({
+    hostname: server.hostname,
+    port: server.port,
+    data: {
+      state: 0,
+      pending: null,
+    } as SocketInfo,
+    socket: {
+      open: trySend,
+      drain: trySend,
+      data(socket, data) {},
+    },
+  });
+  await promise;
+  expect().pass();
+});
diff --git a/test/js/bun/shell/exec.test.ts b/test/js/bun/shell/exec.test.ts
index 2fb108ddcf..cd6b074161 100644
--- a/test/js/bun/shell/exec.test.ts
+++ b/test/js/bun/shell/exec.test.ts
@@ -71,6 +71,13 @@ describe("bun exec", () => {
     }
   });
 
+  TestBuilder.command`${BUN} exec cd`
+    .env(bunEnv)
+    .exitCode(0)
+    .stderr("")
+    .stdout("")
+    .runAsTest("cd with no arguments works");
+
   test("bun works even when not in PATH", async () => {
     const val = await $`bun exec 'bun'`.env({ ...bunEnv, PATH: "" }).nothrow();
     expect(val.stderr.toString()).not.toContain("bun: command not found: bun");
diff --git a/test/js/bun/test/jest-each.test.ts b/test/js/bun/test/jest-each.test.ts
index bb8bd54b4c..0bd0239ac7 100644
--- a/test/js/bun/test/jest-each.test.ts
+++ b/test/js/bun/test/jest-each.test.ts
@@ -53,3 +53,7 @@ describe.each(["some", "cool", "strings"])("works with describe: %s", s => {
     done();
   });
 });
+
+describe("does not return zero", () => {
+  expect(it.each([1, 2])("wat", () => {})).toBeUndefined();
+});
diff --git a/test/js/bun/test/snapshot-tests/snapshots/__snapshots__/snapshot.test.ts.snap b/test/js/bun/test/snapshot-tests/snapshots/__snapshots__/snapshot.test.ts.snap
index 51953013d8..47112120bc 100644
--- a/test/js/bun/test/snapshot-tests/snapshots/__snapshots__/snapshot.test.ts.snap
+++ b/test/js/bun/test/snapshot-tests/snapshots/__snapshots__/snapshot.test.ts.snap
@@ -172,7 +172,7 @@ exports[`most types: Float32Array 1`] = `Float32Array []`;
 
 exports[`most types: Float64Array 1`] = `Float64Array []`;
 
-exports[`most types: Function 1`] = `[Function]`;
+exports[`most types: Function 1`] = `[Function: test1000000]`;
 
 exports[`most types: Int8Array 1`] = `Int8Array []`;
 
diff --git a/test/js/bun/test/test-timers.test.ts b/test/js/bun/test/test-timers.test.ts
index 963467dee5..b216469c05 100644
--- a/test/js/bun/test/test-timers.test.ts
+++ b/test/js/bun/test/test-timers.test.ts
@@ -20,7 +20,9 @@ test("we can go back in time", () => {
     expect(DateBeforeMocked).not.toBe(Date);
     expect(DateBeforeMocked.now).not.toBe(Date.now);
   }
-
+  jest.setSystemTime(new Date("2020-01-01T00:00:00.000Z").getTime());
+  expect(new Date().toISOString()).toBe("2020-01-01T00:00:00.000Z");
+  expect(Date.now()).toBe(1577836800000);
   jest.useRealTimers();
   const now = new Date();
   now.setHours(0, 0, 0, 0);
diff --git a/test/js/bun/udp/dgram-unref-hang-fixture.ts b/test/js/bun/udp/dgram-unref-hang-fixture.ts
new file mode 100644
index 0000000000..0dcb614d24
--- /dev/null
+++ b/test/js/bun/udp/dgram-unref-hang-fixture.ts
@@ -0,0 +1,6 @@
+import dgram from "node:dgram";
+const socket = dgram.createSocket({ type: "udp4" });
+socket.unref();
+socket.send("test", 1337, "127.0.0.1", (error, bytes) => {
+  console.log(error, bytes);
+});
diff --git a/test/js/bun/udp/dgram.test.ts b/test/js/bun/udp/dgram.test.ts
index c6d486c3c6..5a9301322a 100644
--- a/test/js/bun/udp/dgram.test.ts
+++ b/test/js/bun/udp/dgram.test.ts
@@ -3,6 +3,7 @@ import { describe, test, expect, it } from "bun:test";
 
 import { nodeDataCases } from "./testdata";
 import { disableAggressiveGCScope } from "harness";
+import path from "path";
 
 describe("createSocket()", () => {
   test("connect", done => {
@@ -188,3 +189,9 @@ describe("createSocket()", () => {
     });
   }
 });
+
+describe("unref()", () => {
+  test("call before bind() does not hang", async () => {
+    expect([path.join(import.meta.dir, "dgram-unref-hang-fixture.ts")]).toRun();
+  });
+});
diff --git a/test/js/bun/util/bun-cryptohasher.test.ts b/test/js/bun/util/bun-cryptohasher.test.ts
index 554dfef6fe..28af94e035 100644
--- a/test/js/bun/util/bun-cryptohasher.test.ts
+++ b/test/js/bun/util/bun-cryptohasher.test.ts
@@ -6,7 +6,14 @@ test("Bun.file in CryptoHasher is not supported yet", () => {
   expect(() => new Bun.CryptoHasher("sha1").update(Bun.file(import.meta.path))).toThrow();
   expect(() => new Bun.SHA1().update(Bun.file(import.meta.path))).toThrow();
 });
-
+test("CryptoHasher update should throw when no parameter/null/undefined is passed", () => {
+  // @ts-expect-error
+  expect(() => new Bun.CryptoHasher("sha1").update()).toThrow();
+  // @ts-expect-error
+  expect(() => new Bun.CryptoHasher("sha1").update(undefined)).toThrow();
+  // @ts-expect-error
+  expect(() => new Bun.CryptoHasher("sha1").update(null)).toThrow();
+});
 describe("Hash is consistent", () => {
   const sourceInputs = [
     Buffer.from([
diff --git a/test/js/bun/util/exotic-global-mutable-prototype.test.ts b/test/js/bun/util/exotic-global-mutable-prototype.test.ts
index b6ed071aa1..f51ad39b51 100644
--- a/test/js/bun/util/exotic-global-mutable-prototype.test.ts
+++ b/test/js/bun/util/exotic-global-mutable-prototype.test.ts
@@ -5,6 +5,13 @@ import { test, expect } from "bun:test";
 // Some libraries like `web-worker` override the prototype on `globalThis` to add extra properties.
 test("Object.setPrototypeOf works on globalThis", () => {
   const orig = Object.getPrototypeOf(globalThis);
+  let parent = orig;
+  while (parent) {
+    for (const key in parent) {
+      console.log(key);
+    }
+    parent = Object.getPrototypeOf(parent);
+  }
   Object.setPrototypeOf(
     globalThis,
     Object.create(null, {
diff --git a/test/js/bun/util/inspect-error-leak.test.js b/test/js/bun/util/inspect-error-leak.test.js
new file mode 100644
index 0000000000..49df1a3315
--- /dev/null
+++ b/test/js/bun/util/inspect-error-leak.test.js
@@ -0,0 +1,23 @@
+import { test, expect } from "bun:test";
+
+const perBatch = 2000;
+const repeat = 50;
+test("Printing errors does not leak", () => {
+  function batch() {
+    for (let i = 0; i < perBatch; i++) {
+      Bun.inspect(new Error("leak"));
+    }
+    Bun.gc(true);
+  }
+
+  batch();
+  const baseline = Math.floor(process.memoryUsage.rss() / 1024);
+  for (let i = 0; i < repeat; i++) {
+    batch();
+  }
+
+  const after = Math.floor(process.memoryUsage.rss() / 1024);
+  const diff = ((after - baseline) / 1024) | 0;
+  console.log(`RSS increased by ${diff} MB`);
+  expect(diff, `RSS grew by ${diff} MB after ${perBatch * repeat} iterations`).toBeLessThan(10);
+}, 10_000);
diff --git a/test/js/first_party/undici/undici-primordials.test.ts b/test/js/first_party/undici/undici-primordials.test.ts
new file mode 100644
index 0000000000..63c57cf086
--- /dev/null
+++ b/test/js/first_party/undici/undici-primordials.test.ts
@@ -0,0 +1,36 @@
+import { describe, it, expect, beforeAll, afterAll, afterEach } from "bun:test";
+const { Response, Request, Headers, FormData, File, URL, AbortSignal, URLSearchParams } = globalThis;
+afterEach(() => {
+  globalThis.Response = Response;
+  globalThis.Request = Request;
+  globalThis.Headers = Headers;
+  globalThis.FormData = FormData;
+  globalThis.File = File;
+  globalThis.URL = URL;
+  globalThis.AbortSignal = AbortSignal;
+  globalThis.URLSearchParams = URLSearchParams;
+});
+
+it("undici", () => {
+  globalThis.Response =
+    globalThis.Request =
+    globalThis.Headers =
+    globalThis.FormData =
+    globalThis.File =
+    globalThis.URL =
+    globalThis.AbortSignal =
+    globalThis.URLSearchParams =
+      42;
+
+  const undici = require("undici");
+  expect(undici).toBeDefined();
+  expect(undici.Response).toBe(Response);
+  expect(undici.Request).toBe(Request);
+  expect(undici.Headers).toBe(Headers);
+  expect(undici.FormData).toBe(FormData);
+  expect(undici.File).toBe(File);
+  expect(undici.URL).toBe(URL);
+  expect(undici.URLSearchParams).toBe(URLSearchParams);
+
+  // Note: AbortSignal is not exported. It's just used internally.
+});
diff --git a/test/js/node/child_process/child_process.test.ts b/test/js/node/child_process/child_process.test.ts
index a124c6f64c..f2ecb17f7a 100644
--- a/test/js/node/child_process/child_process.test.ts
+++ b/test/js/node/child_process/child_process.test.ts
@@ -223,7 +223,7 @@ describe("spawn()", () => {
 
   it("should allow us to spawn in the default shell", async () => {
     const shellPath: string = await new Promise(resolve => {
-      const child = spawn("echo", [isWindows ? "$env:SHELL" : "$SHELL"], { shell: true });
+      const child = spawn("echo", [isWindows ? "$PSHOME" : "$SHELL"], { shell: true });
       child.stdout.on("data", data => {
         resolve(data.toString().trim());
       });
@@ -240,7 +240,7 @@ describe("spawn()", () => {
   it("should allow us to spawn in a specified shell", async () => {
     const shell = shellExe();
     const shellPath: string = await new Promise(resolve => {
-      const child = spawn("echo", [isWindows ? "$env:SHELL" : "$SHELL"], { shell });
+      const child = spawn("echo", [isWindows ? "$PSHOME" : "$SHELL"], { shell });
       child.stdout.on("data", data => {
         resolve(data.toString().trim());
       });
diff --git a/test/js/node/fs/fs-stats-truncate.test.ts b/test/js/node/fs/fs-stats-truncate.test.ts
new file mode 100644
index 0000000000..a4cda48275
--- /dev/null
+++ b/test/js/node/fs/fs-stats-truncate.test.ts
@@ -0,0 +1,43 @@
+// BUN-2C1
+//   const value = @field(this, @tagName(field));
+//  if (comptime (Big and @typeInfo(@TypeOf(value)) == .Int)) {
+//    return JSC.JSValue.fromInt64NoTruncate(globalObject, @intCast(value));
+//  }
+import { Stats, statSync } from "node:fs";
+import { test, expect } from "bun:test";
+
+test("fs.stats truncate", async () => {
+  const stats = new Stats(...Array.from({ length: 14 }, () => Number.MAX_VALUE));
+  expect(stats.dev).toBeGreaterThan(0);
+  expect(stats.mode).toBeGreaterThan(0);
+  expect(stats.nlink).toBeGreaterThan(0);
+  expect(stats.uid).toBeGreaterThan(0);
+  expect(stats.gid).toBeGreaterThan(0);
+  expect(stats.rdev).toBeGreaterThan(0);
+  expect(stats.blksize).toBeGreaterThan(0);
+  expect(stats.ino).toBeGreaterThan(0);
+  expect(stats.size).toBeGreaterThan(0);
+  expect(stats.blocks).toBeGreaterThan(0);
+  expect(stats.atimeMs).toBeGreaterThan(0);
+  expect(stats.mtimeMs).toBeGreaterThan(0);
+  expect(stats.ctimeMs).toBeGreaterThan(0);
+  expect(stats.birthtimeMs).toBeGreaterThan(0);
+});
+
+test("fs.stats truncate (bigint)", async () => {
+  const stats = statSync(import.meta.path, { bigint: true });
+  expect(stats.dev).toBeTypeOf("bigint");
+  expect(stats.mode).toBeTypeOf("bigint");
+  expect(stats.nlink).toBeTypeOf("bigint");
+  expect(stats.uid).toBeTypeOf("bigint");
+  expect(stats.gid).toBeTypeOf("bigint");
+  expect(stats.rdev).toBeTypeOf("bigint");
+  expect(stats.blksize).toBeTypeOf("bigint");
+  expect(stats.ino).toBeTypeOf("bigint");
+  expect(stats.size).toBeTypeOf("bigint");
+  expect(stats.blocks).toBeTypeOf("bigint");
+  expect(stats.atimeMs).toBeTypeOf("bigint");
+  expect(stats.mtimeMs).toBeTypeOf("bigint");
+  expect(stats.ctimeMs).toBeTypeOf("bigint");
+  expect(stats.birthtimeMs).toBeTypeOf("bigint");
+});
diff --git a/test/js/node/http/node-fetch-primordials.test.ts b/test/js/node/http/node-fetch-primordials.test.ts
new file mode 100644
index 0000000000..2fdb93eca9
--- /dev/null
+++ b/test/js/node/http/node-fetch-primordials.test.ts
@@ -0,0 +1,30 @@
+import { afterEach, expect, test } from "bun:test";
+
+const originalResponse = globalThis.Response;
+const originalRequest = globalThis.Request;
+const originalHeaders = globalThis.Headers;
+afterEach(() => {
+  globalThis.Response = originalResponse;
+  globalThis.Request = originalRequest;
+  globalThis.Headers = originalHeaders;
+  globalThis.fetch = Bun.fetch;
+});
+
+test("fetch, Response, Request can be overriden", async () => {
+  const { Response, Request } = globalThis;
+  globalThis.Response = class BadResponse {};
+  globalThis.Request = class BadRequest {};
+  globalThis.fetch = function badFetch() {};
+
+  const fetch = require("node-fetch").fetch;
+
+  using server = Bun.serve({
+    port: 0,
+    async fetch(req) {
+      return new Response("Hello, World!");
+    },
+  });
+
+  const response = await fetch(server.url);
+  expect(response).toBeInstanceOf(Response);
+});
diff --git a/test/js/node/http/node-fetch.test.js b/test/js/node/http/node-fetch.test.js
index 92a3f12e39..a865d0b157 100644
--- a/test/js/node/http/node-fetch.test.js
+++ b/test/js/node/http/node-fetch.test.js
@@ -3,7 +3,17 @@ import * as iso from "isomorphic-fetch";
 import * as vercelFetch from "@vercel/fetch";
 import * as stream from "stream";
 
-import { test, expect } from "bun:test";
+import { test, expect, beforeAll, afterAll, afterEach } from "bun:test";
+
+const originalResponse = globalThis.Response;
+const originalRequest = globalThis.Request;
+const originalHeaders = globalThis.Headers;
+afterEach(() => {
+  globalThis.Response = originalResponse;
+  globalThis.Request = originalRequest;
+  globalThis.Headers = originalHeaders;
+  globalThis.fetch = Bun.fetch;
+});
 
 test("node-fetch", () => {
   expect(Response.prototype).toBeInstanceOf(globalThis.Response);
diff --git a/test/js/node/http/node-http-error-in-data-handler-fixture.1.js b/test/js/node/http/node-http-error-in-data-handler-fixture.1.js
new file mode 100644
index 0000000000..b33d56f40f
--- /dev/null
+++ b/test/js/node/http/node-http-error-in-data-handler-fixture.1.js
@@ -0,0 +1,35 @@
+const http = require("http");
+const server = http.createServer((req, res) => {
+  res.end("Hello World\n");
+});
+const { promise, resolve, reject } = Promise.withResolvers();
+process.exitCode = 1;
+
+server.listen(0, function () {
+  const port = server.address().port;
+  http
+    .request(`http://localhost:${port}`, res => {
+      res
+        .on("data", data => {
+          // base64 the message to ensure we don't confuse source code with the error message
+          throw new Error(Buffer.from("VGVzdCBwYXNzZWQ=", "base64"));
+        })
+        .on("end", () => {
+          server.close();
+        });
+    })
+    .on("error", reject)
+    .end();
+});
+
+server.on("close", () => {
+  resolve();
+});
+server.on("error", err => {
+  reject(err);
+});
+
+process.on("uncaughtException", err => {
+  console.log(err);
+  process.exit(0);
+});
diff --git a/test/js/node/http/node-http-error-in-data-handler-fixture.2.js b/test/js/node/http/node-http-error-in-data-handler-fixture.2.js
new file mode 100644
index 0000000000..7fb81dc9f2
--- /dev/null
+++ b/test/js/node/http/node-http-error-in-data-handler-fixture.2.js
@@ -0,0 +1,36 @@
+const http = require("http");
+const server = http.createServer(async (req, res) => {
+  res.end("Hello World\n");
+});
+const { promise, resolve, reject } = Promise.withResolvers();
+process.exitCode = 1;
+
+server.listen(0, function () {
+  const port = server.address().port;
+  http
+    .request(`http://localhost:${port}`, res => {
+      res
+        .on("data", async data => {
+          await Bun.sleep(1);
+          // base64 the message to ensure we don't confuse source code with the error message
+          throw new Error(Buffer.from("VGVzdCBwYXNzZWQ=", "base64"));
+        })
+        .on("end", () => {
+          server.close();
+        });
+    })
+    .on("error", reject)
+    .end();
+});
+
+server.on("close", () => {
+  resolve();
+});
+server.on("error", err => {
+  reject(err);
+});
+
+process.on("unhandledRejection", err => {
+  console.log(err);
+  process.exit(0);
+});
diff --git a/test/js/node/http/node-http-primoridals.test.ts b/test/js/node/http/node-http-primoridals.test.ts
new file mode 100644
index 0000000000..0076080135
--- /dev/null
+++ b/test/js/node/http/node-http-primoridals.test.ts
@@ -0,0 +1,130 @@
+import { test, expect, afterEach } from "bun:test";
+
+const Response = globalThis.Response;
+const Request = globalThis.Request;
+const Headers = globalThis.Headers;
+const Blob = globalThis.Blob;
+
+afterEach(() => {
+  globalThis.Response = Response;
+  globalThis.Request = Request;
+  globalThis.Headers = Headers;
+  globalThis.Blob = Blob;
+});
+
+// This test passes by not hanging.
+test("Overriding Request, Response, Headers, and Blob should not break node:http server", async () => {
+  const Response = globalThis.Response;
+  const Request = globalThis.Request;
+  const Headers = globalThis.Headers;
+  const Blob = globalThis.Blob;
+
+  globalThis.Response = class MyResponse {
+    get body() {
+      throw new Error("body getter should not be called");
+    }
+
+    get headers() {
+      throw new Error("headers getter should not be called");
+    }
+
+    get status() {
+      throw new Error("status getter should not be called");
+    }
+
+    get statusText() {
+      throw new Error("statusText getter should not be called");
+    }
+
+    get ok() {
+      throw new Error("ok getter should not be called");
+    }
+
+    get url() {
+      throw new Error("url getter should not be called");
+    }
+
+    get type() {
+      throw new Error("type getter should not be called");
+    }
+  };
+  globalThis.Request = class MyRequest {};
+  globalThis.Headers = class MyHeaders {
+    entries() {
+      throw new Error("entries should not be called");
+    }
+
+    get() {
+      throw new Error("get should not be called");
+    }
+
+    has() {
+      throw new Error("has should not be called");
+    }
+
+    keys() {
+      throw new Error("keys should not be called");
+    }
+
+    values() {
+      throw new Error("values should not be called");
+    }
+
+    forEach() {
+      throw new Error("forEach should not be called");
+    }
+
+    [Symbol.iterator]() {
+      throw new Error("[Symbol.iterator] should not be called");
+    }
+
+    [Symbol.toStringTag]() {
+      throw new Error("[Symbol.toStringTag] should not be called");
+    }
+
+    append() {
+      throw new Error("append should not be called");
+    }
+  };
+  globalThis.Blob = class MyBlob {};
+
+  const http = require("http");
+  const server = http.createServer((req, res) => {
+    res.end("Hello World\n");
+  });
+  const { promise, resolve, reject } = Promise.withResolvers();
+
+  server.listen(0, () => {
+    const { port } = server.address();
+    // client request
+    const req = http
+      .request(`http://localhost:${port}`, res => {
+        res
+          .on("data", data => {
+            expect(data.toString()).toBe("Hello World\n");
+          })
+          .on("end", () => {
+            server.close();
+            console.log("closing time");
+          });
+      })
+      .on("error", reject)
+      .end();
+  });
+
+  server.on("close", () => {
+    resolve();
+  });
+  server.on("error", err => {
+    reject(err);
+  });
+
+  try {
+    await promise;
+  } finally {
+    globalThis.Response = Response;
+    globalThis.Request = Request;
+    globalThis.Headers = Headers;
+    globalThis.Blob = Blob;
+  }
+});
diff --git a/test/js/node/http/node-http.test.ts b/test/js/node/http/node-http.test.ts
index d151e47415..883f30ba7b 100644
--- a/test/js/node/http/node-http.test.ts
+++ b/test/js/node/http/node-http.test.ts
@@ -25,7 +25,7 @@ import { unlinkSync } from "node:fs";
 import { PassThrough } from "node:stream";
 const { describe, expect, it, beforeAll, afterAll, createDoneDotAll, mock } = createTest(import.meta.path);
 import { bunExe } from "bun:harness";
-import { bunEnv, disableAggressiveGCScope, tmpdirSync } from "harness";
+import { bunEnv, disableAggressiveGCScope, tmpdirSync, randomPort } from "harness";
 import * as stream from "node:stream";
 import * as zlib from "node:zlib";
 
@@ -158,6 +158,28 @@ describe("node:http", () => {
       server.close();
     });
 
+    it("should use the provided port", async () => {
+      const server = http.createServer(() => {});
+      const random_port = randomPort();
+      server.listen(random_port);
+      const { port } = server.address();
+      expect(port).toEqual(random_port);
+      server.close();
+    });
+
+    it("should assign a random port when undefined", async () => {
+      const server1 = http.createServer(() => {});
+      const server2 = http.createServer(() => {});
+      server1.listen(undefined);
+      server2.listen(undefined);
+      const { port: port1 } = server1.address();
+      const { port: port2 } = server2.address();
+      expect(port1).not.toEqual(port2);
+      expect(port1).toBeWithin(1024, 65535);
+      server1.close();
+      server2.close();
+    });
+
     it("option method should be uppercase (#7250)", async () => {
       try {
         var server = createServer((req, res) => {
@@ -1921,7 +1943,7 @@ it("should emit events in the right order", async () => {
 
 it("destroy should end download", async () => {
   // just simulate some file that will take forever to download
-  const payload = Buffer.from("X".repeat(16 * 1024));
+  const payload = Buffer.from("X".repeat(128 * 1024));
 
   using server = Bun.serve({
     port: 0,
@@ -1936,24 +1958,33 @@ it("destroy should end download", async () => {
       });
     },
   });
-  {
-    let chunks = 0;
 
-    const { promise, resolve } = Promise.withResolvers();
+  async function run() {
+    let receivedByteLength = 0;
+    let { promise, resolve } = Promise.withResolvers();
     const req = request(server.url, res => {
-      res.on("data", () => {
-        process.nextTick(resolve);
-        chunks++;
+      res.on("data", data => {
+        receivedByteLength += data.length;
+        if (resolve) {
+          resolve();
+          resolve = null;
+        }
       });
     });
     req.end();
-    // wait for the first chunk
     await promise;
-    // should stop the download
     req.destroy();
-    await Bun.sleep(200);
-    expect(chunks).toBeLessThanOrEqual(3);
+    await Bun.sleep(10);
+    const initialByteLength = receivedByteLength;
+    expect(receivedByteLength).toBeLessThanOrEqual(payload.length * 3);
+    await Bun.sleep(10);
+    expect(initialByteLength).toBe(receivedByteLength);
+    await Bun.sleep(10);
   }
+
+  const runCount = 50;
+  const runs = Array.from({ length: runCount }, run);
+  await Promise.all(runs);
 });
 
 it("can send brotli from Server and receive with fetch", async () => {
@@ -2197,3 +2228,27 @@ it("should mark complete true", async () => {
     server.close();
   }
 });
+
+it("should propagate exception in sync data handler", async () => {
+  const { exitCode, stdout } = Bun.spawnSync({
+    cmd: [bunExe(), "run", path.join(import.meta.dir, "node-http-error-in-data-handler-fixture.1.js")],
+    stdout: "pipe",
+    stderr: "inherit",
+    env: bunEnv,
+  });
+
+  expect(stdout.toString()).toContain("Test passed");
+  expect(exitCode).toBe(0);
+});
+
+it("should propagate exception in async data handler", async () => {
+  const { exitCode, stdout } = Bun.spawnSync({
+    cmd: [bunExe(), "run", path.join(import.meta.dir, "node-http-error-in-data-handler-fixture.2.js")],
+    stdout: "pipe",
+    stderr: "inherit",
+    env: bunEnv,
+  });
+
+  expect(stdout.toString()).toContain("Test passed");
+  expect(exitCode).toBe(0);
+});
diff --git a/test/js/node/path/basename.test.js b/test/js/node/path/basename.test.js
index 7d53a9909c..c94cd91132 100644
--- a/test/js/node/path/basename.test.js
+++ b/test/js/node/path/basename.test.js
@@ -45,6 +45,7 @@ describe("path.dirname", () => {
     assert.strictEqual(path.win32.basename("basename.ext\\"), "basename.ext");
     assert.strictEqual(path.win32.basename("basename.ext\\\\"), "basename.ext");
     assert.strictEqual(path.win32.basename("foo"), "foo");
+    assert.strictEqual(path.win32.basename("foo", undefined), "foo");
     assert.strictEqual(path.win32.basename("aaa\\bbb", "\\bbb"), "bbb");
     assert.strictEqual(path.win32.basename("aaa\\bbb", "a\\bbb"), "bbb");
     assert.strictEqual(path.win32.basename("aaa\\bbb", "bbb"), "bbb");
@@ -72,6 +73,7 @@ describe("path.dirname", () => {
     assert.strictEqual(path.posix.basename("basename.ext\\"), "basename.ext\\");
     assert.strictEqual(path.posix.basename("basename.ext\\\\"), "basename.ext\\\\");
     assert.strictEqual(path.posix.basename("foo"), "foo");
+    assert.strictEqual(path.posix.basename("foo", undefined), "foo");
   });
 
   test("posix with control characters", () => {
diff --git a/test/js/node/process/process.test.js b/test/js/node/process/process.test.js
index cb8b466fb5..825b5bde45 100644
--- a/test/js/node/process/process.test.js
+++ b/test/js/node/process/process.test.js
@@ -1,9 +1,53 @@
 import { spawnSync, which } from "bun";
 import { describe, expect, it } from "bun:test";
-import { existsSync, readFileSync } from "fs";
+import { existsSync, readFileSync, writeFileSync } from "fs";
 import { bunEnv, bunExe, isWindows, tmpdirSync } from "harness";
 import { basename, join, resolve } from "path";
 
+expect.extend({
+  toRunInlineFixture(input) {
+    const script = input[0];
+    const optionalStdout = input[1];
+    const expectedCode = input[2];
+    const x = tmpdirSync();
+    const path = join(x, "index.js");
+    writeFileSync(path, script);
+
+    // return expect([path]).toRun(optionalStdout, expectedCode);
+    const cmds = [path];
+    const result = Bun.spawnSync({
+      cmd: [bunExe(), ...cmds],
+      env: bunEnv,
+      stdio: ["inherit", "pipe", "pipe"],
+    });
+
+    if (result.exitCode !== expectedCode) {
+      return {
+        pass: false,
+        message: () =>
+          `Command ${cmds.join(" ")} failed: ${result.exitCode} != ${expectedCode}:` +
+          "\n" +
+          result.stdout.toString("utf-8") +
+          "\n" +
+          result.stderr.toString("utf-8"),
+      };
+    }
+
+    if (optionalStdout != null) {
+      return {
+        pass: result.stdout.toString("utf-8") === optionalStdout,
+        message: () =>
+          `Expected ${cmds.join(" ")} to output ${optionalStdout} but got ${result.stdout.toString("utf-8")}`,
+      };
+    }
+
+    return {
+      pass: true,
+      message: () => `Expected ${cmds.join(" ")} to fail`,
+    };
+  },
+});
+
 const process_sleep = join(import.meta.dir, "process-sleep.js");
 
 it("process", () => {
@@ -622,7 +666,7 @@ it("aborts when the uncaughtException handler throws", async () => {
   const proc = Bun.spawn([bunExe(), join(import.meta.dir, "process-onUncaughtExceptionAbort.js")], {
     stderr: "pipe",
   });
-  expect(await proc.exited).toBe(1);
+  expect(await proc.exited).toBe(7);
   expect(await new Response(proc.stderr).text()).toContain("bar");
 });
 
@@ -655,3 +699,289 @@ it("process.execArgv", async () => {
     expect(result, `bun ${cmd}`).toEqual({ execArgv, argv });
   }
 });
+
+describe("process.exitCode", () => {
+  it("normal", () => {
+    expect([
+      `
+      process.on("exit", (code) => console.log("exit", code, process.exitCode));
+      process.on("beforeExit", (code) => console.log("beforeExit", code, process.exitCode));
+    `,
+      "beforeExit 0 undefined\nexit 0 undefined\n",
+      0,
+    ]).toRunInlineFixture();
+  });
+
+  it("setter", () => {
+    expect([
+      `
+      process.on("exit", (code) => console.log("exit", code, process.exitCode));
+      process.on("beforeExit", (code) => console.log("beforeExit", code, process.exitCode));
+
+      process.exitCode = 0;
+    `,
+      "beforeExit 0 0\nexit 0 0\n",
+      0,
+    ]).toRunInlineFixture();
+  });
+
+  it("setter non-zero", () => {
+    expect([
+      `
+      process.on("exit", (code) => console.log("exit", code, process.exitCode));
+      process.on("beforeExit", (code) => console.log("beforeExit", code, process.exitCode));
+
+      process.exitCode = 3;
+    `,
+      "beforeExit 3 3\nexit 3 3\n",
+      3,
+    ]).toRunInlineFixture();
+  });
+
+  it("exit", () => {
+    expect([
+      `
+      process.on("exit", (code) => console.log("exit", code, process.exitCode));
+      process.on("beforeExit", (code) => console.log("beforeExit", code, process.exitCode));
+
+      process.exit(0);
+    `,
+      "exit 0 0\n",
+      0,
+    ]).toRunInlineFixture();
+  });
+
+  it("exit non-zero", () => {
+    expect([
+      `
+      process.on("exit", (code) => console.log("exit", code, process.exitCode));
+      process.on("beforeExit", (code) => console.log("beforeExit", code, process.exitCode));
+
+      process.exit(3);
+    `,
+      "exit 3 3\n",
+      3,
+    ]).toRunInlineFixture();
+  });
+
+  it("property access on undefined", () => {
+    expect([
+      `
+      process.on("exit", (code) => console.log("exit", code, process.exitCode));
+      process.on("beforeExit", (code) => console.log("beforeExit", code, process.exitCode));
+
+      const x = {};
+      x.y.z();
+    `,
+      "exit 1 1\n",
+      1,
+    ]).toRunInlineFixture();
+  });
+
+  it("thrown Error", () => {
+    expect([
+      `
+      process.on("exit", (code) => console.log("exit", code, process.exitCode));
+      process.on("beforeExit", (code) => console.log("beforeExit", code, process.exitCode));
+
+      throw new Error("oops");
+    `,
+      "exit 1 1\n",
+      1,
+    ]).toRunInlineFixture();
+  });
+
+  it("unhandled rejected promise", () => {
+    expect([
+      `
+      process.on("exit", (code) => console.log("exit", code, process.exitCode));
+      process.on("beforeExit", (code) => console.log("beforeExit", code, process.exitCode));
+
+      await Promise.reject();
+    `,
+      "exit 1 1\n",
+      1,
+    ]).toRunInlineFixture();
+  });
+
+  it("exitsOnExitCodeSet", () => {
+    expect([
+      `
+      const assert = require('assert');
+      process.exitCode = 42;
+      process.on('exit', (code) => {
+        assert.strictEqual(process.exitCode, 42);
+        assert.strictEqual(code, 42);
+      });
+    `,
+      "",
+      42,
+    ]).toRunInlineFixture();
+  });
+
+  it("changesCodeViaExit", () => {
+    expect([
+      `
+      const assert = require('assert');
+      process.exitCode = 99;
+      process.on('exit', (code) => {
+        assert.strictEqual(process.exitCode, 42);
+        assert.strictEqual(code, 42);
+      });
+      process.exit(42);
+    `,
+      "",
+      42,
+    ]).toRunInlineFixture();
+  });
+
+  it("changesCodeZeroExit", () => {
+    expect([
+      `
+      const assert = require('assert');
+      process.exitCode = 99;
+      process.on('exit', (code) => {
+        assert.strictEqual(process.exitCode, 0);
+        assert.strictEqual(code, 0);
+      });
+      process.exit(0);
+    `,
+      "",
+      0,
+    ]).toRunInlineFixture();
+  });
+
+  it("exitWithOneOnUncaught", () => {
+    expect([
+      `
+      process.exitCode = 99;
+      process.on('exit', (code) => {
+        // cannot use assert because it will be uncaughtException -> 1 exit code that will render this test useless
+        if (code !== 1 || process.exitCode !== 1) {
+          console.log('wrong code! expected 1 for uncaughtException');
+          process.exit(99);
+        }
+      });
+      throw new Error('ok');
+    `,
+      "",
+      1,
+    ]).toRunInlineFixture();
+  });
+
+  it("changeCodeInsideExit", () => {
+    expect([
+      `
+      const assert = require('assert');
+      process.exitCode = 95;
+      process.on('exit', (code) => {
+        assert.strictEqual(process.exitCode, 95);
+        assert.strictEqual(code, 95);
+        process.exitCode = 99;
+      });
+    `,
+      "",
+      99,
+    ]).toRunInlineFixture();
+  });
+
+  it.todoIf(isWindows)("zeroExitWithUncaughtHandler", () => {
+    expect([
+      `
+      process.on('exit', (code) => {
+        if (code !== 0) {
+          console.log('wrong code! expected 0; got', code);
+          process.exit(99);
+        }
+        if (process.exitCode !== undefined) {
+          console.log('wrong exitCode! expected undefined; got', process.exitCode);
+          process.exit(99);
+        }
+      });
+      process.on('uncaughtException', () => { });
+      throw new Error('ok');
+    `,
+      "",
+      0,
+    ]).toRunInlineFixture();
+  });
+
+  it.todoIf(isWindows)("changeCodeInUncaughtHandler", () => {
+    expect([
+      `
+      process.on('exit', (code) => {
+        if (code !== 97) {
+          console.log('wrong code! expected 97; got', code);
+          process.exit(99);
+        }
+        if (process.exitCode !== 97) {
+          console.log('wrong exitCode! expected 97; got', process.exitCode);
+          process.exit(99);
+        }
+      });
+      process.on('uncaughtException', () => {
+        process.exitCode = 97;
+      });
+      throw new Error('ok');
+    `,
+      "",
+      97,
+    ]).toRunInlineFixture();
+  });
+
+  it("changeCodeInExitWithUncaught", () => {
+    expect([
+      `
+      const assert = require('assert');
+      process.on('exit', (code) => {
+        assert.strictEqual(process.exitCode, 1);
+        assert.strictEqual(code, 1);
+        process.exitCode = 98;
+      });
+      throw new Error('ok');
+    `,
+      "",
+      98,
+    ]).toRunInlineFixture();
+  });
+
+  it("exitWithZeroInExitWithUncaught", () => {
+    expect([
+      `
+      const assert = require('assert');
+      process.on('exit', (code) => {
+        assert.strictEqual(process.exitCode, 1);
+        assert.strictEqual(code, 1);
+        process.exitCode = 0;
+      });
+      throw new Error('ok');
+    `,
+      "",
+      0,
+    ]).toRunInlineFixture();
+  });
+
+  it("exitWithThrowInUncaughtHandler", () => {
+    expect([
+      `
+      process.on('uncaughtException', () => {
+        throw new Error('ok')
+      });
+      throw new Error('bad');
+    `,
+      "",
+      7,
+    ]).toRunInlineFixture();
+  });
+
+  it.todo("exitWithUndefinedFatalException", () => {
+    expect([
+      `
+      process._fatalException = undefined;
+      throw new Error('ok');
+    `,
+      "",
+      6,
+    ]).toRunInlineFixture();
+  });
+});
diff --git a/test/js/node/tls/node-tls-connect.test.ts b/test/js/node/tls/node-tls-connect.test.ts
index 68416e10e6..123d2015f3 100644
--- a/test/js/node/tls/node-tls-connect.test.ts
+++ b/test/js/node/tls/node-tls-connect.test.ts
@@ -150,9 +150,10 @@ it("should have peer certificate", async () => {
     expect(infoAccess["OCSP - URI"]).toBeDefined();
     expect(infoAccess["CA Issuers - URI"]).toBeDefined();
     expect(cert.ca).toBeFalse();
-    expect(cert.bits).toBe(2048);
-    expect(typeof cert.modulus).toBe("string");
-    expect(typeof cert.exponent).toBe("string");
+    expect(cert.bits).toBeInteger();
+    // These can change:
+    // expect(typeof cert.modulus).toBe("string");
+    // expect(typeof cert.exponent).toBe("string");
     expect(cert.pubkey).toBeInstanceOf(Buffer);
     expect(typeof cert.valid_from).toBe("string");
     expect(typeof cert.valid_to).toBe("string");
diff --git a/test/js/node/util/util.test.js b/test/js/node/util/util.test.js
index 4c1c51511e..a1f63ca801 100644
--- a/test/js/node/util/util.test.js
+++ b/test/js/node/util/util.test.js
@@ -24,6 +24,7 @@
 import { expect, describe, it } from "bun:test";
 import util from "util";
 import assert from "assert";
+import "harness";
 // const context = require('vm').runInNewContext; // TODO: Use a vm polyfill
 
 const strictEqual = (...args) => {
@@ -357,4 +358,46 @@ describe("util", () => {
 
     assert.strictEqual(util.styleText("red", "test"), "\u001b[31mtest\u001b[39m");
   });
+
+  describe("getSystemErrorName", () => {
+    for (const item of ["test", {}, []]) {
+      it(`throws when passing: ${item}`, () => {
+        expect(() => util.getSystemErrorName(item)).toThrowWithCode(TypeError, "ERR_INVALID_ARG_TYPE");
+      });
+    }
+
+    for (const item of [0, 1, Infinity, -Infinity, NaN]) {
+      it(`throws when passing: ${item}`, () => {
+        expect(() => util.getSystemErrorName(item)).toThrowWithCode(RangeError, "ERR_OUT_OF_RANGE");
+      });
+    }
+
+    const proc = Bun.spawnSync({
+      cmd: [
+        "node",
+        "-e",
+        "console.log(JSON.stringify([...require('node:util').getSystemErrorMap().entries()].map((v) => [v[0], v[1][0]])));",
+      ],
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+    for (const [code, name] of JSON.parse(proc.stdout.toString())) {
+      it(`getSystemErrorName(${code}) should be ${name}`, () => {
+        expect(util.getSystemErrorName(code)).toBe(name);
+      });
+    }
+
+    it("getSystemErrorName(-4096) should be unknown", () => {
+      expect(util.getSystemErrorName(-4096)).toBe("Unknown system error -4096");
+    });
+
+    // these are the windows/fallback codes and they should match node in either returning the correct name or 'Unknown system error'.
+    // eg on linux getSystemErrorName(-4034) should return unkown and not 'ERANGE' since errno defines it as -34 for that platform.
+    for (let i = -4095; i <= -4023; i++) {
+      it(`negative space: getSystemErrorName(${i}) is correct`, () => {
+        const cmd = ["node", "-e", `console.log(JSON.stringify(util.getSystemErrorName(${i})));`];
+        const stdio = ["ignore", "pipe", "pipe"];
+        expect(util.getSystemErrorName(i)).toEqual(JSON.parse(Bun.spawnSync({ cmd, stdio }).stdout.toString()));
+      });
+    }
+  });
 });
diff --git a/test/js/node/zlib/zlib.test.js b/test/js/node/zlib/zlib.test.js
index 35bd2ffdc5..40f9670856 100644
--- a/test/js/node/zlib/zlib.test.js
+++ b/test/js/node/zlib/zlib.test.js
@@ -9,28 +9,35 @@ import { tmpdirSync } from "harness";
 import * as stream from "node:stream";
 
 describe("zlib", () => {
-  it("should be able to deflate and inflate", () => {
-    const data = new TextEncoder().encode("Hello World!".repeat(1));
-    const compressed = deflateSync(data);
-    const decompressed = inflateSync(compressed);
-    expect(decompressed.join("")).toBe(data.join(""));
-  });
+  for (let library of ["zlib", "libdeflate"]) {
+    for (let outputLibrary of ["zlib", "libdeflate"]) {
+      describe(`${library} -> ${outputLibrary}`, () => {
+        it("should be able to deflate and inflate", () => {
+          const data = new TextEncoder().encode("Hello World!".repeat(1));
+          const compressed = deflateSync(data, { library });
+          console.log(compressed);
+          const decompressed = inflateSync(compressed, { library: outputLibrary });
+          expect(decompressed.join("")).toBe(data.join(""));
+        });
 
-  it("should be able to gzip and gunzip", () => {
-    const data = new TextEncoder().encode("Hello World!".repeat(1));
-    const compressed = gzipSync(data);
-    const decompressed = gunzipSync(compressed);
-    expect(decompressed.join("")).toBe(data.join(""));
-  });
+        it("should be able to gzip and gunzip", () => {
+          const data = new TextEncoder().encode("Hello World!".repeat(1));
+          const compressed = gzipSync(data, { library });
+          const decompressed = gunzipSync(compressed, { library: outputLibrary });
+          expect(decompressed.join("")).toBe(data.join(""));
+        });
+      });
+    }
+  }
 
   it("should throw on invalid raw deflate data", () => {
     const data = new TextEncoder().encode("Hello World!".repeat(1));
-    expect(() => inflateSync(data)).toThrow(new Error("invalid stored block lengths"));
+    expect(() => inflateSync(data, { library: "zlib" })).toThrow(new Error("invalid stored block lengths"));
   });
 
   it("should throw on invalid gzip data", () => {
     const data = new TextEncoder().encode("Hello World!".repeat(1));
-    expect(() => gunzipSync(data)).toThrow(new Error("incorrect header check"));
+    expect(() => gunzipSync(data, { library: "zlib" })).toThrow(new Error("incorrect header check"));
   });
 });
 
diff --git a/test/js/third_party/remix/remix-build/server/index.js b/test/js/third_party/remix/remix-build/server/index.js
new file mode 100644
index 0000000000..4e62ccc331
--- /dev/null
+++ b/test/js/third_party/remix/remix-build/server/index.js
@@ -0,0 +1,262 @@
+import { jsx, jsxs } from "react/jsx-runtime";
+import { PassThrough } from "node:stream";
+import { createReadableStreamFromReadable } from "@remix-run/node";
+import { RemixServer, Outlet, Meta, Links, ScrollRestoration, Scripts } from "@remix-run/react";
+import { isbot } from "isbot";
+import { renderToPipeableStream } from "react-dom/server";
+const ABORT_DELAY = 5e3;
+function handleRequest(request, responseStatusCode, responseHeaders, remixContext, loadContext) {
+  return isbot(request.headers.get("user-agent") || "")
+    ? handleBotRequest(request, responseStatusCode, responseHeaders, remixContext)
+    : handleBrowserRequest(request, responseStatusCode, responseHeaders, remixContext);
+}
+function handleBotRequest(request, responseStatusCode, responseHeaders, remixContext) {
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
+    const { pipe, abort } = renderToPipeableStream(
+      /* @__PURE__ */ jsx(RemixServer, {
+        context: remixContext,
+        url: request.url,
+        abortDelay: ABORT_DELAY,
+      }),
+      {
+        onAllReady() {
+          shellRendered = true;
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
+          responseHeaders.set("Content-Type", "text/html");
+          console.log(responseHeaders);
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            }),
+          );
+          pipe(body);
+        },
+        onShellError(error) {
+          reject(error);
+        },
+        onError(error) {
+          responseStatusCode = 500;
+          if (shellRendered) {
+            console.error(error);
+          }
+        },
+      },
+    );
+    setTimeout(abort, ABORT_DELAY);
+  });
+}
+function handleBrowserRequest(request, responseStatusCode, responseHeaders, remixContext) {
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
+    const { pipe, abort } = renderToPipeableStream(
+      /* @__PURE__ */ jsx(RemixServer, {
+        context: remixContext,
+        url: request.url,
+        abortDelay: ABORT_DELAY,
+      }),
+      {
+        onShellReady() {
+          shellRendered = true;
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
+          responseHeaders.set("Content-Type", "text/html");
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            }),
+          );
+          pipe(body);
+        },
+        onShellError(error) {
+          reject(error);
+        },
+        onError(error) {
+          responseStatusCode = 500;
+          if (shellRendered) {
+            console.error(error);
+          }
+        },
+      },
+    );
+    setTimeout(abort, ABORT_DELAY);
+  });
+}
+const entryServer = /* @__PURE__ */ Object.freeze(
+  /* @__PURE__ */ Object.defineProperty(
+    {
+      __proto__: null,
+      default: handleRequest,
+    },
+    Symbol.toStringTag,
+    { value: "Module" },
+  ),
+);
+function Layout({ children }) {
+  return /* @__PURE__ */ jsxs("html", {
+    lang: "en",
+    children: [
+      /* @__PURE__ */ jsxs("head", {
+        children: [
+          /* @__PURE__ */ jsx("meta", { charSet: "utf-8" }),
+          /* @__PURE__ */ jsx("meta", {
+            name: "viewport",
+            content: "width=device-width, initial-scale=1",
+          }),
+          /* @__PURE__ */ jsx(Meta, {}),
+          /* @__PURE__ */ jsx(Links, {}),
+        ],
+      }),
+      /* @__PURE__ */ jsxs("body", {
+        children: [children, /* @__PURE__ */ jsx(ScrollRestoration, {}), /* @__PURE__ */ jsx(Scripts, {})],
+      }),
+    ],
+  });
+}
+function App() {
+  return /* @__PURE__ */ jsx(Outlet, {});
+}
+const route0 = /* @__PURE__ */ Object.freeze(
+  /* @__PURE__ */ Object.defineProperty(
+    {
+      __proto__: null,
+      Layout,
+      default: App,
+    },
+    Symbol.toStringTag,
+    { value: "Module" },
+  ),
+);
+const meta = () => {
+  return [{ title: "New Remix App" }, { name: "description", content: "Welcome to Remix!" }];
+};
+function Index() {
+  return /* @__PURE__ */ jsxs("div", {
+    className: "font-sans p-4",
+    children: [
+      /* @__PURE__ */ jsx("h1", {
+        className: "text-3xl",
+        children: "Welcome to Remix",
+      }),
+      /* @__PURE__ */ jsxs("ul", {
+        className: "list-disc mt-4 pl-6 space-y-2",
+        children: [
+          /* @__PURE__ */ jsx("li", {
+            children: /* @__PURE__ */ jsx("a", {
+              className: "text-blue-700 underline visited:text-purple-900",
+              target: "_blank",
+              href: "https://remix.run/start/quickstart",
+              rel: "noreferrer",
+              children: "5m Quick Start",
+            }),
+          }),
+          /* @__PURE__ */ jsx("li", {
+            children: /* @__PURE__ */ jsx("a", {
+              className: "text-blue-700 underline visited:text-purple-900",
+              target: "_blank",
+              href: "https://remix.run/start/tutorial",
+              rel: "noreferrer",
+              children: "30m Tutorial",
+            }),
+          }),
+          /* @__PURE__ */ jsx("li", {
+            children: /* @__PURE__ */ jsx("a", {
+              className: "text-blue-700 underline visited:text-purple-900",
+              target: "_blank",
+              href: "https://remix.run/docs",
+              rel: "noreferrer",
+              children: "Remix Docs",
+            }),
+          }),
+        ],
+      }),
+    ],
+  });
+}
+const route1 = /* @__PURE__ */ Object.freeze(
+  /* @__PURE__ */ Object.defineProperty(
+    {
+      __proto__: null,
+      default: Index,
+      meta,
+    },
+    Symbol.toStringTag,
+    { value: "Module" },
+  ),
+);
+const serverManifest = {
+  entry: {
+    module: "/assets/entry.client-ER-smVHW.js",
+    imports: ["/assets/jsx-runtime-56DGgGmo.js", "/assets/components-BI_hnQlH.js"],
+    css: [],
+  },
+  routes: {
+    root: {
+      id: "root",
+      parentId: void 0,
+      path: "",
+      index: void 0,
+      caseSensitive: void 0,
+      hasAction: false,
+      hasLoader: false,
+      hasClientAction: false,
+      hasClientLoader: false,
+      hasErrorBoundary: false,
+      module: "/assets/root-CBMuz_vA.js",
+      imports: ["/assets/jsx-runtime-56DGgGmo.js", "/assets/components-BI_hnQlH.js"],
+      css: ["/assets/root-BFUH26ow.css"],
+    },
+    "routes/_index": {
+      id: "routes/_index",
+      parentId: "root",
+      path: void 0,
+      index: true,
+      caseSensitive: void 0,
+      hasAction: false,
+      hasLoader: false,
+      hasClientAction: false,
+      hasClientLoader: false,
+      hasErrorBoundary: false,
+      module: "/assets/_index-B6hwyHK-.js",
+      imports: ["/assets/jsx-runtime-56DGgGmo.js"],
+      css: [],
+    },
+  },
+  url: "/assets/manifest-c2e02a52.js",
+  version: "c2e02a52",
+};
+const mode = "production";
+const assetsBuildDirectory = "build/client";
+const basename = "/";
+const future = {
+  v3_fetcherPersist: true,
+  v3_relativeSplatPath: true,
+  v3_throwAbortReason: true,
+  unstable_singleFetch: false,
+  unstable_fogOfWar: false,
+};
+const isSpaMode = false;
+const publicPath = "/";
+const entry = { module: entryServer };
+const routes = {
+  root: {
+    id: "root",
+    parentId: void 0,
+    path: "",
+    index: void 0,
+    caseSensitive: void 0,
+    module: route0,
+  },
+  "routes/_index": {
+    id: "routes/_index",
+    parentId: "root",
+    path: void 0,
+    index: true,
+    caseSensitive: void 0,
+    module: route1,
+  },
+};
+export { serverManifest as assets, assetsBuildDirectory, basename, entry, future, isSpaMode, mode, publicPath, routes };
diff --git a/test/js/third_party/remix/remix.test.ts b/test/js/third_party/remix/remix.test.ts
new file mode 100644
index 0000000000..16667e0f11
--- /dev/null
+++ b/test/js/third_party/remix/remix.test.ts
@@ -0,0 +1,44 @@
+import { describe, it, expect, test } from "bun:test";
+test("remix works", async () => {
+  process.env.PORT = "0";
+  process.exitCode = 1;
+  process.env.NODE_ENV = "production";
+  process.env.HOST = "localhost";
+  process.argv = [process.argv[0], ".", require("path").join(__dirname, "remix-build", "server", "index.js")];
+  const http = require("node:http");
+  const originalListen = http.Server.prototype.listen;
+  let { promise, resolve, reject } = Promise.withResolvers();
+  http.Server.prototype.listen = function listen(...args) {
+    setTimeout(() => {
+      resolve(this.address());
+    }, 10);
+    return originalListen.apply(this, args);
+  };
+
+  require("@remix-run/serve/dist/cli.js");
+
+  // Wait long enough for the server's setTimeout to run.
+  await Bun.sleep(10);
+
+  const port = (await promise).port;
+
+  ({ promise, resolve, reject } = Promise.withResolvers());
+  let chunks = [];
+  const req = http
+    .request(`http://localhost:${port}`, res => {
+      res
+        .on("data", data => {
+          chunks.push(data);
+        })
+        .on("end", () => {
+          resolve();
+        })
+        .on("error", reject);
+    })
+    .end();
+
+  await promise;
+  const data = Buffer.concat(chunks).toString();
+  expect(data).toContain("Remix Docs");
+  process.exitCode = 0;
+});
diff --git a/test/js/web/console/console-log.expected.txt b/test/js/web/console/console-log.expected.txt
index 167512e7bd..86cff95206 100644
--- a/test/js/web/console/console-log.expected.txt
+++ b/test/js/web/console/console-log.expected.txt
@@ -284,3 +284,4 @@ Hello NaN % 1
 Hello NaN %j 1
 Hello \5 6,
 Hello %i 5 6
+%d 1
diff --git a/test/js/web/console/console-log.js b/test/js/web/console/console-log.js
index 46357f219d..32a817bc78 100644
--- a/test/js/web/console/console-log.js
+++ b/test/js/web/console/console-log.js
@@ -261,3 +261,6 @@ console.log("Hello %i %", [1, 2, 3, 4], 1);
 console.log("Hello %i %j", [1, 2, 3, 4], 1);
 console.log("Hello \\%i %i,", 5, 6);
 console.log("Hello %%i %i", 5, 6);
+
+// doesn't go out of bounds when printing
+console.log("%%d", 1);
diff --git a/test/js/web/fetch/fetch-preconnect.test.ts b/test/js/web/fetch/fetch-preconnect.test.ts
new file mode 100644
index 0000000000..1259b0cd45
--- /dev/null
+++ b/test/js/web/fetch/fetch-preconnect.test.ts
@@ -0,0 +1,117 @@
+import { describe, it, expect } from "bun:test";
+import "harness";
+import { isWindows } from "harness";
+
+// TODO: on Windows, these tests fail.
+// This feature is mostly meant for serverless JS environments, so we can no-op it on Windows.
+describe.todoIf(isWindows)("fetch.preconnect", () => {
+  it("fetch.preconnect works", async () => {
+    const { promise, resolve } = Promise.withResolvers();
+    using listener = Bun.listen({
+      port: 0,
+      hostname: "localhost",
+      socket: {
+        open(socket) {
+          resolve(socket);
+        },
+        data() {},
+        close() {},
+      },
+    });
+    fetch.preconnect(`http://localhost:${listener.port}`);
+    const socket = await promise;
+    const fetchPromise = fetch(`http://localhost:${listener.port}`);
+    await Bun.sleep(64);
+    socket.write("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
+    socket.end();
+
+    const response = await fetchPromise;
+    expect(response.status).toBe(200);
+  });
+
+  describe("doesn't break the request when", () => {
+    for (let endOrTerminate of ["end", "terminate", "shutdown"]) {
+      describe(endOrTerminate, () => {
+        for (let at of ["before", "middle", "after"]) {
+          it(at, async () => {
+            let { promise, resolve } = Promise.withResolvers();
+            using listener = Bun.listen({
+              port: 0,
+              hostname: "localhost",
+              socket: {
+                open(socket) {
+                  resolve(socket);
+                },
+                data() {},
+                close() {},
+              },
+            });
+            fetch.preconnect(`http://localhost:${listener.port}`);
+            let socket = await promise;
+            ({ promise, resolve } = Promise.withResolvers());
+            if (at === "before") {
+              await Bun.sleep(16);
+              socket[endOrTerminate]();
+              if (endOrTerminate === "shutdown") {
+                await Bun.sleep(0);
+                socket.end();
+              }
+            }
+            const fetchPromise = fetch(`http://localhost:${listener.port}`);
+            if (at === "middle") {
+              socket[endOrTerminate]();
+              if (endOrTerminate === "shutdown") {
+                socket.end();
+              }
+              await Bun.sleep(16);
+            }
+
+            if (at === "after") {
+              await Bun.sleep(16);
+              socket[endOrTerminate]();
+              if (endOrTerminate === "shutdown") {
+                socket.end();
+              }
+            }
+            socket = await promise;
+            socket.write("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
+            socket.end();
+
+            const response = await fetchPromise;
+            expect(response.status).toBe(200);
+          });
+        }
+      });
+    }
+  });
+
+  it("--fetch-preconnect works", async () => {
+    const { promise, resolve } = Promise.withResolvers();
+    using listener = Bun.listen({
+      port: 0,
+      hostname: "localhost",
+      socket: {
+        open(socket) {
+          socket.write("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
+          socket.end();
+          resolve();
+        },
+        data() {},
+        close() {},
+      },
+    });
+
+    // Do --fetch-preconnect, but don't actually send a request.
+    expect([`--fetch-preconnect=http://localhost:${listener.port}`, "--eval", "Bun.sleep(64)"]).toRun();
+
+    await promise;
+  });
+
+  it("fetch.preconnect validates the URL", async () => {
+    expect(() => fetch.preconnect("http://localhost:0")).toThrow();
+    expect(() => fetch.preconnect("")).toThrow();
+    expect(() => fetch.preconnect(" ")).toThrow();
+    expect(() => fetch.preconnect("unix:///tmp/foo")).toThrow();
+    expect(() => fetch.preconnect("http://:0")).toThrow();
+  });
+});
diff --git a/test/js/web/fetch/fetch-redirect.test.ts b/test/js/web/fetch/fetch-redirect.test.ts
new file mode 100644
index 0000000000..f02fb5fc5c
--- /dev/null
+++ b/test/js/web/fetch/fetch-redirect.test.ts
@@ -0,0 +1,32 @@
+import { describe, it, expect } from "bun:test";
+
+// https://github.com/oven-sh/bun/issues/12701
+it("fetch() preserves body on redirect", async () => {
+  using server = Bun.serve({
+    port: 0,
+
+    async fetch(req) {
+      const { pathname } = new URL(req.url);
+      if (pathname === "/redirect") {
+        return new Response(null, {
+          status: 308,
+          headers: {
+            Location: "/redirect2",
+          },
+        });
+      }
+      if (pathname === "/redirect2") {
+        return new Response(req.body, { status: 200 });
+      }
+      return new Response("you shouldnt see this?", { status: 200 });
+    },
+  });
+
+  const res = await fetch(new URL("/redirect", server.url), {
+    method: "POST",
+    body: "hello",
+  });
+
+  expect(res.status).toBe(200);
+  expect(await res.text()).toBe("hello");
+});
diff --git a/test/js/web/fetch/fetch.stream.test.ts b/test/js/web/fetch/fetch.stream.test.ts
index eac19feffc..7d7908f6a3 100644
--- a/test/js/web/fetch/fetch.stream.test.ts
+++ b/test/js/web/fetch/fetch.stream.test.ts
@@ -652,24 +652,28 @@ describe("fetch() with streaming", () => {
     }
   }
 
-  type CompressionType = "no" | "gzip" | "deflate" | "br" | "deflate_with_headers";
-  type TestType = { headers: Record<string, string>; compression: CompressionType; skip?: boolean };
-  const types: Array<TestType> = [
+  const types = [
     { headers: {}, compression: "no" },
     { headers: { "Content-Encoding": "gzip" }, compression: "gzip" },
+    { headers: { "Content-Encoding": "gzip" }, compression: "gzip-libdeflate" },
     { headers: { "Content-Encoding": "deflate" }, compression: "deflate" },
+    { headers: { "Content-Encoding": "deflate" }, compression: "deflate-libdeflate" },
     { headers: { "Content-Encoding": "deflate" }, compression: "deflate_with_headers" },
-    // { headers: { "Content-Encoding": "br" }, compression: "br", skip: true }, // not implemented yet
-  ];
+    { headers: { "Content-Encoding": "br" }, compression: "br" },
+  ] as const;
 
-  function compress(compression: CompressionType, data: Uint8Array) {
+  function compress(compression, data: Uint8Array) {
     switch (compression) {
+      case "gzip-libdeflate":
       case "gzip":
-        return Bun.gzipSync(data);
+        return Bun.gzipSync(data, { library: compression === "gzip-libdeflate" ? "libdeflate" : "zlib" });
+      case "deflate-libdeflate":
       case "deflate":
-        return Bun.deflateSync(data);
+        return Bun.deflateSync(data, { library: compression === "deflate-libdeflate" ? "libdeflate" : "zlib" });
       case "deflate_with_headers":
         return zlib.deflateSync(data);
+      case "br":
+        return zlib.brotliCompressSync(data);
       default:
         return data;
     }
@@ -1186,7 +1190,14 @@ describe("fetch() with streaming", () => {
             gcTick(false);
             expect(buffer.toString("utf8")).toBe("unreachable");
           } catch (err) {
-            expect((err as Error).name).toBe("ZlibError");
+            if (compression === "br") {
+              expect((err as Error).name).toBe("BrotliDecompressionError");
+            } else if (compression === "deflate-libdeflate") {
+              // Since the compressed data is different, the error ends up different.
+              expect((err as Error).name).toBe("ShortRead");
+            } else {
+              expect((err as Error).name).toBe("ZlibError");
+            }
           }
         }
       });
diff --git a/test/js/web/workers/worker.test.ts b/test/js/web/workers/worker.test.ts
index f99ecb735b..609eb37dfc 100644
--- a/test/js/web/workers/worker.test.ts
+++ b/test/js/web/workers/worker.test.ts
@@ -45,6 +45,10 @@ describe("web worker", () => {
   test("worker-env", done => {
     const worker = new Worker(new URL("worker-fixture-env.js", import.meta.url).href, {
       env: {
+        // Verify that we use putDirectMayBeIndex instead of putDirect
+        [0]: "123",
+        [1]: "234",
+
         hello: "world",
         another_key: 123 as any,
       },
@@ -57,6 +61,8 @@ describe("web worker", () => {
       try {
         expect(e.data).toEqual({
           env: {
+            [0]: "123",
+            [1]: "234",
             hello: "world",
             another_key: "123",
           },
diff --git a/test/napi/napi-app/main.cpp b/test/napi/napi-app/main.cpp
index f443ee79d7..61f7c564c7 100644
--- a/test/napi/napi-app/main.cpp
+++ b/test/napi/napi-app/main.cpp
@@ -69,6 +69,33 @@ static napi_value test_issue_11949(const Napi::CallbackInfo &info) {
   return result;
 }
 
+static void callback_1(napi_env env, napi_value js_callback, void *context,
+                       void *data) {}
+
+napi_value test_napi_threadsafe_function_does_not_hang_after_finalize(
+    const Napi::CallbackInfo &info) {
+
+  Napi::Env env = info.Env();
+  napi_status status;
+
+  napi_value resource_name;
+  status = napi_create_string_utf8(env, "simple", 6, &resource_name);
+  assert(status == napi_ok);
+
+  napi_threadsafe_function cb;
+  status = napi_create_threadsafe_function(env, nullptr, nullptr, resource_name,
+                                           0, 1, nullptr, nullptr, nullptr,
+                                           &callback_1, &cb);
+  assert(status == napi_ok);
+
+  status = napi_release_threadsafe_function(cb, napi_tsfn_release);
+  assert(status == napi_ok);
+
+  printf("success!");
+
+  return ok(env);
+}
+
 napi_value
 test_napi_get_value_string_utf8_with_buffer(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
@@ -123,10 +150,8 @@ Napi::Object InitAll(Napi::Env env, Napi::Object exports1) {
 
   Napi::Object exports = Init2(env, exports1);
 
-  node::AddEnvironmentCleanupHook(
-      isolate, [](void *) {}, isolate);
-  node::RemoveEnvironmentCleanupHook(
-      isolate, [](void *) {}, isolate);
+  node::AddEnvironmentCleanupHook(isolate, [](void *) {}, isolate);
+  node::RemoveEnvironmentCleanupHook(isolate, [](void *) {}, isolate);
 
   exports.Set("test_issue_7685", Napi::Function::New(env, test_issue_7685));
   exports.Set("test_issue_11949", Napi::Function::New(env, test_issue_11949));
@@ -134,6 +159,12 @@ Napi::Object InitAll(Napi::Env env, Napi::Object exports1) {
   exports.Set(
       "test_napi_get_value_string_utf8_with_buffer",
       Napi::Function::New(env, test_napi_get_value_string_utf8_with_buffer));
+
+  exports.Set(
+      "test_napi_threadsafe_function_does_not_hang_after_finalize",
+      Napi::Function::New(
+          env, test_napi_threadsafe_function_does_not_hang_after_finalize));
+
   return exports;
 }
 
diff --git a/test/napi/napi.test.ts b/test/napi/napi.test.ts
index 2c8a64c262..90e800446b 100644
--- a/test/napi/napi.test.ts
+++ b/test/napi/napi.test.ts
@@ -59,6 +59,11 @@ describe("napi", () => {
     });
   });
 
+  it("threadsafe function does not hang on finalize", () => {
+    const result = checkSameOutput("test_napi_threadsafe_function_does_not_hang_after_finalize", []);
+    expect(result).toBe("success!");
+  });
+
   it("#1288", async () => {
     const result = checkSameOutput("self", []);
     expect(result).toBe("hello world!");
diff --git a/test/package.json b/test/package.json
index 3008ded2ec..96c4bd14c1 100644
--- a/test/package.json
+++ b/test/package.json
@@ -11,6 +11,8 @@
     "@grpc/proto-loader": "0.7.10",
     "@napi-rs/canvas": "0.1.47",
     "@prisma/client": "5.8.0",
+    "@remix-run/react": "2.10.3",
+    "@remix-run/serve": "2.10.3",
     "@resvg/resvg-js": "2.4.1",
     "@swc/core": "1.3.38",
     "@types/ws": "8.5.10",
@@ -23,6 +25,7 @@
     "express": "4.18.2",
     "fast-glob": "3.3.1",
     "iconv-lite": "0.6.3",
+    "isbot": "5.1.13",
     "jest-extended": "4.0.0",
     "jsonwebtoken": "9.0.2",
     "jws": "4.0.0",
@@ -61,5 +64,8 @@
   "private": true,
   "scripts": {
     "typecheck": "tsc --noEmit"
+  },
+  "resolutions": {
+    "react": "../node_modules/react"
   }
 }
diff --git a/test/regression/issue/012360.test.ts b/test/regression/issue/012360.test.ts
new file mode 100644
index 0000000000..e50a2b87fd
--- /dev/null
+++ b/test/regression/issue/012360.test.ts
@@ -0,0 +1,40 @@
+// https://github.com/oven-sh/bun/issues/12360
+import { test, expect } from "bun:test";
+import { fileURLToPath, pathToFileURL } from "bun";
+import { tmpdirSync, isWindows } from "harness";
+import { join } from "path";
+
+export async function validatePath(path: URL): Promise<URL | string> {
+  const filePath = fileURLToPath(path);
+
+  if (await Bun.file(filePath).exists()) {
+    return pathToFileURL(filePath);
+  } else {
+    return "";
+  }
+}
+
+test("validate executable given in the config using `validatePath`: invalid value", async () => {
+  const dir = tmpdirSync();
+
+  const filePath = join(dir, "./sample.exe");
+
+  const newFilePath = await validatePath(pathToFileURL(filePath));
+
+  expect(newFilePath).toBe("");
+});
+
+test("validate executable given in the config using `validatePath`: expected real implementation", async () => {
+  const dir = tmpdirSync();
+  const editorPath: URL | string = pathToFileURL(join(dir, "./metaeditor64.exe"));
+  const terminalPath: URL | string = pathToFileURL(join(dir, "./terminal64.exe"));
+
+  await Bun.write(isWindows ? editorPath.pathname.slice(1) : editorPath.pathname, "im a editor");
+  await Bun.write(isWindows ? terminalPath.pathname.slice(1) : terminalPath.pathname, "im a terminal");
+
+  const newEditorPath = <URL>await validatePath(editorPath);
+  const newTerminalPath = <URL>await validatePath(terminalPath);
+
+  expect(newEditorPath.pathname).toBe(editorPath.pathname);
+  expect(newTerminalPath.pathname).toBe(terminalPath.pathname);
+});
diff --git a/test/regression/issue/09555.test.ts b/test/regression/issue/09555.test.ts
new file mode 100644
index 0000000000..be5e2123f3
--- /dev/null
+++ b/test/regression/issue/09555.test.ts
@@ -0,0 +1,163 @@
+import { Readable } from "stream";
+import { test, describe, expect } from "bun:test";
+import { tempDirWithFiles } from "harness";
+import { join } from "path";
+describe("#09555", () => {
+  test("fetch() Response body", async () => {
+    const full = crypto.getRandomValues(new Uint8Array(1024 * 3));
+    const sha = Bun.hash(full);
+    using server = Bun.serve({
+      port: 0,
+      async fetch() {
+        const chunks = [full.slice(0, 1024), full.slice(1024, 1024 * 2), full.slice(1024 * 2)];
+
+        return new Response(
+          new ReadableStream({
+            async pull(controller) {
+              if (chunks.length === 0) {
+                controller.close();
+                return;
+              }
+              controller.enqueue(chunks.shift());
+              await Bun.sleep(100);
+            },
+          }),
+        );
+      },
+    });
+
+    let total = 0;
+    const res = await fetch(server.url.href);
+    const stream = Readable.fromWeb(res.body);
+    let chunks = [];
+    for await (const chunk of stream) {
+      total += chunk.length;
+      chunks.push(chunk);
+    }
+
+    const out = Bun.hash(Buffer.concat(chunks));
+    expect(out).toBe(sha);
+    expect(total).toBe(1024 * 3);
+  });
+
+  test("Bun.serve() Request body streaming", async () => {
+    const full = crypto.getRandomValues(new Uint8Array(1024 * 3));
+    const sha = Bun.CryptoHasher.hash("sha256", full, "base64");
+    using server = Bun.serve({
+      port: 0,
+      async fetch(req) {
+        const readable = Readable.fromWeb(req.body);
+        let chunks = [];
+
+        for await (const chunk of readable) {
+          chunks.push(chunk);
+        }
+
+        const out = Bun.CryptoHasher.hash("sha256", Buffer.concat(chunks), "base64");
+        console.log(out);
+        return new Response(out);
+      },
+    });
+
+    const { promise, resolve } = Promise.withResolvers();
+    const chunks = [];
+    await Bun.connect({
+      hostname: server.url.hostname,
+      port: server.url.port,
+
+      socket: {
+        async open(socket) {
+          socket.write(
+            "POST / HTTP/1.1\r\n" +
+              "Connection: close\r\n" +
+              "Content-Length: " +
+              full.length +
+              "\r\n" +
+              "Host: " +
+              server.url.hostname +
+              "\r\n\r\n",
+          );
+          const chunks = [full.slice(0, 1024), full.slice(1024, 1024 * 2), full.slice(1024 * 2)];
+
+          for (const chunk of chunks) {
+            socket.write(chunk);
+            await Bun.sleep(100);
+          }
+        },
+        drain() {},
+        data(socket, received) {
+          chunks.push(received);
+        },
+        close() {
+          resolve(Buffer.concat(chunks).toString());
+        },
+      },
+    });
+    const outHTTPResponse = (await promise).toString();
+    const out = outHTTPResponse.split("\r\n\r\n")[1];
+    expect(out).toEqual(sha);
+  });
+
+  test("Bun.serve() Request body buffered", async () => {
+    const full = crypto.getRandomValues(new Uint8Array(1024 * 3));
+    const sha = Bun.CryptoHasher.hash("sha256", full, "base64");
+    using server = Bun.serve({
+      port: 0,
+      async fetch(req) {
+        const readable = Readable.fromWeb(req.body);
+        let chunks = [];
+
+        for await (const chunk of readable) {
+          chunks.push(chunk);
+        }
+
+        const out = Bun.CryptoHasher.hash("sha256", Buffer.concat(chunks), "base64");
+        return new Response(out);
+      },
+    });
+
+    const outHTTPResponse = await fetch(server.url.href, {
+      method: "POST",
+      body: full,
+    });
+    const out = await outHTTPResponse.text();
+    expect(out).toEqual(sha);
+  });
+
+  test("Bun.file() NativeReadable", async () => {
+    const full = crypto.getRandomValues(new Uint8Array(1024 * 3));
+    const sha = Bun.CryptoHasher.hash("sha256", full, "base64");
+    const dir = tempDirWithFiles("09555", {
+      "/file.blob": full,
+    });
+    await Bun.write(join(dir, "file.blob"), full);
+    const web = Bun.file(join(dir, "file.blob")).stream();
+    const stream = Readable.fromWeb(web);
+
+    const chunks = [];
+    let total = 0;
+    for await (const chunk of stream) {
+      chunks.push(chunk);
+      total += chunk.length;
+    }
+
+    const out = Bun.CryptoHasher.hash("sha256", Buffer.concat(chunks), "base64");
+    expect(out).toEqual(sha);
+    expect(total).toBe(1024 * 3);
+  });
+
+  test("Readable.fromWeb consumes the ReadableStream", async () => {
+    const bytes = new Blob([crypto.getRandomValues(new Uint8Array(1024 * 3)), new ArrayBuffer(1024 * 1024 * 10)]);
+    const response = new Response(bytes);
+
+    const web = response.body;
+    expect(response.bodyUsed).toBe(false);
+    const stream = Readable.fromWeb(web);
+    expect(response.bodyUsed).toBe(true);
+    expect(() => response.body?.getReader()).toThrow();
+    const methods = ["arrayBuffer", "blob", "formData", "json", "text"];
+    for (const method of methods) {
+      expect(() => response[method]()).toThrow();
+    }
+  });
+});
diff --git a/test/regression/issue/12650.test.js b/test/regression/issue/12650.test.js
new file mode 100644
index 0000000000..eab73865d2
--- /dev/null
+++ b/test/regression/issue/12650.test.js
@@ -0,0 +1,23 @@
+import { expect, describe, it } from "bun:test";
+
+// Custom class for testing
+class CustomException extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "CustomException";
+  }
+}
+
+describe("Test expect.toThrow(expect.any())", () => {
+  it("should throw an error", () => {
+    expect(() => {
+      throw new CustomException("Custom error message");
+    }).toThrow(expect.any(Error));
+  });
+
+  it("should throw a CustomException", () => {
+    expect(() => {
+      throw new CustomException("Custom error message");
+    }).toThrow(expect.any(CustomException));
+  });
+});
diff --git a/test/snippets/bundled-entry-point.js b/test/snippets/bundled-entry-point.js
index a996f86327..77e119729e 100644
--- a/test/snippets/bundled-entry-point.js
+++ b/test/snippets/bundled-entry-point.js
@@ -1,6 +1,6 @@
 import "react";
 
-var hello = 123 ? null ?? "world" : "ok";
+var hello = 123 ? (null ?? "world") : "ok";
 
 export function test() {
   return testDone(import.meta.url);