don't character diff emojis

* fix(build): add option and auto detect for arch linux

This adds a option and a automatic routine for decting arch linux,
where the path for libatomic is a bit special.

* fix: don't statically link if not needed

.dockerignore

@@ -1,17 +1,15 @@
-node_modules
-**/node_modules
-src/bun.js/WebKit/LayoutTests
-zig-out
-zig-build
-**/*.o
 **/*.a
-
-examples
-
+**/*.o
 **/.next
-.git
-src/bun.js/WebKit
 **/CMakeCache.txt
+**/node_modules
+.git
+examples
+node_modules
 packages/**/bun
 packages/**/bun-profile
+src/bun.js/WebKit
+src/bun.js/WebKit/LayoutTests
+zig-build
 zig-cache
+zig-out

.gitattributes

@@ -27,6 +27,8 @@ src/bun.js/bindings/sqlite/sqlite3_local.h linguist-vendored
 src/bun.js/bindings/simdutf.cpp linguist-vendored
 src/bun.js/bindings/simdutf.h linguist-vendored
 
+*-fixture* linguist-generated
+
 src/js/out/WebCoreJSBuiltins.cpp linguist-generated
 src/js/out/WebCoreJSBuiltins.h linguist-generated
 src/js/out/WebCoreJSBuiltins.d.ts linguist-generated

.github/workflows/bun-linux-aarch64.yml

@@ -4,11 +4,6 @@ concurrency:
   group: bun-linux-aarch64-${{ github.ref }}
   cancel-in-progress: true
 
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-  TEST_TAG: bun-test'
-
 on:
   push:
     branches:
@@ -16,6 +11,7 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -37,10 +33,7 @@ jobs:
             arch: aarch64
             build_arch: arm64
             runner: linux-arm64
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-linux-arm64-lto.tar.gz"
-            webkit_basename: "bun-webkit-linux-arm64-lto"
             build_machine_arch: aarch64
-
     steps:
       - uses: actions/checkout@v3
         with:
@@ -72,9 +65,7 @@ jobs:
             BUILDARCH=${{matrix.build_arch}}
             BUILD_MACHINE_ARCH=${{matrix.build_machine_arch}}
             CPU_TARGET=${{matrix.cpu}}
-            WEBKIT_URL=${{matrix.webkit_url}}
             GIT_SHA=${{github.sha}}
-            WEBKIT_BASENAME=${{matrix.webkit_basename}}
           platforms: linux/${{matrix.build_arch}}
           target: artifact
           outputs: type=local,dest=${{runner.temp}}/release
@@ -110,14 +101,6 @@ jobs:
         with:
           name: bun-${{matrix.tag}}
           path: ${{runner.temp}}/release/bun-${{matrix.tag}}.zip
-      - uses: actions/upload-artifact@v3
-        with:
-          name: bun-obj-${{matrix.tag}}
-          path: ${{runner.temp}}/release/bun-obj
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{matrix.tag}}-dependencies
-          path: ${{runner.temp}}/release/bun-dependencies
       - name: Release
         id: release
         uses: ncipollo/release-action@v1

.github/workflows/bun-linux-build.yml

@@ -4,11 +4,6 @@ concurrency:
   group: bun-linux-build-${{ github.ref }}
   cancel-in-progress: true
 
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-  TEST_TAG: bun-test'
-
 on:
   push:
     branches:
@@ -16,6 +11,7 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -25,6 +21,7 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -47,16 +44,12 @@ jobs:
             arch: x86_64
             build_arch: amd64
             runner: big-ubuntu
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-linux-amd64-lto.tar.gz"
-            webkit_basename: "bun-webkit-linux-amd64-lto"
             build_machine_arch: x86_64
           - cpu: nehalem
             tag: linux-x64-baseline
             arch: x86_64
             build_arch: amd64
             runner: big-ubuntu
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-linux-amd64-lto.tar.gz"
-            webkit_basename: "bun-webkit-linux-amd64-lto"
             build_machine_arch: x86_64
 
     steps:
@@ -90,9 +83,14 @@ jobs:
             BUILDARCH=${{matrix.build_arch}}
             BUILD_MACHINE_ARCH=${{matrix.build_machine_arch}}
             CPU_TARGET=${{matrix.cpu}}
-            WEBKIT_URL=${{matrix.webkit_url}}
             GIT_SHA=${{github.sha}}
-            WEBKIT_BASENAME=${{matrix.webkit_basename}}
+
+            SCCACHE_BUCKET=bun
+            SCCACHE_REGION=auto
+            SCCACHE_S3_USE_SSL=true
+            SCCACHE_ENDPOINT=${{ secrets.CACHE_S3_ENDPOINT }}
+            AWS_ACCESS_KEY_ID=${{ secrets.CACHE_S3_ACCESS_KEY_ID }}
+            AWS_SECRET_ACCESS_KEY=${{ secrets.CACHE_S3_SECRET_ACCESS_KEY }}
           platforms: linux/${{matrix.build_arch}}
           target: artifact
           outputs: type=local,dest=${{runner.temp}}/release

.github/workflows/bun-mac-aarch64.yml

@@ -5,9 +5,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-  TEST_TAG: bun-test'
+  LLVM_VERSION: 16
+  BUN_DOWNLOAD_URL_BASE: https://pub-5e11e972747a44bf9aaf9394f185a982.r2.dev/releases/latest
 
 on:
   push:
@@ -15,6 +14,7 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -23,6 +23,7 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -30,79 +31,134 @@ on:
   workflow_dispatch:
 
 jobs:
-  macos-object-files:
-    name: macOS Object
+  macOS-zig:
+    name: macOS Zig Object
     runs-on: med-ubuntu
     if: github.repository_owner == 'oven-sh'
     strategy:
       matrix:
         include:
-          # - cpu: nehalem
-          #   arch: x86_64
-          #   tag: bun-obj-darwin-x64-baseline
-          # - cpu: haswell
-          #   arch: x86_64
-          #   tag: bun-obj-darwin-x64
           - cpu: native
             arch: aarch64
             tag: bun-obj-darwin-aarch64
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - uses: docker/setup-buildx-action@v2
+      - uses: actions/checkout@v4
+      # - name: Checkout submodules
+      #   run: git submodule update --init --recursive --depth=1 --progress --force
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
         id: buildx
         with:
           install: true
-      - name: Run
-        run: |
-          rm -rf ${{runner.temp}}/release
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
+
+      - name: Compile Zig Object
         uses: docker/build-push-action@v3
         if: runner.arch == 'X64'
         with:
           context: .
           push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=min
+          # This doesnt seem to work
+          # cache-from: type=s3,endpoint_url=${{ secrets.CACHE_S3_ENDPOINT }},blobs_prefix=docker_blobs/,manifests_prefix=docker_manifests/,access_key_id=${{ secrets.CACHE_S3_ACCESS_KEY_ID }},secret_access_key=${{ secrets.CACHE_S3_SECRET_ACCESS_KEY }},bucket=bun,region=auto
+          # cache-to: type=s3,endpoint_url=${{ secrets.CACHE_S3_ENDPOINT }},blobs_prefix=docker_blobs/,manifests_prefix=docker_manifests/,access_key_id=${{ secrets.CACHE_S3_ACCESS_KEY_ID }},secret_access_key=${{ secrets.CACHE_S3_SECRET_ACCESS_KEY }},bucket=bun,region=auto
           build-args: |
+            BUILDARCH=${{ runner.arch == 'X64' && 'amd64' || 'arm64' }}
+            BUILD_MACHINE_ARCH=${{ runner.arch == 'X64' && 'x86_64' || 'aarch64' }}
             ARCH=${{ matrix.arch }}
-            BUILDARCH=amd64
-            BUILD_MACHINE_ARCH=x86_64
             CPU_TARGET=${{ matrix.cpu }}
-            TRIPLET=${{matrix.arch}}-macos-none
-            GIT_SHA=${{github.sha}}
-          platforms: linux/amd64
+            TRIPLET=${{ matrix.arch }}-macos-none
+            GIT_SHA=${{ github.sha }}
+          platforms: linux/${{ runner.arch == 'X64' && 'amd64' || 'arm64' }}
           target: build_release_obj
           outputs: type=local,dest=${{runner.temp}}/release
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        if: runner.arch == 'ARM64'
-        with:
-          context: .
-          push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=min
-          build-args: |
-            ARCH=${{ matrix.arch }}
-            BUILDARCH=arm64
-            BUILD_MACHINE_ARCH=aarch64
-            CPU_TARGET=${{ matrix.cpu }}
-            TRIPLET=${{matrix.arch}}-macos-none
-            GIT_SHA=${{github.sha}}
-          platforms: linux/arm64
-          target: build_release_obj
-          outputs: type=local,dest=${{runner.temp}}/release
-      - uses: actions/upload-artifact@v3
+
+      - name: Upload Zig Object
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.tag }}
-          path: ${{runner.temp}}/release/bun.o
+          path: ${{runner.temp}}/release/bun-zig.o
+
+  macOS-dependencies:
+    name: macOS Dependencies
+    runs-on: ${{ matrix.runner }}
+    if: github.repository_owner == 'oven-sh'
+    timeout-minutes: 15
+    strategy:
+      matrix:
+        include:
+          - cpu: native
+            arch: aarch64
+            tag: bun-darwin-aarch64
+            obj: bun-obj-darwin-aarch64
+            artifact: bun-obj-darwin-aarch64
+            runner: macos-arm64
+    steps:
+      - uses: actions/checkout@v4
+      - name: Checkout submodules
+        run: git submodule update --init --recursive --depth=1 --progress --force
+
+      - name: Install system dependencies
+        env:
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          HOMEBREW_NO_AUTO_UPDATE: 1
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
+        run: |
+          brew install sccache ccache rust llvm@$LLVM_VERSION pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config --force
+          echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
+          echo "$(brew --prefix sccache)/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: Hash submodule versions
+        run: |
+          print_data() {
+            git submodule | grep -v WebKit
+            llvm-config --version
+            rustc --version
+            cat $(echo scripts/build*.sh scripts/all-dependencies.sh | tr " " "\n" | sort)
+          }
+          echo "sha=$(print_data | sha1sum | cut -c 1-10)" >> $GITHUB_OUTPUT
+        id: submodule-versions
+
+      - name: Cache submodule dependencies
+        id: cache-deps-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: ${{runner.temp}}/bun-deps
+          key: bun-deps-${{ matrix.tag }}-${{ steps.submodule-versions.outputs.sha }}
+
+      - name: Compile submodule dependencies
+        if: ${{ !steps.cache-deps-restore.outputs.cache-hit }}
+        env:
+          CPU_TARGET: ${{ matrix.cpu }}
+          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
+        run: |
+          mkdir -p $BUN_DEPS_OUT_DIR
+          bash ./scripts/clean-dependencies.sh
+          bash ./scripts/all-dependencies.sh
+
+      - name: Cache submodule dependencies
+        if: ${{ !steps.cache-deps-restore.outputs.cache-hit }}
+        id: cache-deps-save
+        uses: actions/cache/save@v3
+        with:
+          path: ${{runner.temp}}/bun-deps
+          key: ${{ steps.cache-deps-restore.outputs.cache-primary-key }}
+
+      - name: Upload submodule dependencies
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.tag }}-deps
+          path: ${{runner.temp}}/bun-deps
+
   macOS-cpp:
     name: macOS C++
     runs-on: ${{ matrix.runner }}
@@ -111,257 +167,141 @@ jobs:
     strategy:
       matrix:
         include:
-          # - cpu: nehalem
-          #   arch: x86_64
-          #   tag: bun-darwin-x64-baseline
-          #   obj: bun-obj-darwin-x64-baseline
-          #   runner: macos-12
-          #   artifact: bun-obj-darwin-x64-baseline
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          #   dependencies: true
-          #   compile_obj: false
-          # - cpu: haswell
-          #   arch: x86_64
-          #   tag: bun-darwin-x64
-          #   obj: bun-obj-darwin-x64
-          #   runner: macos-12
-          #   artifact: bun-obj-darwin-x64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          #   dependencies: true
-          #   compile_obj: false
-          # - cpu: nehalem
-          #   arch: x86_64
-          #   tag: bun-darwin-x64-baseline
-          #   obj: bun-obj-darwin-x64-baseline
-          #   runner: macos-12
-          #   artifact: bun-obj-darwin-x64-baseline
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          #   dependencies: false
-          #   compile_obj: true
-          # - cpu: haswell
-          #   arch: x86_64
-          #   tag: bun-darwin-x64
-          #   obj: bun-obj-darwin-x64
-          #   runner: macos-12
-          #   artifact: bun-obj-darwin-x64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          #   dependencies: false
-          #   compile_obj: true
           - cpu: native
             arch: aarch64
             tag: bun-darwin-aarch64
             obj: bun-obj-darwin-aarch64
             artifact: bun-obj-darwin-aarch64
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-arm64-lto.tar.gz"
             runner: macos-arm64
-            dependencies: true
-            compile_obj: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Checkout submodules
-        run: git submodule update --init --recursive --depth=1 --progress -j $(sysctl -n hw.ncpu) --force
-      - name: Install dependencies
+        run: git submodule update --init --recursive --depth=1 --progress --force
+
+      - name: Install system dependencies
         env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
           HOMEBREW_NO_AUTO_UPDATE: 1
           HOMEBREW_NO_INSTALL_CLEANUP: 1
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
         run: |
-          brew install ccache rust llvm@16 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force
+          brew install sccache ccache rust llvm@$LLVM_VERSION pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config --force
+          echo "$(brew --prefix sccache)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix coreutils)/libexec/gnubin" >> $GITHUB_PATH
-          echo "$(brew --prefix llvm@16)/bin" >> $GITHUB_PATH
-          brew link --overwrite llvm@16
+          echo "$(brew --prefix llvm@$LLVM_VERSION)/bin" >> $GITHUB_PATH
+          brew link --overwrite llvm@$LLVM_VERSION
+
+      # TODO: replace with sccache
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
           key: ${{ runner.os }}-ccache-${{ matrix.tag }}
           restore-keys: ${{ runner.os }}-ccache-${{ matrix.tag }}
-      - name: Download WebKit
-        if: matrix.compile_obj
-        env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          BUN_RELEASE_DIR: ${{ runner.temp }}/release
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
-        run: |
-          rm -rf $JSC_BASE_DIR
-          mkdir -p $JSC_BASE_DIR
-          curl -L ${{ matrix.webkit_url }} | tar -xz -C $JSC_BASE_DIR --strip-components=1
-      - name: Compile dependencies
-        if: matrix.dependencies
-        env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          BUN_RELEASE_DIR: ${{ runner.temp }}/release
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
-        run: |
-          mkdir -p $BUN_DEPS_OUT_DIR
-          make vendor-without-check
+
       - name: Compile C++
-        if: matrix.compile_obj
         env:
           CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
+          SOURCE_DIR: ${{ github.workspace }}
           OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
           BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          BUN_RELEASE_DIR: ${{ runner.temp }}/release
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
         run: |
-          mkdir -p $OBJ_DIR $BUN_DEPS_OUT_DIR
-          make clean-bindings
-          make -j $(sysctl -n hw.ncpu) release-bindings
+          mkdir -p $OBJ_DIR
+          cd $OBJ_DIR
+
+          cmake -S $SOURCE_DIR -B $OBJ_DIR \
+            -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUN_CPP_ONLY=1 \
+            -DNO_CONFIGURE_DEPENDS=1
+
+          bash compile-cpp-only.sh -v
+
       - name: Upload C++
-        if: matrix.compile_obj
         uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.tag }}-cpp
-          path: ${{ runner.temp }}/bun-cpp-obj
-      - name: Upload Dependencies
-        if: matrix.dependencies
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.tag }}-deps
-          path: ${{runner.temp}}/bun-deps
-  macOS:
+          path: ${{ runner.temp }}/bun-cpp-obj/bun-cpp-objects.a
+  macOS-link:
     name: macOS Link
     runs-on: ${{ matrix.runner }}
     if: github.repository_owner == 'oven-sh'
-    needs: [macOS-cpp, macos-object-files]
-    timeout-minutes: 90
+    needs: [macOS-zig, macOS-cpp, macOS-dependencies]
+    timeout-minutes: 60
     permissions: write-all
     strategy:
       matrix:
         include:
-          # - cpu: nehalem
-          #   arch: x86_64
-          #   tag: bun-darwin-x64-baseline
-          #   obj: bun-obj-darwin-x64-baseline
-          #   package: bun-darwin-x64
-          #   runner: macos-12
-          #   artifact: bun-obj-darwin-x64-baseline
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          # - cpu: haswell
-          #   arch: x86_64
-          #   tag: bun-darwin-x64
-          #   obj: bun-obj-darwin-x64
-          #   package: bun-darwin-x64
-          #   runner: macos-12
-          #   artifact: bun-obj-darwin-x64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
           - cpu: native
             arch: aarch64
             tag: bun-darwin-aarch64
             obj: bun-obj-darwin-aarch64
             package: bun-darwin-aarch64
             artifact: bun-obj-darwin-aarch64
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-arm64-lto.tar.gz"
             runner: macos-arm64
     steps:
       - uses: actions/checkout@v3
       - name: Checkout submodules
-        run: git submodule update --init --recursive --depth=1 --progress -j $(sysctl -n hw.ncpu) --force
-      - name: Install dependencies
+        run: git submodule update --init --recursive --depth=1 --progress --force
+
+      - name: Install system dependencies
         env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
           HOMEBREW_NO_AUTO_UPDATE: 1
           HOMEBREW_NO_INSTALL_CLEANUP: 1
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
         run: |
-          brew install rust ccache llvm@16 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force
+          brew install ccache llvm@$LLVM_VERSION pkg-config coreutils libtool cmake libiconv openssl@1.1 ninja --force
+          echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix coreutils)/libexec/gnubin" >> $GITHUB_PATH
-          echo "$(brew --prefix llvm@16)/bin" >> $GITHUB_PATH
-          brew link --overwrite llvm@16
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ runner.os }}-ccache-${{ matrix.tag }}-link
-          restore-keys: ${{ runner.os }}-ccache-${{ matrix.tag }}-link
-      - name: Download WebKit
-        env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-        run: |
-          rm -rf $JSC_BASE_DIR
-          mkdir -p $JSC_BASE_DIR
-          curl -L ${{ matrix.webkit_url }} | tar -xz -C $JSC_BASE_DIR --strip-components=1
+          echo "$(brew --prefix llvm@$LLVM_VERSION)/bin" >> $GITHUB_PATH
+          brew link --overwrite llvm@$LLVM_VERSION
+
+          curl -LO "$BUN_DOWNLOAD_URL_BASE/bun-darwin-${{matrix.arch}}.zip"
+          unzip bun-darwin-${{matrix.arch}}.zip
+          mkdir -p ${{ runner.temp }}/.bun/bin
+          mv bun-darwin-${{matrix.arch}}/bun ${{ runner.temp }}/.bun/bin/bun
+          chmod +x ${{ runner.temp }}/.bun/bin/bun
+          echo "${{ runner.temp }}/.bun/bin" >> $GITHUB_PATH
+
       - name: Download C++
         uses: actions/download-artifact@v3
         with:
           name: ${{ matrix.tag }}-cpp
           path: ${{ runner.temp }}/bun-cpp-obj
-      - name: Download Dependencies
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ matrix.tag }}-deps
-          path: ${{ runner.temp }}/bun-deps
-      - name: Download Object
+
+      - name: Download Zig Object
         uses: actions/download-artifact@v3
         with:
           name: ${{ matrix.obj }}
           path: ${{ runner.temp }}/release
+
+      - name: Downloaded submodule dependencies
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{ matrix.tag }}-deps
+          path: ${{runner.temp}}/bun-deps
+
       - name: Link
         env:
           CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          BUN_RELEASE_DIR: ${{ runner.temp }}/release
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
         run: |
-          rm -rf packages/${{ matrix.package }}
-          mkdir -p packages/${{ matrix.package }}
-          mv ${{ runner.temp }}/release/* packages/${{ matrix.package }}/
-          make bun-link-lld-release copy-to-bun-release-dir-bin
+          SRC_DIR=$PWD
+          mkdir ${{runner.temp}}/link-build
+          cd ${{runner.temp}}/link-build
+          cmake $SRC_DIR \
+            -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUN_LINK_ONLY=1 \
+            -DBUN_ZIG_OBJ="${{ runner.temp }}/release/bun-zig.o" \
+            -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: Zip
-        env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          BUN_RELEASE_DIR: ${{ runner.temp }}/release
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
         run: |
-          cd ${{runner.temp}}/release
+          cd ${{runner.temp}}/link-build
           chmod +x bun-profile bun
 
-          mkdir ${{matrix.tag}}-profile
-          mkdir ${{matrix.tag}}
-
-          /usr/bin/strip -S bun
+          mkdir -p ${{matrix.tag}}-profile/ ${{matrix.tag}}/
 
           mv bun-profile ${{matrix.tag}}-profile/bun-profile
           mv bun ${{matrix.tag}}/bun
@@ -371,11 +311,11 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: ${{matrix.tag}}-profile
-          path: ${{runner.temp}}/release/${{matrix.tag}}-profile.zip
+          path: ${{runner.temp}}/link-build/${{matrix.tag}}-profile.zip
       - uses: actions/upload-artifact@v3
         with:
           name: ${{matrix.tag}}
-          path: ${{runner.temp}}/release/${{matrix.tag}}.zip
+          path: ${{runner.temp}}/link-build/${{matrix.tag}}.zip
       - name: Release
         id: release
         uses: ncipollo/release-action@v1
@@ -392,7 +332,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: "Canary (${{github.sha}})"
           tag: "canary"
-          artifacts: "${{runner.temp}}/release/${{matrix.tag}}.zip,${{runner.temp}}/release/${{matrix.tag}}-profile.zip"
+          artifacts: "${{runner.temp}}/link-build/${{matrix.tag}}.zip,${{runner.temp}}/link-build/${{matrix.tag}}-profile.zip"
       - uses: sarisia/actions-status-discord@v1
         if: failure() && github.repository_owner == 'oven-sh' && github.event_name == 'pull_request'
         with:
@@ -415,7 +355,7 @@ jobs:
   macOS-test:
     name: Tests ${{matrix.tag}}
     runs-on: ${{ matrix.runner }}
-    needs: [macOS]
+    needs: [macOS-link]
     if: github.event_name == 'pull_request' && github.repository_owner == 'oven-sh'
     permissions:
       pull-requests: write

.github/workflows/bun-mac-x64-baseline.yml

@@ -5,9 +5,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-  TEST_TAG: bun-test'
+  LLVM_VERSION: 16
+  BUN_DOWNLOAD_URL_BASE: https://pub-5e11e972747a44bf9aaf9394f185a982.r2.dev/releases/latest
 
 on:
   push:
@@ -15,6 +14,7 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -23,6 +23,7 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -47,62 +48,129 @@ jobs:
           #   arch: aarch64
           #   tag: bun-obj-darwin-aarch64
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - uses: docker/setup-buildx-action@v2
+      - uses: actions/checkout@v4
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
         id: buildx
         with:
           install: true
-      - name: Run
-        run: |
-          rm -rf ${{runner.temp}}/release
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
+
+      - name: Compile Zig Object
         uses: docker/build-push-action@v3
-        if: runner.arch == 'X64'
         with:
           context: .
           push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=min
+          # This doesnt seem to work
+          # cache-from: type=s3,endpoint_url=${{ secrets.CACHE_S3_ENDPOINT }},blobs_prefix=docker_blobs/,manifests_prefix=docker_manifests/,access_key_id=${{ secrets.CACHE_S3_ACCESS_KEY_ID }},secret_access_key=${{ secrets.CACHE_S3_SECRET_ACCESS_KEY }},bucket=bun,region=auto
+          # cache-to: type=s3,endpoint_url=${{ secrets.CACHE_S3_ENDPOINT }},blobs_prefix=docker_blobs/,manifests_prefix=docker_manifests/,access_key_id=${{ secrets.CACHE_S3_ACCESS_KEY_ID }},secret_access_key=${{ secrets.CACHE_S3_SECRET_ACCESS_KEY }},bucket=bun,region=auto
+          # This was used before, but also does not really work
+          cache-from: type=local,src=/tmp/.buildx-cache-${{matrix.tag}}
+          cache-to: type=local,dest=/tmp/.buildx-cache-${{matrix.tag}}
           build-args: |
+            BUILDARCH=${{ runner.arch == 'X64' && 'amd64' || 'arm64' }}
+            BUILD_MACHINE_ARCH=${{ runner.arch == 'X64' && 'x86_64' || 'aarch64' }}
             ARCH=${{ matrix.arch }}
-            BUILDARCH=amd64
-            BUILD_MACHINE_ARCH=x86_64
             CPU_TARGET=${{ matrix.cpu }}
-            TRIPLET=${{matrix.arch}}-macos-none
-            GIT_SHA=${{github.sha}}
-          platforms: linux/amd64
+            TRIPLET=${{ matrix.arch }}-macos-none
+            GIT_SHA=${{ github.sha }}
+
+            SCCACHE_BUCKET=bun
+            SCCACHE_REGION=auto
+            SCCACHE_S3_USE_SSL=true
+            SCCACHE_ENDPOINT=${{ secrets.CACHE_S3_ENDPOINT }}
+            AWS_ACCESS_KEY_ID=${{ secrets.CACHE_S3_ACCESS_KEY_ID }}
+            AWS_SECRET_ACCESS_KEY=${{ secrets.CACHE_S3_SECRET_ACCESS_KEY }}
+          platforms: linux/${{ runner.arch == 'X64' && 'amd64' || 'arm64' }}
           target: build_release_obj
           outputs: type=local,dest=${{runner.temp}}/release
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        if: runner.arch == 'ARM64'
-        with:
-          context: .
-          push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=min
-          build-args: |
-            ARCH=${{ matrix.arch }}
-            BUILDARCH=arm64
-            BUILD_MACHINE_ARCH=aarch64
-            CPU_TARGET=${{ matrix.cpu }}
-            TRIPLET=${{matrix.arch}}-macos-none
-            GIT_SHA=${{github.sha}}
-          platforms: linux/arm64
-          target: build_release_obj
-          outputs: type=local,dest=${{runner.temp}}/release
-      - uses: actions/upload-artifact@v3
+
+      - name: Upload Zig Object
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.tag }}
-          path: ${{runner.temp}}/release/bun.o
+          path: ${{runner.temp}}/release/bun-zig.o
+  macOS-dependencies:
+    name: macOS Dependencies
+    runs-on: ${{ matrix.runner }}
+    if: github.repository_owner == 'oven-sh'
+    timeout-minutes: 15
+    strategy:
+      matrix:
+        include:
+          - cpu: nehalem
+            arch: x86_64
+            tag: bun-darwin-x64-baseline
+            obj: bun-obj-darwin-x64-baseline
+            runner: macos-12
+            artifact: bun-obj-darwin-x64-baseline
+    steps:
+      - uses: actions/checkout@v4
+      - name: Checkout submodules
+        run: git submodule update --init --recursive --depth=1 --progress --force
+
+      - name: Install system dependencies
+        env:
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          HOMEBREW_NO_AUTO_UPDATE: 1
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
+        run: |
+          brew install sccache ccache rust llvm@$LLVM_VERSION pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config --force
+          echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
+          echo "$(brew --prefix sccache)/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: Hash submodule versions
+        run: |
+          print_data() {
+            git submodule | grep -v WebKit
+            llvm-config --version
+            rustc --version
+            cat $(echo scripts/build*.sh scripts/all-dependencies.sh | tr " " "\n" | sort)
+          }
+          echo "sha=$(print_data | sha1sum | cut -c 1-10)" >> $GITHUB_OUTPUT
+        id: submodule-versions
+
+      - name: Cache submodule dependencies
+        id: cache-deps-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: ${{runner.temp}}/bun-deps
+          key: bun-deps-${{ matrix.tag }}-${{ steps.submodule-versions.outputs.sha }}
+
+      - name: Compile submodule dependencies
+        if: ${{ !steps.cache-deps-restore.outputs.cache-hit }}
+        env:
+          CPU_TARGET: ${{ matrix.cpu }}
+          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
+        run: |
+          mkdir -p $BUN_DEPS_OUT_DIR
+          bash ./scripts/clean-dependencies.sh
+          bash ./scripts/all-dependencies.sh
+
+      - name: Cache submodule dependencies
+        if: ${{ !steps.cache-deps-restore.outputs.cache-hit }}
+        id: cache-deps-save
+        uses: actions/cache/save@v3
+        with:
+          path: ${{runner.temp}}/bun-deps
+          key: ${{ steps.cache-deps-restore.outputs.cache-primary-key }}
+
+      - name: Upload submodule dependencies
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.tag }}-deps
+          path: ${{runner.temp}}/bun-deps
+
   macOS-cpp:
     name: macOS C++
     runs-on: ${{ matrix.runner }}
@@ -117,136 +185,66 @@ jobs:
             obj: bun-obj-darwin-x64-baseline
             runner: macos-12
             artifact: bun-obj-darwin-x64-baseline
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-            dependencies: true
-            compile_obj: false
-          # - cpu: haswell
-          #   arch: x86_64
-          #   tag: bun-darwin-x64
-          #   obj: bun-obj-darwin-x64
-          #   runner: macos-12
-          #   artifact: bun-obj-darwin-x64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          #   dependencies: true
-          #   compile_obj: false
-          - cpu: nehalem
-            arch: x86_64
-            tag: bun-darwin-x64-baseline
-            obj: bun-obj-darwin-x64-baseline
-            runner: macos-12
-            artifact: bun-obj-darwin-x64-baseline
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-            dependencies: false
-            compile_obj: true
-          # - cpu: haswell
-          #   arch: x86_64
-          #   tag: bun-darwin-x64
-          #   obj: bun-obj-darwin-x64
-          #   runner: macos-12
-          #   artifact: bun-obj-darwin-x64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          #   dependencies: false
-          #   compile_obj: true
-          # - cpu: native
-          #   arch: aarch64
-          #   tag: bun-darwin-aarch64
-          #   obj: bun-obj-darwin-aarch64
-          #   artifact: bun-obj-darwin-aarch64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          #   runner: macos-arm64
-          #   dependencies: true
-          #   compile_obj: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Checkout submodules
-        run: git submodule update --init --recursive --depth=1 --progress -j $(sysctl -n hw.ncpu) --force
-      - name: Install dependencies
+        run: git submodule update --init --recursive --depth=1 --progress --force
+
+      - name: Install system dependencies
         env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
           HOMEBREW_NO_AUTO_UPDATE: 1
           HOMEBREW_NO_INSTALL_CLEANUP: 1
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
         run: |
-          brew install ccache rust llvm@16 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force
+          brew install sccache ccache rust llvm@$LLVM_VERSION pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config --force
+          echo "$(brew --prefix sccache)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix coreutils)/libexec/gnubin" >> $GITHUB_PATH
-          echo "$(brew --prefix llvm@16)/bin" >> $GITHUB_PATH
-          brew link --overwrite llvm@16
-      - name: ccache (dependencies)
+          echo "$(brew --prefix llvm@$LLVM_VERSION)/bin" >> $GITHUB_PATH
+          brew link --overwrite llvm@$LLVM_VERSION
+
+          curl -LO "$BUN_DOWNLOAD_URL_BASE/bun-darwin-x64.zip"
+          unzip bun-darwin-x64.zip
+          mkdir -p ${{ runner.temp }}/.bun/bin
+          mv bun-darwin-x64/bun ${{ runner.temp }}/.bun/bin/bun
+          chmod +x ${{ runner.temp }}/.bun/bin/bun
+          echo "${{ runner.temp }}/.bun/bin" >> $GITHUB_PATH
+
+      # TODO: replace with sccache
+      - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
-        if: matrix.dependencies
         with:
-          key: ${{ runner.os }}-ccache-${{ matrix.tag }}-dependencies
-          restore-keys: ${{ runner.os }}-ccache-${{ matrix.tag }}-dependencies
-      - name: ccache (c++)
-        uses: hendrikmuhs/ccache-action@v1.2
-        if: matrix.compile_obj
-        with:
-          key: ${{ runner.os }}-ccache-${{ matrix.tag }}-obj
-          restore-keys: ${{ runner.os }}-ccache-${{ matrix.tag }}-obj
-      - name: Download WebKit
-        if: matrix.compile_obj
-        env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-        run: |
-          rm -rf $JSC_BASE_DIR
-          mkdir -p $JSC_BASE_DIR
-          curl -L ${{ matrix.webkit_url }} | tar -xz -C $JSC_BASE_DIR --strip-components=1
-      - name: Compile dependencies
-        if: matrix.dependencies
-        env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
-        run: |
-          mkdir -p $OBJ_DIR $BUN_DEPS_OUT_DIR
-          make vendor-without-check
+          key: ${{ runner.os }}-ccache-${{ matrix.tag }}
+          restore-keys: ${{ runner.os }}-ccache-${{ matrix.tag }}
+
       - name: Compile C++
-        if: matrix.compile_obj
         env:
           CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
+          SOURCE_DIR: ${{ github.workspace }}
           OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
           BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
         run: |
-          mkdir -p $OBJ_DIR $BUN_DEPS_OUT_DIR
-          make -j $(sysctl -n hw.ncpu) release-bindings
+          mkdir -p $OBJ_DIR
+          cd $OBJ_DIR
+
+          cmake -S $SOURCE_DIR -B $OBJ_DIR \
+            -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUN_CPP_ONLY=1 \
+            -DNO_CONFIGURE_DEPENDS=1
+
+          bash compile-cpp-only.sh -v
+
       - name: Upload C++
-        if: matrix.compile_obj
         uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.tag }}-cpp
-          path: ${{ runner.temp }}/bun-cpp-obj
-      - name: Upload Dependencies
-        if: matrix.dependencies
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.tag }}-deps
-          path: ${{runner.temp}}/bun-deps
+          path: ${{ runner.temp }}/bun-cpp-obj/bun-cpp-objects.a
   macOS:
     name: macOS Link
     runs-on: ${{ matrix.runner }}
     if: github.repository_owner == 'oven-sh'
-    needs: [macOS-cpp, macos-object-files]
+    needs: [macOS-cpp, macos-object-files, macOS-dependencies]
     timeout-minutes: 90
     permissions: write-all
     strategy:
@@ -259,113 +257,70 @@ jobs:
             package: bun-darwin-x64
             runner: macos-12
             artifact: bun-obj-darwin-x64-baseline
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          # - cpu: haswell
-          #   arch: x86_64
-          #   tag: bun-darwin-x64
-          #   obj: bun-obj-darwin-x64
-          #   package: bun-darwin-x64
-          #   runner: macos-12
-          #   artifact: bun-obj-darwin-x64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          # - cpu: native
-          #   arch: aarch64
-          #   tag: bun-darwin-aarch64
-          #   obj: bun-obj-darwin-aarch64
-          #   package: bun-darwin-aarch64
-          #   artifact: bun-obj-darwin-aarch64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          #   runner: macos-arm64
     steps:
       - uses: actions/checkout@v3
       - name: Checkout submodules
-        run: git submodule update --init --recursive --depth=1 --progress -j $(sysctl -n hw.ncpu) --force
-      - name: Install dependencies
+        run: git submodule update --init --recursive --depth=1 --progress --force
+
+      - name: Install system dependencies
         env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
           HOMEBREW_NO_AUTO_UPDATE: 1
           HOMEBREW_NO_INSTALL_CLEANUP: 1
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
         run: |
-          brew install ccache rust llvm@16 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force
+          brew install ccache llvm@$LLVM_VERSION pkg-config coreutils libtool cmake libiconv openssl@1.1 ninja --force
+          echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix coreutils)/libexec/gnubin" >> $GITHUB_PATH
-          echo "$(brew --prefix llvm@16)/bin" >> $GITHUB_PATH
-          brew link --overwrite llvm@16
-      - name: ccache (link)
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ runner.os }}-ccache-${{ matrix.tag }}-link
-          restore-keys: ${{ runner.os }}-ccache-${{ matrix.tag }}-link
-      - name: Download WebKit
-        env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          BUN_RELEASE_DIR: ${{ runner.temp }}/release
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
-        run: |
-          rm -rf $JSC_BASE_DIR
-          mkdir -p $JSC_BASE_DIR
-          curl -L ${{ matrix.webkit_url }} | tar -xz -C $JSC_BASE_DIR --strip-components=1
+          echo "$(brew --prefix llvm@$LLVM_VERSION)/bin" >> $GITHUB_PATH
+          brew link --overwrite llvm@$LLVM_VERSION
+
+          curl -LO "$BUN_DOWNLOAD_URL_BASE/bun-darwin-x64.zip"
+          unzip bun-darwin-x64.zip
+          mkdir -p ${{ runner.temp }}/.bun/bin
+          mv bun-darwin-x64/bun ${{ runner.temp }}/.bun/bin/bun
+          chmod +x ${{ runner.temp }}/.bun/bin/bun
+          echo "${{ runner.temp }}/.bun/bin" >> $GITHUB_PATH
+
       - name: Download C++
         uses: actions/download-artifact@v3
         with:
           name: ${{ matrix.tag }}-cpp
           path: ${{ runner.temp }}/bun-cpp-obj
-      - name: Download Dependencies
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ matrix.tag }}-deps
-          path: ${{ runner.temp }}/bun-deps
-      - name: Download Object
+
+      - name: Download Zig Object
         uses: actions/download-artifact@v3
         with:
           name: ${{ matrix.obj }}
           path: ${{ runner.temp }}/release
+
+      - name: Downloaded submodule dependencies
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{ matrix.tag }}-deps
+          path: ${{runner.temp}}/bun-deps
+
       - name: Link
         env:
           CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          BUN_RELEASE_DIR: ${{ runner.temp }}/release
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
         run: |
-          rm -rf packages/${{ matrix.package }}
-          mkdir -p packages/${{ matrix.package }}
-          mv ${{ runner.temp }}/release/* packages/${{ matrix.package }}/
-          make bun-link-lld-release copy-to-bun-release-dir-bin
+          SRC_DIR=$PWD
+          mkdir ${{runner.temp}}/link-build
+          cd ${{runner.temp}}/link-build
+          cmake $SRC_DIR \
+            -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUN_LINK_ONLY=1 \
+            -DBUN_ZIG_OBJ="${{ runner.temp }}/release/bun-zig.o" \
+            -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: Zip
-        env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          BUN_RELEASE_DIR: ${{ runner.temp }}/release
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
         run: |
-          cd ${{runner.temp}}/release
+          cd ${{runner.temp}}/link-build
           chmod +x bun-profile bun
 
-          mkdir ${{matrix.tag}}-profile
-          mkdir ${{matrix.tag}}
-
-          /usr/bin/strip -S bun
+          mkdir -p ${{matrix.tag}}-profile/ ${{matrix.tag}}/
 
           mv bun-profile ${{matrix.tag}}-profile/bun-profile
           mv bun ${{matrix.tag}}/bun
@@ -375,11 +330,11 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: ${{matrix.tag}}-profile
-          path: ${{runner.temp}}/release/${{matrix.tag}}-profile.zip
+          path: ${{runner.temp}}/link-build/${{matrix.tag}}-profile.zip
       - uses: actions/upload-artifact@v3
         with:
           name: ${{matrix.tag}}
-          path: ${{runner.temp}}/release/${{matrix.tag}}.zip
+          path: ${{runner.temp}}/link-build/${{matrix.tag}}.zip
       - name: Release
         id: release
         uses: ncipollo/release-action@v1
@@ -396,7 +351,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: "Canary (${{github.sha}})"
           tag: "canary"
-          artifacts: "${{runner.temp}}/release/${{matrix.tag}}.zip,${{runner.temp}}/release/${{matrix.tag}}-profile.zip"
+          artifacts: "${{runner.temp}}/link-build/${{matrix.tag}}.zip,${{runner.temp}}/link-build/${{matrix.tag}}-profile.zip"
       - uses: sarisia/actions-status-discord@v1
         if: failure() && github.repository_owner == 'oven-sh' && github.event_name == 'pull_request'
         with:
@@ -417,7 +372,7 @@ jobs:
 
             [Commit ${{github.sha}}](https://github.com/oven-sh/bun/commits/${{github.sha}})
   macOS-test:
-    name: Tests ${{matrix.tag}}
+    name: macOS Test
     runs-on: ${{ matrix.runner }}
     needs: [macOS]
     if: github.event_name == 'pull_request' && github.repository_owner == 'oven-sh'

.github/workflows/bun-mac-x64.yml

@@ -5,9 +5,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-  TEST_TAG: bun-test'
+  LLVM_VERSION: 16
+  BUN_DOWNLOAD_URL_BASE: https://pub-5e11e972747a44bf9aaf9394f185a982.r2.dev/releases/latest
 
 on:
   push:
@@ -15,6 +14,7 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -23,6 +23,7 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -30,8 +31,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  macos-object-files:
-    name: macOS Object
+  macOS-zig:
+    name: macOS Zig Object
     runs-on: med-ubuntu
     if: github.repository_owner == 'oven-sh'
     strategy:
@@ -43,66 +44,131 @@ jobs:
           - cpu: haswell
             arch: x86_64
             tag: bun-obj-darwin-x64
-          # - cpu: native
-          #   arch: aarch64
-          #   tag: bun-obj-darwin-aarch64
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - uses: docker/setup-buildx-action@v2
+      - uses: actions/checkout@v4
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
         id: buildx
         with:
           install: true
-      - name: Run
-        run: |
-          rm -rf ${{runner.temp}}/release
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
+
+      - name: Compile Zig Object
         uses: docker/build-push-action@v3
-        if: runner.arch == 'X64'
         with:
           context: .
           push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=min
+          # This doesnt seem to work
+          # cache-from: type=s3,endpoint_url=${{ secrets.CACHE_S3_ENDPOINT }},blobs_prefix=docker_blobs/,manifests_prefix=docker_manifests/,access_key_id=${{ secrets.CACHE_S3_ACCESS_KEY_ID }},secret_access_key=${{ secrets.CACHE_S3_SECRET_ACCESS_KEY }},bucket=bun,region=auto
+          # cache-to: type=s3,endpoint_url=${{ secrets.CACHE_S3_ENDPOINT }},blobs_prefix=docker_blobs/,manifests_prefix=docker_manifests/,access_key_id=${{ secrets.CACHE_S3_ACCESS_KEY_ID }},secret_access_key=${{ secrets.CACHE_S3_SECRET_ACCESS_KEY }},bucket=bun,region=auto
+          # This was used before, but also does not really work
+          cache-from: type=local,src=/tmp/.buildx-cache-${{matrix.tag}}
+          cache-to: type=local,dest=/tmp/.buildx-cache-${{matrix.tag}}
           build-args: |
+            BUILDARCH=${{ runner.arch == 'X64' && 'amd64' || 'arm64' }}
+            BUILD_MACHINE_ARCH=${{ runner.arch == 'X64' && 'x86_64' || 'aarch64' }}
             ARCH=${{ matrix.arch }}
-            BUILDARCH=amd64
-            BUILD_MACHINE_ARCH=x86_64
             CPU_TARGET=${{ matrix.cpu }}
-            TRIPLET=${{matrix.arch}}-macos-none
-            GIT_SHA=${{github.sha}}
-          platforms: linux/amd64
+            TRIPLET=${{ matrix.arch }}-macos-none
+            GIT_SHA=${{ github.sha }}
+
+            SCCACHE_BUCKET=bun
+            SCCACHE_REGION=auto
+            SCCACHE_S3_USE_SSL=true
+            SCCACHE_ENDPOINT=${{ secrets.CACHE_S3_ENDPOINT }}
+            AWS_ACCESS_KEY_ID=${{ secrets.CACHE_S3_ACCESS_KEY_ID }}
+            AWS_SECRET_ACCESS_KEY=${{ secrets.CACHE_S3_SECRET_ACCESS_KEY }}
+          platforms: linux/${{ runner.arch == 'X64' && 'amd64' || 'arm64' }}
           target: build_release_obj
           outputs: type=local,dest=${{runner.temp}}/release
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        if: runner.arch == 'ARM64'
-        with:
-          context: .
-          push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=min
-          build-args: |
-            ARCH=${{ matrix.arch }}
-            BUILDARCH=arm64
-            BUILD_MACHINE_ARCH=aarch64
-            CPU_TARGET=${{ matrix.cpu }}
-            TRIPLET=${{matrix.arch}}-macos-none
-            GIT_SHA=${{github.sha}}
-          platforms: linux/arm64
-          target: build_release_obj
-          outputs: type=local,dest=${{runner.temp}}/release
-      - uses: actions/upload-artifact@v3
+
+      - name: Upload Zig Object
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.tag }}
-          path: ${{runner.temp}}/release/bun.o
+          path: ${{runner.temp}}/release/bun-zig.o
+
+  macOS-dependencies:
+    name: macOS Dependencies
+    runs-on: ${{ matrix.runner }}
+    if: github.repository_owner == 'oven-sh'
+    timeout-minutes: 15
+    strategy:
+      matrix:
+        include:
+          - cpu: haswell
+            arch: x86_64
+            tag: bun-darwin-x64
+            obj: bun-obj-darwin-x64
+            runner: macos-12
+            artifact: bun-obj-darwin-x64
+    steps:
+      - uses: actions/checkout@v4
+      - name: Checkout submodules
+        run: git submodule update --init --recursive --depth=1 --progress --force
+
+      - name: Install system dependencies
+        env:
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          HOMEBREW_NO_AUTO_UPDATE: 1
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
+        run: |
+          brew install sccache ccache rust llvm@$LLVM_VERSION pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config --force
+          echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
+          echo "$(brew --prefix sccache)/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: Hash submodule versions
+        run: |
+          print_data() {
+            git submodule | grep -v WebKit
+            llvm-config --version
+            rustc --version
+            cat $(echo scripts/build*.sh scripts/all-dependencies.sh | tr " " "\n" | sort)
+          }
+          echo "sha=$(print_data | sha1sum | cut -c 1-10)" >> $GITHUB_OUTPUT
+        id: submodule-versions
+
+      - name: Cache submodule dependencies
+        id: cache-deps-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: ${{runner.temp}}/bun-deps
+          key: bun-deps-${{ matrix.tag }}-${{ steps.submodule-versions.outputs.sha }}
+
+      - name: Compile submodule dependencies
+        if: ${{ !steps.cache-deps-restore.outputs.cache-hit }}
+        env:
+          CPU_TARGET: ${{ matrix.cpu }}
+          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
+        run: |
+          mkdir -p $BUN_DEPS_OUT_DIR
+          bash ./scripts/clean-dependencies.sh
+          bash ./scripts/all-dependencies.sh
+
+      - name: Cache submodule dependencies
+        if: ${{ !steps.cache-deps-restore.outputs.cache-hit }}
+        id: cache-deps-save
+        uses: actions/cache/save@v3
+        with:
+          path: ${{runner.temp}}/bun-deps
+          key: ${{ steps.cache-deps-restore.outputs.cache-primary-key }}
+
+      - name: Upload submodule dependencies
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.tag }}-deps
+          path: ${{runner.temp}}/bun-deps
+
   macOS-cpp:
     name: macOS C++
     runs-on: ${{ matrix.runner }}
@@ -111,157 +177,77 @@ jobs:
     strategy:
       matrix:
         include:
-          # - cpu: nehalem
-          #   arch: x86_64
-          #   tag: bun-darwin-x64-baseline
-          #   obj: bun-obj-darwin-x64-baseline
-          #   runner: macos-12
-          #   artifact: bun-obj-darwin-x64-baseline
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          #   dependencies: true
-          #   compile_obj: false
           - cpu: haswell
             arch: x86_64
             tag: bun-darwin-x64
             obj: bun-obj-darwin-x64
             runner: macos-12
             artifact: bun-obj-darwin-x64
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-            dependencies: true
-            compile_obj: false
-          # - cpu: nehalem
-          #   arch: x86_64
-          #   tag: bun-darwin-x64-baseline
-          #   obj: bun-obj-darwin-x64-baseline
-          #   runner: macos-12
-          #   artifact: bun-obj-darwin-x64-baseline
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          #   dependencies: false
-          #   compile_obj: true
-          - cpu: haswell
-            arch: x86_64
-            tag: bun-darwin-x64
-            obj: bun-obj-darwin-x64
-            runner: macos-12
-            artifact: bun-obj-darwin-x64
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-            dependencies: false
-            compile_obj: true
-          # - cpu: native
-          #   arch: aarch64
-          #   tag: bun-darwin-aarch64
-          #   obj: bun-obj-darwin-aarch64
-          #   artifact: bun-obj-darwin-aarch64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-arm64-lto.tar.gz"
-          #   runner: macos-arm64
-          #   dependencies: true
-          #   compile_obj: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Checkout submodules
-        run: git submodule update --init --recursive --depth=1 --progress -j $(sysctl -n hw.ncpu) --force
-      - name: Install dependencies
+        run: git submodule update --init --recursive --depth=1 --progress --force
+
+      - name: Install system dependencies
         env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
           HOMEBREW_NO_AUTO_UPDATE: 1
           HOMEBREW_NO_INSTALL_CLEANUP: 1
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
         run: |
-          brew install rust ccache llvm@16 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force
+          brew install sccache ccache rust llvm@$LLVM_VERSION pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config --force
+          echo "$(brew --prefix sccache)/bin" >> $GITHUB_PATH
+          echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix coreutils)/libexec/gnubin" >> $GITHUB_PATH
-          echo "$(brew --prefix llvm@16)/bin" >> $GITHUB_PATH
-          brew link --overwrite llvm@16
-      - name: Download WebKit
-        if: matrix.compile_obj
-        env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
-        run: |
-          rm -rf $JSC_BASE_DIR
-          mkdir -p $JSC_BASE_DIR
-          curl -L ${{ matrix.webkit_url }} | tar -xz -C $JSC_BASE_DIR --strip-components=1
-      - name: ccache (dependencies)
+          echo "$(brew --prefix llvm@$LLVM_VERSION)/bin" >> $GITHUB_PATH
+          brew link --overwrite llvm@$LLVM_VERSION
+
+          curl -LO "$BUN_DOWNLOAD_URL_BASE/bun-darwin-x64.zip"
+          unzip bun-darwin-x64.zip
+          mkdir -p ${{ runner.temp }}/.bun/bin
+          mv bun-darwin-x64/bun ${{ runner.temp }}/.bun/bin/bun
+          chmod +x ${{ runner.temp }}/.bun/bin/bun
+          echo "${{ runner.temp }}/.bun/bin" >> $GITHUB_PATH
+
+      # TODO: replace with sccache
+      - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
-        if: matrix.dependencies
         with:
-          key: ${{ runner.os }}-ccache-${{ matrix.tag }}-dependencies
-          restore-keys: ${{ runner.os }}-ccache-${{ matrix.tag }}-dependencies
-      - name: ccache (c++)
-        uses: hendrikmuhs/ccache-action@v1.2
-        if: matrix.compile_obj
-        with:
-          key: ${{ runner.os }}-ccache-${{ matrix.tag }}-obj
-          restore-keys: ${{ runner.os }}-ccache-${{ matrix.tag }}-obj
-      - name: Compile dependencies
-        if: matrix.dependencies
-        env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
-        run: |
-          mkdir -p $OBJ_DIR $BUN_DEPS_OUT_DIR
-          make vendor-without-check
+          key: ${{ runner.os }}-ccache-${{ matrix.tag }}
+          restore-keys: ${{ runner.os }}-ccache-${{ matrix.tag }}
+
       - name: Compile C++
-        if: matrix.compile_obj
         env:
           CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
+          SOURCE_DIR: ${{ github.workspace }}
           OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
           BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
         run: |
-          mkdir -p $OBJ_DIR $BUN_DEPS_OUT_DIR
-          make -j $(sysctl -n hw.ncpu) release-bindings
+          mkdir -p $OBJ_DIR
+          cd $OBJ_DIR
+
+          cmake -S $SOURCE_DIR -B $OBJ_DIR \
+            -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUN_CPP_ONLY=1 \
+            -DNO_CONFIGURE_DEPENDS=1
+
+          bash compile-cpp-only.sh -v
+
       - name: Upload C++
-        if: matrix.compile_obj
         uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.tag }}-cpp
-          path: ${{ runner.temp }}/bun-cpp-obj
-      - name: Upload Dependencies
-        if: matrix.dependencies
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.tag }}-deps
-          path: ${{runner.temp}}/bun-deps
-
+          path: ${{ runner.temp }}/bun-cpp-obj/bun-cpp-objects.a
   macOS:
     name: macOS Link
     runs-on: ${{ matrix.runner }}
     if: github.repository_owner == 'oven-sh'
-    needs: [macOS-cpp, macos-object-files]
+    needs: [macOS-cpp, macOS-zig, macOS-dependencies]
     timeout-minutes: 90
     permissions: write-all
     strategy:
       matrix:
         include:
-          # - cpu: nehalem
-          #   arch: x86_64
-          #   tag: bun-darwin-x64-baseline
-          #   obj: bun-obj-darwin-x64-baseline
-          #   package: bun-darwin-x64
-          #   runner: macos-12
-          #   artifact: bun-obj-darwin-x64-baseline
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
           - cpu: haswell
             arch: x86_64
             tag: bun-darwin-x64
@@ -269,105 +255,71 @@ jobs:
             package: bun-darwin-x64
             runner: macos-12
             artifact: bun-obj-darwin-x64
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-amd64-lto.tar.gz"
-          # - cpu: native
-          #   arch: aarch64
-          #   tag: bun-darwin-aarch64
-          #   obj: bun-obj-darwin-aarch64
-          #   package: bun-darwin-aarch64
-          #   artifact: bun-obj-darwin-aarch64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3/bun-webkit-macos-arm64-lto.tar.gz"
-          #   runner: macos-arm64
+            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/2023-oct3-4/bun-webkit-macos-amd64-lto.tar.gz"
     steps:
       - uses: actions/checkout@v3
       - name: Checkout submodules
-        run: git submodule update --init --recursive --depth=1 --progress -j $(sysctl -n hw.ncpu) --force
-      - name: Install dependencies
+        run: git submodule update --init --recursive --depth=1 --progress --force
+
+      - name: Install system dependencies
         env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
           HOMEBREW_NO_AUTO_UPDATE: 1
           HOMEBREW_NO_INSTALL_CLEANUP: 1
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
         run: |
-          brew install rust ccache llvm@16 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force
+          brew install ccache llvm@$LLVM_VERSION pkg-config coreutils libtool cmake libiconv openssl@1.1 ninja --force
+          echo "$(brew --prefix ccache)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix coreutils)/libexec/gnubin" >> $GITHUB_PATH
-          echo "$(brew --prefix llvm@16)/bin" >> $GITHUB_PATH
-          brew link --overwrite llvm@16
-      - name: Download WebKit
-        env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          BUN_RELEASE_DIR: ${{ runner.temp }}/release
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
-        run: |
-          rm -rf $JSC_BASE_DIR
-          mkdir -p $JSC_BASE_DIR
-          curl -L ${{ matrix.webkit_url }} | tar -xz -C $JSC_BASE_DIR --strip-components=1
+          echo "$(brew --prefix llvm@$LLVM_VERSION)/bin" >> $GITHUB_PATH
+          brew link --overwrite llvm@$LLVM_VERSION
+
+          curl -LO "$BUN_DOWNLOAD_URL_BASE/bun-darwin-x64.zip"
+          unzip bun-darwin-x64.zip
+          mkdir -p ${{ runner.temp }}/.bun/bin
+          mv bun-darwin-x64/bun ${{ runner.temp }}/.bun/bin/bun
+          chmod +x ${{ runner.temp }}/.bun/bin/bun
+          echo "${{ runner.temp }}/.bun/bin" >> $GITHUB_PATH
+
       - name: Download C++
         uses: actions/download-artifact@v3
         with:
           name: ${{ matrix.tag }}-cpp
           path: ${{ runner.temp }}/bun-cpp-obj
-      - name: Download Dependencies
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ matrix.tag }}-deps
-          path: ${{ runner.temp }}/bun-deps
-      - name: Download Object
+
+      - name: Download Zig Object
         uses: actions/download-artifact@v3
         with:
           name: ${{ matrix.obj }}
           path: ${{ runner.temp }}/release
-      - name: ccache (link)
-        uses: hendrikmuhs/ccache-action@v1.2
+
+      - name: Downloaded submodule dependencies
+        uses: actions/download-artifact@v3
         with:
-          key: ${{ runner.os }}-ccache-${{ matrix.tag }}-link
-          restore-keys: ${{ runner.os }}-ccache-${{ matrix.tag }}-link
+          name: ${{ matrix.tag }}-deps
+          path: ${{runner.temp}}/bun-deps
+
       - name: Link
         env:
           CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          BUN_RELEASE_DIR: ${{ runner.temp }}/release
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
         run: |
-          rm -rf packages/${{ matrix.package }}
-          mkdir -p packages/${{ matrix.package }}
-          mv ${{ runner.temp }}/release/* packages/${{ matrix.package }}/
-          make bun-link-lld-release copy-to-bun-release-dir-bin
+          SRC_DIR=$PWD
+          mkdir ${{runner.temp}}/link-build
+          cd ${{runner.temp}}/link-build
+          cmake $SRC_DIR \
+            -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUN_LINK_ONLY=1 \
+            -DBUN_ZIG_OBJ="${{ runner.temp }}/release/bun-zig.o" \
+            -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: Zip
-        env:
-          CPU_TARGET: ${{ matrix.cpu }}
-          JSC_BASE_DIR: ${{ runner.temp }}/bun-webkit
-          JSC_LIB: ${{ runner.temp }}/bun-webkit/lib
-          BUN_DEPLOY_DIR: ${{ runner.temp }}/release/bun
-          OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj
-          BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps
-          BUN_RELEASE_DIR: ${{ runner.temp }}/release
-          WEBKIT_RELEASE_DIR: ${{ runner.temp }}/bun-webkit
-          WEBKIT_RELEASE_DIR_LTO: ${{ runner.temp }}/bun-webkit
         run: |
-          cd ${{runner.temp}}/release
+          cd ${{runner.temp}}/link-build
           chmod +x bun-profile bun
 
-          mkdir ${{matrix.tag}}-profile
-          mkdir ${{matrix.tag}}
-
-          /usr/bin/strip -S bun
+          mkdir -p ${{matrix.tag}}-profile/ ${{matrix.tag}}/
 
           mv bun-profile ${{matrix.tag}}-profile/bun-profile
           mv bun ${{matrix.tag}}/bun
@@ -377,11 +329,11 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: ${{matrix.tag}}-profile
-          path: ${{runner.temp}}/release/${{matrix.tag}}-profile.zip
+          path: ${{runner.temp}}/link-build/${{matrix.tag}}-profile.zip
       - uses: actions/upload-artifact@v3
         with:
           name: ${{matrix.tag}}
-          path: ${{runner.temp}}/release/${{matrix.tag}}.zip
+          path: ${{runner.temp}}/link-build/${{matrix.tag}}.zip
       - name: Release
         id: release
         uses: ncipollo/release-action@v1
@@ -398,7 +350,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: "Canary (${{github.sha}})"
           tag: "canary"
-          artifacts: "${{runner.temp}}/release/${{matrix.tag}}.zip,${{runner.temp}}/release/${{matrix.tag}}-profile.zip"
+          artifacts: "${{runner.temp}}/link-build/${{matrix.tag}}.zip,${{runner.temp}}/link-build/${{matrix.tag}}-profile.zip"
       - uses: sarisia/actions-status-discord@v1
         if: failure() && github.repository_owner == 'oven-sh' && github.event_name == 'pull_request'
         with:

.github/workflows/bun-release.yml

@@ -2,7 +2,7 @@ name: bun-release
 concurrency: release
 env:
   BUN_VERSION: ${{ github.event.inputs.tag || github.event.release.tag_name || 'canary' }}
-  BUN_LATEST: ${{ github.event.inputs.is-latest || github.event.release.prerelease == 'false' }}
+  BUN_LATEST: ${{ (github.event.inputs.is-latest || github.event.release.tag_name) && 'true' || 'false' }}
 on:
   release:
     types:
@@ -152,7 +152,7 @@ jobs:
       matrix:
         include:
           - variant: debian
-            suffix: ''
+            suffix: ""
           - variant: debian
             suffix: -debian
           - variant: slim

.github/workflows/bun-windows-x64.yml

@@ -0,0 +1,159 @@
+# TODO(@paperdave)
+# this workflow is a work in progress
+name: bun-windows-x64
+
+concurrency:
+  group: bun-windows-x64-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  # push:
+  #   branches: [main]
+  #   paths:
+  #     - "src/**/*"
+  #     - "test/**/*"
+  #     - "packages/bun-usockets/src/**/*"
+  #     - "build.zig"
+  #     - "Makefile"
+  #     - "Dockerfile"
+  # pull_request:
+  #   branches: [main]
+  #   paths:
+  #     - "src/**/*"
+  #     - "test/**/*"
+  #     - "packages/bun-usockets/src/**/*"
+  #     - "build.zig"
+  #     - "Makefile"
+  #     - "Dockerfile"
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  # windows-zig:
+  #   name: Windows Zig Object
+  #   runs-on: med-ubuntu
+  #   if: github.repository_owner == 'oven-sh'
+  #   strategy:
+  #     matrix:
+  #       include:
+  #         - cpu: native
+  #           arch: x86_64
+  #           tag: bun-windows-x64
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - name: Setup Docker Buildx
+  #       uses: docker/setup-buildx-action@v2
+  #       id: buildx
+  #       with:
+  #         install: true
+
+  #     - name: Login to GitHub Container Registry
+  #       uses: docker/login-action@v2
+  #       with:
+  #         registry: ghcr.io
+  #         username: ${{ github.actor }}
+  #         password: ${{ secrets.GITHUB_TOKEN }}
+
+  #     - name: Compile Zig Object
+  #       uses: docker/build-push-action@v3
+  #       if: runner.arch == 'X64'
+  #       with:
+  #         context: .
+  #         push: false
+  #         # This doesnt seem to work
+  #         # cache-from: type=s3,endpoint_url=${{ secrets.CACHE_S3_ENDPOINT }},blobs_prefix=docker_blobs/,manifests_prefix=docker_manifests/,access_key_id=${{ secrets.CACHE_S3_ACCESS_KEY_ID }},secret_access_key=${{ secrets.CACHE_S3_SECRET_ACCESS_KEY }},bucket=bun,region=auto
+  #         # cache-to: type=s3,endpoint_url=${{ secrets.CACHE_S3_ENDPOINT }},blobs_prefix=docker_blobs/,manifests_prefix=docker_manifests/,access_key_id=${{ secrets.CACHE_S3_ACCESS_KEY_ID }},secret_access_key=${{ secrets.CACHE_S3_SECRET_ACCESS_KEY }},bucket=bun,region=auto
+  #         build-args: |
+  #           BUILDARCH=${{ runner.arch == 'X64' && 'amd64' || 'arm64' }}
+  #           BUILD_MACHINE_ARCH=${{ runner.arch == 'X64' && 'x86_64' || 'aarch64' }}
+  #           ARCH=${{ matrix.arch }}
+  #           CPU_TARGET=${{ matrix.cpu }}
+  #           TRIPLET=${{ matrix.arch }}-windows-msvc
+  #           GIT_SHA=${{ github.sha }}
+  #         platforms: linux/${{ runner.arch == 'X64' && 'amd64' || 'arm64' }}
+  #         target: build_release_obj
+  #         outputs: type=local,dest=${{runner.temp}}/release
+
+  #     - name: Upload Zig Object
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: ${{ matrix.tag }}-zig
+  #         path: ${{runner.temp}}/release/bun-zig.o
+
+  # windows-dependencies:
+  #   strategy:
+  #     matrix:
+  #       include:
+  #         - runner: windows-latest
+  #           arch: amd64
+  #           tag: bun-windows-x64
+  #   runs-on: windows-latest
+  #   timeout-minutes: 90
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: ilammy/msvc-dev-cmd@7315a94840631165970262a99c72cfb48a65d25d
+  #       with:
+  #         arch: ${{ matrix.arch }}
+  #     - uses: KyleMayes/install-llvm-action@1a3da29f56261a1e1f937ec88f0856a9b8321d7e
+  #       with:
+  #         version: 16.0.6
+  #     - run: choco install -y ninja
+  #     - name: Build Dependencies
+  #       run: |
+  #         git submodule update --init --recursive --progress --depth=1 --checkout
+  #         Invoke-WebRequest -Uri "https://www.nasm.us/pub/nasm/releasebuilds/2.16.01/win64/nasm-2.16.01-win64.zip" -OutFile nasm.zip
+  #         Expand-Archive nasm.zip (mkdir -Force "nasm")
+  #         $Nasm = (Get-ChildItem "nasm")
+  #         $env:Path += ";${Nasm}"
+  #         $env:BUN_DEPS_OUT_DIR = (mkdir -Force "./bun-deps")
+  #         ./scripts/all-dependencies.ps1
+  #     - uses: actions/upload-artifact@v3
+  #       with:
+  #         name: bun-deps/
+  #         path: bun-windows-x64-deps
+
+  windows-codegen:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          curl -fsSL ${{ secrets.BUN_DOWNLOAD_URL_BASE }}/bun-linux-x64.zip > bun.zip
+          unzip bun.zip
+          export PATH="$PWD/bun-linux-x64:$PATH"
+          ./scripts/cross-compile-codegen.sh win32 x64
+      - uses: actions/upload-artifact@v3
+        with:
+          name: bun-windows-x64-codegen
+          path: build-codegen-win32-x64/
+
+  windows-dependencies:
+    strategy:
+      matrix:
+        include:
+          - runner: windows-latest
+            arch: amd64
+            tag: bun-windows-x64
+    runs-on: windows-latest
+    timeout-minutes: 90
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ilammy/msvc-dev-cmd@7315a94840631165970262a99c72cfb48a65d25d
+        with:
+          arch: ${{ matrix.arch }}
+      - uses: KyleMayes/install-llvm-action@1a3da29f56261a1e1f937ec88f0856a9b8321d7e
+        with:
+          version: 16.0.6
+      - run: choco install -y ninja
+      - uses: actions/download-artifact@v2
+        with:
+          name: bun-windows-x64-codegen
+          path: build
+      - name: Build Dependencies
+        run: |
+          git submodule update --init --recursive --progress --depth=1 --checkout
+          cd build
+          cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DNO_CODEGEN=1 -DNO_CONFIGURE_DEPENDS=1
+      - uses: actions/upload-artifact@v3
+        with:
+          name: bun-deps/
+          path: bun-windows-x64-deps

.github/workflows/zig-fmt.yml

@@ -1,7 +1,7 @@
 name: zig-fmt
 
 env:
-  ZIG_VERSION: 0.12.0-dev.163+6780a6bbf
+  ZIG_VERSION: 0.12.0-dev.1297+a9e66ed73
 
 on:
   pull_request:

.gitignore

@@ -110,7 +110,7 @@ misctools/machbench
 *.big
 .eslintcache
 
-bun-webkit
+/bun-webkit
 
 src/deps/c-ares/build
 src/bun.js/bindings-obj
@@ -135,3 +135,24 @@ make-dev-stats.csv
 
 .uuid
 tsconfig.tsbuildinfo
+
+*.lib
+*.pdb
+CMakeFiles
+build.ninja
+.ninja_deps
+.ninja_log
+CMakeCache.txt
+cmake_install.cmake
+compile_commands.json
+
+*.lib
+x64
+**/*.vcxproj*
+**/*.sln*
+**/*.dir
+**/*.pdb
+
+/.webkit-cache
+/src/deps/libuv
+/build-*/

.gitmodules

@@ -1,10 +1,3 @@
-[submodule "src/deps/picohttpparser"]
-path = src/deps/picohttpparser
-url = https://github.com/h2o/picohttpparser.git
-ignore = dirty
-depth = 1
-shallow = true
-fetchRecurseSubmodules = false
 [submodule "src/javascript/jsc/WebKit"]
 path = src/bun.js/WebKit
 url = https://github.com/oven-sh/WebKit.git
@@ -13,6 +6,13 @@ depth = 1
 update = none
 shallow = true
 fetchRecurseSubmodules = false
+[submodule "src/deps/picohttpparser"]
+path = src/deps/picohttpparser
+url = https://github.com/h2o/picohttpparser.git
+ignore = dirty
+depth = 1
+shallow = true
+fetchRecurseSubmodules = false
 [submodule "src/deps/mimalloc"]
 path = src/deps/mimalloc
 url = https://github.com/Jarred-Sumner/mimalloc.git
@@ -56,15 +56,23 @@ depth = 1
 shallow = true
 fetchRecurseSubmodules = false
 [submodule "src/deps/c-ares"]
-	path = src/deps/c-ares
-	url = https://github.com/c-ares/c-ares.git
+path = src/deps/c-ares
+url = https://github.com/c-ares/c-ares.git
+ignore = dirty
+depth = 1
+shallow = true
+fetchRecurseSubmodules = false
 [submodule "src/deps/zstd"]
-	path = src/deps/zstd
-	url = https://github.com/facebook/zstd.git
-	ignore = dirty
+path = src/deps/zstd
+url = https://github.com/facebook/zstd.git
+ignore = dirty
+depth = 1
+shallow = true
+fetchRecurseSubmodules = false
 [submodule "src/deps/base64"]
-	path = src/deps/base64
-	url = https://github.com/aklomp/base64.git
-	ignore = dirty
-	depth = 1
-	shallow = true
+path = src/deps/base64
+url = https://github.com/aklomp/base64.git
+ignore = dirty
+depth = 1
+shallow = true
+fetchRecurseSubmodules = false

.scripts/make-dev-timer.ts

@@ -1,21 +0,0 @@
-// I would have made this a bash script but there isn't an easy way to track
-// time in bash sub-second cross platform.
-import fs from "fs";
-const start = Date.now() + 5;
-const result = Bun.spawnSync(process.argv.slice(2), {
-  stdio: ["inherit", "inherit", "inherit"],
-});
-const end = Date.now();
-const diff = (Math.max(Math.round(end - start), 0) / 1000).toFixed(3);
-const success = result.exitCode === 0;
-try {
-  const line = `${new Date().toISOString()}, ${success ? "success" : "fail"}, ${diff}\n`;
-  if (fs.existsSync(".scripts/make-dev-stats.csv")) {
-    fs.appendFileSync(".scripts/make-dev-stats.csv", line);
-  } else {
-    fs.writeFileSync(".scripts/make-dev-stats.csv", line);
-  }
-} catch {
-  // Ignore
-}
-process.exit(result.exitCode);

.scripts/postinstall.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-set -euxo pipefail
-
-# if bun-webkit node_modules directory exists
-if [ -d ./node_modules/bun-webkit ]; then
-    rm -f bun-webkit
-    # get the first matching bun-webkit-* directory name
-    ln -s ./node_modules/$(ls ./node_modules | grep bun-webkit- | head -n 1) ./bun-webkit
-fi
-
-# sets up vscode C++ intellisense
-rm -f .vscode/clang++
-ln -s $(which clang++-16 || which clang++) .vscode/clang++ 2>/dev/null

.vscode/c_cpp_properties.json

@@ -1,16 +1,64 @@
 {
   "configurations": [
     {
-      "name": "Mac",
+      "name": "Debug",
       "forcedInclude": ["${workspaceFolder}/src/bun.js/bindings/root.h"],
       "includePath": [
-        "${workspaceFolder}/../webkit-build/include/",
-        "${workspaceFolder}/bun-webkit/include/",
-        "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/",
-        "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/ICU/Headers/",
-        "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/JavaScriptCore/PrivateHeaders/",
-        "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/WTF/Headers",
-        "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/bmalloc/Headers/",
+        "${workspaceFolder}/build/bun-webkit/include",
+        "${workspaceFolder}/build/codegen",
+        "${workspaceFolder}/src/bun.js/bindings/",
+        "${workspaceFolder}/src/bun.js/bindings/webcore/",
+        "${workspaceFolder}/src/bun.js/bindings/sqlite/",
+        "${workspaceFolder}/src/bun.js/bindings/webcrypto/",
+        "${workspaceFolder}/src/bun.js/modules/",
+        "${workspaceFolder}/src/js/builtins/",
+        "${workspaceFolder}/src/deps/boringssl/include/",
+        "${workspaceFolder}/src/deps",
+        "${workspaceFolder}/src/napi/*",
+        "${workspaceFolder}/packages/bun-usockets/src",
+        "${workspaceFolder}/packages/"
+      ],
+      "browse": {
+        "path": [
+          "${workspaceFolder}/build/bun-webkit/include",
+          "${workspaceFolder}/src/bun.js/bindings",
+          "${workspaceFolder}/src/napi/*",
+          "${workspaceFolder}/src/js/builtins/*",
+          "${workspaceFolder}/src/bun.js/modules/*",
+          "${workspaceFolder}/src/deps/*",
+          "${workspaceFolder}/src/deps/boringssl/include/*",
+          "${workspaceFolder}/packages/bun-usockets/*",
+          "${workspaceFolder}/packages/bun-uws/*",
+          "${workspaceFolder}/src/napi/*"
+        ],
+        "limitSymbolsToIncludedHeaders": true,
+        "databaseFilename": ".vscode/cppdb"
+      },
+      "defines": [
+        "STATICALLY_LINKED_WITH_JavaScriptCore=1",
+        "STATICALLY_LINKED_WITH_WTF=1",
+        "BUILDING_WITH_CMAKE=1",
+        "NOMINMAX",
+        "ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS=0",
+        "BUILDING_JSCONLY__",
+        "USE_FOUNDATION=1",
+        "ASSERT_ENABLED=1",
+        "DU_DISABLE_RENAMING=1"
+      ],
+      "macFrameworkPath": [],
+      "compilerPath": "${workspaceFolder}/.vscode/clang++",
+      "cStandard": "c17",
+      "cppStandard": "c++20"
+    },
+    {
+      "name": "BunWithJSCDebug",
+      "forcedInclude": ["${workspaceFolder}/src/bun.js/bindings/root.h"],
+      "includePath": [
+        "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Debug/",
+        "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Debug/ICU/Headers/",
+        "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Debug/JavaScriptCore/PrivateHeaders/",
+        "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Debug/WTF/Headers",
+        "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Debug/bmalloc/Headers/",
         "${workspaceFolder}/src/bun.js/bindings/",
         "${workspaceFolder}/src/bun.js/bindings/webcore/",
         "${workspaceFolder}/src/bun.js/bindings/sqlite/",
@@ -26,13 +74,11 @@
       ],
       "browse": {
         "path": [
-          "${workspaceFolder}/../webkit-build/include/",
-          "${workspaceFolder}/bun-webkit/include/",
-          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/",
-          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/ICU/Headers/",
-          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/JavaScriptCore/PrivateHeaders/**",
-          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/WTF/Headers/**",
-          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/bmalloc/Headers/**",
+          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Debug/",
+          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Debug/ICU/Headers/",
+          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Debug/JavaScriptCore/PrivateHeaders/**",
+          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Debug/WTF/Headers/**",
+          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Debug/bmalloc/Headers/**",
           "${workspaceFolder}/src/bun.js/bindings/*",
           "${workspaceFolder}/src/bun.js/bindings/*",
           "${workspaceFolder}/src/napi/*",
@@ -49,7 +95,7 @@
           "${workspaceFolder}/src/napi"
         ],
         "limitSymbolsToIncludedHeaders": true,
-        "databaseFilename": ".vscode/cppdb"
+        "databaseFilename": ".vscode/cppdb_debug"
       },
       "defines": [
         "STATICALLY_LINKED_WITH_JavaScriptCore=1",
@@ -59,7 +105,7 @@
         "ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS=0",
         "BUILDING_JSCONLY__",
         "USE_FOUNDATION=1",
-        "ASSERT_ENABLED=0",
+        "ASSERT_ENABLED=1",
         "DU_DISABLE_RENAMING=1"
       ],
       "macFrameworkPath": [],

.vscode/launch.json

@@ -82,7 +82,7 @@
       "request": "launch",
       "name": "bun test [*]",
       "program": "bun-debug",
-      "args": ["test"],
+      "args": ["test", "js/node"],
       "cwd": "${workspaceFolder}/test",
       "env": {
         "FORCE_COLOR": "1",
@@ -96,7 +96,7 @@
       "request": "launch",
       "name": "bun test [*] (fast)",
       "program": "bun-debug",
-      "args": ["test"],
+      "args": ["test", "js"],
       // The cwd here must be the same as in CI. Or you will cause test failures that only happen in CI.
       "cwd": "${workspaceFolder}/test",
       "env": {
@@ -307,13 +307,10 @@
       "name": "bun install",
       "program": "bun-debug",
       "args": ["install"],
-      "cwd": "${fileDirname}",
+      "cwd": "/Users/jarred/Build/worky",
       "console": "internalConsole",
-      "env": {
-        "BUN_DEBUG_QUIET_LOGS": "1"
-      }
+      "env": {}
     },
-
     {
       "type": "lldb",
       "request": "launch",

.vscode/settings.json

@@ -7,45 +7,36 @@
   "search.followSymlinks": false,
   "search.useIgnoreFiles": true,
   "zig.buildOnSave": false,
-  // We do this until we upgrade to latest Zig so that zls doesn't break our code.
-  "zig.formattingProvider": "extension",
-  "zig.buildArgs": ["obj", "-Dfor-editor"],
+  "zig.formattingProvider": "zls",
   "zig.buildOption": "build",
   "zig.buildFilePath": "${workspaceFolder}/build.zig",
+  "zig.initialSetupDone": true,
+  "editor.formatOnSave": true,
   "[zig]": {
     "editor.tabSize": 4,
     "editor.useTabStops": false,
-    "editor.defaultFormatter": "ziglang.vscode-zig",
-    "editor.formatOnSave": true
+    "editor.defaultFormatter": "ziglang.vscode-zig"
   },
   "[ts]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[js]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "zig.zls.enableInlayHints": false,
-  "zig.zls.enabled": true,
   "git.ignoreSubmodules": true,
   "[jsx]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[tsx]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true
-  },
-  "[yaml]": {
-    "editor.formatOnSave": true
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
+  "[yaml]": {},
   "[markdown]": {
     "editor.unicodeHighlight.ambiguousCharacters": false,
     "editor.unicodeHighlight.invisibleCharacters": false,
     "diffEditor.ignoreTrimWhitespace": false,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true,
     "editor.wordWrap": "on",
     "editor.quickSuggestions": {
       "comments": "off",
@@ -65,8 +56,6 @@
     "**/*.xcscheme": true,
     "**/*.pem": true,
     "**/*.xcodeproj": true,
-    "test/snapshots": true,
-    "test/snapshots-no-hmr": true,
     "src/bun.js/WebKit": true,
     "src/deps/libarchive": true,
     "src/deps/mimalloc": true,
@@ -78,30 +67,25 @@
     "src/deps/lol-html": true,
     "src/deps/c-ares": true,
     "src/deps/tinycc": true,
-    "src/deps/zstd": true,
-    "test/snippets/package-json-exports/_node_modules_copy": true,
-    "src/js/out": true,
-    "packages/bun-uws/fuzzing/seed-corpus/": true,
-    "**/*.dep": true,
-    "**/CMakeFiles": true
+    "src/deps/zstd": true
   },
   "C_Cpp.files.exclude": {
     "**/.vscode": true,
-    "src/bun.js/WebKit/JSTests": true,
-    "src/bun.js/WebKit/Tools": true,
-    "src/bun.js/WebKit/WebDriverTests": true,
-    "src/bun.js/WebKit/WebKit.xcworkspace": true,
-    "src/bun.js/WebKit/WebKitLibraries": true,
-    "src/bun.js/WebKit/Websites": true,
-    "src/bun.js/WebKit/resources": true,
-    "src/bun.js/WebKit/LayoutTests": true,
-    "src/bun.js/WebKit/ManualTests": true,
-    "src/bun.js/WebKit/PerformanceTests": true,
-    "src/bun.js/WebKit/WebKitLegacy": true,
-    "src/bun.js/WebKit/WebCore": true,
-    "src/bun.js/WebKit/WebDriver": true,
-    "src/bun.js/WebKit/WebKitBuild": true,
-    "src/bun.js/WebKit/WebInspectorUI": true
+    "WebKit/JSTests": true,
+    "WebKit/Tools": true,
+    "WebKit/WebDriverTests": true,
+    "WebKit/WebKit.xcworkspace": true,
+    "WebKit/WebKitLibraries": true,
+    "WebKit/Websites": true,
+    "WebKit/resources": true,
+    "WebKit/LayoutTests": true,
+    "WebKit/ManualTests": true,
+    "WebKit/PerformanceTests": true,
+    "WebKit/WebKitLegacy": true,
+    "WebKit/WebCore": true,
+    "WebKit/WebDriver": true,
+    "WebKit/WebKitBuild": true,
+    "WebKit/WebInspectorUI": true
   },
   "[cpp]": {
     "editor.defaultFormatter": "xaver.clang-format"
@@ -192,20 +176,12 @@
     "set": "cpp",
     "__memory": "cpp",
     "memory_resource": "cpp",
-    "resource.h": "c",
-    "sysinfo.h": "c",
     "*.tcc": "cpp",
     "list": "cpp",
     "shared_mutex": "cpp",
     "cinttypes": "cpp",
     "variant": "cpp",
     "sysctl.h": "c",
-    "interface_adresses.h": "c",
-    "interface_addresses.h": "c",
-    "ctype.h": "c",
-    "ethernet.h": "c",
-    "inet.h": "c",
-    "packet.h": "c",
     "queue": "cpp",
     "compare": "cpp",
     "concepts": "cpp",
@@ -221,9 +197,24 @@
     "regex": "cpp",
     "span": "cpp",
     "valarray": "cpp",
-    "codecvt": "cpp"
+    "codecvt": "cpp",
+    "xtr1common": "cpp",
+    "stop_token": "cpp",
+    "xfacet": "cpp",
+    "xhash": "cpp",
+    "xiosbase": "cpp",
+    "xlocale": "cpp",
+    "xlocbuf": "cpp",
+    "xlocinfo": "cpp",
+    "xlocmes": "cpp",
+    "xlocmon": "cpp",
+    "xlocnum": "cpp",
+    "xloctime": "cpp",
+    "xmemory": "cpp",
+    "xstring": "cpp",
+    "xtree": "cpp",
+    "xutility": "cpp"
   },
-  "cmake.configureOnOpen": false,
   "C_Cpp.errorSquiggles": "enabled",
   "eslint.workingDirectories": ["packages/bun-types"],
   "typescript.tsdk": "node_modules/typescript/lib"

CONTRIBUTING.md

@@ -10,7 +10,7 @@ Today (February 2023), Bun's codebase has five distinct parts:
 
 - JavaScript, JSX, & TypeScript transpiler, module resolver, and related code
 - JavaScript runtime ([`src/bun.js/`](src/bun.js/))
-- JavaScript runtime bindings ([`src/bun.zig/bindings/**/*.cpp`](src/bun.zig/bindings/))
+- JavaScript runtime bindings ([`src/bun.js/bindings/**/*.cpp`](src/bun.js/bindings/))
 - Package manager ([`src/install/`](src/install/))
 - Shared utilities ([`src/string_immutable.zig`](src/string_immutable.zig))
 

Dockerfile

@@ -1,6 +1,11 @@
+# This Dockerfile is used by CI workflows to build Bun. It is not intended as a development
+# environment, or to be used as a base image for other projects.
+#
+# You likely want this image instead: https://hub.docker.com/r/oven/bun
+#
+# TODO: move this file to reduce confusion
 ARG DEBIAN_FRONTEND=noninteractive
 ARG GITHUB_WORKSPACE=/build
-ARG ZIG_PATH=${GITHUB_WORKSPACE}/zig
 ARG WEBKIT_DIR=${GITHUB_WORKSPACE}/bun-webkit 
 ARG BUN_RELEASE_DIR=${GITHUB_WORKSPACE}/bun-release
 ARG BUN_DEPS_OUT_DIR=${GITHUB_WORKSPACE}/bun-deps
@@ -8,123 +13,140 @@ ARG BUN_DIR=${GITHUB_WORKSPACE}/bun
 ARG CPU_TARGET=native
 ARG ARCH=x86_64
 ARG BUILD_MACHINE_ARCH=x86_64
-ARG TRIPLET=${ARCH}-linux-gnu
 ARG BUILDARCH=amd64
-ARG WEBKIT_TAG=2023-oct3
-ARG ZIG_TAG=jul1
-ARG ZIG_VERSION="0.12.0-dev.163+6780a6bbf"
-ARG WEBKIT_BASENAME="bun-webkit-linux-$BUILDARCH"
+ARG TRIPLET=${ARCH}-linux-gnu
+ARG GIT_SHA="unknown"
+ARG BUN_DOWNLOAD_URL_BASE="https://pub-5e11e972747a44bf9aaf9394f185a982.r2.dev/releases/latest"
 
-ARG ZIG_FOLDERNAME=zig-linux-${BUILD_MACHINE_ARCH}-${ZIG_VERSION}
-ARG ZIG_FILENAME=${ZIG_FOLDERNAME}.tar.xz
-ARG WEBKIT_URL="https://github.com/oven-sh/WebKit/releases/download/$WEBKIT_TAG/${WEBKIT_BASENAME}.tar.gz"
-ARG ZIG_URL="https://ziglang.org/builds/${ZIG_FILENAME}"
-ARG GIT_SHA=""
-ARG BUN_BASE_VERSION=1.0
+ARG BUN_VERSION="1.0.7"
+ARG NODE_VERSION="20"
+ARG LLVM_VERSION="16"
+ARG ZIG_VERSION="0.12.0-dev.1297+a9e66ed73"
+
+ARG SCCACHE_BUCKET
+ARG SCCACHE_REGION
+ARG SCCACHE_S3_USE_SSL
+ARG SCCACHE_ENDPOINT
+ARG AWS_ACCESS_KEY_ID
+ARG AWS_SECRET_ACCESS_KEY
 
 FROM bitnami/minideb:bullseye as bun-base
 
-RUN install_packages ca-certificates curl wget lsb-release software-properties-common gnupg gnupg1 gnupg2 &&  \
-    echo "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-16 main" > /etc/apt/sources.list.d/llvm.list && \
-    echo "deb-src https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-16 main" >> /etc/apt/sources.list.d/llvm.list && \
-    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
-    curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \
-    install_packages \
-    cmake \
-    file \
-    git \
-    gnupg \
-    libc-dev \
-    libxml2 \
-    libxml2-dev \
-    make \
-    ninja-build \
-    perl \
-    python3 \
-    rsync \
-    ruby \
-    unzip \
-    clang-16 \
-    lld-16 \
-    lldb-16 \
-    clangd-16 \
-    xz-utils \
-    bash tar gzip ccache nodejs && \
-    npm install -g esbuild
+ARG BUN_DOWNLOAD_URL_BASE
+ARG DEBIAN_FRONTEND
+ARG BUN_VERSION
+ARG NODE_VERSION
+ARG LLVM_VERSION
+ARG BUILD_MACHINE_ARCH
+ARG BUN_DIR
+ARG BUN_DEPS_OUT_DIR
+
+ENV CI 1
+ENV BUILDARCH=${BUILDARCH}
+ENV BUN_DEPS_OUT_DIR=${BUN_DEPS_OUT_DIR}
 
 ENV CXX=clang++-16
 ENV CC=clang-16
-
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-ARG BUILDARCH
-ARG ZIG_PATH
-ARG WEBKIT_URL
-ARG ZIG_URL
-ARG ZIG_FOLDERNAME
-ARG ZIG_FILENAME
-
-ENV WEBKIT_OUT_DIR=${WEBKIT_DIR}
-ENV BUILDARCH=${BUILDARCH}
 ENV AR=/usr/bin/llvm-ar-16
-ENV ZIG "${ZIG_PATH}/zig"
-ENV PATH="$ZIG/bin:$PATH"
 ENV LD=lld-16
 
-RUN mkdir -p $BUN_DIR $BUN_DEPS_OUT_DIR 
+ENV SCCACHE_BUCKET=${SCCACHE_BUCKET}
+ENV SCCACHE_REGION=${SCCACHE_REGION}
+ENV SCCACHE_S3_USE_SSL=${SCCACHE_S3_USE_SSL}
+ENV SCCACHE_ENDPOINT=${SCCACHE_ENDPOINT}
+ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
 
-FROM bun-base as bun-base-with-zig-and-webkit
+RUN apt-get update -y \
+  && install_packages \
+  ca-certificates \
+  curl \
+  gnupg \
+  && echo "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${LLVM_VERSION} main" > /etc/apt/sources.list.d/llvm.list \
+  && echo "deb-src https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${LLVM_VERSION} main" >> /etc/apt/sources.list.d/llvm.list \
+  && curl -fsSL "https://apt.llvm.org/llvm-snapshot.gpg.key" | apt-key add - \
+  && echo "deb https://deb.nodesource.com/node_${NODE_VERSION}.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \
+  && curl -fsSL "https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key" | apt-key add - \
+  && echo "deb https://apt.kitware.com/ubuntu/ focal main" > /etc/apt/sources.list.d/kitware.list \
+  && curl -fsSL "https://apt.kitware.com/keys/kitware-archive-latest.asc" | apt-key add - \
+  && install_packages \
+  wget \
+  bash \
+  software-properties-common \
+  build-essential \
+  autoconf \
+  automake \
+  libtool \
+  pkg-config \
+  clang-${LLVM_VERSION} \
+  lld-${LLVM_VERSION} \
+  lldb-${LLVM_VERSION} \
+  clangd-${LLVM_VERSION} \
+  make \
+  cmake \
+  ninja-build \
+  file \
+  libc-dev \
+  libxml2 \
+  libxml2-dev \
+  xz-utils \
+  git \
+  tar \
+  rsync \
+  gzip \
+  unzip \
+  perl \
+  python3 \
+  ruby \
+  golang \
+  nodejs \
+  && ln -s /usr/bin/clang-${LLVM_VERSION} /usr/bin/clang \
+  && ln -s /usr/bin/clang++-${LLVM_VERSION} /usr/bin/clang++ \
+  && ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/lld \
+  && ln -s /usr/bin/lldb-${LLVM_VERSION} /usr/bin/lldb \
+  && ln -s /usr/bin/clangd-${LLVM_VERSION} /usr/bin/clangd \
+  && ln -s /usr/bin/llvm-ar-${LLVM_VERSION} /usr/bin/llvm-ar \
+  && arch="$(dpkg --print-architecture)" \
+  && case "${arch##*-}" in \
+  amd64) variant="x64";; \
+  arm64) variant="aarch64";; \
+  *) echo "error: unsupported architecture: $arch"; exit 1 ;; \
+  esac \
+  && wget "${BUN_DOWNLOAD_URL_BASE}/bun-linux-${variant}.zip" \
+  && unzip bun-linux-${variant}.zip \
+  && mv bun-linux-${variant}/bun /usr/bin/bun \
+  && 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 \
+#   && tar xf sccache-v0.5.4-${BUILD_MACHINE_ARCH}-unknown-linux-musl.tar.gz \
+#   && mv sccache-v0.5.4-${BUILD_MACHINE_ARCH}-unknown-linux-musl/sccache /usr/bin/sccache \
+#   && rm -rf sccache-v0.5.4-${BUILD_MACHINE_ARCH}-unknown-linux-musl.tar.gz sccache-v0.5.4-${BUILD_MACHINE_ARCH}-unknown-linux-musl \
+
+FROM bun-base as bun-base-with-zig
+
+ARG ZIG_VERSION
+ARG BUILD_MACHINE_ARCH
+ARG ZIG_FOLDERNAME=zig-linux-${BUILD_MACHINE_ARCH}-${ZIG_VERSION}
+ARG ZIG_FILENAME=${ZIG_FOLDERNAME}.tar.xz
+ARG ZIG_URL="https://ziglang.org/builds/${ZIG_FILENAME}"
 
 WORKDIR $GITHUB_WORKSPACE
 
 ADD $ZIG_URL .
-RUN tar xf ${ZIG_FILENAME} && \
-    rm ${ZIG_FILENAME} && mv ${ZIG_FOLDERNAME} zig;
-
-
-
-WORKDIR $GITHUB_WORKSPACE
-
-ARG GITHUB_WORKSPACE
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-ARG BUILDARCH
-ARG ZIG_PATH
-ARG WEBKIT_URL
-ARG ZIG_URL
-ARG WEBKIT_BASENAME
-
-ADD ${WEBKIT_URL} .
-
-RUN mkdir -p ${WEBKIT_DIR} && cd ${GITHUB_WORKSPACE} && \
-    gunzip ${WEBKIT_BASENAME}.tar.gz && tar -xf ${WEBKIT_BASENAME}.tar && \
-    cat ${WEBKIT_DIR}/include/cmakeconfig.h > /dev/null
-
-LABEL org.opencontainers.image.title="bun base image with zig & webkit ${BUILDARCH} (glibc)"
-LABEL org.opencontainers.image.source=https://github.com/oven-sh/bun
+RUN tar xf ${ZIG_FILENAME} \
+  && mv ${ZIG_FOLDERNAME}/lib /usr/lib/zig \
+  && mv ${ZIG_FOLDERNAME}/zig /usr/bin/zig \
+  && rm -rf ${ZIG_FILENAME} ${ZIG_FOLDERNAME}
 
 FROM bun-base as c-ares
 
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
 ARG BUN_DIR
 ARG CPU_TARGET
 ENV CPU_TARGET=${CPU_TARGET}
-
 ENV CCACHE_DIR=/ccache
-ENV JSC_BASE_DIR=${WEBKIT_DIR}
-ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib
 
 COPY Makefile ${BUN_DIR}/Makefile
 COPY src/deps/c-ares ${BUN_DIR}/src/deps/c-ares
@@ -133,20 +155,11 @@ WORKDIR $BUN_DIR
 
 RUN --mount=type=cache,target=/ccache cd $BUN_DIR && make c-ares && rm -rf ${BUN_DIR}/src/deps/c-ares ${BUN_DIR}/Makefile
 
-
 FROM bun-base as lolhtml
 
-RUN install_packages build-essential && curl https://sh.rustup.rs -sSf | sh -s -- -y
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
 ARG BUN_DIR
-
 ARG CPU_TARGET
 ENV CPU_TARGET=${CPU_TARGET}
 
@@ -155,88 +168,57 @@ COPY src/deps/lol-html ${BUN_DIR}/src/deps/lol-html
 
 ENV CCACHE_DIR=/ccache
 
-RUN --mount=type=cache,target=/ccache export PATH=$PATH:$HOME/.cargo/bin && export CC=$(which clang-16) && cd ${BUN_DIR} && \
-    make lolhtml && rm -rf src/deps/lol-html Makefile
+RUN --mount=type=cache,target=/ccache export PATH=$PATH:$HOME/.cargo/bin && cd ${BUN_DIR} && \
+  make lolhtml && rm -rf src/deps/lol-html Makefile
 
 FROM bun-base as mimalloc
 
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
 ARG BUN_DIR
+ARG CPU_TARGET
+ENV CPU_TARGET=${CPU_TARGET}
 
 COPY Makefile ${BUN_DIR}/Makefile
 COPY src/deps/mimalloc ${BUN_DIR}/src/deps/mimalloc
-ARG CPU_TARGET
-ENV CPU_TARGET=${CPU_TARGET}
 
 ENV CCACHE_DIR=/ccache
 
 RUN --mount=type=cache,target=/ccache cd ${BUN_DIR} && \
-    make mimalloc && rm -rf src/deps/mimalloc Makefile
+  make mimalloc && rm -rf src/deps/mimalloc Makefile
 
 FROM bun-base as zlib
 
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
 ARG BUN_DIR
 ARG CPU_TARGET
 ENV CPU_TARGET=${CPU_TARGET}
+ENV CCACHE_DIR=/ccache
 
 COPY Makefile ${BUN_DIR}/Makefile
 COPY src/deps/zlib ${BUN_DIR}/src/deps/zlib
 
 WORKDIR $BUN_DIR
 
-ENV CCACHE_DIR=/ccache
-
 RUN --mount=type=cache,target=/ccache cd $BUN_DIR && \
-    make zlib && rm -rf src/deps/zlib Makefile
+  make zlib && rm -rf src/deps/zlib Makefile
 
 FROM bun-base as libarchive
 
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
 ARG BUN_DIR
 ARG CPU_TARGET
 ENV CPU_TARGET=${CPU_TARGET}
+ENV CCACHE_DIR=/ccache
 
 RUN install_packages autoconf automake libtool pkg-config 
 
 COPY Makefile ${BUN_DIR}/Makefile
 COPY src/deps/libarchive ${BUN_DIR}/src/deps/libarchive
 
-ENV CCACHE_DIR=/ccache
 WORKDIR $BUN_DIR
 
-
 RUN --mount=type=cache,target=/ccache cd $BUN_DIR && \
-    make libarchive && rm -rf src/deps/libarchive Makefile
-
-
+  make libarchive && rm -rf src/deps/libarchive Makefile
 
 FROM bun-base as tinycc
 
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
 ARG BUN_DEPS_OUT_DIR
 ARG BUN_DIR
 ARG CPU_TARGET
@@ -248,13 +230,6 @@ FROM bun-base as boringssl
 
 RUN install_packages golang
 
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
 ARG BUN_DIR
 ARG CPU_TARGET
 ENV CPU_TARGET=${CPU_TARGET}
@@ -268,42 +243,8 @@ ENV CCACHE_DIR=/ccache
 
 RUN --mount=type=cache,target=/ccache cd ${BUN_DIR} && make boringssl && rm -rf src/deps/boringssl Makefile
 
-FROM bun-base as uws
-
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-ARG CPU_TARGET
-ENV CPU_TARGET=${CPU_TARGET}
-
-COPY Makefile ${BUN_DIR}/Makefile
-COPY packages/bun-uws ${BUN_DIR}/packages/bun-uws
-COPY packages/bun-usockets ${BUN_DIR}/packages/bun-usockets
-COPY src/deps/zlib ${BUN_DIR}/src/deps/zlib
-COPY src/deps/boringssl/include ${BUN_DIR}/src/deps/boringssl/include
-COPY src/deps/c-ares/include ${BUN_DIR}/src/deps/c-ares/include
-COPY src/deps/libuwsockets.cpp ${BUN_DIR}/src/deps/libuwsockets.cpp
-COPY src/deps/_libusockets.h ${BUN_DIR}/src/deps/_libusockets.h
-
-WORKDIR $BUN_DIR
-
-RUN cd $BUN_DIR && \
-    make uws && rm -rf packages/bun-uws Makefile
-
 FROM bun-base as base64
 
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
 ARG BUN_DIR
 ARG CPU_TARGET
 ENV CPU_TARGET=${CPU_TARGET}
@@ -314,225 +255,10 @@ COPY src/deps/base64 ${BUN_DIR}/src/deps/base64
 WORKDIR $BUN_DIR
 
 RUN cd $BUN_DIR && \
-    make base64 && rm -rf src/deps/base64 Makefile
-
-FROM bun-base as picohttp
-
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-ARG CPU_TARGET
-ENV CPU_TARGET=${CPU_TARGET}
-
-COPY Makefile ${BUN_DIR}/Makefile
-COPY src/deps/picohttpparser ${BUN_DIR}/src/deps/picohttpparser
-COPY src/deps/*.c ${BUN_DIR}/src/deps/
-COPY src/deps/*.h ${BUN_DIR}/src/deps/
-
-WORKDIR $BUN_DIR
-
-RUN cd $BUN_DIR && \
-    make picohttp
-
-
-FROM bun-base-with-zig-and-webkit as identifier_cache
-
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-ARG CPU_TARGET
-ENV CPU_TARGET=${CPU_TARGET}
-
-WORKDIR $BUN_DIR
-
-COPY Makefile ${BUN_DIR}/Makefile
-COPY src/js_lexer/identifier_data.zig ${BUN_DIR}/src/js_lexer/identifier_data.zig
-COPY src/js_lexer/identifier_cache.zig ${BUN_DIR}/src/js_lexer/identifier_cache.zig
-
-RUN cd $BUN_DIR && \
-    make identifier-cache && rm -rf zig-cache Makefile
-
-FROM bun-base-with-zig-and-webkit as node_fallbacks
-
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-ARG CPU_TARGET
-ENV CPU_TARGET=${CPU_TARGET}
-
-WORKDIR $BUN_DIR
-
-
-COPY Makefile ${BUN_DIR}/Makefile
-COPY src/node-fallbacks ${BUN_DIR}/src/node-fallbacks
-RUN cd $BUN_DIR && \
-    make node-fallbacks && rm -rf src/node-fallbacks/node_modules Makefile
-
-FROM bun-base-with-zig-and-webkit as prepare_release
-
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-ARG CPU_TARGET
-ENV CPU_TARGET=${CPU_TARGET}
-
-WORKDIR $BUN_DIR
-
-COPY ./root.zig ${BUN_DIR}/root.zig
-COPY ./src ${BUN_DIR}/src
-COPY ./build.zig ${BUN_DIR}/build.zig
-COPY ./completions ${BUN_DIR}/completions
-COPY ./packages ${BUN_DIR}/packages
-COPY ./src/build-id ${BUN_DIR}/src/build-id
-COPY ./package.json ${BUN_DIR}/package.json
-COPY ./misctools ${BUN_DIR}/misctools
-COPY Makefile ${BUN_DIR}/Makefile
-
-
-FROM prepare_release as compile_release_obj
-
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-ARG CPU_TARGET
-ENV CPU_TARGET=${CPU_TARGET}
-
-COPY Makefile ${BUN_DIR}/Makefile
-COPY .prettierrc.cjs ${BUN_DIR}/.prettierrc.cjs
-
-WORKDIR $BUN_DIR
-
-ENV JSC_BASE_DIR=${WEBKIT_DIR}
-ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib
-ARG ARCH
-ARG TRIPLET
-ARG CPU_TARGET
-ENV CPU_TARGET=${CPU_TARGET}
-ARG GIT_SHA
-ARG BUN_BASE_VERSION
-
-ENV BUN_BASE_VERSION=${BUN_BASE_VERSION}
-ENV GIT_SHA=${GIT_SHA}
-
-COPY --from=identifier_cache ${BUN_DIR}/src/js_lexer/*.blob ${BUN_DIR}/src/js_lexer/
-COPY --from=node_fallbacks ${BUN_DIR}/src/node-fallbacks/out ${BUN_DIR}/src/node-fallbacks/out
-
-COPY ./src/build-id ${BUN_DIR}/src/build-id
-
-ENV CCACHE_DIR=/ccache
-
-RUN --mount=type=cache,target=/ccache cd $BUN_DIR && mkdir -p src/bun.js/bindings-obj &&  rm -rf $HOME/.cache zig-cache && make prerelease && \
-    mkdir -p $BUN_RELEASE_DIR && \
-    OUTPUT_DIR=/tmp/bun-${TRIPLET}-${GIT_SHA} $ZIG_PATH/zig build obj -Doutput-dir=/tmp/bun-${TRIPLET}-${GIT_SHA} -Doptimize=ReleaseFast -Dtarget="${TRIPLET}" -Dcpu="${CPU_TARGET}" && \
-    cp /tmp/bun-${TRIPLET}-${GIT_SHA}/bun.o /tmp/bun-${TRIPLET}-${GIT_SHA}/bun-${BUN_BASE_VERSION}.$(cat ${BUN_DIR}/src/build-id).o && cd / && rm -rf $BUN_DIR
-
-FROM scratch as build_release_obj
-
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG GIT_SHA
-ARG TRIPLET
-ARG BUN_DIR
-ARG CPU_TARGET
-ENV CPU_TARGET=${CPU_TARGET}
-
-COPY --from=compile_release_obj /tmp/bun-${TRIPLET}-${GIT_SHA}/*.o /
-
-FROM prepare_release as compile_cpp
-
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-ARG CPU_TARGET
-ENV CPU_TARGET=${CPU_TARGET}
-
-COPY Makefile ${BUN_DIR}/Makefile
-COPY .prettierrc.cjs ${BUN_DIR}/.prettierrc.cjs
-
-WORKDIR $BUN_DIR
-
-ENV JSC_BASE_DIR=${WEBKIT_DIR}
-ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib
-
-# Required for webcrypto bindings
-COPY src/deps/boringssl/include ${BUN_DIR}/src/deps/boringssl/include
-
-ENV CCACHE_DIR=/ccache
-
-RUN --mount=type=cache,target=/ccache cd $BUN_DIR && mkdir -p src/bun.js/bindings-obj &&  rm -rf $HOME/.cache zig-cache && mkdir -p $BUN_RELEASE_DIR && \
-    make release-bindings -j10 && mv src/bun.js/bindings-obj/* /tmp
-
-FROM bun-base as sqlite
-
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-
-ARG CPU_TARGET
-ENV CPU_TARGET=${CPU_TARGET}
-
-ENV CCACHE_DIR=/ccache
-
-COPY Makefile ${BUN_DIR}/Makefile
-COPY src/bun.js/bindings/sqlite ${BUN_DIR}/src/bun.js/bindings/sqlite
-COPY .prettierrc.cjs ${BUN_DIR}/.prettierrc.cjs
-
-WORKDIR $BUN_DIR
-
-ENV JSC_BASE_DIR=${WEBKIT_DIR}
-ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib
-
-RUN --mount=type=cache,target=/ccache cd $BUN_DIR && make sqlite
+  make base64 && rm -rf src/deps/base64 Makefile
 
 FROM bun-base as zstd
 
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
 ARG BUN_DIR
 
 ARG CPU_TARGET
@@ -546,140 +272,167 @@ COPY .prettierrc.cjs ${BUN_DIR}/.prettierrc.cjs
 
 WORKDIR $BUN_DIR
 
-ENV JSC_BASE_DIR=${WEBKIT_DIR}
-ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib
-
 RUN --mount=type=cache,target=/ccache cd $BUN_DIR && make zstd
 
-FROM scratch as build_release_cpp
-
-COPY --from=compile_cpp /tmp/*.o /
-
-FROM prepare_release as build_release
+FROM bun-base-with-zig as bun-identifier-cache
 
 ARG DEBIAN_FRONTEND
 ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
+ARG CPU_TARGET
 ARG BUN_DIR
+ENV CPU_TARGET=${CPU_TARGET}
+
+WORKDIR $BUN_DIR
+
+COPY src/js_lexer/identifier_data.zig ${BUN_DIR}/src/js_lexer/identifier_data.zig
+COPY src/js_lexer/identifier_cache.zig ${BUN_DIR}/src/js_lexer/identifier_cache.zig
+
+RUN cd $BUN_DIR \
+  && zig run src/js_lexer/identifier_data.zig \
+  && rm -rf zig-cache
+
+FROM bun-base as bun-node-fallbacks
+
+ARG BUN_DIR
+
+WORKDIR $BUN_DIR
+
+COPY src/node-fallbacks ${BUN_DIR}/src/node-fallbacks
+
+RUN cd $BUN_DIR/src/node-fallbacks \
+  && bun install --frozen-lockfile \
+  && bun run build \
+  && rm -rf src/node-fallbacks/node_modules
+
+FROM bun-base as bun-webkit
+
+ARG BUILDARCH
+
+COPY CMakeLists.txt ${BUN_DIR}/CMakeLists.txt
+
+RUN mkdir ${BUN_DIR}/bun-webkit \
+  && WEBKIT_TAG=$(grep 'set(WEBKIT_TAG' "${BUN_DIR}/CMakeLists.txt" | awk '{print $2}' | cut -f 1 -d ')') \
+  && WEBKIT_URL="https://github.com/oven-sh/WebKit/releases/download/autobuild-${WEBKIT_TAG}/bun-webkit-linux-${BUILDARCH}-lto.tar.gz" \
+  && echo "Downloading ${WEBKIT_URL}" \
+  && curl -fsSL "${WEBKIT_URL}" | tar -xz -C ${BUN_DIR}/bun-webkit --strip-components=1
+
+FROM bun-base as bun-cpp-objects
+
+COPY --from=bun-webkit ${BUN_DIR}/bun-webkit ${BUN_DIR}/bun-webkit
+
+COPY packages ${BUN_DIR}/packages
+COPY src ${BUN_DIR}/src
+COPY CMakeLists.txt ${BUN_DIR}/CMakeLists.txt
+COPY src/deps/boringssl/include ${BUN_DIR}/src/deps/boringssl/include
+
+ENV CCACHE_DIR=/ccache
+
+RUN --mount=type=cache,target=/ccache  mkdir ${BUN_DIR}/build \
+  && cd ${BUN_DIR}/build \
+  && mkdir -p tmp_modules tmp_functions js codegen \
+  && cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DBUN_CPP_ONLY=1 -DWEBKIT_DIR=/build/bun/bun-webkit \
+  && bash compile-cpp-only.sh
+
+FROM bun-base-with-zig as bun-codegen-for-zig
+
+COPY package.json bun.lockb Makefile .gitmodules .prettierrc.cjs ${BUN_DIR}/
+COPY src/runtime ${BUN_DIR}/src/runtime
+COPY src/runtime.js src/runtime.footer*.js src/react-refresh.js ${BUN_DIR}/src/
+COPY packages/bun-error ${BUN_DIR}/packages/bun-error
+COPY src/fallback.ts ${BUN_DIR}/src/fallback.ts
+COPY src/api ${BUN_DIR}/src/api
+
+WORKDIR $BUN_DIR
+
+# TODO: move away from Makefile entirely
+RUN bun install --frozen-lockfile \
+  && make runtime_js fallback_decoder bun_error \
+  && rm -rf src/runtime src/fallback.ts node_modules bun.lockb package.json Makefile
+
+FROM bun-base-with-zig as bun-compile-zig-obj
+
+ARG ZIG_PATH
+ARG TRIPLET
+ARG GIT_SHA
+ARG CPU_TARGET
+
+COPY *.zig package.json CMakeLists.txt ${BUN_DIR}/
+COPY completions ${BUN_DIR}/completions
+COPY packages ${BUN_DIR}/packages
+COPY src ${BUN_DIR}/src
+
+COPY --from=bun-identifier-cache ${BUN_DIR}/src/js_lexer/*.blob ${BUN_DIR}/src/js_lexer/
+COPY --from=bun-node-fallbacks ${BUN_DIR}/src/node-fallbacks/out ${BUN_DIR}/src/node-fallbacks/out
+COPY --from=bun-codegen-for-zig ${BUN_DIR}/src/*.out.js ${BUN_DIR}/src/*.out.refresh.js ${BUN_DIR}/src/
+COPY --from=bun-codegen-for-zig ${BUN_DIR}/packages/bun-error/dist ${BUN_DIR}/packages/bun-error/dist
+
+WORKDIR $BUN_DIR
+
+RUN mkdir -p build \
+  && bun run $BUN_DIR/src/codegen/bundle-modules-fast.ts $BUN_DIR/build \
+  && cd build \
+  && cmake .. \
+  -G Ninja \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCPU_TARGET="${CPU_TARGET}" \
+  -DZIG_TARGET="${TRIPLET}" \
+  -DWEBKIT_DIR="omit" \
+  -DNO_CONFIGURE_DEPENDS=1 \
+  -DNO_CODEGEN=1 \
+  -DBUN_ZIG_OBJ="/tmp/bun-zig.o" \
+  && ONLY_ZIG=1 ninja "/tmp/bun-zig.o" \
+  && echo "-> /tmp/bun-zig.o"
+
+FROM scratch as build_release_obj
+
 ARG CPU_TARGET
 ENV CPU_TARGET=${CPU_TARGET}
 
-COPY Makefile ${BUN_DIR}/Makefile
-COPY .prettierrc.cjs ${BUN_DIR}/.prettierrc.cjs
+COPY --from=bun-compile-zig-obj /tmp/bun-zig.o /
+
+FROM bun-base as bun-link
+
+ARG CPU_TARGET
+ENV CPU_TARGET=${CPU_TARGET}
 
 WORKDIR $BUN_DIR
 
-ENV JSC_BASE_DIR=${WEBKIT_DIR}
-ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib
+RUN mkdir -p build bun-webkit
 
-COPY --from=zlib ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
-COPY --from=base64 ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
-COPY --from=libarchive ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
-COPY --from=boringssl ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
-COPY --from=lolhtml ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
-COPY --from=mimalloc ${BUN_DEPS_OUT_DIR}/*.o ${BUN_DEPS_OUT_DIR}/
-COPY --from=picohttp ${BUN_DEPS_OUT_DIR}/*.o ${BUN_DEPS_OUT_DIR}/
-COPY --from=sqlite ${BUN_DEPS_OUT_DIR}/*.o  ${BUN_DEPS_OUT_DIR}/
-COPY --from=zstd ${BUN_DEPS_OUT_DIR}/*.a  ${BUN_DEPS_OUT_DIR}/
-COPY --from=tinycc ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
-COPY --from=uws ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
-COPY --from=uws ${BUN_DEPS_OUT_DIR}/*.o ${BUN_DEPS_OUT_DIR}/
-COPY --from=c-ares ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
+# lol
+COPY src/bun.js/bindings/sqlite/sqlite3.c ${BUN_DIR}/src/bun.js/bindings/sqlite/sqlite3.c
 
-COPY --from=build_release_obj /*.o /tmp
-COPY --from=build_release_cpp /*.o ${BUN_DIR}/src/bun.js/bindings-obj/
-COPY --from=build_release_cpp /*.a ${BUN_DEPS_OUT_DIR}/
+COPY src/symbols.dyn src/linker.lds ${BUN_DIR}/src/
 
-RUN cd $BUN_DIR && mkdir -p ${BUN_RELEASE_DIR} && make bun-relink copy-to-bun-release-dir && \
-    rm -rf $HOME/.cache zig-cache misctools package.json build-id completions build.zig $(BUN_DIR)/packages
+COPY CMakeLists.txt ${BUN_DIR}/CMakeLists.txt
+COPY --from=zlib ${BUN_DEPS_OUT_DIR}/* ${BUN_DEPS_OUT_DIR}/
+COPY --from=base64 ${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}/
+COPY --from=mimalloc ${BUN_DEPS_OUT_DIR}/* ${BUN_DEPS_OUT_DIR}/
+COPY --from=zstd ${BUN_DEPS_OUT_DIR}/*  ${BUN_DEPS_OUT_DIR}/
+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=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}/bun-webkit/lib ${BUN_DIR}/bun-webkit/lib
 
+WORKDIR $BUN_DIR/build
 
+RUN cmake .. \
+  -G Ninja \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DBUN_LINK_ONLY=1 \
+  -DBUN_ZIG_OBJ="${BUN_DIR}/build/bun-zig.o" \
+  -DBUN_CPP_ARCHIVE="${BUN_DIR}/build/bun-cpp-objects.a" \
+  -DWEBKIT_DIR="${BUN_DIR}/bun-webkit" \
+  -DBUN_DEPS_OUT_DIR="${BUN_DEPS_OUT_DIR}" \
+  && ninja \
+  && mkdir -p /build/out \
+  && mv bun bun-profile /build/out \
+  && rm -rf ${BUN_DIR} ${BUN_DEPS_OUT_DIR}
 
 FROM scratch as artifact
 
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-
-COPY --from=build_release ${BUN_RELEASE_DIR}/bun /bun
-COPY --from=build_release ${BUN_RELEASE_DIR}/bun-profile /bun-profile
-COPY --from=build_release ${BUN_DEPS_OUT_DIR}/* /bun-dependencies
-COPY --from=build_release_obj /*.o /bun-obj
-
-
-FROM prepare_release as build_unit
-
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-
-WORKDIR $BUN_DIR
-
-ENV PATH "$ZIG_PATH:$PATH"
-ENV LIB_ICU_PATH "${WEBKIT_DIR}/lib"
-
-CMD make headers \
-    api \
-    analytics \
-    bun_error \
-    fallback_decoder \
-    bindings -j10 && \
-    make \
-    run-all-unit-tests
-
-
-
-# FROM bun-test-base as test_base
-
-# ARG DEBIAN_FRONTEND=noninteractive
-# ARG GITHUB_WORKSPACE=/build
-# ARG ZIG_PATH=${GITHUB_WORKSPACE}/zig
-# # Directory extracts to "bun-webkit"
-# ARG WEBKIT_DIR=${GITHUB_WORKSPACE}/bun-webkit 
-# ARG BUN_RELEASE_DIR=${GITHUB_WORKSPACE}/bun-release
-# ARG BUN_DEPS_OUT_DIR=${GITHUB_WORKSPACE}/bun-deps
-# ARG BUN_DIR=${GITHUB_WORKSPACE}/bun
-
-# ARG BUILDARCH=amd64
-# RUN groupadd -r chromium && useradd   -d  ${BUN_DIR} -M -r -g chromium -G audio,video chromium \
-#     && mkdir -p /home/chromium/Downloads && chown -R chromium:chromium /home/chromium
-
-# USER chromium
-# WORKDIR $BUN_DIR
-
-# ENV NPM_CLIENT bun
-# ENV PATH "${BUN_DIR}/packages/bun-linux-x64:${BUN_DIR}/packages/bun-linux-aarch64:$PATH"
-# ENV CI 1
-# ENV BROWSER_EXECUTABLE /usr/bin/chromium
-
-# COPY ./test ${BUN_DIR}/test
-# COPY Makefile ${BUN_DIR}/Makefile
-# COPY package.json ${BUN_DIR}/package.json
-# COPY .docker/run-test.sh ${BUN_DIR}/run-test.sh
-# COPY ./bun.lockb ${BUN_DIR}/bun.lockb   
-
-# # # We don't want to worry about architecture differences in this image
-# COPY --from=release /opt/bun/bin/bun ${BUN_DIR}/packages/bun-linux-aarch64/bun
-# COPY --from=release /opt/bun/bin/bun ${BUN_DIR}/packages/bun-linux-x64/bun
-
-# USER root
-# RUN chgrp -R chromium ${BUN_DIR} && chmod g+rwx ${BUN_DIR} && chown -R chromium:chromium ${BUN_DIR}
-# USER chromium
-
-# CMD [ "bash", "run-test.sh" ]
-
-# FROM release
+COPY --from=bun-link /build/out /

Makefile

@@ -39,7 +39,6 @@ endif
 
 MIN_MACOS_VERSION ?= $(DEFAULT_MIN_MACOS_VERSION)
 BUN_BASE_VERSION = 1.0
-
 CI ?= false
 
 AR=
@@ -66,7 +65,7 @@ PACKAGE_JSON_VERSION = $(BUN_BASE_VERSION).$(BUILD_ID)
 BUN_BUILD_TAG = bun-v$(PACKAGE_JSON_VERSION)
 BUN_RELEASE_BIN = $(PACKAGE_DIR)/bun
 PRETTIER ?= $(shell which prettier 2>/dev/null || echo "./node_modules/.bin/prettier")
-ESBUILD = $(shell which esbuild 2>/dev/null || echo "./node_modules/.bin/esbuild")
+ESBUILD = "$(shell which esbuild 2>/dev/null || echo "./node_modules/.bin/esbuild")"
 DSYMUTIL ?= $(shell which dsymutil 2>/dev/null || which dsymutil-15 2>/dev/null)
 WEBKIT_DIR ?= $(realpath src/bun.js/WebKit)
 WEBKIT_RELEASE_DIR ?= $(WEBKIT_DIR)/WebKitBuild/Release
@@ -74,7 +73,7 @@ WEBKIT_DEBUG_DIR ?= $(WEBKIT_DIR)/WebKitBuild/Debug
 WEBKIT_RELEASE_DIR_LTO ?= $(WEBKIT_DIR)/WebKitBuild/ReleaseLTO
 
 
-NPM_CLIENT ?= $(shell which bun 2>/dev/null || which npm 2>/dev/null)
+NPM_CLIENT = "$(shell which bun 2>/dev/null || which npm 2>/dev/null)"
 ZIG ?= $(shell which zig 2>/dev/null || echo -e "error: Missing zig. Please make sure zig is in PATH. Or set ZIG=/path/to-zig-executable")
 
 # We must use the same compiler version for the JavaScriptCore bindings and JavaScriptCore
@@ -187,11 +186,6 @@ BUN_CFLAGS = $(MACOS_MIN_FLAG) $(MARCH_NATIVE)  $(OPTIMIZATION_LEVEL) -fno-excep
 BUN_TMP_DIR := /tmp/make-bun
 CFLAGS=$(CFLAGS_WITHOUT_MARCH) $(MARCH_NATIVE)
 
-DEFAULT_USE_BMALLOC := 1
-
-
-USE_BMALLOC ?= DEFAULT_USE_BMALLOC
-
 # Set via postinstall
 ifeq (,$(realpath $(JSC_BASE_DIR)))
 	JSC_BASE_DIR = $(realpath $(firstword $(wildcard bun-webkit)))
@@ -380,9 +374,7 @@ ICU_FLAGS ?=
 # Ideally, we could just look up the linker search paths
 ifeq ($(OS_NAME),linux)
 LIB_ICU_PATH ?= $(JSC_LIB)
-	ICU_FLAGS += $(LIB_ICU_PATH)/libicuuc.a $(LIB_ICU_PATH)/libicudata.a $(LIB_ICU_PATH)/libicui18n.a
-else
-LIB_ICU_PATH ?= $(BUN_DEPS_DIR)
+ICU_FLAGS += $(LIB_ICU_PATH)/libicuuc.a $(LIB_ICU_PATH)/libicudata.a $(LIB_ICU_PATH)/libicui18n.a
 endif
 
 ifeq ($(OS_NAME),darwin)
@@ -764,7 +756,7 @@ USOCKETS_DIR = $(BUN_DIR)/packages/bun-usockets
 USOCKETS_SRC_DIR = $(USOCKETS_DIR)/src
 
 usockets:
-	rm -rf $(USOCKETS_DIR)/*.i $(USOCKETS_DIR)/*.bc $(USOCKETS_DIR)/*.o $(USOCKETS_DIR)/*.s $(USOCKETS_DIR)/*.ii $(USOCKETS_DIR)/*.s
+	rm -rf $(USOCKETS_DIR)/*.i $(USOCKETS_DIR)/*.bc $(USOCKETS_DIR)/*.o $(USOCKETS_DIR)/*.s $(USOCKETS_DIR)/*.ii $(USOCKETS_DIR)/*.s  $(BUN_DEPS_OUT_DIR)/libusockets.a
 	cd $(USOCKETS_DIR) && $(CC_WITH_CCACHE) -I$(USOCKETS_SRC_DIR)  -fno-builtin-malloc -fno-builtin-free -fno-builtin-realloc $(EMIT_LLVM_FOR_RELEASE)  $(MACOS_MIN_FLAG) -fPIC $(CFLAGS) $(UWS_CC_FLAGS) -save-temps -I$(BUN_DEPS_DIR)/uws/uSockets/src $(UWS_LDFLAGS) -g $(DEFAULT_LINKER_FLAGS) $(PLATFORM_LINKER_FLAGS) $(OPTIMIZATION_LEVEL) -c $(wildcard $(USOCKETS_SRC_DIR)/*.c) $(wildcard $(USOCKETS_SRC_DIR)/**/*.c)
 	cd $(USOCKETS_DIR) && $(CXX_WITH_CCACHE)  -I$(USOCKETS_SRC_DIR) -fno-builtin-malloc -fno-builtin-free -fno-builtin-realloc $(EMIT_LLVM_FOR_RELEASE) $(MACOS_MIN_FLAG)  -fPIC $(CXXFLAGS) $(UWS_CXX_FLAGS) -save-temps -I$(BUN_DEPS_DIR)/uws/uSockets/src $(UWS_LDFLAGS) -g $(DEFAULT_LINKER_FLAGS) $(PLATFORM_LINKER_FLAGS) $(OPTIMIZATION_LEVEL)  -c $(wildcard $(USOCKETS_SRC_DIR)/*.cpp) $(wildcard $(USOCKETS_SRC_DIR)/**/*.cpp)
 	cd $(USOCKETS_DIR) && $(AR) rcvs $(BUN_DEPS_OUT_DIR)/libusockets.a $(USOCKETS_DIR)/*.{o,bc}
@@ -833,10 +825,10 @@ fallback_decoder:
 
 .PHONY: runtime_js
 runtime_js:
-	@NODE_ENV=production $(ESBUILD) --define:process.env.NODE_ENV="production" --target=esnext  --bundle src/runtime/index.ts --format=iife --platform=browser --global-name=BUN_RUNTIME --minify --external:/bun:* > src/runtime.out.js; cat src/runtime.footer.js >> src/runtime.out.js
-	@NODE_ENV=production $(ESBUILD) --define:process.env.NODE_ENV="production" --target=esnext  --bundle src/runtime/index-with-refresh.ts --format=iife --platform=browser --global-name=BUN_RUNTIME --minify --external:/bun:* > src/runtime.out.refresh.js; cat src/runtime.footer.with-refresh.js >> src/runtime.out.refresh.js
-	@NODE_ENV=production $(ESBUILD) --define:process.env.NODE_ENV="production" --target=esnext  --bundle src/runtime/index-without-hmr.ts --format=iife --platform=node --global-name=BUN_RUNTIME --minify --external:/bun:* > src/runtime.node.pre.out.js; cat src/runtime.node.pre.out.js src/runtime.footer.node.js > src/runtime.node.out.js
-	@NODE_ENV=production $(ESBUILD) --define:process.env.NODE_ENV="production" --target=esnext  --bundle src/runtime/index-without-hmr.ts --format=iife --platform=node --global-name=BUN_RUNTIME --minify --external:/bun:* > src/runtime.bun.pre.out.js; cat src/runtime.bun.pre.out.js src/runtime.footer.bun.js > src/runtime.bun.out.js
+	@NODE_ENV=production $(ESBUILD) --define:process.env.NODE_ENV=\"production\" --target=esnext  --bundle src/runtime/index.ts --format=iife --platform=browser --global-name=BUN_RUNTIME --minify --external:/bun:* > src/runtime.out.js; cat src/runtime.footer.js >> src/runtime.out.js
+	@NODE_ENV=production $(ESBUILD) --define:process.env.NODE_ENV=\"production\" --target=esnext  --bundle src/runtime/index-with-refresh.ts --format=iife --platform=browser --global-name=BUN_RUNTIME --minify --external:/bun:* > src/runtime.out.refresh.js; cat src/runtime.footer.with-refresh.js >> src/runtime.out.refresh.js
+	@NODE_ENV=production $(ESBUILD) --define:process.env.NODE_ENV=\"production\" --target=esnext  --bundle src/runtime/index-without-hmr.ts --format=iife --platform=node --global-name=BUN_RUNTIME --minify --external:/bun:* > src/runtime.node.pre.out.js; cat src/runtime.node.pre.out.js src/runtime.footer.node.js > src/runtime.node.out.js
+	@NODE_ENV=production $(ESBUILD) --define:process.env.NODE_ENV=\"production\" --target=esnext  --bundle src/runtime/index-without-hmr.ts --format=iife --platform=node --global-name=BUN_RUNTIME --minify --external:/bun:* > src/runtime.bun.pre.out.js; cat src/runtime.bun.pre.out.js src/runtime.footer.bun.js > src/runtime.bun.out.js
 
 .PHONY: runtime_js_dev
 runtime_js_dev:
@@ -937,6 +929,9 @@ clone-submodules:
 
 .PHONY: headers
 headers:
+	echo please don't run the headers generator anymore. i don't think it works. 
+	echo if you really need it, run make headers2
+headers2: 
 	rm -f /tmp/build-jsc-headers src/bun.js/bindings/headers.zig
 	touch src/bun.js/bindings/headers.zig
 	$(ZIG) build headers-obj
@@ -1326,7 +1321,7 @@ release-bindings: $(OBJ_DIR) $(OBJ_FILES) $(WEBCORE_OBJ_FILES) $(SQLITE_OBJ_FILE
 # Do not add $(DEBUG_DIR) to this list
 # It will break caching, causing you to have to wait for every .cpp file to rebuild.
 .PHONY: bindings
-bindings: $(DEBUG_OBJ_DIR) $(DEBUG_OBJ_FILES) $(DEBUG_WEBCORE_OBJ_FILES) $(DEBUG_SQLITE_OBJ_FILES) $(DEBUG_NODE_OS_OBJ_FILES) $(DEBUG_BUILTINS_OBJ_FILES) $(DEBUG_IO_FILES) $(DEBUG_MODULES_OBJ_FILES) $(DEBUG_WEBCRYPTO_OBJ_FILES)
+bindings-real: $(DEBUG_OBJ_DIR) $(DEBUG_OBJ_FILES) $(DEBUG_WEBCORE_OBJ_FILES) $(DEBUG_SQLITE_OBJ_FILES) $(DEBUG_NODE_OS_OBJ_FILES) $(DEBUG_BUILTINS_OBJ_FILES) $(DEBUG_IO_FILES) $(DEBUG_MODULES_OBJ_FILES) $(DEBUG_WEBCRYPTO_OBJ_FILES)
 
 .PHONY: jsc-bindings-mac
 jsc-bindings-mac: bindings
@@ -1485,12 +1480,12 @@ wasm-return1:
 	$(ZIG) build-lib -OReleaseSmall test/bun.js/wasm-return-1-test.zig -femit-bin=test/bun.js/wasm-return-1-test.wasm -target wasm32-freestanding
 
 generate-classes:
-	bun src/bun.js/scripts/generate-classes.ts
+	bun src/codegen/generate-classes.ts
 	$(ZIG) fmt src/bun.js/bindings/generated_classes.zig
 	$(CLANG_FORMAT) -i src/bun.js/bindings/ZigGeneratedClasses.h src/bun.js/bindings/ZigGeneratedClasses.cpp
 
 generate-sink:
-	bun src/bun.js/scripts/generate-jssink.js
+	bun src/codegen/generate-jssink.js
 	$(CLANG_FORMAT) -i  src/bun.js/bindings/JSSink.cpp  src/bun.js/bindings/JSSink.h
 	./src/bun.js/scripts/create_hash_table src/bun.js/bindings/JSSink.cpp > src/bun.js/bindings/JSSinkLookupTable.h
 	$(SED) -i -e 's/#include "Lookup.h"//' src/bun.js/bindings/JSSinkLookupTable.h
@@ -1913,46 +1908,30 @@ vendor: assert-deps submodule vendor-without-check
 vendor-dev: assert-deps submodule npm-install-dev vendor-without-npm
 
 .PHONY: bun
-bun: vendor identifier-cache build-obj bun-link-lld-release bun-codesign-release-local
+bun: 
+	echo makefile is deprecated - use `cmake` / `bun run build`
+	echo 'See https://bun.sh/docs/project/contributing for more details'
 
-.PHONY: static-hash-table
-static-hash-table:
-	bun src/js/_codegen/static-hash-tables.ts
+cpp:
+	echo makefile is deprecated - use `cmake` / `bun run build`
+	echo 'See https://bun.sh/docs/project/contributing for more details'
 
-.PHONY: cpp
-cpp: ## compile src/js/builtins + all c++ code then link
-	@make clean-bindings js
-	@make static-hash-table
-	@make bindings -j$(CPU_COUNT)
-	@make link
+zig:
+	echo makefile is deprecated - use `cmake` / `bun run build`
+	echo 'See https://bun.sh/docs/project/contributing for more details'
 
-.PHONY: cpp
-cpp-no-link:
-	@make clean-bindings js
-	@make bindings -j$(CPU_COUNT)
+dev:
+	echo makefile is deprecated - use `cmake` / `bun run build`
+	echo 'See https://bun.sh/docs/project/contributing for more details'
 
-.PHONY: zig
-zig: ## compile zig code then link
-	@make mkdir-dev dev-obj link
+setup:
+	echo makefile is deprecated - use `cmake` / `bun run build`
+	echo 'See https://bun.sh/docs/project/contributing for more details'
 
-.PHONY: zig-no-link
-zig-no-link:
-	@make mkdir-dev dev-obj
+bindings:
+	echo makefile is deprecated - use `cmake` / `bun run build`
+	echo 'See https://bun.sh/docs/project/contributing for more details'
 
-.PHONY: dev
-dev: # combo of `make cpp` and `make zig`
-	@make cpp-no-link zig-no-link -j2
-	@make link
-
-.PHONY: setup
-setup: vendor-dev identifier-cache clean-bindings
-	make jsc-check dev
-	@echo ""
-	@echo "First build complete!"
-	@echo "\"bun-debug\" is available at $(DEBUG_BIN)/bun-debug"
-	@echo ""
-
-.PHONY: help
-help: ## to print this help
-	@echo "For detailed build instructions, see https://bun.sh/docs/project/development"
-	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z0-9_-]+:.*?## / {gsub("\\\\n",sprintf("\n%22c",""), $$2);printf "\033[36m%-20s\033[0m \t\t%s\n", $$1, $$2}' $(MAKEFILE_LIST)
+help:
+	echo makefile is deprecated - use `cmake` / `bun run build`
+	echo 'See https://bun.sh/docs/project/contributing for more details'

README.md

@@ -93,8 +93,8 @@ bun upgrade --canary
   - [`bun run`](https://bun.sh/docs/cli/run)
   - [`bun install`](https://bun.sh/docs/cli/install)
   - [`bun test`](https://bun.sh/docs/cli/test)
-  - [`bun init`](https://bun.sh/docs/templates#bun-init)
-  - [`bun create`](https://bun.sh/docs/templates#bun-create)
+  - [`bun init`](https://bun.sh/docs/cli/init)
+  - [`bun create`](https://bun.sh/docs/cli/bun-create)
   - [`bunx`](https://bun.sh/docs/cli/bunx)
 - Runtime
   - [Runtime](https://bun.sh/docs/runtime/index)

bench/snippets/async-overhead.mjs

@@ -6,23 +6,30 @@ bench("await 1", async function () {
   return await 1;
 });
 
-function callnextTick(resolve) {
-  process.nextTick(resolve);
-}
+if (typeof process !== "undefined") {
+  bench("process.nextTick x 100", async function () {
+    var remaining = 100;
+    var cb, promise;
+    promise = new Promise(resolve => {
+      cb = resolve;
+    });
 
-function awaitNextTick() {
-  return new Promise(callnextTick);
-}
+    for (let i = 0; i < 100; i++) {
+      process.nextTick(() => {
+        if (--remaining === 0) cb();
+      });
+    }
 
-bench("promise.nextTick", async function () {
-  return awaitNextTick();
-});
+    return promise;
+  });
+
+  bench("await 1 x 100", async function () {
+    for (let i = 0; i < 100; i++) await 1;
+  });
+}
 
 bench("await new Promise(resolve => resolve())", async function () {
   await new Promise(resolve => resolve());
 });
-bench("Promise.all(Array.from({length: 100}, () => new Promise((resolve) => resolve())))", async function () {
-  return Promise.all(Array.from({ length: 100 }, () => Promise.resolve(1)));
-});
 
 await run();

bench/snippets/require-builtins.mjs

@@ -0,0 +1,25 @@
+import { bench, run } from "./runner.mjs";
+import { builtinModules } from "node:module";
+import { writeFile } from "node:fs/promises";
+import { spawnSync } from "child_process";
+
+for (let builtin of builtinModules) {
+  const path = `/tmp/require.${builtin.replaceAll("/", "_")}.cjs`;
+  await writeFile(
+    path,
+    `
+const builtin = ${JSON.stringify(builtin)};
+const now = require("perf_hooks").performance.now();
+require(builtin);
+const end = require("perf_hooks").performance.now();
+process.stdout.write(JSON.stringify({builtin, time: end - now}) + "\\n");
+  `,
+  );
+  const result = spawnSync(typeof Bun !== "undefined" ? "bun" : "node", [path], {
+    stdio: ["inherit", "inherit", "inherit"],
+    env: {
+      ...process.env,
+      NODE_NO_WARNINGS: "1",
+    },
+  });
+}

build.zig

@@ -1,4 +1,7 @@
+const recommended_zig_version = "0.12.0-dev.1297+a9e66ed73";
+const zig_version = @import("builtin").zig_version;
 const std = @import("std");
+
 const pathRel = std.fs.path.relative;
 const Wyhash = @import("./src/wyhash.zig").Wyhash;
 var is_debug_build = false;
@@ -11,6 +14,11 @@ fn moduleSource(comptime out: []const u8) FileSource {
     }
 }
 
+fn exists(path: []const u8) bool {
+    _ = std.fs.openFileAbsolute(path, .{ .mode = .read_only }) catch return false;
+    return true;
+}
+
 const color_map = std.ComptimeStringMap([]const u8, .{
     &.{ "black", "30m" },
     &.{ "blue", "34m" },
@@ -46,11 +54,37 @@ fn addInternalPackages(b: *Build, step: *CompileStep, _: std.mem.Allocator, _: [
     };
 
     step.addModule("async_io", io);
+
+    step.addModule("zlib-internal", brk: {
+        if (target.isWindows()) {
+            break :brk b.createModule(.{ .source_file = FileSource.relative("src/deps/zlib.win32.zig") });
+        }
+
+        break :brk b.createModule(.{ .source_file = FileSource.relative("src/deps/zlib.posix.zig") });
+    });
+
+    var async_: *Module = brk: {
+        if (target.isDarwin() or target.isLinux() or target.isFreeBSD()) {
+            break :brk b.createModule(.{
+                .source_file = FileSource.relative("src/async/posix_event_loop.zig"),
+            });
+        } else if (target.isWindows()) {
+            break :brk b.createModule(.{
+                .source_file = FileSource.relative("src/async/windows_event_loop.zig"),
+            });
+        }
+
+        break :brk b.createModule(.{
+            .source_file = FileSource.relative("src/async/stub_event_loop.zig"),
+        });
+    };
+    step.addModule("async", async_);
 }
 
 const BunBuildOptions = struct {
     canary: bool = false,
     sha: [:0]const u8 = "",
+    version: []const u8 = "",
     baseline: bool = false,
     bindgen: bool = false,
     sizegen: bool = false,
@@ -59,6 +93,8 @@ const BunBuildOptions = struct {
     runtime_js_version: u64 = 0,
     fallback_html_version: u64 = 0,
 
+    tinycc: bool = true,
+
     pub fn updateRuntime(this: *BunBuildOptions) anyerror!void {
         if (std.fs.cwd().openFile("src/runtime.out.js", .{ .mode = .read_only })) |file| {
             defer file.close();
@@ -90,6 +126,11 @@ const BunBuildOptions = struct {
     pub fn step(this: BunBuildOptions, b: anytype) *std.build.OptionsStep {
         var opts = b.addOptions();
         opts.addOption(@TypeOf(this.canary), "is_canary", this.canary);
+        opts.addOption(
+            std.SemanticVersion,
+            "version",
+            std.SemanticVersion.parse(this.version) catch @panic(b.fmt("Invalid version: {s}", .{this.version})),
+        );
         opts.addOption(@TypeOf(this.sha), "sha", this.sha);
         opts.addOption(@TypeOf(this.baseline), "baseline", this.baseline);
         opts.addOption(@TypeOf(this.bindgen), "bindgen", this.bindgen);
@@ -97,6 +138,7 @@ const BunBuildOptions = struct {
         opts.addOption(@TypeOf(this.base_path), "base_path", this.base_path);
         opts.addOption(@TypeOf(this.runtime_js_version), "runtime_js_version", this.runtime_js_version);
         opts.addOption(@TypeOf(this.fallback_html_version), "fallback_html_version", this.fallback_html_version);
+        opts.addOption(@TypeOf(this.tinycc), "tinycc", this.tinycc);
         return opts;
     }
 };
@@ -146,6 +188,26 @@ pub fn build(b: *Build) !void {
 }
 
 pub fn build_(b: *Build) !void {
+    switch (comptime zig_version.order(std.SemanticVersion.parse(recommended_zig_version) catch unreachable)) {
+        .eq => {},
+        .lt => {
+            @compileError("The minimum version of Zig required to compile Bun is " ++ recommended_zig_version ++ ", found " ++ @import("builtin").zig_version_string);
+        },
+        .gt => {
+            const colors = std.io.getStdErr().supportsAnsiEscapeCodes();
+            std.debug.print(
+                "{s}WARNING:\nBun recommends Zig version '{s}', but found '{s}', build may fail...\nMake sure you installed the right version as per https://bun.sh/docs/project/contributing#install-zig\n{s}You can update to the right version using 'zigup {s}'\n\n",
+                .{
+                    if (colors) "\x1b[1;33m" else "",
+                    recommended_zig_version,
+                    @import("builtin").zig_version_string,
+                    if (colors) "\x1b[0m" else "",
+                    recommended_zig_version,
+                },
+            );
+        },
+    }
+
     // Standard target options allows the person running `zig build` to choose
     // what target to build for. Here we do not override the defaults, which
     // means any target is allowed, and the default is native. Other options
@@ -155,6 +217,8 @@ pub fn build_(b: *Build) !void {
     // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
     optimize = b.standardOptimizeOption(.{});
 
+    const generated_code_directory = b.option([]const u8, "generated-code", "Set the generated code directory") orelse "./build";
+
     var output_dir_buf = std.mem.zeroes([4096]u8);
     var bin_label = if (optimize == std.builtin.OptimizeMode.Debug) "packages/debug-bun-" else "packages/bun-";
 
@@ -187,15 +251,17 @@ pub fn build_(b: *Build) !void {
 
     var triplet = triplet_buf[0 .. osname.len + cpuArchName.len + 1];
 
-    if (b.option([]const u8, "output-dir", "target to install to") orelse std.os.getenv("OUTPUT_DIR")) |output_dir_| {
-        output_dir = try pathRel(b.allocator, b.install_prefix, output_dir_);
+    const outfile_maybe = b.option([]const u8, "output-file", "target to install to");
+
+    if (outfile_maybe) |outfile| {
+        output_dir = try pathRel(b.allocator, b.install_prefix, std.fs.path.dirname(outfile) orelse "");
     } else {
         const output_dir_base = try std.fmt.bufPrint(&output_dir_buf, "{s}{s}", .{ bin_label, triplet });
         output_dir = try pathRel(b.allocator, b.install_prefix, output_dir_base);
     }
 
     is_debug_build = optimize == OptimizeMode.Debug;
-    const bun_executable_name = if (optimize == std.builtin.OptimizeMode.Debug) "bun-debug" else "bun";
+    const bun_executable_name = if (outfile_maybe) |outfile| std.fs.path.basename(outfile[0 .. outfile.len - std.fs.path.extension(outfile).len]) else if (is_debug_build) "bun-debug" else "bun";
     const root_src = if (target.getOsTag() == std.Target.Os.Tag.freestanding)
         "root_wasm.zig"
     else
@@ -217,10 +283,31 @@ pub fn build_(b: *Build) !void {
         .root_source_file = FileSource.relative(root_src),
         .target = target,
         .optimize = optimize,
-        .main_pkg_path = .{ .cwd_relative = b.pathFromRoot(".") },
+        .main_mod_path = .{ .cwd_relative = b.pathFromRoot(".") },
     });
 
-    b.reference_trace = 16;
+    if (!exists(b.pathFromRoot(try std.fs.path.join(b.allocator, &.{
+        "src",
+        "js_lexer",
+        "id_continue_bitset.blob",
+    })))) {
+        const identifier_data = b.pathFromRoot(try std.fs.path.join(b.allocator, &.{ "src", "js_lexer", "identifier_data.zig" }));
+        var run_step = b.addSystemCommand(&.{
+            b.zig_exe,
+            "run",
+            identifier_data,
+        });
+        run_step.has_side_effects = true;
+        obj.step.dependOn(&run_step.step);
+    }
+
+    b.reference_trace = if (b.option(u32, "reference-trace", "Set the reference trace")) |trace|
+        if (trace == 0)
+            null
+        else
+            trace
+    else
+        16;
 
     var default_build_options: BunBuildOptions = brk: {
         const is_baseline = arch.isX86() and (target.cpu_model == .baseline or
@@ -231,7 +318,7 @@ pub fn build_(b: *Build) !void {
             git_sha = b.allocator.dupeZ(u8, sha) catch unreachable;
         } else {
             sha: {
-                const result = std.ChildProcess.exec(.{
+                const result = std.ChildProcess.run(.{
                     .allocator = b.allocator,
                     .argv = &.{
                         "git",
@@ -246,9 +333,12 @@ pub fn build_(b: *Build) !void {
             }
         }
 
-        const is_canary = (std.os.getenvZ("BUN_CANARY") orelse "0")[0] == '1';
+        const is_canary =
+            b.option(bool, "canary", "Treat this as a canary build") orelse
+            ((b.env_map.get("BUN_CANARY") orelse "0")[0] == '1');
         break :brk .{
             .canary = is_canary,
+            .version = b.option([]const u8, "version", "Value of `Bun.version`") orelse "0.0.0",
             .sha = git_sha,
             .baseline = is_baseline,
             .bindgen = false,
@@ -283,8 +373,9 @@ pub fn build_(b: *Build) !void {
             min_version,
             max_version,
             obj.target.getCpuModel().name,
-        }) catch unreachable;
-        std.io.getStdErr().writer().print("Output: {s}/{s}\n\n", .{ output_dir, bun_executable_name }) catch unreachable;
+        }) catch {};
+        std.io.getStdErr().writer().print("Zig {s}\n", .{@import("builtin").zig_version_string}) catch {};
+        // std.io.getStdErr().writer().print("Output: {s}/{s}\n\n", .{ output_dir, bun_executable_name }) catch unreachable;
 
         defer obj_step.dependOn(&obj.step);
 
@@ -303,13 +394,22 @@ pub fn build_(b: *Build) !void {
 
         obj.addOptions("build_options", actual_build_options.step(b));
 
-        obj.linkLibC();
+        // Generated Code
+        // TODO: exit with a better error early if these files do not exist. it is an indication someone ran `zig build` directly without the code generators.
+        obj.addModule("generated/ZigGeneratedClasses.zig", b.createModule(.{
+            .source_file = .{ .path = b.fmt("{s}/ZigGeneratedClasses.zig", .{generated_code_directory}) },
+        }));
+        obj.addModule("generated/ResolvedSourceTag.zig", b.createModule(.{
+            .source_file = .{ .path = b.fmt("{s}/ResolvedSourceTag.zig", .{generated_code_directory}) },
+        }));
 
+        obj.linkLibC();
+        obj.dll_export_fns = true;
         obj.strip = false;
-        obj.bundle_compiler_rt = false;
         obj.omit_frame_pointer = optimize != .Debug;
+        obj.subsystem = .Console;
         // Disable stack probing on x86 so we don't need to include compiler_rt
-        if (target.getCpuArch().isX86()) obj.disable_stack_probing = true;
+        if (target.getCpuArch().isX86() or target.isWindows()) obj.disable_stack_probing = true;
 
         if (b.option(bool, "for-editor", "Do not emit bin, just check for errors") orelse false) {
             // obj.emit_bin = .no_emit;
@@ -331,7 +431,7 @@ pub fn build_(b: *Build) !void {
             .root_source_file = FileSource.relative("src/bindgen.zig"),
             .target = target,
             .optimize = optimize,
-            .main_pkg_path = obj.main_pkg_path,
+            .main_mod_path = obj.main_mod_path,
         });
         defer headers_step.dependOn(&headers_obj.step);
         try configureObjectStep(b, headers_obj, headers_step, @TypeOf(target), target);
@@ -348,7 +448,7 @@ pub fn build_(b: *Build) !void {
             .root_source_file = FileSource.relative("root_wasm.zig"),
             .target = target,
             .optimize = optimize,
-            .main_pkg_path = obj.main_pkg_path,
+            .main_mod_path = obj.main_mod_path,
         });
         defer wasm_step.dependOn(&wasm.step);
         wasm.strip = false;
@@ -367,7 +467,7 @@ pub fn build_(b: *Build) !void {
             .root_source_file = FileSource.relative("misctools/http_bench.zig"),
             .target = target,
             .optimize = optimize,
-            .main_pkg_path = obj.main_pkg_path,
+            .main_mod_path = obj.main_mod_path,
         });
         defer headers_step.dependOn(&headers_obj.step);
         try configureObjectStep(b, headers_obj, headers_step, @TypeOf(target), target);
@@ -381,7 +481,7 @@ pub fn build_(b: *Build) !void {
             .root_source_file = FileSource.relative("misctools/machbench.zig"),
             .target = target,
             .optimize = optimize,
-            .main_pkg_path = obj.main_pkg_path,
+            .main_mod_path = obj.main_mod_path,
         });
         defer headers_step.dependOn(&headers_obj.step);
         try configureObjectStep(b, headers_obj, headers_step, @TypeOf(target), target);
@@ -395,7 +495,7 @@ pub fn build_(b: *Build) !void {
             .root_source_file = FileSource.relative("misctools/fetch.zig"),
             .target = target,
             .optimize = optimize,
-            .main_pkg_path = obj.main_pkg_path,
+            .main_mod_path = obj.main_mod_path,
         });
         defer headers_step.dependOn(&headers_obj.step);
         try configureObjectStep(b, headers_obj, headers_step, @TypeOf(target), target);
@@ -409,7 +509,7 @@ pub fn build_(b: *Build) !void {
             .root_source_file = FileSource.relative("src/bench/string-handling.zig"),
             .target = target,
             .optimize = optimize,
-            .main_pkg_path = obj.main_pkg_path,
+            .main_mod_path = obj.main_mod_path,
         });
         defer headers_step.dependOn(&headers_obj.step);
         try configureObjectStep(b, headers_obj, headers_step, @TypeOf(target), target);
@@ -423,7 +523,7 @@ pub fn build_(b: *Build) !void {
             .root_source_file = FileSource.relative("src/sha.zig"),
             .target = target,
             .optimize = optimize,
-            .main_pkg_path = obj.main_pkg_path,
+            .main_mod_path = obj.main_mod_path,
         });
         defer headers_step.dependOn(&headers_obj.step);
         try configureObjectStep(b, headers_obj, headers_step, @TypeOf(target), target);
@@ -437,7 +537,7 @@ pub fn build_(b: *Build) !void {
             .root_source_file = FileSource.relative("src/sourcemap/vlq_bench.zig"),
             .target = target,
             .optimize = optimize,
-            .main_pkg_path = obj.main_pkg_path,
+            .main_mod_path = obj.main_mod_path,
         });
         defer headers_step.dependOn(&headers_obj.step);
         try configureObjectStep(b, headers_obj, headers_step, @TypeOf(target), target);
@@ -451,7 +551,7 @@ pub fn build_(b: *Build) !void {
             .root_source_file = FileSource.relative("misctools/tgz.zig"),
             .target = target,
             .optimize = optimize,
-            .main_pkg_path = obj.main_pkg_path,
+            .main_mod_path = obj.main_mod_path,
         });
         defer headers_step.dependOn(&headers_obj.step);
         try configureObjectStep(b, headers_obj, headers_step, @TypeOf(target), target);
@@ -468,7 +568,7 @@ pub fn build_(b: *Build) !void {
         var headers_obj: *CompileStep = b.addTest(.{
             .root_source_file = FileSource.relative(test_file orelse "src/main.zig"),
             .target = target,
-            .main_pkg_path = obj.main_pkg_path,
+            .main_mod_path = obj.main_mod_path,
         });
         headers_obj.filter = test_filter;
         if (test_bin_) |test_bin| {

docs/api/binary-data.md

@@ -26,10 +26,10 @@ Below is a quick "cheat sheet" that doubles as a table of contents. Click an ite
 
 ---
 
-<!-- - [`File`](#file)
-- _Browser only_. A subclass of `Blob` that represents a file. Has a `name` and `lastModified` timestamp. There is experimental support in Node.js v20; Bun does not support `File` yet; most of its functionality is provided by `BunFile`.
+- [`File`](#file)
+- A subclass of `Blob` that represents a file. Has a `name` and `lastModified` timestamp. There is experimental support in Node.js v20.
 
---- -->
+---
 
 - [`BunFile`](#bunfile)
 - _Bun only_. A subclass of `Blob` that represents a lazily-loaded file on disk. Created with `Bun.file(path)`.

docs/api/spawn.md

@@ -183,6 +183,60 @@ const proc = Bun.spawn(["echo", "hello"]);
 proc.unref();
 ```
 
+## Inter-process communication (IPC)
+
+Bun supports direct inter-process communication channel between two `bun` processes. To receive messages from a spawned Bun subprocess, specify an `ipc` handler.
+{%callout%}
+**Note** — This API is only compatible with other `bun` processes. Use `process.execPath` to get a path to the currently running `bun` executable.
+{%/callout%}
+
+```ts#parent.ts
+const child = Bun.spawn(["bun", "child.ts"], {
+  ipc(message) {
+    /**
+     * The message received from the sub process
+     **/
+  },
+});
+```
+
+The parent process can send messages to the subprocess using the `.send()` method on the returned `Subprocess` instance. A reference to the sending subprocess is also available as the second argument in the `ipc` handler.
+
+```ts#parent.ts
+const childProc = Bun.spawn(["bun", "child.ts"], {
+  ipc(message, childProc) {
+    /**
+     * The message received from the sub process
+     **/
+    childProc.send("Respond to child")
+  },
+});
+
+childProc.send("I am your father"); // The parent can send messages to the child as well
+```
+
+Meanwhile the child process can send messages to its parent using with `process.send()` and receive messages with `process.on("message")`. This is the same API used for `child_process.fork()` in Node.js.
+
+```ts#child.ts
+process.send("Hello from child as string");
+process.send({ message: "Hello from child as object" });
+
+process.on("message", (message) => {
+  // print message from parent
+  console.log(message);
+});
+```
+
+All messages are serialized using the JSC `serialize` API, which allows for the same set of [transferrable types](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Transferable_objects) supported by `postMessage` and `structuredClone`, including strings, typed arrays, streams, and objects.
+
+```ts#child.ts
+// send a string
+process.send("Hello from child as string");
+
+// send an object
+process.send({ message: "Hello from child as object" });
+```
+
 ## Blocking API (`Bun.spawnSync()`)
 
 Bun provides a synchronous equivalent of `Bun.spawn` called `Bun.spawnSync`. This is a blocking API that supports the same inputs and parameters as `Bun.spawn`. It returns a `SyncSubprocess` object, which differs from `Subprocess` in a few ways.

docs/api/utils.md

@@ -398,7 +398,7 @@ buf; // => Uint8Array(25)
 compressed; // => Uint8Array(10)
 ```
 
-The second argument supports the same set of configuration options as [`Bun.gzipSync`](#bun.gzipSync).
+The second argument supports the same set of configuration options as [`Bun.gzipSync`](#bungzipsync).
 
 ## `Bun.inflateSync()`
 

docs/bundler/index.md

@@ -328,7 +328,7 @@ Depending on the target, Bun will apply different module resolution rules and op
 
   All bundles generated with `target: "bun"` are marked with a special `// @bun` pragma, which indicates to the Bun runtime that there's no need to re-transpile the file before execution.
 
-  If any entrypoints contains a Bun shebang (`#!/usr/bin/env bun`) the bundler will default to `target: "bun"` instead of `"browser`.
+  If any entrypoints contains a Bun shebang (`#!/usr/bin/env bun`) the bundler will default to `target: "bun"` instead of `"browser"`.
 
 ---
 

docs/cli/add.md

@@ -0,0 +1,155 @@
+To add a particular package:
+
+```bash
+$ bun add preact
+```
+
+To specify a version, version range, or tag:
+
+```bash
+$ bun add zod@3.20.0
+$ bun add zod@^3.0.0
+$ bun add zod@latest
+```
+
+## `--dev`
+
+{% callout %}
+**Alias** — `--development`, `-d`, `-D`
+{% /callout %}
+
+To add a package as a dev dependency (`"devDependencies"`):
+
+```bash
+$ bun add --dev @types/react
+$ bun add -d @types/react
+```
+
+## `--optional`
+
+To add a package as an optional dependency (`"optionalDependencies"`):
+
+```bash
+$ bun add --optional lodash
+```
+
+## `--exact`
+
+To add a package and pin to the resolved version, use `--exact`. This will resolve the version of the package and add it to your `package.json` with an exact version number instead of a version range.
+
+```bash
+$ bun add react --exact
+$ bun add react -E
+```
+
+This will add the following to your `package.json`:
+
+```jsonc
+{
+  "dependencies": {
+    // without --exact
+    "react": "^18.2.0", // this matches >= 18.2.0 < 19.0.0
+
+    // with --exact
+    "react": "18.2.0" // this matches only 18.2.0 exactly
+  }
+}
+```
+
+To view a complete list of options for this command:
+
+```bash
+$ bun add --help
+```
+
+## `--global`
+
+{% callout %}
+**Note** — This would not modify package.json of your current project folder.
+**Alias** - `bun add --global`, `bun add -g`, `bun install --global` and `bun install -g`
+{% /callout %}
+
+To install a package globally, use the `-g`/`--global` flag. This will not modify the `package.json` of your current project. Typically this is used for installing command-line tools.
+
+```bash
+$ bun add --global cowsay # or `bun add -g cowsay`
+$ cowsay "Bun!"
+ ______
+< Bun! >
+ ------
+        \   ^__^
+         \  (oo)\_______
+            (__)\       )\/\
+                ||----w |
+                ||     ||
+```
+
+{% details summary="Configuring global installation behavior" %}
+
+```toml
+[install]
+# where `bun add --global` installs packages
+globalDir = "~/.bun/install/global"
+
+# where globally-installed package bins are linked
+globalBinDir = "~/.bun/bin"
+```
+
+{% /details %}
+
+## Trusted dependencies
+
+Unlike other npm clients, Bun does not execute arbitrary lifecycle scripts for installed dependencies, such as `postinstall`. These scripts represent a potential security risk, as they can execute arbitrary code on your machine.
+
+To tell Bun to allow lifecycle scripts for a particular package, add the package to `trustedDependencies` in your package.json.
+
+```json-diff
+  {
+    "name": "my-app",
+    "version": "1.0.0",
++   "trustedDependencies": ["my-trusted-package"]
+  }
+```
+
+Bun reads this field and will run lifecycle scripts for `my-trusted-package`.
+
+<!-- Bun maintains an allow-list of popular packages containing `postinstall` scripts that are known to be safe. To run lifecycle scripts for packages that aren't on this list, add the package to `trustedDependencies` in your package.json. -->
+
+## Git dependencies
+
+To add a dependency from a git repository:
+
+```bash
+$ bun add git@github.com:moment/moment.git
+```
+
+Bun supports a variety of protocols, including [`github`](https://docs.npmjs.com/cli/v9/configuring-npm/package-json#github-urls), [`git`](https://docs.npmjs.com/cli/v9/configuring-npm/package-json#git-urls-as-dependencies), `git+ssh`, `git+https`, and many more.
+
+```json
+{
+  "dependencies": {
+    "dayjs": "git+https://github.com/iamkun/dayjs.git",
+    "lodash": "git+ssh://github.com/lodash/lodash.git#4.17.21",
+    "moment": "git@github.com:moment/moment.git",
+    "zod": "github:colinhacks/zod"
+  }
+}
+```
+
+## Tarball dependencies
+
+A package name can correspond to a publicly hosted `.tgz` file. During installation, Bun will download and install the package from the specified tarball URL, rather than from the package registry.
+
+```sh
+$ bun add zod@https://registry.npmjs.org/zod/-/zod-3.21.4.tgz
+```
+
+This will add the following line to your `package.json`:
+
+```json#package.json
+{
+  "dependencies": {
+    "zod": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz"
+  }
+}
+```

docs/cli/bun-create.md

@@ -1,36 +1,12 @@
-## `bun init`
-
-Scaffold an empty project with the interactive `bun init` command.
-
-```bash
-$ bun init
-bun init helps you get started with a minimal project and tries to
-guess sensible defaults. Press ^C anytime to quit.
-
-package name (quickstart):
-entry point (index.ts):
-
-Done! A package.json file was saved in the current directory.
- + index.ts
- + .gitignore
- + tsconfig.json (for editor auto-complete)
- + README.md
-
-To get started, run:
-  bun run index.ts
-```
-
-Press `enter` to accept the default answer for each prompt, or pass the `-y` flag to auto-accept the defaults.
-
-## `bun create`
-
 {% callout %}
 **Note** — You don’t need `bun create` to use Bun. You don’t need any configuration at all. This command exists to make getting started a bit quicker and easier.
 {% /callout %}
 
 Template a new Bun project with `bun create`. This is a flexible command that can be used to create a new project with a `create-<template>` npm package, a GitHub repo, or a local template.
 
-### From `npm`
+If you're looking to create a brand new empty project, use [`bun init`](/docs/cli/init).
+
+## From `npm`
 
 ```sh
 $ bun create <template> [<destination>]
@@ -45,7 +21,7 @@ $ bunx create-remix
 
 Refer to the documentation of the associated `create-<template>` package for complete documentation and usage instructions.
 
-### From GitHub
+## From GitHub
 
 This will download the contents of the GitHub repo to disk.
 
@@ -115,7 +91,7 @@ $ bun create https://github.com/ahfarmer/calculator ./myapp
 
 Bun installs the files as they currently exist current default branch (usually `main` or `master`). Unlike `git clone` it doesn't download the commit history or configure a remote. -->
 
-### From a local template
+## From a local template
 
 {% callout %}
 **⚠️ Warning** — Unlike remote templates, running `bun create` with a local template will delete the entire destination folder if it already exists! Be careful.
@@ -231,7 +207,7 @@ After cloning a template, `bun create` will automatically remove the `"bun-creat
 
 ---
 
-- `GITHUB_API_TOKEN`
+- `GITHUB_ACCESS_TOKEN`
 - This lets `bun create` work with private repositories or if you get rate-limited
 
 {% /table %}

docs/cli/bun-install.md

@@ -59,8 +59,8 @@ optional = true
 # Install local devDependencies (default: true)
 dev = true
 
-# Install peerDependencies (default: false)
-peer = false
+# Install peerDependencies (default: true)
+peer = true
 
 # When using `bun install -g`, install packages here
 globalDir = "~/.bun/install/global"
@@ -170,7 +170,7 @@ bun stores normalized `cpu` and `os` values from npm in the lockfile, along with
 
 ## Peer dependencies?
 
-Peer dependencies are handled similarly to yarn. `bun install` does not automatically install peer dependencies and will try to choose an existing dependency.
+Peer dependencies are handled similarly to yarn. `bun install` will automatically install peer dependencies. If the dependency is marked optional in `peerDependenciesMeta`, an existing dependency will be chosen if possible.
 
 ## Lockfile
 

docs/cli/create.md

@@ -1,256 +0,0 @@
-## `bun init`
-
-Scaffold an empty project with `bun init`. It's an interactive tool.
-
-```bash
-$ bun init
-bun init helps you get started with a minimal project and tries to
-guess sensible defaults. Press ^C anytime to quit.
-
-package name (quickstart):
-entry point (index.ts):
-
-Done! A package.json file was saved in the current directory.
- + index.ts
- + .gitignore
- + tsconfig.json (for editor auto-complete)
- + README.md
-
-To get started, run:
-  bun run index.ts
-```
-
-Press `enter` to accept the default answer for each prompt, or pass the `-y` flag to auto-accept the defaults.
-
-## `bun create`
-
-Template a new Bun project with `bun create`.
-
-```bash
-$ bun create <template> <destination>
-```
-
-{% callout %}
-**Note** — You don’t need `bun create` to use Bun. You don’t need any configuration at all. This command exists to make getting started a bit quicker and easier.
-{% /callout %}
-
-A template can take a number of forms:
-
-```bash
-$ bun create <template>         # an official template (remote)
-$ bun create <username>/<repo>  # a GitHub repo (remote)
-$ bun create <local-template>   # a custom template (local)
-```
-
-Running `bun create` performs the following steps:
-
-- Download the template (remote templates only)
-- Copy all template files into the destination folder. By default Bun will _not overwrite_ any existing files. Use the `--force` flag to overwrite existing files.
-- Install dependencies with `bun install`.
-- Initialize a fresh Git repo. Opt out with the `--no-git` flag.
-- Run the template's configured `start` script, if defined.
-
-<!-- ## Official templates
-
-The following official templates are available.
-
-```bash
-bun create next ./myapp
-bun create react ./myapp
-bun create svelte-kit ./myapp
-bun create elysia ./myapp
-bun create hono ./myapp
-bun create kingworld ./myapp
-```
-
-Each of these corresponds to a directory in the [bun-community/create-templates](https://github.com/bun-community/create-templates) repo. If you think a major framework is missing, please open a PR there. This list will change over time as additional examples are added. To see an up-to-date list, run `bun create` with no arguments.
-
-```bash
-$ bun create
-Welcome to bun! Create a new project by pasting any of the following:
-  <list of templates>
-```
-
-{% callout %}
-⚡️ **Speed** — At the time of writing, `bun create react app` runs ~11x faster on a M1 Macbook Pro than `yarn create react-app app`.
-{% /callout %} -->
-
-## GitHub repos
-
-A template of the form `<username>/<repo>` will be downloaded from GitHub.
-
-```bash
-$ bun create ahfarmer/calculator ./myapp
-```
-
-Complete GitHub URLs will also work:
-
-```bash
-$ bun create github.com/ahfarmer/calculator ./myapp
-$ bun create https://github.com/ahfarmer/calculator ./myapp
-```
-
-Bun installs the files as they currently exist current default branch (usually `main`). Unlike `git clone` it doesn't download the commit history or configure a remote.
-
-## Local templates
-
-{% callout %}
-**⚠️ Warning** — Unlike remote templates, running `bun create` with a local template will delete the entire destination folder if it already exists! Be careful.
-{% /callout %}
-Bun's templater can be extended to support custom templates defined on your local file system. These templates should live in one of the following directories:
-
-- `$HOME/.bun-create/<name>`: global templates
-- `<project root>/.bun-create/<name>`: project-specific templates
-
-{% callout %}
-**Note** — You can customize the global template path by setting the `BUN_CREATE_DIR` environment variable.
-{% /callout %}
-
-To create a local template, navigate to `$HOME/.bun-create` and create a new directory with the desired name of your template.
-
-```bash
-$ cd $HOME/.bun-create
-$ mkdir foo
-$ cd foo
-```
-
-Then, create a `package.json` file in that directory with the following contents:
-
-```json
-{
-  "name": "foo"
-}
-```
-
-You can run `bun create foo` elsewhere on your file system to verify that Bun is correctly finding your local template.
-
-{% table %}
-
----
-
-- `postinstall`
-- runs after installing dependencies
-
----
-
-- `preinstall`
-- runs before installing dependencies
-
-<!-- ---
-
-- `start`
-- a command to auto-start the application -->
-
-{% /table %}
-
-Each of these can correspond to a string or array of strings. An array of commands will be executed in order. Here is an example:
-
-```json
-{
-  "name": "@bun-examples/simplereact",
-  "version": "0.0.1",
-  "main": "index.js",
-  "dependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
-  },
-  "bun-create": {
-    "preinstall": "echo 'Installing...'", // a single command
-    "postinstall": ["echo 'Done!'"], // an array of commands
-    "start": "bun run echo 'Hello world!'"
-  }
-}
-```
-
-When cloning a template, `bun create` will automatically remove the `"bun-create"` section from `package.json` before writing it to the destination folder.
-
-## Reference
-
-### CLI flags
-
-{% table %}
-
-- Flag
-- Description
-
----
-
-- `--force`
-- Overwrite existing files
-
----
-
-- `--no-install`
-- Skip installing `node_modules` & tasks
-
----
-
-- `--no-git`
-- Don’t initialize a git repository
-
----
-
-- `--open`
-- Start & open in-browser after finish
-
-{% /table %}
-
-### Environment variables
-
-{% table %}
-
-- Name
-- Description
-
----
-
-- `GITHUB_API_DOMAIN`
-- If you’re using a GitHub enterprise or a proxy, you can customize the GitHub domain Bun pings for downloads
-
----
-
-- `GITHUB_API_TOKEN`
-- This lets `bun create` work with private repositories or if you get rate-limited
-
-{% /table %}
-
-{% details summary="How `bun create` works" %}
-
-When you run `bun create ${template} ${destination}`, here’s what happens:
-
-IF remote template
-
-1. GET `registry.npmjs.org/@bun-examples/${template}/latest` and parse it
-2. GET `registry.npmjs.org/@bun-examples/${template}/-/${template}-${latestVersion}.tgz`
-3. Decompress & extract `${template}-${latestVersion}.tgz` into `${destination}`
-
-   - If there are files that would overwrite, warn and exit unless `--force` is passed
-
-IF GitHub repo
-
-1. Download the tarball from GitHub’s API
-2. Decompress & extract into `${destination}`
-
-   - If there are files that would overwrite, warn and exit unless `--force` is passed
-
-ELSE IF local template
-
-1. Open local template folder
-2. Delete destination directory recursively
-3. Copy files recursively using the fastest system calls available (on macOS `fcopyfile` and Linux, `copy_file_range`). Do not copy or traverse into `node_modules` folder if exists (this alone makes it faster than `cp`)
-
-4. Parse the `package.json` (again!), update `name` to be `${basename(destination)}`, remove the `bun-create` section from the `package.json` and save the updated `package.json` to disk.
-   - IF Next.js is detected, add `bun-framework-next` to the list of dependencies
-   - IF Create React App is detected, add the entry point in /src/index.{js,jsx,ts,tsx} to `public/index.html`
-   - IF Relay is detected, add `bun-macro-relay` so that Relay works
-5. Auto-detect the npm client, preferring `pnpm`, `yarn` (v1), and lastly `npm`
-6. Run any tasks defined in `"bun-create": { "preinstall" }` with the npm client
-7. Run `${npmClient} install` unless `--no-install` is passed OR no dependencies are in package.json
-8. Run any tasks defined in `"bun-create": { "preinstall" }` with the npm client
-9. Run `git init; git add -A .; git commit -am "Initial Commit";`
-
-   - Rename `gitignore` to `.gitignore`. NPM automatically removes `.gitignore` files from appearing in packages.
-   - If there are dependencies, this runs in a separate thread concurrently while node_modules are being installed
-   - Using libgit2 if available was tested and performed 3x slower in microbenchmarks
-
-{% /details %}

docs/cli/init.md

@@ -1,3 +1,27 @@
+Scaffold an empty Bun project with the interactive `bun init` command.
+
+```bash
+$ bun init
+bun init helps you get started with a minimal project and tries to
+guess sensible defaults. Press ^C anytime to quit.
+
+package name (quickstart):
+entry point (index.ts):
+
+Done! A package.json file was saved in the current directory.
+ + index.ts
+ + .gitignore
+ + tsconfig.json (for editor auto-complete)
+ + README.md
+
+To get started, run:
+  bun run index.ts
+```
+
+Press `enter` to accept the default answer for each prompt, or pass the `-y` flag to auto-accept the defaults.
+
+{% details summary="How `bun init` works" %}
+
 `bun init` is a quick way to start a blank project with Bun. It guesses with sane defaults and is non-destructive when run multiple times.
 
 ![Demo](https://user-images.githubusercontent.com/709451/183006613-271960a3-ff22-4f7c-83f5-5e18f684c836.gif)
@@ -13,6 +37,4 @@ If you pass `-y` or `--yes`, it will assume you want to continue without asking
 
 At the end, it runs `bun install` to install `bun-types`.
 
-#### How is `bun init` different than `bun create`?
-
-`bun init` is for blank projects. `bun create` applies templates.
+{% /details %}

docs/cli/install.md

@@ -9,7 +9,7 @@ The `bun` CLI contains a Node.js-compatible package manager designed to be a dra
 {% /callout %}
 
 {% details summary="For Linux users" %}
-The minimum Linux Kernel version is 5.1. If you're on Linux kernel 5.1 - 5.5, `bun install` should still work, but HTTP requests will be slow due to a lack of support for io_uring's `connect()` operation.
+The recommended minimum Linux Kernel version is 5.6. If you're on Linux kernel 5.1 - 5.5, `bun install` will work, but HTTP requests will be slow due to a lack of support for io_uring's `connect()` operation.
 
 If you're using Ubuntu 20.04, here's how to install a [newer kernel](https://wiki.ubuntu.com/Kernel/LTSEnablementStack):
 
@@ -23,41 +23,19 @@ sudo apt install --install-recommends linux-generic-hwe-20.04
 
 {% /details %}
 
-## `bun install`
-
 To install all dependencies of a project:
 
 ```bash
 $ bun install
 ```
 
-On Linux, `bun install` tends to install packages 20-100x faster than `npm install`. On macOS, it's more like 4-80x.
-
-![package install benchmark](https://user-images.githubusercontent.com/709451/147004342-571b6123-17a9-49a2-8bfd-dcfc5204047e.png)
-
 Running `bun install` will:
 
-- **Install** all `dependencies`, `devDependencies`, and `optionalDependencies`. Bun does not install `peerDependencies` by default.
+- **Install** all `dependencies`, `devDependencies`, and `optionalDependencies`. Bun will install `peerDependencies` by default.
 - **Run** your project's `{pre|post}install` and `{pre|post}prepare` scripts at the appropriate time. For security reasons Bun _does not execute_ lifecycle scripts of installed dependencies.
 - **Write** a `bun.lockb` lockfile to the project root.
 
-To install in production mode (i.e. without `devDependencies` or `optionalDependencies`):
-
-```bash
-$ bun install --production
-```
-
-To install with reproducible dependencies, use `--frozen-lockfile`. If your `package.json` disagrees with `bun.lockb`, Bun will exit with an error. This is useful for production builds and CI environments.
-
-```bash
-$ bun install --frozen-lockfile
-```
-
-To perform a dry run (i.e. don't actually install anything):
-
-```bash
-$ bun install --dry-run
-```
+## Logging
 
 To modify logging verbosity:
 
@@ -66,86 +44,59 @@ $ bun install --verbose # debug logging
 $ bun install --silent  # no logging
 ```
 
-{% details summary="Configuring behavior" %}
-The default behavior of `bun install` can be configured in `bunfig.toml`:
+## Lifecycle scripts
 
-```toml
-[install]
+Unlike other npm clients, Bun does not execute arbitrary lifecycle scripts like `postinstall` for installed dependencies. Executing arbitrary scripts represents a potential security risk.
 
-# whether to install optionalDependencies
-optional = true
+To tell Bun to allow lifecycle scripts for a particular package, add the package to `trustedDependencies` in your package.json.
 
-# whether to install devDependencies
-dev = true
-
-# whether to install peerDependencies
-peer = false
-
-# equivalent to `--production` flag
-production = false
-
-# equivalent to `--frozen-lockfile` flag
-frozenLockfile = false
-
-# equivalent to `--dry-run` flag
-dryRun = false
+```json-diff
+  {
+    "name": "my-app",
+    "version": "1.0.0",
++   "trustedDependencies": ["my-trusted-package"]
+  }
 ```
 
-{% /details %}
+Then re-install the package. Bun will read this field and run lifecycle scripts for `my-trusted-package`.
 
-## `bun add`
+## Workspaces
 
-To add a particular package:
+Bun supports `"workspaces"` in package.json. For complete documentation refer to [Package manager > Workspaces](/docs/install/workspaces).
 
-```bash
-$ bun add preact
-```
-
-To specify a version, version range, or tag:
-
-```bash
-$ bun add zod@3.20.0
-$ bun add zod@^3.0.0
-$ bun add zod@latest
-```
-
-To add a package as a dev dependency (`"devDependencies"`):
-
-```bash
-$ bun add --dev @types/react
-$ bun add -d @types/react
-```
-
-To add a package as an optional dependency (`"optionalDependencies"`):
-
-```bash
-$ bun add --optional lodash
-```
-
-To add a package and pin to the resolved version, use `--exact`. This will resolve the version of the package and add it to your `package.json` with an exact version number instead of a version range.
-
-```bash
-$ bun add react --exact
-```
-
-This will add the following to your `package.json`:
-
-```jsonc
+```json#package.json
 {
+  "name": "my-app",
+  "version": "1.0.0",
+  "workspaces": ["packages/*"],
   "dependencies": {
-    // without --exact
-    "react": "^18.2.0", // this matches >= 18.2.0 < 19.0.0
-
-    // with --exact
-    "react": "18.2.0" // this matches only 18.2.0 exactly
+    "preact": "^10.5.13"
   }
 }
 ```
 
-To install a package globally:
+## Overrides and resolutions
+
+Bun supports npm's `"overrides"` and Yarn's `"resolutions"` in `package.json`. These are mechanisms for specifying a version range for _metadependencies_—the dependencies of your dependencies. Refer to [Package manager > Overrides and resolutions](/docs/install/overrides) for complete documentation.
+
+```json-diff#package.json
+  {
+    "name": "my-app",
+    "dependencies": {
+      "foo": "^2.0.0"
+    },
++   "overrides": {
++     "bar": "~4.4.0"
++   }
+  }
+```
+
+## Global packages
+
+To install a package globally, use the `-g`/`--global` flag. Typically this is used for installing command-line tools.
 
 ```bash
-$ bun add --global cowsay # or `bun add -g cowsay`
+$ bun install --global cowsay # or `bun install -g cowsay`
 $ cowsay "Bun!"
  ______
 < Bun! >
@@ -157,159 +108,75 @@ $ cowsay "Bun!"
                 ||     ||
 ```
 
-{% details summary="Configuring global installation behavior" %}
+## Production mode
 
-```toml
-[install]
-# where `bun install --global` installs packages
-globalDir = "~/.bun/install/global"
-
-# where globally-installed package bins are linked
-globalBinDir = "~/.bun/bin"
-```
-
-{% /details %}
-To view a complete list of options for a given command:
+To install in production mode (i.e. without `devDependencies` or `optionalDependencies`):
 
 ```bash
-$ bun add --help
+$ bun install --production
 ```
 
-## `bun remove`
-
-To remove a dependency:
+For reproducible installs, use `--frozen-lockfile`. This will install the exact versions of each package specified in the lockfile. If your `package.json` disagrees with `bun.lockb`, Bun will exit with an error. The lockfile will not be updated.
 
 ```bash
-$ bun remove preact
+$ bun install --frozen-lockfile
 ```
 
-## `bun update`
+For more information on Bun's binary lockfile `bun.lockb`, refer to [Package manager > Lockfile](/docs/install/lockfile).
 
-To update all dependencies to the latest version _that's compatible with the version range specified in your `package.json`_:
+## Dry run
 
-```sh
-$ bun update
-```
-
-This will not edit your `package.json`. There's currently no command to force-update all dependencies to the latest version regardless version ranges.
-
-## `bun link`
-
-Use `bun link` in a local directory to register the current package as a "linkable" package.
+To perform a dry run (i.e. don't actually install anything):
 
 ```bash
-$ cd /path/to/cool-pkg
-$ cat package.json
-{
-  "name": "cool-pkg",
-  "version": "1.0.0"
-}
-$ bun link
-bun link v1.x (7416672e)
-Success! Registered "cool-pkg"
-
-To use cool-pkg in a project, run:
-  bun link cool-pkg
-
-Or add it in dependencies in your package.json file:
-  "cool-pkg": "link:cool-pkg"
+$ bun install --dry-run
 ```
 
-This package can now be "linked" into other projects using `bun link cool-pkg`. This will create a symlink in the `node_modules` directory of the target project, pointing to the local directory.
+## Non-npm dependencies
 
-```bash
-$ cd /path/to/my-app
-$ bun link cool-pkg
-```
+Bun supports installing dependencies from Git, GitHub, and local or remotely-hosted tarballs. For complete documentation refer to [Package manager > Git, GitHub, and tarball dependencies](/docs/cli/add).
 
-In addition, the `--save` flag can be used to add `cool-pkg` to the `dependencies` field of your app's package.json with a special version specifier that tells Bun to load from the registered local directory instead of installing from `npm`:
-
-```json-diff
-  {
-    "name": "my-app",
-    "version": "1.0.0",
-    "dependencies": {
-+     "cool-pkg": "link:cool-pkg"
-    }
-  }
-```
-
-## Trusted dependencies
-
-Unlike other npm clients, Bun does not execute arbitrary lifecycle scripts for installed dependencies, such as `postinstall`. These scripts represent a potential security risk, as they can execute arbitrary code on your machine.
-
-<!-- Bun maintains an allow-list of popular packages containing `postinstall` scripts that are known to be safe. To run lifecycle scripts for packages that aren't on this list, add the package to `trustedDependencies` in your package.json. -->
-
-To tell Bun to allow lifecycle scripts for a particular package, add the package to `trustedDependencies` in your package.json.
-
-<!-- ```json-diff
-  {
-    "name": "my-app",
-    "version": "1.0.0",
-+   "trustedDependencies": {
-+     "my-trusted-package": "*"
-+   }
-  }
-``` -->
-
-```json-diff
-  {
-    "name": "my-app",
-    "version": "1.0.0",
-+   "trustedDependencies": ["my-trusted-package"]
-  }
-```
-
-Bun reads this field and will run lifecycle scripts for `my-trusted-package`.
-
-<!-- If you specify a version range, Bun will only execute lifecycle scripts if the resolved package version matches the range. -->
-<!--
-```json
-{
-  "name": "my-app",
-  "version": "1.0.0",
-  "trustedDependencies": {
-    "my-trusted-package": "^1.0.0"
-  }
-}
-``` -->
-
-## Git dependencies
-
-To add a dependency from a git repository:
-
-```bash
-$ bun install git@github.com:moment/moment.git
-```
-
-Bun supports a variety of protocols, including [`github`](https://docs.npmjs.com/cli/v9/configuring-npm/package-json#github-urls), [`git`](https://docs.npmjs.com/cli/v9/configuring-npm/package-json#git-urls-as-dependencies), `git+ssh`, `git+https`, and many more.
-
-```json
+```json#package.json
 {
   "dependencies": {
     "dayjs": "git+https://github.com/iamkun/dayjs.git",
     "lodash": "git+ssh://github.com/lodash/lodash.git#4.17.21",
     "moment": "git@github.com:moment/moment.git",
-    "zod": "github:colinhacks/zod"
+    "zod": "github:colinhacks/zod",
+    "react": "https://registry.npmjs.org/react/-/react-18.2.0.tgz"
   }
 }
 ```
 
-## Tarball dependencies
+## Configuration
 
-A package name can correspond to a publicly hosted `.tgz` file. During `bun install`, Bun will download and install the package from the specified tarball URL, rather than from the package registry.
+The default behavior of `bun install` can be configured in `bunfig.toml`. The default values are shown below.
 
-```json#package.json
-{
-  "dependencies": {
-    "zod": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz"
-  }
-}
+```toml
+[install]
+
+# whether to install optionalDependencies
+optional = true
+
+# whether to install devDependencies
+dev = true
+
+# whether to install peerDependencies
+peer = true
+
+# equivalent to `--production` flag
+production = false
+
+# equivalent to `--frozen-lockfile` flag
+frozenLockfile = false
+
+# equivalent to `--dry-run` flag
+dryRun = false
 ```
 
 ## CI/CD
 
-Looking to speed up your CI? Use the official `oven-sh/setup-bun` action to install `bun` in a GitHub Actions pipeline.
+Looking to speed up your CI? Use the official [`oven-sh/setup-bun`](https://github.com/oven-sh/setup-bun) action to install `bun` in a GitHub Actions pipeline.
 
 ```yaml#.github/workflows/release.yml
 name: bun-types

docs/cli/link.md

@@ -0,0 +1,46 @@
+Use `bun link` in a local directory to register the current package as a "linkable" package.
+
+```bash
+$ cd /path/to/cool-pkg
+$ cat package.json
+{
+  "name": "cool-pkg",
+  "version": "1.0.0"
+}
+$ bun link
+bun link v1.x (7416672e)
+Success! Registered "cool-pkg"
+
+To use cool-pkg in a project, run:
+  bun link cool-pkg
+
+Or add it in dependencies in your package.json file:
+  "cool-pkg": "link:cool-pkg"
+```
+
+This package can now be "linked" into other projects using `bun link cool-pkg`. This will create a symlink in the `node_modules` directory of the target project, pointing to the local directory.
+
+```bash
+$ cd /path/to/my-app
+$ bun link cool-pkg
+```
+
+In addition, the `--save` flag can be used to add `cool-pkg` to the `dependencies` field of your app's package.json with a special version specifier that tells Bun to load from the registered local directory instead of installing from `npm`:
+
+```json-diff
+  {
+    "name": "my-app",
+    "version": "1.0.0",
+    "dependencies": {
++     "cool-pkg": "link:cool-pkg"
+    }
+  }
+```
+
+To _unregister_ a local package, navigate to the package's root directory and run `bun unlink`.
+
+```bash
+$ cd /path/to/cool-pkg
+$ bun unlink
+bun unlink v1.x (7416672e)
+```

docs/cli/remove.md

@@ -0,0 +1,5 @@
+To remove a dependency:
+
+```bash
+$ bun remove ts-node
+```

docs/cli/update.md

@@ -0,0 +1,7 @@
+To update all dependencies to the latest version _that's compatible with the version range specified in your `package.json`_:
+
+```sh
+$ bun update
+```
+
+This will not edit your `package.json`. There's currently no command to force-update all dependencies to the latest version regardless version ranges.

docs/guides/ecosystem/docker.md

@@ -0,0 +1,140 @@
+---
+name: Containerize a Bun application with Docker
+---
+
+{% callout %}
+This guide assumes you already have [Docker Desktop](https://www.docker.com/products/docker-desktop/) installed.
+{% /callout %}
+
+[Docker](https://www.docker.com) is a platform for packaging and running an application as a lightweight, portable _container_ that encapsulates all the necessary dependencies.
+
+---
+
+To _containerize_ our application, we define a `Dockerfile`. This file contains a list of instructions to initialize the container, copy our local project files into it, install dependencies, and starts the application.
+
+```docker#Dockerfile
+# use the official Bun image
+# see all versions at https://hub.docker.com/r/oven/bun/tags
+FROM oven/bun:1 as base
+WORKDIR /usr/src/app
+
+# install dependencies into temp directory
+# this will cache them and speed up future builds
+FROM base AS install
+RUN mkdir -p /temp/dev
+COPY package.json bun.lockb /temp/dev/
+RUN cd /temp/dev && bun install --frozen-lockfile
+
+# install with --production (exclude devDependencies)
+RUN mkdir -p /temp/prod
+COPY package.json bun.lockb /temp/prod/
+RUN cd /temp/prod && bun install --frozen-lockfile --production
+
+# copy node_modules from temp directory
+# then copy all (non-ignored) project files into the image
+FROM install AS prerelease
+COPY --from=install /temp/dev/node_modules node_modules
+COPY . .
+
+# [optional] tests & build
+ENV NODE_ENV=production
+RUN bun test
+RUN bun run build
+
+# copy production dependencies and source code into final image
+FROM base AS release
+COPY --from=install /temp/prod/node_modules node_modules
+COPY --from=prerelease /usr/src/app/index.ts .
+COPY --from=prerelease /usr/src/app/package.json .
+
+# run the app
+USER bun
+EXPOSE 3000/tcp
+ENTRYPOINT [ "bun", "run", "index.ts" ]
+```
+
+---
+
+Now that you have your docker image, let's look at `.dockerignore` which has the same syntax as `.gitignore`, here you need to specify the files/directories that must not go in any stage of the docker build. An example for a ignore file is
+
+```txt#.dockerignore
+node_modules
+Dockerfile*
+docker-compose*
+.dockerignore
+.git
+.gitignore
+README.md
+LICENSE
+.vscode
+Makefile
+helm-charts
+.env
+.editorconfig
+.idea
+coverage*
+```
+
+---
+
+We'll now use `docker build` to convert this `Dockerfile` into a _Docker image_, is a self-contained template containing all the dependencies and configuration required to run the application.
+
+The `-t` flag lets us specify a name for the image, and `--pull` tells Docker to automatically download the latest version of the base image (`oven/bun`). The initial build will take longer, as Docker will download all the base images and dependencies.
+
+```bash
+$ docker build --pull -t bun-hello-world .
+[+] Building 0.9s (21/21) FINISHED
+ => [internal] load build definition from Dockerfile                                                                                     0.0s
+ => => transferring dockerfile: 37B                                                                                                      0.0s
+ => [internal] load .dockerignore                                                                                                        0.0s
+ => => transferring context: 35B                                                                                                         0.0s
+ => [internal] load metadata for docker.io/oven/bun:1                                                                                    0.8s
+ => [auth] oven/bun:pull token for registry-1.docker.io                                                                                  0.0s
+ => [base 1/2] FROM docker.io/oven/bun:1@sha256:373265748d3cd3624cb3f3ee6004f45b1fc3edbd07a622aeeec17566d2756997                         0.0s
+ => [internal] load build context                                                                                                        0.0s
+ => => transferring context: 155B                                                                                                        0.0s
+ # ...lots of commands...
+ => exporting to image                                                                                                                   0.0s
+ => => exporting layers                                                                                                                  0.0s
+ => => writing image sha256:360663f7fdcd6f11e8e94761d5592e2e4dfc8d167f034f15cd5a863d5dc093c4                                             0.0s
+ => => naming to docker.io/library/bun-hello-world                                                                                       0.0s
+```
+
+---
+
+We've built a new _Docker image_. Now let's use that image to spin up an actual, running _container_.
+
+We'll use `docker run` to start a new container using the `bun-hello-world` image. It will be run in _detached_ mode (`-d`) and we'll map the container's port 3000 to our local machine's port 3000 (`-p 3000:3000`).
+
+The `run` command prints a string representing the _container ID_.
+
+```sh
+$ docker run -d -p 3000:3000 bun-hello-world
+7f03e212a15ede8644379bce11a13589f563d3909a9640446c5bbefce993678d
+```
+
+---
+
+The container is now running in the background. Visit [localhost:3000](http://localhost:3000). You should see a `Hello, World!` message.
+
+---
+
+To stop the container, we'll use `docker stop <container-id>`.
+
+```sh
+$ docker stop 7f03e212a15ede8644379bce11a13589f563d3909a9640446c5bbefce993678d
+```
+
+---
+
+If you can't find the container ID, you can use `docker ps` to list all running containers.
+
+```sh
+$ docker ps
+CONTAINER ID        IMAGE               COMMAND                  CREATED             STATUS              PORTS                    NAMES
+7f03e212a15e        bun-hello-world     "bun run index.ts"       2 minutes ago       Up 2 minutes        0.0.0.0:3000->3000/tcp   flamboyant_cerf
+```
+
+---
+
+That's it! Refer to the [Docker documentation](https://docs.docker.com/) for more advanced usage.

docs/guides/ecosystem/drizzle.md

@@ -0,0 +1,185 @@
+---
+name: Use Drizzle ORM with Bun
+---
+
+Drizzle is an ORM that supports both a SQL-like "query builder" API and an ORM-like [Queries API](https://orm.drizzle.team/docs/rqb). It supports the `bun:sqlite` built-in module.
+
+---
+
+Let's get started by creating a fresh project with `bun init` and installing Drizzle.
+
+```sh
+$ bun init -y
+$ bun add drizzle-orm
+$ bun add -D drizzle-kit
+```
+
+---
+
+Then we'll connect to a SQLite database using the `bun:sqlite` module and create the Drizzle database instance.
+
+```ts#db.ts
+import { drizzle } from "drizzle-orm/bun-sqlite";
+import { Database } from "bun:sqlite";
+
+const sqlite = new Database("sqlite.db");
+export const db = drizzle(sqlite);
+```
+
+---
+
+To see the database in action, add these lines to `index.ts`.
+
+```ts#index.ts
+import { db } from "./db";
+import { sql } from "drizzle-orm";
+
+const query = sql`select "hello world" as text`;
+const result = db.get<{ text: string }>(query);
+console.log(result);
+```
+
+---
+
+Then run `index.ts` with Bun. Bun will automatically create `sqlite.db` and execute the query.
+
+```sh
+$ bun run index.ts
+{
+  text: "hello world"
+}
+```
+
+---
+
+Lets give our database a proper schema. Create a `schema.ts` file and define a `movies` table.
+
+```ts#schema.ts
+import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core";
+
+export const movies = sqliteTable("movies", {
+  id: integer("id").primaryKey(),
+  title: text("name"),
+  releaseYear: integer("release_year"),
+});
+```
+
+---
+
+We can use the `drizzle-kit` CLI to generate an initial SQL migration.
+
+```sh
+$ bunx drizzle-kit generate:sqlite --schema ./schema.ts
+```
+
+---
+
+This creates a new `drizzle` directory containing a `.sql` migration file and `meta` directory.
+
+```txt
+drizzle
+├── 0000_ordinary_beyonder.sql
+└── meta
+    ├── 0000_snapshot.json
+    └── _journal.json
+```
+
+---
+
+We can execute these migrations with a simple `migrate.ts` script.
+
+This script creates a new connection to a SQLite database that writes to `sqlite.db`, then executes all unexecuted migrations in the `drizzle` directory.
+
+```ts#migrate.ts
+import { migrate } from "drizzle-orm/bun-sqlite/migrator";
+
+import { drizzle } from "drizzle-orm/bun-sqlite";
+import { Database } from "bun:sqlite";
+
+const sqlite = new Database("sqlite.db");
+const db = drizzle(sqlite);
+await migrate(db, { migrationsFolder: "./drizzle" });
+```
+
+---
+
+We can run this script with `bun` to execute the migration.
+
+```sh
+$ bun run migrate.ts
+```
+
+---
+
+Now that we have a database, let's add some data to it. Create a `seed.ts` file with the following contents.
+
+```ts#seed.ts
+import { db } from "./db";
+import * as schema from "./schema";
+
+await db.insert(schema.movies).values([
+  {
+    title: "The Matrix",
+    releaseYear: 1999,
+  },
+  {
+    title: "The Matrix Reloaded",
+    releaseYear: 2003,
+  },
+  {
+    title: "The Matrix Revolutions",
+    releaseYear: 2003,
+  },
+]);
+
+console.log(`Seeding complete.`);
+```
+
+---
+
+Then run this file.
+
+```sh
+$ bun run seed.ts
+Seeding complete.
+```
+
+---
+
+We finally have a database with a schema and some sample data. Let's use Drizzle to query it. Replace the contents of `index.ts` with the following.
+
+```ts#index.ts
+import * as schema from "./schema";
+import { db } from "./db";
+
+const result = await db.select().from(schema.movies);
+console.log(result);
+```
+
+---
+
+Then run the file. You should see the three movies we inserted.
+
+```sh
+$ bun run index.ts
+bun run index.ts
+[
+  {
+    id: 1,
+    title: "The Matrix",
+    releaseYear: 1999
+  }, {
+    id: 2,
+    title: "The Matrix Reloaded",
+    releaseYear: 2003
+  }, {
+    id: 3,
+    title: "The Matrix Revolutions",
+    releaseYear: 2003
+  }
+]
+```
+
+---
+
+Refer to the [Drizzle website](https://orm.drizzle.team/docs/overview) for complete documentation.

docs/guides/ecosystem/edgedb.md

@@ -0,0 +1,227 @@
+---
+name: Use EdgeDB with Bun
+---
+
+EdgeDB is a graph-relational database powered by Postgres under the hood. It provides a declarative schema language, migrations system, and object-oriented query language, in addition to supporting raw SQL queries. It solves the object-relational mapping problem at the database layer, eliminating the for an ORM library in your application code.
+
+---
+
+First, [install EdgeDB](https://www.edgedb.com/install) if you haven't already.
+
+{% codetabs %}
+
+```sh#Linux/macOS
+$ curl --proto '=https' --tlsv1.2 -sSf https://sh.edgedb.com | sh
+```
+
+```sh#Windows
+$ iwr https://ps1.edgedb.com -useb | iex
+```
+
+{% /codetabs %}
+
+---
+
+Use `bun init` to create a fresh project.
+
+```sh
+$ mkdir my-edgedb-app
+$ cd my-edgedb-app
+$ bun init -y
+```
+
+---
+
+We'll use the EdgeDB CLI to initialize an EdgeDB instance for our project. This creates an `edgedb.toml` file in our project root.
+
+```sh
+$ edgedb project init
+No `edgedb.toml` found in `/Users/colinmcd94/Documents/bun/fun/examples/my-edgedb-app` or above
+Do you want to initialize a new project? [Y/n]
+> Y
+Specify the name of EdgeDB instance to use with this project [default: my_edgedb_app]:
+> my_edgedb_app
+Checking EdgeDB versions...
+Specify the version of EdgeDB to use with this project [default: x.y]:
+> x.y
+┌─────────────────────┬────────────────────────────────────────────────────────────────────────┐
+│ Project directory   │ /Users/colinmcd94/Documents/bun/fun/examples/my-edgedb-app             │
+│ Project config      │ /Users/colinmcd94/Documents/bun/fun/examples/my-edgedb-app/edgedb.toml │
+│ Schema dir (empty)  │ /Users/colinmcd94/Documents/bun/fun/examples/my-edgedb-app/dbschema    │
+│ Installation method │ portable package                                                       │
+│ Version             │ x.y+6d5921b                                                            │
+│ Instance name       │ my_edgedb_app                                                          │
+└─────────────────────┴────────────────────────────────────────────────────────────────────────┘
+Version x.y+6d5921b is already downloaded
+Initializing EdgeDB instance...
+Applying migrations...
+Everything is up to date. Revision initial
+Project initialized.
+To connect to my_edgedb_app, run `edgedb`
+```
+
+---
+
+To see if the database is running, let's open a REPL and run a simple query.
+
+Then run `\quit` to exit the REPL.
+
+```sh
+$ edgedb
+edgedb> select 1 + 1;
+2
+edgedb> \quit
+```
+
+---
+
+With the project initialized, we can define a schema. The `edgedb project init` command already created a `dbschema/default.esdl` file to contain our schema.
+
+```txt
+dbschema
+├── default.esdl
+└── migrations
+```
+
+---
+
+Open that file and paste the following contents.
+
+```txt
+module default {
+  type Movie {
+    title: str;
+    releaseYear: int64;
+  }
+};
+```
+
+---
+
+Then generate and apply an initial migration.
+
+```sh
+$ edgedb migration create
+Created /Users/colinmcd94/Documents/bun/fun/examples/my-edgedb-app/dbschema/migrations/00001.edgeql, id: m1uwekrn4ni4qs7ul7hfar4xemm5kkxlpswolcoyqj3xdhweomwjrq
+$ edgedb migrate
+Applied m1uwekrn4ni4qs7ul7hfar4xemm5kkxlpswolcoyqj3xdhweomwjrq (00001.edgeql)
+```
+
+---
+
+With out schema applied, let's execute some queries using EdgeDB's JavaScript client library. We'll install the client library and EdgeDB's codegen CLI, and create a `seed.ts`.file.
+
+```sh
+$ bun add edgedb
+$ bun add -D @edgedb/generate
+$ touch seed.ts
+```
+
+---
+
+Paste the following code into `seed.ts`.
+
+The client auto-connects to the database. We insert a couple movies using the `.execute()` method.
+
+```ts
+import { createClient } from "edgedb";
+
+const client = createClient();
+
+const INSERT_MOVIE = `
+  insert Movie {
+    title := <str>$title,
+    releaseYear := <int64>$year,
+  }
+`;
+
+const movies = [
+  { title: "The Matrix", year: 1999 },
+  { title: "The Matrix Reloaded", year: 2003 },
+  { title: "The Matrix Revolutions", year: 2003 },
+];
+
+for (const movie of movies) {
+  await client.execute(INSERT_MOVIE, movie);
+}
+
+console.log(`Seeding complete.`);
+process.exit();
+```
+
+---
+
+Then run this file with Bun.
+
+```sh
+$ bun run seed.ts
+Seeding complete.
+```
+
+---
+
+EdgeDB implements a number of code generation tools for TypeScript. To query our newly seeded database in a typesafe way, we'll use `@edgedb/generate` to code-generate the EdgeQL query builder.
+
+```sh
+$ bunx @edgedb/generate edgeql-js
+Generating query builder...
+Detected tsconfig.json, generating TypeScript files.
+   To override this, use the --target flag.
+   Run `npx @edgedb/generate --help` for full options.
+Introspecting database schema...
+Writing files to ./dbschema/edgeql-js
+Generation complete! 🤘
+Checking the generated query builder into version control
+is not recommended. Would you like to update .gitignore to ignore
+the query builder directory? The following line will be added:
+
+   dbschema/edgeql-js
+
+[y/n] (leave blank for "y")
+> y
+```
+
+---
+
+In `index.ts`, we can import the generated query builder from `./dbschema/edgeql-js` and write a simple select query.
+
+```ts
+import { createClient } from "edgedb";
+import e from "./dbschema/edgeql-js";
+
+const client = createClient();
+
+const query = e.select(e.Movie, () => ({
+  title: true,
+  releaseYear: true,
+}));
+
+const results = await query.run(client);
+console.log(results);
+
+results; // { title: string, releaseYear: number | null }[]
+```
+
+---
+
+Running the file with Bun, we can see the list of movies we inserted.
+
+```sh
+$ bun run index.ts
+[
+  {
+    title: "The Matrix",
+    releaseYear: 1999
+  }, {
+    title: "The Matrix Reloaded",
+    releaseYear: 2003
+  }, {
+    title: "The Matrix Revolutions",
+    releaseYear: 2003
+  }
+]
+```
+
+---
+
+For complete documentation, refer to the [EdgeDB docs](https://www.edgedb.com/docs).

docs/guides/ecosystem/pm2.md

@@ -0,0 +1,54 @@
+---
+name: Run Bun as a daemon with PM2
+---
+
+[PM2](https://pm2.keymetrics.io/) is a popular process manager that manages and runs your applications as daemons (background processes).
+
+It offers features like process monitoring, automatic restarts, and easy scaling. Using a process manager is common when deploying a Bun application on a cloud-hosted virtual private server (VPS), as it:
+
+- Keeps your Node.js application running continuously.
+- Ensure high availability and reliability of your application.
+- Monitor and manage multiple processes with ease.
+- Simplify the deployment process.
+
+---
+
+You can use PM2 with Bun in two ways: as a CLI option or in a configuration file.
+
+### With `--interpreter`
+
+---
+
+To start your application with PM2 and Bun as the interpreter, open your terminal and run the following command:
+
+```bash
+pm2 start --interpreter ~/.bun/bin/bun index.ts
+```
+
+---
+
+### With a configuration file
+
+---
+
+Alternatively, you can create a PM2 configuration file. Create a file named `pm2.config.js` in your project directory and add the following content.
+
+```javascript
+module.exports = {
+  name: "app", // Name of your application
+  script: "index.ts", // Entry point of your application
+  interpreter: "~/.bun/bin/bun", // Path to the Bun interpreter
+};
+```
+
+---
+
+After saving the file, you can start your application with PM2
+
+```bash
+pm2 start pm2.config.js
+```
+
+---
+
+That’s it! Your JavaScript/TypeScript web server is now running as a daemon with PM2 using Bun as the interpreter.

docs/guides/ecosystem/prisma.md

@@ -1,5 +1,5 @@
 ---
-name: Get started using Prisma
+name: Use Prisma with Bun
 ---
 
 {% callout %}

docs/guides/ecosystem/react.md

@@ -4,7 +4,7 @@ name: Use React and JSX
 
 React just works with Bun. Bun supports `.jsx` and `.tsx` files out of the box.
 
-Remember that JSX is just a special syntax for including HTML-like syntax in JavaScript files. It's commonReact uses JSX syntax, as do other React alternatives like [Preact](https://preactjs.com/) and [Solid](https://www.solidjs.com/). Bun's internal transpiler converts JSX syntax into vanilla JavaScript before execution.
+Remember that JSX is just a special syntax for including HTML-like syntax in JavaScript files. React uses JSX syntax, as do alternatives like [Preact](https://preactjs.com/) and [Solid](https://www.solidjs.com/). Bun's internal transpiler converts JSX syntax into vanilla JavaScript before execution.
 
 ---
 
@@ -27,7 +27,7 @@ const element = jsx("h1", { children: "Hello, world!" });
 
 ---
 
-This code requires `react` to run, so make sure you you've installed React.
+This code requires `react` to run, so make sure you've installed React.
 
 ```bash
 $ bun install react

docs/guides/ecosystem/systemd.md

@@ -0,0 +1,113 @@
+---
+name: Run Bun as a daemon with systemd
+---
+
+[systemd](https://systemd.io) is an init system and service manager for Linux operating systems that manages the startup and control of system processes and services.
+
+<!-- systemd provides aggressive parallelization capabilities, uses socket and D-Bus activation for starting services, offers on-demand starting of daemons, keeps track of processes using Linux control groups, maintains mount and auto mount points, and implements an elaborate transactional dependency-based service control logic. systemd supports SysV and LSB init scripts and works as a replacement for sysvinit. -->
+
+<!-- Other parts include a logging daemon, utilities to control basic system configuration like the hostname, date, locale, maintain a list of logged-in users and running containers and virtual machines, system accounts, runtime directories and settings, and daemons to manage simple network configuration, network time synchronization, log forwarding, and name resolution. -->
+
+---
+
+To run a Bun application as a daemon using **systemd** you'll need to create a _service file_ in `/lib/systemd/system/`.
+
+```sh
+$ cd /lib/systemd/system
+$ touch my-app.service
+```
+
+---
+
+Here is a typical service file that runs an application on system start. You can use this as a template for your own service. Replace `YOUR_USER` with the name of the user you want to run the application as. To run as `root`, replace `YOUR_USER` with `root`, though this is generally not recommended for security reasons.
+
+Refer to the [systemd documentation](https://www.freedesktop.org/software/systemd/man/systemd.service.html) for more information on each setting.
+
+```ini#my-app.service
+[Unit]
+# describe the app
+Description=My App
+# start the app after the network is available
+After=network.target
+
+[Service]
+# usually you'll use 'simple'
+# one of https://www.freedesktop.org/software/systemd/man/systemd.service.html#Type=
+Type=simple
+# which user to use when starting the app
+User=YOUR_USER
+# path to your application's root directory
+WorkingDirectory=/home/YOUR_USER/path/to/my-app
+# the command to start the app
+# requires absolute paths
+ExecStart=/home/YOUR_USER/.bun/bin/bun run index.ts
+# restart policy
+# one of {no|on-success|on-failure|on-abnormal|on-watchdog|on-abort|always}
+Restart=always
+
+[Install]
+# start the app automatically
+WantedBy=multi-user.target
+```
+
+---
+
+If your application starts a webserver, note that non-`root` users are not able to listen on ports 80 or 443 by default. To permanently allow Bun to listen on these ports when executed by a non-`root` user, use the following command. This step isn't necessary when running as `root`.
+
+```bash
+$ sudo setcap CAP_NET_BIND_SERVICE=+eip ~/.bun/bin/bun
+```
+
+---
+
+With the service file configured, you can now _enable_ the service. Once enabled, it will start automatically on reboot. This requires `sudo` permissions.
+
+```bash
+$ sudo systemctl enable my-app
+```
+
+---
+
+To start the service without rebooting, you can manually _start_ it.
+
+```bash
+$ sudo systemctl start my-app
+```
+
+---
+
+Check the status of your application with `systemctl status`. If you've started your app successfully, you should see something like this:
+
+```bash
+$ sudo systemctl status my-app
+● my-app.service - My App
+     Loaded: loaded (/lib/systemd/system/my-app.service; enabled; preset: enabled)
+     Active: active (running) since Thu 2023-10-12 11:34:08 UTC; 1h 8min ago
+   Main PID: 309641 (bun)
+      Tasks: 3 (limit: 503)
+     Memory: 40.9M
+        CPU: 1.093s
+     CGroup: /system.slice/my-app.service
+             └─309641 /home/YOUR_USER/.bun/bin/bun run /home/YOUR_USER/application/index.ts
+```
+
+---
+
+To update the service, edit the contents of the service file, then reload the daemon.
+
+```bash
+$ sudo systemctl daemon-reload
+```
+
+---
+
+For a complete guide on the service unit configuration, you can check [this page](https://www.freedesktop.org/software/systemd/man/systemd.service.html). Or refer to this cheatsheet of common commands:
+
+```bash
+$ sudo systemctl daemon-reload # tell systemd that some files got changed
+$ sudo systemctl enable my-app # enable the app (to allow auto-start)
+$ sudo systemctl disable my-app # disable the app (turns off auto-start)
+$ sudo systemctl start my-app # start the app if is stopped
+$ sudo systemctl stop my-app # stop the app
+$ sudo systemctl restart my-app # restart the app
+```

docs/guides/ecosystem/vite.md

@@ -30,8 +30,7 @@ bun install
 
 Start the development server with the `vite` CLI using `bunx`.
 
-The `--bun` flag tells Bun to run Vite's CLI using `bun` instead of `node`; by default Bun respects Vite's `#!/usr/bin/env node` [shebang line](<https://en.wikipedia.org/wiki/Shebang_(Unix)>). After Bun 1.0 this flag will no longer be necessary.
-
+The `--bun` flag tells Bun to run Vite's CLI using `bun` instead of `node`; by default Bun respects Vite's `#!/usr/bin/env node` [shebang line](<https://en.wikipedia.org/wiki/Shebang_(Unix)>).
 ```bash
 bunx --bun vite
 ```

docs/guides/install/add-peer.md

@@ -2,7 +2,7 @@
 name: Add a peer dependency
 ---
 
-To add an npm package as a peer dependency, directly modify the `peerDependencies` object in your package.json. Running `bun install` will not install peer dependencies.
+To add an npm package as a peer dependency, directly modify the `peerDependencies` object in your package.json. Running `bun install` will install peer dependencies by default, unless marked optional in `peerDependenciesMeta`.
 
 ```json-diff
 {

docs/guides/install/trusted.md

@@ -47,4 +47,4 @@ Note that this only allows lifecycle scripts for the specific package listed in
 
 ---
 
-See [Docs > Package manager > Trusted dependencies](/docs/cli/install#trusted-dependencies) for complete documentation of trusted dependencies.
+See [Docs > Package manager > Trusted dependencies](/docs/install/lifecycle) for complete documentation of trusted dependencies.

docs/guides/process/ipc.md

@@ -0,0 +1,66 @@
+---
+name: Spawn a child process and communicate using IPC
+---
+
+Use [`Bun.spawn()`](/docs/api/spawn) to spawn a child process. When spawning a second `bun` process, you can open a direct inter-process communication (IPC) channel between the two processes.
+
+{%callout%}
+**Note** — This API is only compatible with other `bun` processes. Use `process.execPath` to get a path to the currently running `bun` executable.
+{%/callout%}
+
+```ts#parent.ts
+const child = Bun.spawn(["bun", "child.ts"], {
+  ipc(message) {
+    /**
+     * The message received from the sub process
+     **/
+  },
+});
+```
+
+---
+
+The parent process can send messages to the subprocess using the `.send()` method on the returned `Subprocess` instance. A reference to the sending subprocess is also available as the second argument in the `ipc` handler.
+
+```ts#parent.ts
+const childProc = Bun.spawn(["bun", "child.ts"], {
+  ipc(message, childProc) {
+    /**
+     * The message received from the sub process
+     **/
+    childProc.send("Respond to child")
+  },
+});
+
+childProc.send("I am your father"); // The parent can send messages to the child as well
+```
+
+---
+
+Meanwhile the child process can send messages to its parent using with `process.send()` and receive messages with `process.on("message")`. This is the same API used for `child_process.fork()` in Node.js.
+
+```ts#child.ts
+process.send("Hello from child as string");
+process.send({ message: "Hello from child as object" });
+
+process.on("message", (message) => {
+  // print message from parent
+  console.log(message);
+});
+```
+
+---
+
+All messages are serialized using the JSC `serialize` API, which allows for the same set of [transferrable types](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Transferable_objects) supported by `postMessage` and `structuredClone`, including strings, typed arrays, streams, and objects.
+
+```ts#child.ts
+// send a string
+process.send("Hello from child as string");
+
+// send an object
+process.send({ message: "Hello from child as object" });
+```
+
+---
+
+See [Docs > API > Child processes](/docs/api/spawn) for complete documentation.

docs/guides/test/mock-clock.md

@@ -20,7 +20,7 @@ test("party like it's 1999", () => {
 
 ---
 
-The `setSystemTime` function is commonly used on conjunction with [Lifecycle Hooks](/docs/test/lifecycle) to configure a testing environment with a determinstic "fake clock".
+The `setSystemTime` function is commonly used on conjunction with [Lifecycle Hooks](/docs/test/lifecycle) to configure a testing environment with a deterministic "fake clock".
 
 ```ts
 import { test, expect, beforeAll, setSystemTime } from "bun:test";

docs/guides/util/import-meta-file.md

@@ -2,7 +2,7 @@
 name: Get the file name of the current file
 ---
 
-Bun provides a handful of module-specific utilities on the [`import.meta`](/docs/api/import-meta) object. Use `import.meta.file` to retreive the name of the current file.
+Bun provides a handful of module-specific utilities on the [`import.meta`](/docs/api/import-meta) object. Use `import.meta.file` to retrieve the name of the current file.
 
 ```ts#/a/b/c.ts
 import.meta.file; // => "c.ts"

docs/guides/util/import-meta-path.md

@@ -2,7 +2,7 @@
 name: Get the absolute path of the current file
 ---
 
-Bun provides a handful of module-specific utilities on the [`import.meta`](/docs/api/import-meta) object. Use `import.meta.path` to retreive the absolute path of the current file.
+Bun provides a handful of module-specific utilities on the [`import.meta`](/docs/api/import-meta) object. Use `import.meta.path` to retrieve the absolute path of the current file.
 
 ```ts#/a/b/c.ts
 import.meta.path; // => "/a/b/c.ts"

docs/guides/websocket/pubsub.md

@@ -28,7 +28,7 @@ const server = Bun.serve<{ username: string }>({
     },
     close(ws) {
       const msg = `${ws.data.username} has left the chat`;
-      ws.publish("the-group-chat", msg);
+      server.publish("the-group-chat", msg);
       ws.unsubscribe("the-group-chat");
     },
   },

docs/guides/write-file/append.md

@@ -0,0 +1,52 @@
+---
+name: Append content to a file
+---
+
+Bun implements the `node:fs` module, which includes the `fs.appendFile` and `fs.appendFileSync` functions for appending content to files.
+
+---
+
+You can use `fs.appendFile` to asynchronously append data to a file, creating the file if it does not yet exist. The content can be a string or a `Buffer`.
+
+```ts
+import { appendFile } from "node:fs/promises";
+
+await appendFile("message.txt", "data to append");
+```
+
+---
+
+To use the non-`Promise` API:
+
+```ts
+import { appendFile } from "node:fs";
+
+appendFile("message.txt", "data to append", err => {
+  if (err) throw err;
+  console.log('The "data to append" was appended to file!');
+});
+```
+
+---
+
+To specify the encoding of the content:
+
+```js
+import { appendFile } from "node:fs";
+
+appendFile("message.txt", "data to append", "utf8", callback);
+```
+
+---
+
+To append the data synchronously, use `fs.appendFileSync`:
+
+```ts
+import { appendFileSync } from "node:fs";
+
+appendFileSync("message.txt", "data to append", "utf8");
+```
+
+---
+
+See the [Node.js documentation](https://nodejs.org/api/fs.html#fspromisesappendfilepath-data-options) for more information.

docs/index.md

@@ -26,7 +26,7 @@ Get started with one of the quick links below, or read on to learn more about Bu
 {% arrowbutton href="/docs/installation" text="Install Bun" /%}
 {% arrowbutton href="/docs/quickstart" text="Do the quickstart" /%}
 {% arrowbutton href="/docs/cli/install" text="Install a package" /%}
-{% arrowbutton href="/docs/templates" text="Use a project template" /%}
+{% arrowbutton href="/docs/cli/bun-create" text="Use a project template" /%}
 {% arrowbutton href="/docs/bundler" text="Bundle code for production" /%}
 {% arrowbutton href="/docs/api/http" text="Build an HTTP server" /%}
 {% arrowbutton href="/docs/api/websockets" text="Build a Websocket server" /%}
@@ -37,11 +37,14 @@ Get started with one of the quick links below, or read on to learn more about Bu
 
 ## What is a runtime?
 
-JavaScript (or, more formally, ECMAScript) is just a _specification_ for a programming language. Anyone can write a JavaScript _engine_ that ingests a valid JavaScript program and executes it. The two most popular engines in use today are V8 (developed by Google) and JavaScriptCore (developed by Apple). Both are open source.
+JavaScript (or, more formally, ECMAScript) is just a _specification_ for a programming language. Anyone can write a JavaScript _engine_ that ingests a valid JavaScript program and executes it. The two most popular engines in use today are V8 (developed by Google)
+and JavaScriptCore (developed by Apple). Both are open source.
+
+But most JavaScript programs don't run in a vacuum. They need a way to access the outside world to perform useful tasks. This is where _runtimes_ come in. They implement additional APIs that are then made available to the JavaScript programs they execute.
 
 ### Browsers
 
-But most JavaScript programs don't run in a vacuum. They need a way to access the outside world to perform useful tasks. This is where _runtimes_ come in. They implement additional APIs that are then made available to the JavaScript programs they execute. Notably, browsers ship with JavaScript runtimes that implement a set of Web-specific APIs that are exposed via the global `window` object. Any JavaScript code executed by the browser can use these APIs to implement interactive or dynamic behavior in the context of the current webpage.
+Notably, browsers ship with JavaScript runtimes that implement a set of Web-specific APIs that are exposed via the global `window` object. Any JavaScript code executed by the browser can use these APIs to implement interactive or dynamic behavior in the context of the current webpage.
 
 <!-- JavaScript runtime that exposes  JavaScript engines are designed to run "vanilla" JavaScript programs, but it's often JavaScript _runtimes_ use an engine internally to execute the code and implement additional APIs that are then made available to executed programs.
 JavaScript was [initially designed](https://en.wikipedia.org/wiki/JavaScript) as a language to run in web browsers to implement interactivity and dynamic behavior in web pages. Browsers are the first JavaScript runtimes. JavaScript programs that are executed in browsers have access to a set of Web-specific global APIs on the `window` object. -->

docs/install/index.md

@@ -39,7 +39,7 @@ On Linux, `bun install` tends to install packages 20-100x faster than `npm insta
 
 Running `bun install` will:
 
-- **Install** all `dependencies`, `devDependencies`, and `optionalDependencies`. Bun does not install `peerDependencies` by default.
+- **Install** all `dependencies`, `devDependencies`, and `optionalDependencies`. Bun will install `peerDependencies` by default.
 - **Run** your project's `{pre|post}install` scripts at the appropriate time. For security reasons Bun _does not execute_ lifecycle scripts of installed dependencies.
 - **Write** a `bun.lockb` lockfile to the project root.
 
@@ -81,7 +81,7 @@ optional = true
 dev = true
 
 # whether to install peerDependencies
-peer = false
+peer = true
 
 # equivalent to `--production` flag
 production = false

docs/install/lifecycle.md

@@ -0,0 +1,44 @@
+Packages on `npm` can define _lifecycle scripts_ in their `package.json`. Some of the most common are below, but there are [many others](https://docs.npmjs.com/cli/v10/using-npm/scripts).
+
+- `preinstall`: Runs before the package is installed
+- `postinstall`: Runs after the package is installed
+- `preuninstall`: Runs before the package is uninstalled
+- `prepublishOnly`: Runs before the package is published
+
+These scripts are arbitrary shell commands that the package manager is expected to read and execute at the appropriate time. But executing arbitrary scripts represents a potential security risk, so—unlike other `npm` clients—Bun does not execute arbitrary lifecycle scripts by default.
+
+## `postinstall`
+
+The `postinstall` script is particularly important. It's widely used to build or install platform-specific binaries for packages that are implemented as [native Node.js add-ons](https://nodejs.org/api/addons.html). For example, `node-sass` is a popular package that uses `postinstall` to build a native binary for Sass.
+
+```json
+{
+  "name": "my-app",
+  "version": "1.0.0",
+  "dependencies": {
+    "node-sass": "^6.0.1"
+  }
+}
+```
+
+## `trustedDependencies`
+
+Instead of executing arbitrary scripts, Bun uses a "default-secure" approach. You can add certain packages to an allow list, and Bun will execute lifecycle scripts for those packages. To tell Bun to allow lifecycle scripts for a particular package, add the package name to `trustedDependencies` array in your `package.json`.
+
+```json-diff
+  {
+    "name": "my-app",
+    "version": "1.0.0",
++   "trustedDependencies": ["node-sass"]
+  }
+```
+
+Once added to `trustedDependencies`, install/re-install the package. Bun will read this field and run lifecycle scripts for `my-trusted-package`.
+
+## `--ignore-scripts`
+
+To disable lifecycle scripts for all packages, use the `--ignore-scripts` flag.
+
+```bash
+$ bun install --ignore-scripts
+```

docs/install/overrides.md

@@ -0,0 +1,73 @@
+Bun supports npm's `"overrides"` and Yarn's `"resolutions"` in `package.json`. These are mechanisms for specifying a version range for _metadependencies_—the dependencies of your dependencies. Refer to [Package manager > Overrides and resolutions](/docs/install/overrides) for complete documentation.
+
+```json-diff#package.json
+  {
+    "name": "my-app",
+    "dependencies": {
+      "foo": "^2.0.0"
+    },
++   "overrides": {
++     "bar": "~4.4.0"
++   }
+  }
+```
+
+By default, Bun will install the latest version of all dependencies and metadependencies, according to the ranges specified in each package's `package.json`. Let's say you have a project with one dependency, `foo`, which in turn has a dependency on `bar`. This means `bar` is a _metadependency_ of our project.
+
+```json#package.json
+{
+  "name": "my-app",
+  "dependencies": {
+    "foo": "^2.0.0"
+  }
+}
+```
+
+When you run `bun install`, Bun will install the latest versions of each package.
+
+```
+# tree layout of node_modules
+node_modules
+├── foo@1.2.3
+└── bar@4.5.6
+```
+
+But what if a security vulnerability was introduced in `bar@4.5.6`? We may want a way to pin `bar` to an older version that doesn't have the vulnerability. This is where `"overrides"`/`"resolutions"` come in.
+
+## `"overrides"`
+
+Add `bar` to the `"overrides"` field in `package.json`. Bun will defer to the specified version range when determining which version of `bar` to install, whether it's a dependency or a metadependency.
+
+{% callout %}
+**Note** — Bun currently only supports top-level `"overrides"`. [Nested overrides](https://docs.npmjs.com/cli/v9/configuring-npm/package-json#overrides) are not supported.
+{% /callout %}
+
+```json-diff#package.json
+  {
+    "name": "my-app",
+    "dependencies": {
+      "foo": "^2.0.0"
+    },
++   "overrides": {
++     "bar": "~4.4.0"
++   }
+  }
+```
+
+## `"resolutions"`
+
+The syntax is similar for `"resolutions"`, which is Yarn's alternative to `"overrides"`. Bun supports this feature to make migration from Yarn easier.
+
+As with `"overrides"`, _nested resolutions_ are not currently supported.
+
+```json-diff#package.json
+  {
+    "name": "my-app",
+    "dependencies": {
+      "foo": "^2.0.0"
+    },
++   "resolutions": {
++     "bar": "~4.4.0"
++   }
+  }
+```

docs/install/workspaces.md

@@ -24,7 +24,7 @@ tree
         └── tsconfig.json
 ```
 
-In the root `package.json`, the `"workspaces"` key is used to indicate which subdirectories should be considered packages/workspaces within the monorepo. It conventional to place all the workspace in a directory called `packages`.
+In the root `package.json`, the `"workspaces"` key is used to indicate which subdirectories should be considered packages/workspaces within the monorepo. It's conventional to place all the workspace in a directory called `packages`.
 
 ```json
 {

docs/installation.md

@@ -1,6 +1,8 @@
 Bun ships as a single executable that can be installed a few different ways.
 
-## macOS and Linux
+## Installing
+
+### macOS and Linux
 
 {% callout %}
 **Linux users** — The `unzip` package is required to install Bun. Use `sudo apt install unzip` to install `unzip` package.
@@ -35,7 +37,7 @@ $ proto install bun
 
 {% /codetabs %}
 
-## Windows
+### Windows
 
 Bun provides a _limited, experimental_ native build for Windows. At the moment, only the Bun runtime is supported.
 
@@ -67,6 +69,59 @@ $ docker pull oven/bun:alpine
 $ docker pull oven/bun:distroless
 ```
 
+## Checking installation
+
+To check that Bun was installed successfully, open a new terminal window and run `bun --version`.
+
+```sh
+$ bun --version
+1.x.y
+```
+
+To see the precise commit of [oven-sh/bun](https://github.com/oven-sh/bun) that you're using, run `bun --revision`.
+
+```sh
+$ bun --revision
+1.x.y+b7982ac1318937560f38e0f8eb18f45eaa43480f
+```
+
+If you've installed Bun but are seeing a `command not found` error, you may have to manually add the installation directory (`~/.bun/bin`) to your `PATH`.
+
+{% details summary="How to add to your `PATH`" %}
+First, determine what shell you're using:
+
+```sh
+$ echo $SHELL
+/bin/zsh # or /bin/bash or /bin/fish
+```
+
+Then add these lines below to bottom of your shell's configuration file.
+
+{% codetabs %}
+
+```bash#~/.zshrc
+# add to ~/.zshrc
+export BUN_INSTALL="$HOME/.bun"
+export PATH="$BUN_INSTALL/bin:$PATH"
+```
+
+```bash#~/.bashrc
+# add to ~/.bashrc
+export BUN_INSTALL="$HOME/.bun"
+export PATH="$BUN_INSTALL/bin:$PATH"
+```
+
+```sh#~/.config/fish/config.fish
+# add to ~/.config/fish/config.fish
+export BUN_INSTALL="$HOME/.bun"
+export PATH="$BUN_INSTALL/bin:$PATH"
+```
+
+{% /codetabs %}
+Save the file. You'll need to open a new shell/terminal window for the changes to take effect.
+
+{% /details %}
+
 ## Upgrading
 
 Once installed, the binary can upgrade itself.

docs/nav.ts

@@ -38,12 +38,13 @@ export default {
     page("typescript", "TypeScript", {
       description: "Install and configure type declarations for Bun's APIs",
     }),
-    page("templates", "Templates", {
-      description: "Hit the ground running with one of Bun's official templates, or download a template from GitHub.",
+
+    divider("Templating"),
+    page("cli/init", "`bun init`", {
+      description: "Scaffold an empty Bun project.",
     }),
-    page("guides", "Guides", {
-      description: "A set of walkthrough guides and code snippets for performing common tasks with Bun",
-      href: "/guides",
+    page("cli/bun-create", "`bun create`", {
+      description: "Scaffold a new Bun project from an official template or GitHub repo.",
     }),
 
     // page("typescript", "TypeScript"),
@@ -81,7 +82,6 @@ export default {
     // page("bundev", "Dev server"),
     // page("benchmarks", "Benchmarks"),
 
-    // divider("Runtime"),
     divider("Runtime"),
     page("cli/run", "`bun run`", {
       description: "Use `bun run` to execute JavaScript/TypeScript files and package.json scripts.",
@@ -152,6 +152,21 @@ export default {
       description:
         "Install all dependencies with `bun install`, or manage dependencies with `bun add` and `bun remove`.",
     }),
+    page("cli/add", "`bun add`", {
+      description: "Add dependencies to your project.",
+    }),
+    page("cli/remove", "`bun remove`", {
+      description: "Remove dependencies from your project.",
+    }),
+    page("cli/update", "`bun update`", {
+      description: "Update your project's dependencies.",
+    }),
+    page("cli/link", "`bun link`", {
+      description: "Install local packages as dependencies in your project.",
+    }),
+    page("cli/pm", "`bun pm`", {
+      description: "Utilities relating to package management with Bun.",
+    }),
     page("install/cache", "Global cache", {
       description:
         "Bun's package manager installs all packages into a shared global cache to avoid redundant re-downloads.",
@@ -159,6 +174,9 @@ export default {
     page("install/workspaces", "Workspaces", {
       description: "Bun's package manager supports workspaces and mono-repo development workflows.",
     }),
+    page("install/lifecycle", "Lifecycle scripts", {
+      description: "How Bun handles package lifecycle scripts with trustedDependencies",
+    }),
     page("install/lockfile", "Lockfile", {
       description:
         "Bun's binary lockfile `bun.lockb` tracks your resolved dependency tree, making future installs fast and repeatable.",
@@ -166,9 +184,12 @@ export default {
     page("install/registries", "Scopes and registries", {
       description: "How to configure private scopes and custom package registries.",
     }),
-    page("install/utilities", "Utilities", {
-      description: "Use `bun pm` to introspect your global module cache or project dependency tree.",
+    page("install/overrides", "Overrides and resolutions", {
+      description: "Specify version ranges for nested dependencies",
     }),
+    // page("install/utilities", "Utilities", {
+    //   description: "Use `bun pm` to introspect your global module cache or project dependency tree.",
+    // }),
 
     divider("Bundler"),
     page("bundler", "`Bun.build`", {
@@ -334,7 +355,7 @@ export default {
     page("project/benchmarking", "Benchmarking", {
       description: `Bun is designed for performance. Learn how to benchmark Bun yourself.`,
     }),
-    page("project/development", "Development", {
+    page("project/contributing", "Contributing", {
       description: "Learn how to contribute to Bun and get your local development environment up and running.",
     }),
     page("project/licensing", "License", {

docs/project/building-windows.md

@@ -0,0 +1,61 @@
+## Prerequisites
+
+### System Dependencies
+
+- [Visual Studio](https://visualstudio.microsoft.com) with the "Desktop development with C++" workload. You should install Git and CMake from here, if not already installed.
+- Ninja
+- Go
+- Rust
+- NASM
+- Perl
+  - Do not use Strawberry Perl, it includes tools from MSys2 which will break your build.
+- Ruby
+
+### Zig
+
+Bun pins a version of Zig. As the compiler is still in development, breaking changes happen often that will break the build. It is recommended to use [Zigup](https://github.com/marler8997/zigup/releases) as it can quickly switch to any version by name, but you can also [manually download Zig](https://ziglang.org/download/).
+
+```bash
+$ zigup 0.12.0-dev.1297+a9e66ed73
+```
+
+{% callout %}
+We last updated Zig on **October 26th, 2023**
+{% /callout %}
+
+### Codegen
+
+On Unix platforms, we depend on an existing build of Bun to generate code for itself. Since the Windows branch is not stable enough for this to pass, you currently need to generate the code.
+
+On a system with Bun installed, run:
+
+```bash
+$ bash ./scripts/cross-compile-codegen.sh win32 x64
+# -> build-codegen-win32-x64
+```
+
+Copy the contents of this to the Windows machine into a folder named `build`
+
+TODO: Use WSL to automatically run codegen without a separate machine.
+
+## Building
+
+```ps1
+npm install
+
+.\scripts\env.ps1
+
+.\scripts\update-submodules.ps1
+.\scripts\all-dependencies.ps1
+
+cd build # this was created by the codegen script in the prerequisites
+
+cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Debug
+ninja
+```
+
+If this was successful, you should have a `bun-debug.exe` in the `build` folder.
+
+```ps1
+.\bun-debug.exe --version
+```

docs/project/contributing.md

@@ -2,7 +2,7 @@ Configuring a development environment for Bun can take 10-30 minutes depending o
 
 If you are using Windows, you must use a WSL environment as Bun does not yet compile on Windows natively.
 
-Before starting, you will need to already have a release build of Bun installed, as we use our bundler to transpile and minify our code.
+Before starting, you will need to already have a release build of Bun installed, as we use our bundler to transpile and minify our code, as well as for code generation scripts.
 
 {% codetabs %}
 
@@ -72,16 +72,11 @@ If not, run this to manually link it:
 ```bash#macOS (Homebrew)
 # use fish_add_path if you're using fish
 $ export PATH="$PATH:$(brew --prefix llvm@16)/bin"
-$ export LDFLAGS="$LDFLAGS -L$(brew --prefix llvm@16)/lib"
-$ export CPPFLAGS="$CPPFLAGS -I$(brew --prefix llvm@16)/include"
 ```
 
 ```bash#Arch
-
+# use fish_add_path if you're using fish
 $ export PATH="$PATH:/usr/lib/llvm16/bin"
-$ export LDFLAGS="$LDFLAGS -L/usr/lib/llvm16/lib"
-$ export CPPFLAGS="$CPPFLAGS -I/usr/lib/llvm16/include"
-
 ```
 
 {% /codetabs %}
@@ -93,225 +88,79 @@ Using your system's package manager, install the rest of Bun's dependencies:
 {% codetabs %}
 
 ```bash#macOS (Homebrew)
-$ brew install automake ccache cmake coreutils esbuild gnu-sed go libiconv libtool ninja pkg-config rust
+$ brew install automake ccache cmake coreutils gnu-sed go libiconv libtool ninja pkg-config rust
 ```
 
 ```bash#Ubuntu/Debian
-$ sudo apt install cargo ccache cmake git golang libtool ninja-build pkg-config rustc esbuild
+$ sudo apt install cargo ccache cmake git golang libtool ninja-build pkg-config rustc ruby-full
 ```
 
 ```bash#Arch
-$ sudo pacman -S base-devel ccache cmake esbuild git go libiconv libtool make ninja pkg-config python rust sed unzip
+$ sudo pacman -S base-devel ccache cmake git go libiconv libtool make ninja pkg-config python rust sed unzip ruby
 ```
 
 ```bash#Fedora
-$ sudo dnf install cargo ccache cmake git golang libtool ninja-build pkg-config rustc golang-github-evanw-esbuild libatomic-static libstdc++-static sed unzip
+$ sudo dnf install cargo ccache cmake git golang libtool ninja-build pkg-config rustc libatomic-static libstdc++-static sed unzip
 ```
 
 {% /codetabs %}
 
-{% details summary="Ubuntu — Unable to locate package esbuild" %}
-
-The `apt install esbuild` command may fail with an `Unable to locate package` error if you are using a Ubuntu mirror that does not contain an exact copy of the original Ubuntu server. Note that the same error may occur if you are not using any mirror but have the Ubuntu Universe enabled in the `sources.list`. In this case, you can install esbuild manually:
-
-```bash
-$ curl -fsSL https://esbuild.github.io/dl/latest | sh
-$ chmod +x ./esbuild
-$ sudo mv ./esbuild /usr/local/bin
-```
-
-{% /details %}
-
-In addition to this, you will need an npm package manager (`bun`, `npm`, etc) to install the `package.json` dependencies.
-
 ## Install Zig
 
 Zig can be installed either with our npm package [`@oven/zig`](https://www.npmjs.com/package/@oven/zig), or by using [zigup](https://github.com/marler8997/zigup).
 
 ```bash
 $ bun install -g @oven/zig
-$ zigup 0.12.0-dev.163+6780a6bbf
+$ zigup 0.12.0-dev.1297+a9e66ed73
 ```
 
 {% callout %}
-We last updated Zig on **July 18th, 2023**
+We last updated Zig on **October 26th, 2023**
 {% /callout %}
 
-## First Build
+## Building Bun
 
 After cloning the repository, run the following command to run the first build. This may take a while as it will clone submodules and build dependencies.
 
 ```bash
-$ make setup
+$ bun setup
 ```
 
-The binary will be located at `packages/debug-bun-{platform}-{arch}/bun-debug`. It is recommended to add this to your `$PATH`. To verify the build worked, let's print the version number on the development build of Bun.
+The binary will be located at `./build/bun-debug`. It is recommended to add this to your `$PATH`. To verify the build worked, let's print the version number on the development build of Bun.
 
 ```bash
-$ packages/debug-bun-*/bun-debug --version
-bun 1.x.y__dev
+$ build/bun-debug --version
+x.y.z_debug
 ```
 
-Note: `make setup` is just an alias for the following:
+To rebuild, you can invoke `bun run build`
 
 ```bash
-$ make assert-deps submodule npm-install-dev node-fallbacks runtime_js fallback_decoder bun_error mimalloc picohttp zlib boringssl libarchive lolhtml sqlite usockets uws tinycc c-ares zstd base64 cpp zig link
+$ bun run build
 ```
 
-## Rebuilding
+These two scripts, `setup` and `build`, are aliases to do roughly the following:
 
-Bun uses a series of make commands to rebuild parts of the codebase. The general rule for rebuilding is there is `make link` to rerun the linker, and then different make targets for different parts of the codebase. Do not pass `-j` to make as these scripts will break if run out of order, and multiple cores will be used when possible during the builds.
+```bash
+$ ./scripts/setup.sh
+$ cmake -S . -G Ninja -B build -DCMAKE_BUILD_TYPE=Debug
+$ ninja -C build # 'bun run build' runs just this
+```
 
-{% table %}
-
-- What changed
-- Run this command
-
----
-
-- Zig Code
-- `make zig`
-
----
-
-- C++ Code
-- `make cpp`
-
----
-
-- Zig + C++ Code
-- `make dev` (combination of the above two)
-
----
-
-- JS/TS Code in `src/js`
-- `make js` (in bun-debug, js is loaded from disk without a recompile). If you change the names of any file or add/remove anything, you must also run `make dev`.
-
----
-
-- `*.classes.ts`
-- `make generate-classes dev`
-
----
-
-- JSSink
-- `make generate-sink cpp`
-
----
-
-- `src/node_fallbacks/*`
-- `make node-fallbacks zig`
-
----
-
-- `identifier_data.zig`
-- `make identifier-cache zig`
-
----
-
-- Code using `cppFn`/`JSC.markBinding`
-- `make headers` (TODO: explain what this is used for and why it's useful)
-
-{% /table %}
-
-`make setup` cloned a bunch of submodules and built the subprojects. When a submodule is out of date, run `make submodule` to quickly reset/update all your submodules, then you can rebuild individual submodules with their respective command.
-
-{% table %}
-
-- Dependency
-- Run this command
-
----
-
-- WebKit
-- `bun install` (it is a prebuilt package)
-
----
-
-- uWebSockets
-- `make uws`
-
----
-
-- Mimalloc
-- `make mimalloc`
-
----
-
-- PicoHTTPParser
-- `make picohttp`
-
----
-
-- zlib
-- `make zlib`
-
----
-
-- BoringSSL
-- `make boringssl`
-
----
-
-- libarchive
-- `make libarchive`
-
----
-
-- lolhtml
-- `make lolhtml`
-
----
-
-- sqlite
-- `make sqlite`
-
----
-
-- TinyCC
-- `make tinycc`
-
----
-
-- c-ares
-- `make c-ares`
-
----
-
-- zstd
-- `make zstd`
-
----
-
-- Base64
-- `make base64`
-
-{% /table %}
-
-The above will probably also need Zig and/or C++ code rebuilt.
+Advanced uses can pass CMake flags to customize the build.
 
 ## VSCode
 
 VSCode is the recommended IDE for working on Bun, as it has been configured. Once opening, you can run `Extensions: Show Recommended Extensions` to install the recommended extensions for Zig and C++. ZLS is automatically configured.
 
-## JavaScript builtins
-
-When you change anything in `src/js/builtins/*` or switch branches, run this:
-
-```bash
-$ make js cpp
-```
-
-That inlines the TypeScript code into C++ headers.
+## Code generation scripts
 
 {% callout %}
-Make sure you have `ccache` installed, otherwise regeneration will take much longer than it should.
+
+**Note**: This section is outdated. The code generators are run automatically by ninja, instead of by `make`.
+
 {% /callout %}
 
-For more information on how `src/js` works, see `src/js/README.md` in the codebase.
-
-## Code generation scripts
-
 Bun leverages a lot of code generation scripts.
 
 The [./src/bun.js/bindings/headers.h](https://github.com/oven-sh/bun/blob/main/src/bun.js/bindings/headers.h) file has bindings to & from Zig <> C++ code. This file is generated by running the following:
@@ -344,26 +193,17 @@ You probably won't need to run that one much.
 
 ## Modifying ESM modules
 
-Certain modules like `node:fs`, `node:stream`, `bun:sqlite`, and `ws` are implemented in JavaScript. These live in `src/js/{node,bun,thirdparty}` files and are pre-bundled using Bun. The bundled code is committed so CI builds can run without needing a copy of Bun.
-
-When these are changed, run:
-
-```
-$ make js
-```
-
-In debug builds, Bun automatically loads these from the filesystem, wherever it was compiled, so no need to re-run `make dev`.
+Certain modules like `node:fs`, `node:stream`, `bun:sqlite`, and `ws` are implemented in JavaScript. These live in `src/js/{node,bun,thirdparty}` files and are pre-bundled using Bun. In debug builds, Bun automatically loads these from the filesystem, wherever it was compiled, so no need to re-run `make dev`.
 
 ## Release build
 
 To build a release build of Bun, run:
 
 ```bash
-$ make release-bindings -j12
-$ make release
+$ bun run build:release
 ```
 
-The binary will be located at `packages/bun-{platform}-{arch}/bun`.
+The binary will be located at `./build-release/bun` and `./build-release/bun-profile`.
 
 ## Valgrind
 
@@ -383,15 +223,32 @@ You'll need a very recent version of Valgrind due to DWARF 5 debug symbols. You
 $ valgrind --fair-sched=try --track-origins=yes bun-debug <args>
 ```
 
-## Updating `WebKit`
+## Building WebKit locally + Debug mode of JSC
 
-The Bun team will occasionally bump the version of WebKit used in Bun. When this happens, you may see errors in `src/bun.js/bindings` during builds. When you see this, install the latest version of `bun-webkit` and re-compile.
+{% callout %}
+
+**TODO**: This is out of date. TLDR is pass `-DUSE_DEBUG_JSC=1` or `-DWEBKIT_DIR=...` to CMake. it will probably need more fiddling. ask @paperdave if you need this.
+
+{% /callout %}
+
+WebKit is not cloned by default (to save time and disk space). To clone and build WebKit locally, run:
 
 ```bash
-$ bun install
-$ make cpp
+# once you run this, `make submodule` can be used to automatically
+# update WebKit and the other submodules
+$ git submodule update --init --depth 1 --checkout src/bun.js/WebKit
+# to make a jsc release build
+$ make jsc
+# JSC debug build does not work perfectly with Bun yet, this is actively being
+# worked on and will eventually become the default.
+$ make jsc-build-linux-compile-debug cpp
+$ make jsc-build-mac-compile-debug cpp
 ```
 
+Note that the WebKit folder, including build artifacts, is 8GB+ in size.
+
+If you are using a JSC debug build and using VScode, make sure to run the `C/C++: Select a Configuration` command to configure intellisense to find the debug headers.
+
 ## Troubleshooting
 
 ### 'span' file not found on Ubuntu
@@ -435,29 +292,6 @@ If you see an error when compiling `libarchive`, run this:
 $ brew install pkg-config
 ```
 
-### missing files on `zig build obj`
-
-If you see an error about missing files on `zig build obj`, make sure you built the headers.
-
-```bash
-$ make headers
-```
-
-### cmakeconfig.h not found
-
-If you see an error about `cmakeconfig.h` not being found, this is because the precompiled WebKit did not install properly.
-
-```bash
-$ bun install
-```
-
-Check to see the command installed webkit, and you can manually look for `node_modules/bun-webkit-{platform}-{arch}`:
-
-```bash
-# this should reveal two directories. if not, something went wrong
-$ echo node_modules/bun-webkit*
-```
-
 ### macOS `library not found for -lSystem`
 
 If you see this error when compiling, run:
@@ -474,4 +308,4 @@ Bun requires `libatomic` to be statically linked. On Arch Linux, it is only give
 $ sudo ln -s /lib/libatomic.so /lib/libatomic.a
 ```
 
-The built version of bun may not work on other systems if compiled this way.
+The built version of Bun may not work on other systems if compiled this way.

docs/project/internals/build-process-for-ci.md

@@ -0,0 +1,75 @@
+There are four parts to the CI build:
+
+- Dependencies: should be cached across builds as much as possible, it depends on git submodule hashes
+- Zig Object: depends on \*.zig and potentially src/js
+- C++ Object: depends on \*.cpp and src/js
+- Linking: depends on the above three
+
+Utilizing multiple GitHub Action runners allows us to do a lot of work in parallel.
+
+## Dependencies
+
+```sh
+BUN_DEPS_OUT_DIR="/optional/out/dir" bash ./scripts/all-dependencies.sh
+```
+
+## Zig Object
+
+This does not have a dependency on WebKit or any of the dependencies at all. It can be compiled without checking out submodules, but you will need to have bun install run. It can be very easily cross compiled.
+
+```sh
+BUN_REPO=/path/to/oven-sh/bun
+
+cd tmp1
+
+cmake $BUN_REPO \
+  -G Ninja \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCPU_TARGET="native" \
+  -DZIG_TARGET="native" \
+  -DBUN_ZIG_OBJ="./bun-zig.o"
+
+ninja ./bun-zig.o
+# -> bun-zig.o
+```
+
+## C++ Object
+
+Note: if WEBKIT_DIR is not passed, it is automatically downloaded from GitHub releases. This depends on the headers from submodules but not necessarily the build copies of them, .a files, etc.
+
+```sh
+cd tmp2
+
+cmake $BUN_REPO \
+  -G Ninja \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DBUN_CPP_ONLY=1 \
+
+bash compile-cpp-only.sh
+# -> bun-cpp-objects.a
+```
+
+## Linking
+
+The goal is you run both stages from above on different machines, so that they can build in parallel. Zig build is slow, and MacOS build runners are slower on average than the linux ones. With both artifacts from above, you can link them together:
+
+```sh
+cd tmp3
+
+cmake $BUN_REPO \
+  -G Ninja \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DBUN_LINK_ONLY=1 \
+  -DBUN_ZIG_OBJ="/path/to/bun-zig.o" \
+  -DBUN_CPP_ARCHIVE="/path/to/bun-cpp-objects.a"
+
+ninja
+
+# optiona:
+#   -DBUN_DEPS_OUT_DIR=... custom deps dir, use this to cache the built deps between rebuilds
+#   -DWEBKIT_DIR=... same thing, but it's probably fast enough to pull from github releases
+
+# -> bun
+# -> bun-profile
+# -> bun.dSYM/
+```

docs/quickstart.md

@@ -42,7 +42,10 @@ const server = Bun.serve({
 console.log(`Listening on http://localhost:${server.port} ...`);
 ```
 
-If you're using TypeScript, you may see a type error on the `Bun` global. To fix this, install `bun-types`.
+{% details summary="Seeing TypeScript errors on `Bun`?" %}
+If you used `bun init`, Bun will have automatically installed Bun's TypeScript declarations and configured your `tsconfig.json`. If you're trying out Bun in an existing project, you may see a type error on the `Bun` global.
+
+To fix this, first install `bun-types` as a dev dependency.
 
 ```sh
 $ bun add -d bun-types
@@ -58,6 +61,8 @@ Then add the following line to your `compilerOptions` in `tsconfig.json`.
 }
 ```
 
+{% /details %}
+
 Run the file from your shell.
 
 ```bash

docs/runtime/bunfig.md

@@ -209,11 +209,11 @@ dev = true
 
 ### `install.peer`
 
-Whether to install peer dependencies. Default `false`.
+Whether to install peer dependencies. Default `true`.
 
 ```toml
 [install]
-peer = false
+peer = true
 ```
 
 ### `install.production`

docs/runtime/nodejs-apis.md

@@ -30,7 +30,7 @@ This page is updated regularly to reflect compatibility status of the latest ver
 
 ### [`node:crypto`](https://nodejs.org/api/crypto.html)
 
-🟡 Missing `Certificate` `ECDH` `KeyObject` `X509Certificate` `checkPrime` `checkPrimeSync` `createPrivateKey` `createPublicKey` `createSecretKey` `diffieHellman` `generateKey` `generateKeyPair` `generateKeyPairSync` `generateKeySync` `generatePrime` `generatePrimeSync` `getCipherInfo` `getFips` `hkdf` `hkdfSync` `secureHeapUsed` `setEngine` `setFips` `sign` `verify`
+🟡 Missing `Certificate` `ECDH` `X509Certificate` `checkPrime` `checkPrimeSync` `diffieHellman` `generatePrime` `generatePrimeSync` `getCipherInfo` `getFips` `hkdf` `hkdfSync` `secureHeapUsed` `setEngine` `setFips`
 
 Some methods are not optimized yet.
 
@@ -156,7 +156,7 @@ Some methods are not optimized yet.
 
 ### [`node:vm`](https://nodejs.org/api/vm.html)
 
-🟡 Core functionality works, but VM modules are not implemented. Missing `createScript`. `ShadowRealm` can be used.
+🟡 Core functionality works, but experimental VM ES modules are not implemented, including `vm.Module`, `vm.SourceTextModule`, `vm.SyntheticModule`,`importModuleDynamically`, and `vm.measureMemory`. Options like `timeout`, `breakOnSigint`, `cachedData` are not implemented yet. There is a bug with `this` value for contextified options not having the correct prototype.
 
 ### [`node:wasi`](https://nodejs.org/api/wasi.html)
 

docs/runtime/plugins.md

@@ -221,7 +221,7 @@ console.log(mySvelteComponent.render());
 
 {% note %}
 
-This feature is currently only available at runtime with `Bun.plugin` and not yet supported in the bundler, but you can mimick the behavior using `onResolve` and `onLoad`.
+This feature is currently only available at runtime with `Bun.plugin` and not yet supported in the bundler, but you can mimic the behavior using `onResolve` and `onLoad`.
 
 {% /note %}
 

misctools/mime.js

@@ -15,8 +15,8 @@ for (let key of Object.keys(json).sort()) {
 }
 
 const withExtensions = [
-  ...new Set([
-    ...Object.keys(json)
+  ...new Set(
+    Object.keys(json)
       .filter(key => {
         return !!json[key]?.extensions?.length;
       })
@@ -26,7 +26,7 @@ const withExtensions = [
         });
       })
       .sort(),
-  ]),
+  ),
 ];
 
 all += "\n";

misctools/readlink-getfd.zig

@@ -27,7 +27,7 @@ pub fn main() anyerror!void {
     var args = std.mem.bytesAsSlice([]u8, try std.process.argsAlloc(allocator));
 
     const to_resolve = args[args.len - 1];
-    const cwd = try std.process.getCwdAlloc(allocator);
+    const cwd = try bun.getcwdAlloc(allocator);
     var path: []u8 = undefined;
     var out_buffer: [bun.MAX_PATH_BYTES]u8 = undefined;
 

misctools/tgz.zig

@@ -47,7 +47,7 @@ pub fn main() anyerror!void {
         bun.asByteSlice(args[args.len - 1]),
     };
 
-    const tarball_path = path_handler.joinAbsStringBuf(try std.process.getCwdAlloc(std.heap.c_allocator), &tarball_path_buf, &parts, .auto);
+    const tarball_path = path_handler.joinAbsStringBuf(try bun.getcwdAlloc(std.heap.c_allocator), &tarball_path_buf, &parts, .auto);
     Output.prettyErrorln("Tarball Path: {s}", .{tarball_path});
     var folder = basename;
 

package.json

@@ -1,4 +1,5 @@
 {
+  "name": "bun",
   "dependencies": {
     "@vscode/debugadapter": "^1.61.0",
     "esbuild": "^0.17.15",
@@ -14,9 +15,9 @@
   },
   "private": true,
   "scripts": {
-    "build-runtime": "esbuild --target=esnext  --bundle src/runtime/index.ts --format=iife --platform=browser --global-name=BUN_RUNTIME > src/runtime.out.js; cat src/runtime.footer.js >> src/runtime.out.js",
-    "build-fallback": "esbuild --target=esnext  --bundle src/fallback.ts --format=iife --platform=browser --minify > src/fallback.out.js",
-    "postinstall": "bash .scripts/postinstall.sh",
+    "setup": "./scripts/setup.sh",
+    "build": "if [ ! -e build ]; then bun setup; fi && ninja -C build",
+    "build:release": "cmake . -DCMAKE_BUILD_TYPE=Release -GNinja -Bbuild-release && ninja -Cbuild-release",
     "typecheck": "tsc --noEmit && cd test && bun run typecheck",
     "fmt": "prettier --write --cache './{src,test,bench,packages/{bun-types,bun-inspector-*,bun-vscode,bun-debug-adapter-protocol}}/**/*.{mjs,ts,tsx,js,jsx}'",
     "lint": "eslint './**/*.d.ts' --cache",
@@ -25,8 +26,7 @@
   "devDependencies": {
     "@types/react": "^18.0.25",
     "@typescript-eslint/eslint-plugin": "^5.31.0",
-    "@typescript-eslint/parser": "^5.31.0",
-    "bun-webkit": "0.0.1-2c4d07c9499a65f36f554dc4cd4e9e0640632b8c"
+    "@typescript-eslint/parser": "^5.31.0"
   },
   "version": "0.0.0",
   "prettier": "./.prettierrc.cjs"

packages/bun-debug-adapter-protocol/scripts/generate-protocol.ts

@@ -5,7 +5,7 @@ import { spawnSync } from "node:child_process";
 run().catch(console.error);
 
 async function run() {
-  const cwd = new URL("../protocol/", import.meta.url);
+  const cwd = new URL("../src/protocol/", import.meta.url);
   const runner = "Bun" in globalThis ? "bunx" : "npx";
   const write = (name: string, data: string) => {
     const path = new URL(name, cwd);

packages/bun-debug-adapter-protocol/src/protocol/index.d.ts

@@ -638,7 +638,7 @@ export namespace DAP {
    */
   export type BreakpointLocationsRequest = {
     /**
-     * The source location of the breakpoints; either `source.path` or `source.reference` must be specified.
+     * The source location of the breakpoints; either `source.path` or `source.sourceReference` must be specified.
      */
     source: Source;
     /**
@@ -1139,6 +1139,12 @@ export namespace DAP {
      * The value should be less than or equal to 2147483647 (2^31-1).
      */
     indexedVariables?: number;
+    /**
+     * A memory reference to a location appropriate for this result.
+     * For pointer type eval results, this is generally a reference to the memory address contained in the pointer.
+     * This attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
+     */
+    memoryReference?: string;
   };
   /**
    * Arguments for `source` request.
@@ -1286,7 +1292,7 @@ export namespace DAP {
     /**
      * A memory reference to a location appropriate for this result.
      * For pointer type eval results, this is generally a reference to the memory address contained in the pointer.
-     * This attribute should be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
+     * This attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
      */
     memoryReference?: string;
   };
@@ -1344,6 +1350,12 @@ export namespace DAP {
      * The value should be less than or equal to 2147483647 (2^31-1).
      */
     indexedVariables?: number;
+    /**
+     * A memory reference to a location appropriate for this result.
+     * For pointer type eval results, this is generally a reference to the memory address contained in the pointer.
+     * This attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
+     */
+    memoryReference?: string;
   };
   /**
    * Arguments for `stepInTargets` request.
@@ -2064,8 +2076,10 @@ export namespace DAP {
      */
     indexedVariables?: number;
     /**
-     * The memory reference for the variable if the variable represents executable code, such as a function pointer.
-     * This attribute is only required if the corresponding capability `supportsMemoryReferences` is true.
+     * A memory reference associated with this variable.
+     * For pointer type variables, this is generally a reference to the memory address contained in the pointer.
+     * For executable data, this reference may later be used in a `disassemble` request.
+     * This attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
      */
     memoryReference?: string;
   };

packages/bun-debug-adapter-protocol/src/protocol/protocol.json

@@ -108,7 +108,7 @@
         { "$ref": "#/definitions/Request" },
         {
           "type": "object",
-          "description": "The `cancel` request is used by the client in two situations:\n- to indicate that it is no longer interested in the result produced by a specific request issued earlier\n- to cancel a progress sequence. Clients should only call this request if the corresponding capability `supportsCancelRequest` is true.\nThis request has a hint characteristic: a debug adapter can only be expected to make a 'best effort' in honoring this request but there are no guarantees.\nThe `cancel` request may return an error if it could not cancel an operation but a client should refrain from presenting this error to end users.\nThe request that got cancelled still needs to send a response back. This can either be a normal result (`success` attribute true) or an error response (`success` attribute false and the `message` set to `cancelled`).\nReturning partial results from a cancelled request is possible but please note that a client has no generic way for detecting that a response is partial or not.\nThe progress that got cancelled still needs to send a `progressEnd` event back.\n A client should not assume that progress just got cancelled after sending the `cancel` request.",
+          "description": "The `cancel` request is used by the client in two situations:\n- to indicate that it is no longer interested in the result produced by a specific request issued earlier\n- to cancel a progress sequence.\nClients should only call this request if the corresponding capability `supportsCancelRequest` is true.\nThis request has a hint characteristic: a debug adapter can only be expected to make a 'best effort' in honoring this request but there are no guarantees.\nThe `cancel` request may return an error if it could not cancel an operation but a client should refrain from presenting this error to end users.\nThe request that got cancelled still needs to send a response back. This can either be a normal result (`success` attribute true) or an error response (`success` attribute false and the `message` set to `cancelled`).\nReturning partial results from a cancelled request is possible but please note that a client has no generic way for detecting that a response is partial or not.\nThe progress that got cancelled still needs to send a `progressEnd` event back.\n A client should not assume that progress just got cancelled after sending the `cancel` request.",
           "properties": {
             "command": { "type": "string", "enum": ["cancel"] },
             "arguments": { "$ref": "#/definitions/CancelArguments" }
@@ -1074,7 +1074,7 @@
       "properties": {
         "source": {
           "$ref": "#/definitions/Source",
-          "description": "The source location of the breakpoints; either `source.path` or `source.reference` must be specified."
+          "description": "The source location of the breakpoints; either `source.path` or `source.sourceReference` must be specified."
         },
         "line": {
           "type": "integer",
@@ -2035,6 +2035,10 @@
                 "indexedVariables": {
                   "type": "integer",
                   "description": "The number of indexed child variables.\nThe client can use this information to present the variables in a paged UI and fetch them in chunks.\nThe value should be less than or equal to 2147483647 (2^31-1)."
+                },
+                "memoryReference": {
+                  "type": "string",
+                  "description": "A memory reference to a location appropriate for this result.\nFor pointer type eval results, this is generally a reference to the memory address contained in the pointer.\nThis attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true."
                 }
               },
               "required": ["value"]
@@ -2326,7 +2330,7 @@
                 },
                 "memoryReference": {
                   "type": "string",
-                  "description": "A memory reference to a location appropriate for this result.\nFor pointer type eval results, this is generally a reference to the memory address contained in the pointer.\nThis attribute should be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true."
+                  "description": "A memory reference to a location appropriate for this result.\nFor pointer type eval results, this is generally a reference to the memory address contained in the pointer.\nThis attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true."
                 }
               },
               "required": ["result", "variablesReference"]
@@ -2397,6 +2401,10 @@
                 "indexedVariables": {
                   "type": "integer",
                   "description": "The number of indexed child variables.\nThe client can use this information to present the variables in a paged UI and fetch them in chunks.\nThe value should be less than or equal to 2147483647 (2^31-1)."
+                },
+                "memoryReference": {
+                  "type": "string",
+                  "description": "A memory reference to a location appropriate for this result.\nFor pointer type eval results, this is generally a reference to the memory address contained in the pointer.\nThis attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true."
                 }
               },
               "required": ["value"]
@@ -3240,7 +3248,7 @@
         },
         "memoryReference": {
           "type": "string",
-          "description": "The memory reference for the variable if the variable represents executable code, such as a function pointer.\nThis attribute is only required if the corresponding capability `supportsMemoryReferences` is true."
+          "description": "A memory reference associated with this variable.\nFor pointer type variables, this is generally a reference to the memory address contained in the pointer.\nFor executable data, this reference may later be used in a `disassemble` request.\nThis attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true."
         }
       },
       "required": ["name", "value", "variablesReference"]
@@ -3299,8 +3307,8 @@
               "Indicates that the object is a constant.",
               "Indicates that the object is read only.",
               "Indicates that the object is a raw string.",
-              "Indicates that the object can have an Object ID created for it.",
-              "Indicates that the object has an Object ID associated with it.",
+              "Indicates that the object can have an Object ID created for it. This is a vestigial attribute that is used by some clients; 'Object ID's are not specified in the protocol.",
+              "Indicates that the object has an Object ID associated with it. This is a vestigial attribute that is used by some clients; 'Object ID's are not specified in the protocol.",
               "Indicates that the evaluation had side effects.",
               "Indicates that the object has its value tracked by a data breakpoint."
             ]

packages/bun-inspector-protocol/scripts/generate-protocol.ts

@@ -5,7 +5,7 @@ import { spawnSync } from "node:child_process";
 run().catch(console.error);
 
 async function run() {
-  const cwd = new URL("../protocol/", import.meta.url);
+  const cwd = new URL("../src/protocol/", import.meta.url);
   const runner = "Bun" in globalThis ? "bunx" : "npx";
   const write = (name: string, data: string) => {
     const path = new URL(name, cwd);

packages/bun-inspector-protocol/src/protocol/v8/index.d.ts

@@ -1136,7 +1136,8 @@ export namespace V8 {
       | "Canceled"
       | "RpPageNotVisible"
       | "SilentMediationFailure"
-      | "ThirdPartyCookiesBlocked";
+      | "ThirdPartyCookiesBlocked"
+      | "NotSignedInWithIdp";
     export type FederatedAuthUserInfoRequestIssueDetails = {
       federatedAuthUserInfoRequestIssueReason: FederatedAuthUserInfoRequestIssueReason;
     };
@@ -1192,6 +1193,25 @@ export namespace V8 {
        */
       failedRequestInfo?: FailedRequestInfo | undefined;
     };
+    export type PropertyRuleIssueReason = "InvalidSyntax" | "InvalidInitialValue" | "InvalidInherits" | "InvalidName";
+    /**
+     * This issue warns about errors in property rules that lead to property
+     * registrations being ignored.
+     */
+    export type PropertyRuleIssueDetails = {
+      /**
+       * Source code position of the property rule.
+       */
+      sourceCodeLocation: SourceCodeLocation;
+      /**
+       * Reason why the property rule was discarded.
+       */
+      propertyRuleIssueReason: PropertyRuleIssueReason;
+      /**
+       * The value of the property rule property that failed to parse
+       */
+      propertyValue?: string | undefined;
+    };
     /**
      * A unique identifier for the type of issue. Each type may use one of the
      * optional fields in InspectorIssueDetails to convey more specific
@@ -1215,7 +1235,8 @@ export namespace V8 {
       | "FederatedAuthRequestIssue"
       | "BounceTrackingIssue"
       | "StylesheetLoadingIssue"
-      | "FederatedAuthUserInfoRequestIssue";
+      | "FederatedAuthUserInfoRequestIssue"
+      | "PropertyRuleIssue";
     /**
      * This struct holds a list of optional fields with additional information
      * specific to the kind of issue. When adding a new issue code, please also
@@ -1239,6 +1260,7 @@ export namespace V8 {
       federatedAuthRequestIssueDetails?: FederatedAuthRequestIssueDetails | undefined;
       bounceTrackingIssueDetails?: BounceTrackingIssueDetails | undefined;
       stylesheetLoadingIssueDetails?: StylesheetLoadingIssueDetails | undefined;
+      propertyRuleIssueDetails?: PropertyRuleIssueDetails | undefined;
       federatedAuthUserInfoRequestIssueDetails?: FederatedAuthUserInfoRequestIssueDetails | undefined;
     };
     /**
@@ -1390,16 +1412,82 @@ export namespace V8 {
        */
       name: string;
       /**
-       * address field name, for example Jon Doe.
+       * address field value, for example Jon Doe.
        */
       value: string;
     };
+    /**
+     * A list of address fields.
+     */
+    export type AddressFields = {
+      fields: AddressField[];
+    };
     export type Address = {
       /**
-       * fields and values defining a test address.
+       * fields and values defining an address.
        */
       fields: AddressField[];
     };
+    /**
+     * Defines how an address can be displayed like in chrome://settings/addresses.
+     * Address UI is a two dimensional array, each inner array is an "address information line", and when rendered in a UI surface should be displayed as such.
+     * The following address UI for instance:
+     * [[{name: "GIVE_NAME", value: "Jon"}, {name: "FAMILY_NAME", value: "Doe"}], [{name: "CITY", value: "Munich"}, {name: "ZIP", value: "81456"}]]
+     * should allow the receiver to render:
+     * Jon Doe
+     * Munich 81456
+     */
+    export type AddressUI = {
+      /**
+       * A two dimension array containing the repesentation of values from an address profile.
+       */
+      addressFields: AddressFields[];
+    };
+    /**
+     * Specified whether a filled field was done so by using the html autocomplete attribute or autofill heuristics.
+     */
+    export type FillingStrategy = "autocompleteAttribute" | "autofillInferred";
+    export type FilledField = {
+      /**
+       * The type of the field, e.g text, password etc.
+       */
+      htmlType: string;
+      /**
+       * the html id
+       */
+      id: string;
+      /**
+       * the html name
+       */
+      name: string;
+      /**
+       * the field value
+       */
+      value: string;
+      /**
+       * The actual field type, e.g FAMILY_NAME
+       */
+      autofillType: string;
+      /**
+       * The filling strategy
+       */
+      fillingStrategy: FillingStrategy;
+    };
+    /**
+     * Emitted when an address form is filled.
+     * @event `Autofill.addressFormFilled`
+     */
+    export type AddressFormFilledEvent = {
+      /**
+       * Information about the fields that were filled
+       */
+      filledFields: FilledField[];
+      /**
+       * An UI representation of the address used to fill the form.
+       * Consists of a 2D array where each child represents an address/profile line.
+       */
+      addressUi: AddressUI;
+    };
     /**
      * Trigger autofill on a form identified by the fieldId.
      * If the field and related form cannot be autofilled, returns an error.
@@ -1437,6 +1525,26 @@ export namespace V8 {
      * @response `Autofill.setAddresses`
      */
     export type SetAddressesResponse = {};
+    /**
+     * Disables autofill domain notifications.
+     * @request `Autofill.disable`
+     */
+    export type DisableRequest = {};
+    /**
+     * Disables autofill domain notifications.
+     * @response `Autofill.disable`
+     */
+    export type DisableResponse = {};
+    /**
+     * Enables autofill domain notifications.
+     * @request `Autofill.enable`
+     */
+    export type EnableRequest = {};
+    /**
+     * Enables autofill domain notifications.
+     * @response `Autofill.enable`
+     */
+    export type EnableResponse = {};
   }
   export namespace BackgroundService {
     /**
@@ -3573,6 +3681,25 @@ export namespace V8 {
      * @response `CSS.setEffectivePropertyValueForNode`
      */
     export type SetEffectivePropertyValueForNodeResponse = {};
+    /**
+     * Modifies the property rule property name.
+     * @request `CSS.setPropertyRulePropertyName`
+     */
+    export type SetPropertyRulePropertyNameRequest = {
+      styleSheetId: StyleSheetId;
+      range: SourceRange;
+      propertyName: string;
+    };
+    /**
+     * Modifies the property rule property name.
+     * @response `CSS.setPropertyRulePropertyName`
+     */
+    export type SetPropertyRulePropertyNameResponse = {
+      /**
+       * The resulting key text after modification.
+       */
+      propertyName: Value;
+    };
     /**
      * Modifies the keyframe rule key text.
      * @request `CSS.setKeyframeKey`
@@ -7168,6 +7295,16 @@ export namespace V8 {
      * @response `EventBreakpoints.removeInstrumentationBreakpoint`
      */
     export type RemoveInstrumentationBreakpointResponse = {};
+    /**
+     * Removes all breakpoints
+     * @request `EventBreakpoints.disable`
+     */
+    export type DisableRequest = {};
+    /**
+     * Removes all breakpoints
+     * @response `EventBreakpoints.disable`
+     */
+    export type DisableResponse = {};
   }
   export namespace FedCm {
     /**
@@ -7178,7 +7315,7 @@ export namespace V8 {
     /**
      * Whether the dialog shown is an account chooser or an auto re-authentication dialog.
      */
-    export type DialogType = "AccountChooser" | "AutoReauthn" | "ConfirmIdpSignin";
+    export type DialogType = "AccountChooser" | "AutoReauthn" | "ConfirmIdpLogin";
     /**
      * Corresponds to IdentityRequestAccount
      */
@@ -7189,7 +7326,7 @@ export namespace V8 {
       givenName: string;
       pictureUrl: string;
       idpConfigUrl: string;
-      idpSigninUrl: string;
+      idpLoginUrl: string;
       loginState: LoginState;
       /**
        * These two are only set if the loginState is signUp
@@ -7252,6 +7389,20 @@ export namespace V8 {
      * @response `FedCm.selectAccount`
      */
     export type SelectAccountResponse = {};
+    /**
+     * Only valid if the dialog type is ConfirmIdpLogin. Acts as if the user had
+     * clicked the continue button.
+     * @request `FedCm.confirmIdpLogin`
+     */
+    export type ConfirmIdpLoginRequest = {
+      dialogId: string;
+    };
+    /**
+     * Only valid if the dialog type is ConfirmIdpLogin. Acts as if the user had
+     * clicked the continue button.
+     * @response `FedCm.confirmIdpLogin`
+     */
+    export type ConfirmIdpLoginResponse = {};
     /**
      * undefined
      * @request `FedCm.dismissDialog`
@@ -10477,6 +10628,7 @@ export namespace V8 {
       | "ch-ect"
       | "ch-prefers-color-scheme"
       | "ch-prefers-reduced-motion"
+      | "ch-prefers-reduced-transparency"
       | "ch-rtt"
       | "ch-save-data"
       | "ch-ua"
@@ -13109,7 +13261,6 @@ export namespace V8 {
       | "LowEndDevice"
       | "InvalidSchemeRedirect"
       | "InvalidSchemeNavigation"
-      | "InProgressNavigation"
       | "NavigationRequestBlockedByCsp"
       | "MainFrameNavigation"
       | "MojoBinderPolicy"
@@ -13121,7 +13272,6 @@ export namespace V8 {
       | "NavigationBadHttpStatus"
       | "ClientCertRequested"
       | "NavigationRequestNetworkError"
-      | "MaxNumOfRunningPrerendersExceeded"
       | "CancelAllHostsForTesting"
       | "DidFailLoad"
       | "Stop"
@@ -13133,9 +13283,8 @@ export namespace V8 {
       | "MixedContent"
       | "TriggerBackgrounded"
       | "MemoryLimitExceeded"
-      | "FailToGetMemoryUsage"
       | "DataSaverEnabled"
-      | "HasEffectiveUrl"
+      | "TriggerUrlHasEffectiveUrl"
       | "ActivatedBeforeStarted"
       | "InactivePageRestriction"
       | "StartFailed"
@@ -13166,7 +13315,13 @@ export namespace V8 {
       | "PrerenderingDisabledByDevTools"
       | "ResourceLoadBlockedByClient"
       | "SpeculationRuleRemoved"
-      | "ActivatedWithAuxiliaryBrowsingContexts";
+      | "ActivatedWithAuxiliaryBrowsingContexts"
+      | "MaxNumOfRunningEagerPrerendersExceeded"
+      | "MaxNumOfRunningNonEagerPrerendersExceeded"
+      | "MaxNumOfRunningEmbedderPrerendersExceeded"
+      | "PrerenderingUrlHasEffectiveUrl"
+      | "RedirectedPrerenderingUrlHasEffectiveUrl"
+      | "ActivationUrlHasEffectiveUrl";
     /**
      * Preloading status values, see also PreloadingTriggeringOutcome. This
      * status is shared by prefetchStatusUpdated and prerenderStatusUpdated.
@@ -13221,24 +13376,6 @@ export namespace V8 {
     export type RuleSetRemovedEvent = {
       id: RuleSetId;
     };
-    /**
-     * Fired when a prerender attempt is completed.
-     * @event `Preload.prerenderAttemptCompleted`
-     */
-    export type PrerenderAttemptCompletedEvent = {
-      key: PreloadingAttemptKey;
-      /**
-       * The frame id of the frame initiating prerendering.
-       */
-      initiatingFrameId: Page.FrameId;
-      prerenderingUrl: string;
-      finalStatus: PrerenderFinalStatus;
-      /**
-       * This is used to give users more information about the name of the API call
-       * that is incompatible with prerender and has caused the cancellation of the attempt
-       */
-      disallowedApiMethod?: string | undefined;
-    };
     /**
      * Fired when a preload enabled state is updated.
      * @event `Preload.preloadEnabledStateUpdated`
@@ -13935,12 +14072,21 @@ export namespace V8 {
     /**
      * Enum of interest group access types.
      */
-    export type InterestGroupAccessType = "join" | "leave" | "update" | "loaded" | "bid" | "win";
+    export type InterestGroupAccessType =
+      | "join"
+      | "leave"
+      | "update"
+      | "loaded"
+      | "bid"
+      | "win"
+      | "additionalBid"
+      | "additionalBidWin"
+      | "clear";
     /**
      * Ad advertising element inside an interest group.
      */
     export type InterestGroupAd = {
-      renderUrl: string;
+      renderURL: string;
       metadata?: string | undefined;
     };
     /**
@@ -13951,10 +14097,10 @@ export namespace V8 {
       name: string;
       expirationTime: Network.TimeSinceEpoch;
       joiningOrigin: string;
-      biddingUrl?: string | undefined;
-      biddingWasmHelperUrl?: string | undefined;
-      updateUrl?: string | undefined;
-      trustedBiddingSignalsUrl?: string | undefined;
+      biddingLogicURL?: string | undefined;
+      biddingWasmHelperURL?: string | undefined;
+      updateURL?: string | undefined;
+      trustedBiddingSignalsURL?: string | undefined;
       trustedBiddingSignalsKeys: string[];
       userBiddingSignals?: string | undefined;
       ads: InterestGroupAd[];
@@ -14099,20 +14245,27 @@ export namespace V8 {
       key: string;
       value: UnsignedInt128AsBase16;
     };
+    export type AttributionReportingEventReportWindows = {
+      /**
+       * duration in seconds
+       */
+      start: number;
+      /**
+       * duration in seconds
+       */
+      ends: number[];
+    };
     export type AttributionReportingSourceRegistration = {
       time: Network.TimeSinceEpoch;
       /**
        * duration in seconds
        */
-      expiry?: number | undefined;
+      expiry: number;
+      eventReportWindows: AttributionReportingEventReportWindows;
       /**
        * duration in seconds
        */
-      eventReportWindow?: number | undefined;
-      /**
-       * duration in seconds
-       */
-      aggregatableReportWindow?: number | undefined;
+      aggregatableReportWindow: number;
       type: AttributionReportingSourceType;
       sourceOrigin: string;
       reportingOrigin: string;
@@ -16381,6 +16534,7 @@ export namespace V8 {
     "Animation.animationCreated": Animation.AnimationCreatedEvent;
     "Animation.animationStarted": Animation.AnimationStartedEvent;
     "Audits.issueAdded": Audits.IssueAddedEvent;
+    "Autofill.addressFormFilled": Autofill.AddressFormFilledEvent;
     "BackgroundService.recordingStateChanged": BackgroundService.RecordingStateChangedEvent;
     "BackgroundService.backgroundServiceEventReceived": BackgroundService.BackgroundServiceEventReceivedEvent;
     "Browser.downloadWillBegin": Browser.DownloadWillBeginEvent;
@@ -16460,7 +16614,6 @@ export namespace V8 {
     "PerformanceTimeline.timelineEventAdded": PerformanceTimeline.TimelineEventAddedEvent;
     "Preload.ruleSetUpdated": Preload.RuleSetUpdatedEvent;
     "Preload.ruleSetRemoved": Preload.RuleSetRemovedEvent;
-    "Preload.prerenderAttemptCompleted": Preload.PrerenderAttemptCompletedEvent;
     "Preload.preloadEnabledStateUpdated": Preload.PreloadEnabledStateUpdatedEvent;
     "Preload.prefetchStatusUpdated": Preload.PrefetchStatusUpdatedEvent;
     "Preload.prerenderStatusUpdated": Preload.PrerenderStatusUpdatedEvent;
@@ -16533,6 +16686,8 @@ export namespace V8 {
     "Audits.checkFormsIssues": Audits.CheckFormsIssuesRequest;
     "Autofill.trigger": Autofill.TriggerRequest;
     "Autofill.setAddresses": Autofill.SetAddressesRequest;
+    "Autofill.disable": Autofill.DisableRequest;
+    "Autofill.enable": Autofill.EnableRequest;
     "BackgroundService.startObserving": BackgroundService.StartObservingRequest;
     "BackgroundService.stopObserving": BackgroundService.StopObservingRequest;
     "BackgroundService.setRecording": BackgroundService.SetRecordingRequest;
@@ -16583,6 +16738,7 @@ export namespace V8 {
     "CSS.trackComputedStyleUpdates": CSS.TrackComputedStyleUpdatesRequest;
     "CSS.takeComputedStyleUpdates": CSS.TakeComputedStyleUpdatesRequest;
     "CSS.setEffectivePropertyValueForNode": CSS.SetEffectivePropertyValueForNodeRequest;
+    "CSS.setPropertyRulePropertyName": CSS.SetPropertyRulePropertyNameRequest;
     "CSS.setKeyframeKey": CSS.SetKeyframeKeyRequest;
     "CSS.setMediaText": CSS.SetMediaTextRequest;
     "CSS.setContainerQueryText": CSS.SetContainerQueryTextRequest;
@@ -16705,9 +16861,11 @@ export namespace V8 {
     "Emulation.setAutomationOverride": Emulation.SetAutomationOverrideRequest;
     "EventBreakpoints.setInstrumentationBreakpoint": EventBreakpoints.SetInstrumentationBreakpointRequest;
     "EventBreakpoints.removeInstrumentationBreakpoint": EventBreakpoints.RemoveInstrumentationBreakpointRequest;
+    "EventBreakpoints.disable": EventBreakpoints.DisableRequest;
     "FedCm.enable": FedCm.EnableRequest;
     "FedCm.disable": FedCm.DisableRequest;
     "FedCm.selectAccount": FedCm.SelectAccountRequest;
+    "FedCm.confirmIdpLogin": FedCm.ConfirmIdpLoginRequest;
     "FedCm.dismissDialog": FedCm.DismissDialogRequest;
     "FedCm.resetCooldown": FedCm.ResetCooldownRequest;
     "Fetch.disable": Fetch.DisableRequest;
@@ -16979,6 +17137,8 @@ export namespace V8 {
     "Audits.checkFormsIssues": Audits.CheckFormsIssuesResponse;
     "Autofill.trigger": Autofill.TriggerResponse;
     "Autofill.setAddresses": Autofill.SetAddressesResponse;
+    "Autofill.disable": Autofill.DisableResponse;
+    "Autofill.enable": Autofill.EnableResponse;
     "BackgroundService.startObserving": BackgroundService.StartObservingResponse;
     "BackgroundService.stopObserving": BackgroundService.StopObservingResponse;
     "BackgroundService.setRecording": BackgroundService.SetRecordingResponse;
@@ -17029,6 +17189,7 @@ export namespace V8 {
     "CSS.trackComputedStyleUpdates": CSS.TrackComputedStyleUpdatesResponse;
     "CSS.takeComputedStyleUpdates": CSS.TakeComputedStyleUpdatesResponse;
     "CSS.setEffectivePropertyValueForNode": CSS.SetEffectivePropertyValueForNodeResponse;
+    "CSS.setPropertyRulePropertyName": CSS.SetPropertyRulePropertyNameResponse;
     "CSS.setKeyframeKey": CSS.SetKeyframeKeyResponse;
     "CSS.setMediaText": CSS.SetMediaTextResponse;
     "CSS.setContainerQueryText": CSS.SetContainerQueryTextResponse;
@@ -17151,9 +17312,11 @@ export namespace V8 {
     "Emulation.setAutomationOverride": Emulation.SetAutomationOverrideResponse;
     "EventBreakpoints.setInstrumentationBreakpoint": EventBreakpoints.SetInstrumentationBreakpointResponse;
     "EventBreakpoints.removeInstrumentationBreakpoint": EventBreakpoints.RemoveInstrumentationBreakpointResponse;
+    "EventBreakpoints.disable": EventBreakpoints.DisableResponse;
     "FedCm.enable": FedCm.EnableResponse;
     "FedCm.disable": FedCm.DisableResponse;
     "FedCm.selectAccount": FedCm.SelectAccountResponse;
+    "FedCm.confirmIdpLogin": FedCm.ConfirmIdpLoginResponse;
     "FedCm.dismissDialog": FedCm.DismissDialogResponse;
     "FedCm.resetCooldown": FedCm.ResetCooldownResponse;
     "Fetch.disable": Fetch.DisableResponse;

packages/bun-inspector-protocol/src/protocol/v8/protocol.json

@@ -1091,7 +1091,8 @@
             "Canceled",
             "RpPageNotVisible",
             "SilentMediationFailure",
-            "ThirdPartyCookiesBlocked"
+            "ThirdPartyCookiesBlocked",
+            "NotSignedInWithIdp"
           ]
         },
         {
@@ -1163,6 +1164,34 @@
             }
           ]
         },
+        {
+          "id": "PropertyRuleIssueReason",
+          "type": "string",
+          "enum": ["InvalidSyntax", "InvalidInitialValue", "InvalidInherits", "InvalidName"]
+        },
+        {
+          "id": "PropertyRuleIssueDetails",
+          "description": "This issue warns about errors in property rules that lead to property\nregistrations being ignored.",
+          "type": "object",
+          "properties": [
+            {
+              "name": "sourceCodeLocation",
+              "description": "Source code position of the property rule.",
+              "$ref": "SourceCodeLocation"
+            },
+            {
+              "name": "propertyRuleIssueReason",
+              "description": "Reason why the property rule was discarded.",
+              "$ref": "PropertyRuleIssueReason"
+            },
+            {
+              "name": "propertyValue",
+              "description": "The value of the property rule property that failed to parse",
+              "optional": true,
+              "type": "string"
+            }
+          ]
+        },
         {
           "id": "InspectorIssueCode",
           "description": "A unique identifier for the type of issue. Each type may use one of the\noptional fields in InspectorIssueDetails to convey more specific\ninformation about the kind of issue.",
@@ -1185,7 +1214,8 @@
             "FederatedAuthRequestIssue",
             "BounceTrackingIssue",
             "StylesheetLoadingIssue",
-            "FederatedAuthUserInfoRequestIssue"
+            "FederatedAuthUserInfoRequestIssue",
+            "PropertyRuleIssue"
           ]
         },
         {
@@ -1227,6 +1257,7 @@
             },
             { "name": "bounceTrackingIssueDetails", "optional": true, "$ref": "BounceTrackingIssueDetails" },
             { "name": "stylesheetLoadingIssueDetails", "optional": true, "$ref": "StylesheetLoadingIssueDetails" },
+            { "name": "propertyRuleIssueDetails", "optional": true, "$ref": "PropertyRuleIssueDetails" },
             {
               "name": "federatedAuthUserInfoRequestIssueDetails",
               "optional": true,
@@ -1344,20 +1375,76 @@
           "type": "object",
           "properties": [
             { "name": "name", "description": "address field name, for example GIVEN_NAME.", "type": "string" },
-            { "name": "value", "description": "address field name, for example Jon Doe.", "type": "string" }
+            { "name": "value", "description": "address field value, for example Jon Doe.", "type": "string" }
           ]
         },
+        {
+          "id": "AddressFields",
+          "description": "A list of address fields.",
+          "type": "object",
+          "properties": [{ "name": "fields", "type": "array", "items": { "$ref": "AddressField" } }]
+        },
         {
           "id": "Address",
           "type": "object",
           "properties": [
             {
               "name": "fields",
-              "description": "fields and values defining a test address.",
+              "description": "fields and values defining an address.",
               "type": "array",
               "items": { "$ref": "AddressField" }
             }
           ]
+        },
+        {
+          "id": "AddressUI",
+          "description": "Defines how an address can be displayed like in chrome://settings/addresses.\nAddress UI is a two dimensional array, each inner array is an \"address information line\", and when rendered in a UI surface should be displayed as such.\nThe following address UI for instance:\n[[{name: \"GIVE_NAME\", value: \"Jon\"}, {name: \"FAMILY_NAME\", value: \"Doe\"}], [{name: \"CITY\", value: \"Munich\"}, {name: \"ZIP\", value: \"81456\"}]]\nshould allow the receiver to render:\nJon Doe\nMunich 81456",
+          "type": "object",
+          "properties": [
+            {
+              "name": "addressFields",
+              "description": "A two dimension array containing the repesentation of values from an address profile.",
+              "type": "array",
+              "items": { "$ref": "AddressFields" }
+            }
+          ]
+        },
+        {
+          "id": "FillingStrategy",
+          "description": "Specified whether a filled field was done so by using the html autocomplete attribute or autofill heuristics.",
+          "type": "string",
+          "enum": ["autocompleteAttribute", "autofillInferred"]
+        },
+        {
+          "id": "FilledField",
+          "type": "object",
+          "properties": [
+            { "name": "htmlType", "description": "The type of the field, e.g text, password etc.", "type": "string" },
+            { "name": "id", "description": "the html id", "type": "string" },
+            { "name": "name", "description": "the html name", "type": "string" },
+            { "name": "value", "description": "the field value", "type": "string" },
+            { "name": "autofillType", "description": "The actual field type, e.g FAMILY_NAME", "type": "string" },
+            { "name": "fillingStrategy", "description": "The filling strategy", "$ref": "FillingStrategy" }
+          ]
+        }
+      ],
+      "events": [
+        {
+          "name": "addressFormFilled",
+          "description": "Emitted when an address form is filled.",
+          "parameters": [
+            {
+              "name": "filledFields",
+              "description": "Information about the fields that were filled",
+              "type": "array",
+              "items": { "$ref": "FilledField" }
+            },
+            {
+              "name": "addressUi",
+              "description": "An UI representation of the address used to fill the form.\nConsists of a 2D array where each child represents an address/profile line.",
+              "$ref": "AddressUI"
+            }
+          ]
         }
       ],
       "commands": [
@@ -1387,7 +1474,9 @@
           "name": "setAddresses",
           "description": "Set addresses so that developers can verify their forms implementation.",
           "parameters": [{ "name": "addresses", "type": "array", "items": { "$ref": "Address" } }]
-        }
+        },
+        { "name": "disable", "description": "Disables autofill domain notifications." },
+        { "name": "enable", "description": "Enables autofill domain notifications." }
       ]
     },
     {
@@ -3211,6 +3300,18 @@
             { "name": "value", "type": "string" }
           ]
         },
+        {
+          "name": "setPropertyRulePropertyName",
+          "description": "Modifies the property rule property name.",
+          "parameters": [
+            { "name": "styleSheetId", "$ref": "StyleSheetId" },
+            { "name": "range", "$ref": "SourceRange" },
+            { "name": "propertyName", "type": "string" }
+          ],
+          "returns": [
+            { "name": "propertyName", "description": "The resulting key text after modification.", "$ref": "Value" }
+          ]
+        },
         {
           "name": "setKeyframeKey",
           "description": "Modifies the keyframe rule key text.",
@@ -4628,7 +4729,7 @@
     {
       "domain": "DOMDebugger",
       "description": "DOM debugging allows setting breakpoints on particular DOM operations and events. JavaScript\nexecution will stop on these operations as if there was a regular breakpoint set.",
-      "dependencies": ["DOM", "Debugger", "Runtime"],
+      "dependencies": ["DOM", "Runtime"],
       "types": [
         {
           "id": "DOMBreakpointType",
@@ -4738,6 +4839,8 @@
           "name": "removeInstrumentationBreakpoint",
           "description": "Removes breakpoint on particular native event.",
           "experimental": true,
+          "deprecated": true,
+          "redirect": "EventBreakpoints",
           "parameters": [{ "name": "eventName", "description": "Instrumentation name to stop on.", "type": "string" }]
         },
         {
@@ -4788,6 +4891,8 @@
           "name": "setInstrumentationBreakpoint",
           "description": "Sets breakpoint on particular native event.",
           "experimental": true,
+          "deprecated": true,
+          "redirect": "EventBreakpoints",
           "parameters": [{ "name": "eventName", "description": "Instrumentation name to stop on.", "type": "string" }]
         },
         {
@@ -6069,7 +6174,7 @@
     },
     {
       "domain": "EventBreakpoints",
-      "description": "EventBreakpoints permits setting breakpoints on particular operations and\nevents in targets that run JavaScript but do not have a DOM.\nJavaScript execution will stop on these operations as if there was a regular\nbreakpoint set.",
+      "description": "EventBreakpoints permits setting JavaScript breakpoints on operations and events\noccurring in native code invoked from JavaScript. Once breakpoint is hit, it is\nreported through Debugger domain, similarly to regular breakpoints being hit.",
       "experimental": true,
       "commands": [
         {
@@ -6081,7 +6186,8 @@
           "name": "removeInstrumentationBreakpoint",
           "description": "Removes breakpoint on particular native event.",
           "parameters": [{ "name": "eventName", "description": "Instrumentation name to stop on.", "type": "string" }]
-        }
+        },
+        { "name": "disable", "description": "Removes all breakpoints" }
       ]
     },
     {
@@ -6099,7 +6205,7 @@
           "id": "DialogType",
           "description": "Whether the dialog shown is an account chooser or an auto re-authentication dialog.",
           "type": "string",
-          "enum": ["AccountChooser", "AutoReauthn", "ConfirmIdpSignin"]
+          "enum": ["AccountChooser", "AutoReauthn", "ConfirmIdpLogin"]
         },
         {
           "id": "Account",
@@ -6112,7 +6218,7 @@
             { "name": "givenName", "type": "string" },
             { "name": "pictureUrl", "type": "string" },
             { "name": "idpConfigUrl", "type": "string" },
-            { "name": "idpSigninUrl", "type": "string" },
+            { "name": "idpLoginUrl", "type": "string" },
             { "name": "loginState", "$ref": "LoginState" },
             {
               "name": "termsOfServiceUrl",
@@ -6160,6 +6266,11 @@
             { "name": "accountIndex", "type": "integer" }
           ]
         },
+        {
+          "name": "confirmIdpLogin",
+          "description": "Only valid if the dialog type is ConfirmIdpLogin. Acts as if the user had\nclicked the continue button.",
+          "parameters": [{ "name": "dialogId", "type": "string" }]
+        },
         {
           "name": "dismissDialog",
           "parameters": [
@@ -6987,16 +7098,14 @@
             {
               "name": "tiltX",
               "description": "The plane angle between the Y-Z plane and the plane containing both the stylus axis and the Y axis, in degrees of the range [-90,90], a positive tiltX is to the right (default: 0)",
-              "experimental": true,
               "optional": true,
-              "type": "integer"
+              "type": "number"
             },
             {
               "name": "tiltY",
               "description": "The plane angle between the X-Z plane and the plane containing both the stylus axis and the X axis, in degrees of the range [-90,90], a positive tiltY is towards the user (default: 0).",
-              "experimental": true,
               "optional": true,
-              "type": "integer"
+              "type": "number"
             },
             {
               "name": "twist",
@@ -7280,16 +7389,14 @@
             {
               "name": "tiltX",
               "description": "The plane angle between the Y-Z plane and the plane containing both the stylus axis and the Y axis, in degrees of the range [-90,90], a positive tiltX is to the right (default: 0).",
-              "experimental": true,
               "optional": true,
-              "type": "integer"
+              "type": "number"
             },
             {
               "name": "tiltY",
               "description": "The plane angle between the X-Z plane and the plane containing both the stylus axis and the X axis, in degrees of the range [-90,90], a positive tiltY is towards the user (default: 0).",
-              "experimental": true,
               "optional": true,
-              "type": "integer"
+              "type": "number"
             },
             {
               "name": "twist",
@@ -9158,6 +9265,7 @@
             "ch-ect",
             "ch-prefers-color-scheme",
             "ch-prefers-reduced-motion",
+            "ch-prefers-reduced-transparency",
             "ch-rtt",
             "ch-save-data",
             "ch-ua",
@@ -11403,7 +11511,6 @@
             "LowEndDevice",
             "InvalidSchemeRedirect",
             "InvalidSchemeNavigation",
-            "InProgressNavigation",
             "NavigationRequestBlockedByCsp",
             "MainFrameNavigation",
             "MojoBinderPolicy",
@@ -11415,7 +11522,6 @@
             "NavigationBadHttpStatus",
             "ClientCertRequested",
             "NavigationRequestNetworkError",
-            "MaxNumOfRunningPrerendersExceeded",
             "CancelAllHostsForTesting",
             "DidFailLoad",
             "Stop",
@@ -11427,9 +11533,8 @@
             "MixedContent",
             "TriggerBackgrounded",
             "MemoryLimitExceeded",
-            "FailToGetMemoryUsage",
             "DataSaverEnabled",
-            "HasEffectiveUrl",
+            "TriggerUrlHasEffectiveUrl",
             "ActivatedBeforeStarted",
             "InactivePageRestriction",
             "StartFailed",
@@ -11460,7 +11565,13 @@
             "PrerenderingDisabledByDevTools",
             "ResourceLoadBlockedByClient",
             "SpeculationRuleRemoved",
-            "ActivatedWithAuxiliaryBrowsingContexts"
+            "ActivatedWithAuxiliaryBrowsingContexts",
+            "MaxNumOfRunningEagerPrerendersExceeded",
+            "MaxNumOfRunningNonEagerPrerendersExceeded",
+            "MaxNumOfRunningEmbedderPrerendersExceeded",
+            "PrerenderingUrlHasEffectiveUrl",
+            "RedirectedPrerenderingUrlHasEffectiveUrl",
+            "ActivationUrlHasEffectiveUrl"
           ]
         },
         {
@@ -11515,26 +11626,6 @@
           "parameters": [{ "name": "ruleSet", "$ref": "RuleSet" }]
         },
         { "name": "ruleSetRemoved", "parameters": [{ "name": "id", "$ref": "RuleSetId" }] },
-        {
-          "name": "prerenderAttemptCompleted",
-          "description": "Fired when a prerender attempt is completed.",
-          "parameters": [
-            { "name": "key", "$ref": "PreloadingAttemptKey" },
-            {
-              "name": "initiatingFrameId",
-              "description": "The frame id of the frame initiating prerendering.",
-              "$ref": "Page.FrameId"
-            },
-            { "name": "prerenderingUrl", "type": "string" },
-            { "name": "finalStatus", "$ref": "PrerenderFinalStatus" },
-            {
-              "name": "disallowedApiMethod",
-              "description": "This is used to give users more information about the name of the API call\nthat is incompatible with prerender and has caused the cancellation of the attempt",
-              "optional": true,
-              "type": "string"
-            }
-          ]
-        },
         {
           "name": "preloadEnabledStateUpdated",
           "description": "Fired when a preload enabled state is updated.",
@@ -12077,14 +12168,14 @@
           "id": "InterestGroupAccessType",
           "description": "Enum of interest group access types.",
           "type": "string",
-          "enum": ["join", "leave", "update", "loaded", "bid", "win"]
+          "enum": ["join", "leave", "update", "loaded", "bid", "win", "additionalBid", "additionalBidWin", "clear"]
         },
         {
           "id": "InterestGroupAd",
           "description": "Ad advertising element inside an interest group.",
           "type": "object",
           "properties": [
-            { "name": "renderUrl", "type": "string" },
+            { "name": "renderURL", "type": "string" },
             { "name": "metadata", "optional": true, "type": "string" }
           ]
         },
@@ -12097,10 +12188,10 @@
             { "name": "name", "type": "string" },
             { "name": "expirationTime", "$ref": "Network.TimeSinceEpoch" },
             { "name": "joiningOrigin", "type": "string" },
-            { "name": "biddingUrl", "optional": true, "type": "string" },
-            { "name": "biddingWasmHelperUrl", "optional": true, "type": "string" },
-            { "name": "updateUrl", "optional": true, "type": "string" },
-            { "name": "trustedBiddingSignalsUrl", "optional": true, "type": "string" },
+            { "name": "biddingLogicURL", "optional": true, "type": "string" },
+            { "name": "biddingWasmHelperURL", "optional": true, "type": "string" },
+            { "name": "updateURL", "optional": true, "type": "string" },
+            { "name": "trustedBiddingSignalsURL", "optional": true, "type": "string" },
             { "name": "trustedBiddingSignalsKeys", "type": "array", "items": { "type": "string" } },
             { "name": "userBiddingSignals", "optional": true, "type": "string" },
             { "name": "ads", "type": "array", "items": { "$ref": "InterestGroupAd" } },
@@ -12275,20 +12366,24 @@
             { "name": "value", "$ref": "UnsignedInt128AsBase16" }
           ]
         },
+        {
+          "id": "AttributionReportingEventReportWindows",
+          "experimental": true,
+          "type": "object",
+          "properties": [
+            { "name": "start", "description": "duration in seconds", "type": "integer" },
+            { "name": "ends", "description": "duration in seconds", "type": "array", "items": { "type": "integer" } }
+          ]
+        },
         {
           "id": "AttributionReportingSourceRegistration",
           "experimental": true,
           "type": "object",
           "properties": [
             { "name": "time", "$ref": "Network.TimeSinceEpoch" },
-            { "name": "expiry", "description": "duration in seconds", "optional": true, "type": "integer" },
-            { "name": "eventReportWindow", "description": "duration in seconds", "optional": true, "type": "integer" },
-            {
-              "name": "aggregatableReportWindow",
-              "description": "duration in seconds",
-              "optional": true,
-              "type": "integer"
-            },
+            { "name": "expiry", "description": "duration in seconds", "type": "integer" },
+            { "name": "eventReportWindows", "$ref": "AttributionReportingEventReportWindows" },
+            { "name": "aggregatableReportWindow", "description": "duration in seconds", "type": "integer" },
             { "name": "type", "$ref": "AttributionReportingSourceType" },
             { "name": "sourceOrigin", "type": "string" },
             { "name": "reportingOrigin", "type": "string" },

packages/bun-lambda/runtime.ts

@@ -279,7 +279,7 @@ async function sendResponse(response: unknown): Promise<void> {
   }
   await fetch(`runtime/invocation/${requestId}/response`, {
     method: "POST",
-    body: response === null ? null : JSON.stringify(response),
+    body: response === null ? null : (typeof response === 'string' ? response : JSON.stringify(response)),
   });
 }
 

packages/bun-types/buffer.d.ts

@@ -2084,31 +2084,31 @@ declare module "buffer" {
       values(): IterableIterator<number>;
     }
     var Buffer: BufferConstructor;
-
-    /**
-     * This function returns `true` if `input` contains only valid UTF-8-encoded data,
-     * including the case in which `input` is empty.
-     *
-     * Throws if the `input` is a detached array buffer.
-     * @since Bun v0.6.13
-     * @param input The input to validate.
-     */
-    export function isUtf8(
-      input: TypedArray | ArrayBufferLike | DataView,
-    ): boolean;
-
-    /**
-     * This function returns `true` if `input` contains only valid ASCII-encoded data,
-     * including the case in which `input` is empty.
-     *
-     * Throws if the `input` is a detached array buffer.
-     * @since Bun v0.6.13
-     * @param input The input to validate.
-     */
-    export function isAscii(
-      input: TypedArray | ArrayBufferLike | DataView,
-    ): boolean;
   }
+
+  /**
+   * This function returns `true` if `input` contains only valid UTF-8-encoded data,
+   * including the case in which `input` is empty.
+   *
+   * Throws if the `input` is a detached array buffer.
+   * @since Bun v0.6.13
+   * @param input The input to validate.
+   */
+  export function isUtf8(
+    input: TypedArray | ArrayBufferLike | DataView,
+  ): boolean;
+
+  /**
+   * This function returns `true` if `input` contains only valid ASCII-encoded data,
+   * including the case in which `input` is empty.
+   *
+   * Throws if the `input` is a detached array buffer.
+   * @since Bun v0.6.13
+   * @param input The input to validate.
+   */
+  export function isAscii(
+    input: TypedArray | ArrayBufferLike | DataView,
+  ): boolean;
 }
 declare module "node:buffer" {
   export * from "buffer";

packages/bun-types/bun-test.d.ts

@@ -27,6 +27,38 @@ declare module "bun:test" {
 
   export const mock: {
     <T extends AnyFunction>(Function: T): Mock<T>;
+
+    /**
+     * Replace the module `id` with the return value of `factory`.
+     *
+     * This is useful for mocking modules.
+     *
+     * @param id module ID to mock
+     * @param factory a function returning an object that will be used as the exports of the mocked module
+     *
+     * @example
+     * ## Example
+     * ```ts
+     * import { mock } from "bun:test";
+     *
+     * mock.module("fs/promises", () => {
+     *  return {
+     *    readFile: () => Promise.resolve("hello world"),
+     *  };
+     * });
+     *
+     * import { readFile } from "fs/promises";
+     *
+     * console.log(await readFile("hello.txt", "utf8")); // hello world
+     * ```
+     *
+     * ## More notes
+     *
+     * If the module is already loaded, exports are overwritten with the return
+     * value of `factory`. If the export didn't exist before, it will not be
+     * added to existing import statements. This is due to how ESM works.
+     */
+    module(id: string, factory: () => any): void | Promise<void>;
   };
 
   /**
@@ -479,13 +511,13 @@ declare module "bun:test" {
    * @param actual the actual value
    */
   export const expect: {
-    (actual?: unknown): Expect;
+    <T = unknown>(actual?: T): Expect<T>;
     any: (
       constructor: ((..._: any[]) => any) | { new (..._: any[]): any },
     ) => Expect;
     anything: () => Expect;
-    stringContaining: (str: string) => Expect;
-    stringMatching: (regex: RegExp | string) => Expect;
+    stringContaining: (str: string) => Expect<string>;
+    stringMatching: <T extends RegExp | string>(regex: T) => Expect<T>;
   };
   /**
    * Asserts that a value matches some criteria.
@@ -982,6 +1014,16 @@ declare module "bun:test" {
      * @param end the end number (exclusive)
      */
     toBeWithin(start: number, end: number): void;
+    /**
+     * Asserts that a value is equal to the expected string, ignoring any whitespace.
+     *
+     * @example
+     * expect(" foo ").toEqualIgnoringWhitespace("foo");
+     * expect("bar").toEqualIgnoringWhitespace(" bar ");
+     *
+     * @param expected the expected string
+     */
+    toEqualIgnoringWhitespace(expected: string): void;
     /**
      * Asserts that a value is a `symbol`.
      *

packages/bun-types/bun.d.ts

@@ -1870,6 +1870,15 @@ declare module "bun" {
      */
     port?: string | number;
 
+    /**
+     * If the `SO_REUSEPORT` flag should be set.
+     *
+     * This allows multiple processes to bind to the same port, which is useful for load balancing.
+     *
+     * @default false
+     */
+    reusePort?: boolean;
+
     /**
      * What hostname should the server listen on?
      *
@@ -4068,7 +4077,7 @@ declare module "bun" {
    * Spawn a new process
    *
    * ```js
-   * const {stdout} = Bun.spawn(["echo", "hello"]));
+   * const {stdout} = Bun.spawn(["echo", "hello"]);
    * const text = await readableStreamToText(stdout);
    * console.log(text); // "hello\n"
    * ```
@@ -4130,7 +4139,7 @@ declare module "bun" {
    * Synchronously spawn a new process
    *
    * ```js
-   * const {stdout} = Bun.spawnSync(["echo", "hello"]));
+   * const {stdout} = Bun.spawnSync(["echo", "hello"]);
    * console.log(stdout.toString()); // "hello\n"
    * ```
    *

packages/bun-types/globals.d.ts

@@ -235,7 +235,10 @@ declare namespace NodeJS {
   interface Require {
     (id: string): any;
     resolve: RequireResolve;
+    cache: Record<string, NodeModule>;
+    main: NodeModule | undefined;
   }
+
   interface ProcessEnv {}
   type Signals =
     | "SIGABRT"
@@ -546,6 +549,12 @@ interface Worker extends EventTarget, AbstractWorker {
    */
   unref(): void;
 
+  /**
+   * An integer identifier for the referenced thread. Inside the worker thread,
+   * it is available as `require('node:worker_threads').threadId`.
+   * This value is unique for each `Worker` instance inside a single process.
+   * @since v10.5.0
+   */
   threadId: number;
 }
 
@@ -733,6 +742,8 @@ interface Process {
    * On other operating systems, this returns `undefined`.
    */
   constrainedMemory(): number | undefined;
+
+  send(data: any): void;
 }
 
 interface MemoryUsageObject {
@@ -2386,6 +2397,12 @@ declare var WebSocket: {
        * Sets the sub-protocols the client is willing to accept.
        */
       protocols?: string[];
+      /**
+       * Override the default TLS options
+       */
+      tls?: {
+        rejectUnauthorized?: boolean | undefined; // Defaults to true
+      };
     },
   ): WebSocket;
 

packages/bun-types/scripts/bundle.ts

@@ -23,7 +23,7 @@ try {
 
 const header = await file(join(import.meta.dir, "..", "header.txt")).text();
 const filesToCat = (await getDotTsFiles("./")).filter(
-  f => !["./index.d.ts"].some(tf => f === tf),
+  f => f !== "./index.d.ts",
 );
 
 const fileContents: string[] = [];

packages/bun-types/tests/test.test-d.ts

@@ -45,6 +45,7 @@ describe("bun:test", () => {
   test("expect()", () => {
     expect(1).toBe(1);
     expect(1).not.toBe(2);
+    // @ts-expect-error
     expect({ a: 1 }).toEqual({ a: 1, b: undefined });
     expect({ a: 1 }).toStrictEqual({ a: 1 });
     expect(new Set()).toHaveProperty("size");

packages/bun-types/ws.d.ts

@@ -74,6 +74,8 @@ declare module "ws" {
     WebSocket?: U | undefined;
   }
 
+  interface ServerOption extends WebSocketServerOptions {}
+
   interface AddressInfo {
     address: string;
     family: string;
@@ -219,4 +221,6 @@ declare module "ws" {
       listener: (...args: any[]) => void,
     ): this;
   }
+
+  var Server: typeof WebSocketServer;
 }

packages/bun-usockets/src/bsd.c

@@ -397,6 +397,32 @@ int bsd_recv(LIBUS_SOCKET_DESCRIPTOR fd, void *buf, int length, int flags) {
     return recv(fd, buf, length, flags);
 }
 
+#if !defined(_WIN32)
+#include <sys/uio.h>
+
+int bsd_write2(LIBUS_SOCKET_DESCRIPTOR fd, const char *header, int header_length, const char *payload, int payload_length) {
+    struct iovec chunks[2];
+
+    chunks[0].iov_base = (char *)header;
+    chunks[0].iov_len = header_length;
+    chunks[1].iov_base = (char *)payload;
+    chunks[1].iov_len = payload_length;
+
+    return writev(fd, chunks, 2);
+}
+#else
+int bsd_write2(LIBUS_SOCKET_DESCRIPTOR fd, const char *header, int header_length, const char *payload, int payload_length) {
+    int written = bsd_send(fd, header, header_length, 0);
+    if (written == header_length) {
+        int second_write = bsd_send(fd, payload, payload_length, 0);
+        if (second_write > 0) {
+            written += second_write;
+        }
+    }
+    return written;
+}
+#endif
+
 int bsd_send(LIBUS_SOCKET_DESCRIPTOR fd, const char *buf, int length, int msg_more) {
 
     // MSG_MORE (Linux), MSG_PARTIAL (Windows), TCP_NOPUSH (BSD)
@@ -427,43 +453,12 @@ int bsd_would_block() {
 #endif
 }
 
-// return LIBUS_SOCKET_ERROR or the fd that represents listen socket
-// listen both on ipv6 and ipv4
-LIBUS_SOCKET_DESCRIPTOR bsd_create_listen_socket(const char *host, int port, int options) {
-    struct addrinfo hints, *result;
-    memset(&hints, 0, sizeof(struct addrinfo));
-
-    hints.ai_flags = AI_PASSIVE;
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
-
-    char port_string[16];
-    snprintf(port_string, 16, "%d", port);
-
-    if (getaddrinfo(host, port_string, &hints, &result)) {
-        return LIBUS_SOCKET_ERROR;
-    }
-
-    LIBUS_SOCKET_DESCRIPTOR listenFd = LIBUS_SOCKET_ERROR;
-    struct addrinfo *listenAddr;
-    for (struct addrinfo *a = result; a && listenFd == LIBUS_SOCKET_ERROR; a = a->ai_next) {
-        if (a->ai_family == AF_INET6) {
-            listenFd = bsd_create_socket(a->ai_family, a->ai_socktype, a->ai_protocol);
-            listenAddr = a;
-        }
-    }
-
-    for (struct addrinfo *a = result; a && listenFd == LIBUS_SOCKET_ERROR; a = a->ai_next) {
-        if (a->ai_family == AF_INET) {
-            listenFd = bsd_create_socket(a->ai_family, a->ai_socktype, a->ai_protocol);
-            listenAddr = a;
-        }
-    }
-
-    if (listenFd == LIBUS_SOCKET_ERROR) {
-        freeaddrinfo(result);
-        return LIBUS_SOCKET_ERROR;
-    }
+inline LIBUS_SOCKET_DESCRIPTOR bsd_bind_listen_fd(
+    LIBUS_SOCKET_DESCRIPTOR listenFd,
+    struct addrinfo *listenAddr,
+    int port,
+    int options
+) {
 
     if (port != 0) {
         /* Otherwise, always enable SO_REUSEPORT and SO_REUSEADDR _unless_ options specify otherwise */
@@ -487,22 +482,76 @@ LIBUS_SOCKET_DESCRIPTOR bsd_create_listen_socket(const char *host, int port, int
 #endif
 
     }
-    
+
 #ifdef IPV6_V6ONLY
     int disabled = 0;
     setsockopt(listenFd, IPPROTO_IPV6, IPV6_V6ONLY, (void *) &disabled, sizeof(disabled));
 #endif
 
     if (bind(listenFd, listenAddr->ai_addr, (socklen_t) listenAddr->ai_addrlen) || listen(listenFd, 512)) {
-        bsd_close_socket(listenFd);
-        freeaddrinfo(result);
         return LIBUS_SOCKET_ERROR;
     }
 
-    freeaddrinfo(result);
     return listenFd;
 }
 
+// return LIBUS_SOCKET_ERROR or the fd that represents listen socket
+// listen both on ipv6 and ipv4
+LIBUS_SOCKET_DESCRIPTOR bsd_create_listen_socket(const char *host, int port, int options) {
+    struct addrinfo hints, *result;
+    memset(&hints, 0, sizeof(struct addrinfo));
+
+    hints.ai_flags = AI_PASSIVE;
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+
+    char port_string[16];
+    snprintf(port_string, 16, "%d", port);
+
+    if (getaddrinfo(host, port_string, &hints, &result)) {
+        return LIBUS_SOCKET_ERROR;
+    }
+
+    LIBUS_SOCKET_DESCRIPTOR listenFd = LIBUS_SOCKET_ERROR;
+    struct addrinfo *listenAddr;
+    for (struct addrinfo *a = result; a != NULL; a = a->ai_next) {
+        if (a->ai_family == AF_INET6) {
+            listenFd = bsd_create_socket(a->ai_family, a->ai_socktype, a->ai_protocol);
+            if (listenFd == LIBUS_SOCKET_ERROR) {
+                continue;
+            }
+
+            listenAddr = a;
+            if (bsd_bind_listen_fd(listenFd, listenAddr, port, options) != LIBUS_SOCKET_ERROR) {
+                freeaddrinfo(result);
+                return listenFd;
+            }
+
+            bsd_close_socket(listenFd);
+        }
+    }
+
+    for (struct addrinfo *a = result; a != NULL; a = a->ai_next) {
+        if (a->ai_family == AF_INET) {
+            listenFd = bsd_create_socket(a->ai_family, a->ai_socktype, a->ai_protocol);
+            if (listenFd == LIBUS_SOCKET_ERROR) {
+                continue;
+            }
+
+            listenAddr = a;
+            if (bsd_bind_listen_fd(listenFd, listenAddr, port, options) != LIBUS_SOCKET_ERROR) {
+                freeaddrinfo(result);
+                return listenFd;
+            }
+
+            bsd_close_socket(listenFd);
+        }
+    }
+
+    freeaddrinfo(result);
+    return LIBUS_SOCKET_ERROR;
+}
+
 #ifndef _WIN32
 #include <sys/un.h>
 #else
@@ -768,4 +817,4 @@ LIBUS_SOCKET_DESCRIPTOR bsd_create_connect_socket_unix(const char *server_path,
     }
 
     return fd;
-}
+}

packages/bun-usockets/src/context.c

@@ -566,10 +566,10 @@ void *us_socket_context_ext(int ssl, struct us_socket_context_t *context) {
 }
 
 
-void us_socket_context_on_handshake(int ssl, struct us_socket_context_t *context, void (*on_handshake)(struct us_socket_context_t *, int success, struct us_bun_verify_error_t verify_error, void* custom_data), void* custom_data) {
+void us_socket_context_on_handshake(int ssl, struct us_socket_context_t *context, void (*on_handshake)(struct us_socket_t *, int success, struct us_bun_verify_error_t verify_error, void* custom_data), void* custom_data) {
 #ifndef LIBUS_NO_SSL
     if (ssl) {
-        us_internal_on_ssl_handshake((struct us_internal_ssl_socket_context_t *) context, (void (*)(struct us_internal_ssl_socket_t *, int success, struct us_bun_verify_error_t verify_error, void* custom_data))on_handshake, custom_data);
+        us_internal_on_ssl_handshake((struct us_internal_ssl_socket_context_t *) context, (us_internal_on_handshake_t)on_handshake, custom_data);
         return;
     }
 #endif

packages/bun-usockets/src/crypto/root_certs.cpp

@@ -0,0 +1,90 @@
+// MSVC doesn't support C11 stdatomic.h propertly yet.
+// so we use C++ std::atomic instead.
+#include "./internal/internal.h"
+#include "./root_certs.h"
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <atomic>
+
+static const int root_certs_size = sizeof(root_certs) / sizeof(root_certs[0]);
+static X509* root_cert_instances[sizeof(root_certs) / sizeof(root_certs[0])]  = {NULL};
+static std::atomic_flag root_cert_instances_lock = ATOMIC_FLAG_INIT;
+static std::atomic_bool root_cert_instances_initialized = 0;
+
+// This callback is used to avoid the default passphrase callback in OpenSSL
+// which will typically prompt for the passphrase. The prompting is designed
+// for the OpenSSL CLI, but works poorly for this case because it involves
+// synchronous interaction with the controlling terminal, something we never
+// want, and use this function to avoid it.
+int us_no_password_callback(char* buf, int size, int rwflag, void* u) {
+  return 0;
+}
+
+static X509 * us_ssl_ctx_get_X509_without_callback_from(struct us_cert_string_t content) {
+  X509 *x = NULL;
+  BIO *in;
+
+  ERR_clear_error();  // clear error stack for SSL_CTX_use_certificate()
+
+  in = BIO_new_mem_buf(content.str, content.len);
+  if (in == NULL) {
+    OPENSSL_PUT_ERROR(SSL, ERR_R_BUF_LIB);
+    goto end;
+  }
+
+  x = PEM_read_bio_X509(in, NULL, us_no_password_callback, NULL);
+  if (x == NULL) {
+    OPENSSL_PUT_ERROR(SSL, ERR_R_PEM_LIB);
+    goto end;
+  }
+
+  return x;
+
+end:
+  X509_free(x);
+  BIO_free(in);
+  return NULL;
+}
+
+static void us_internal_init_root_certs() {
+    if(std::atomic_load(&root_cert_instances_initialized) == 1) return;
+
+    while(atomic_flag_test_and_set_explicit(&root_cert_instances_lock, std::memory_order_acquire));
+
+    if(!atomic_exchange(&root_cert_instances_initialized, 1)) {
+        for (size_t i = 0; i < root_certs_size; i++) {
+            root_cert_instances[i] = us_ssl_ctx_get_X509_without_callback_from(root_certs[i]);
+        }        
+    }
+
+    atomic_flag_clear_explicit(&root_cert_instances_lock, std::memory_order_release);
+}
+
+extern "C" int us_internal_raw_root_certs(struct us_cert_string_t** out) {
+    *out = root_certs;
+    return root_certs_size;
+}
+
+extern "C" X509_STORE* us_get_default_ca_store() {
+    X509_STORE *store = X509_STORE_new();
+    if (store == NULL) {
+        return NULL;
+    }
+    
+    if (!X509_STORE_set_default_paths(store)) {
+        X509_STORE_free(store);
+        return NULL;
+    }
+    
+    us_internal_init_root_certs();
+
+    // load all root_cert_instances on the default ca store
+    for (size_t i = 0; i < root_certs_size; i++) {
+        X509* cert = root_cert_instances[i];
+        if(cert == NULL) continue;
+        X509_up_ref(cert);
+        X509_STORE_add_cert(store, cert);       
+    }
+    
+    return store;
+}

packages/bun-usockets/src/eventing/epoll_kqueue.c

@@ -35,8 +35,8 @@ void us_loop_run_bun_tick(struct us_loop_t *loop, int64_t timeoutMs, void*);
 /* Pointer tags are used to indicate a Bun pointer versus a uSockets pointer */
 #define UNSET_BITS_49_UNTIL_64 0x0000FFFFFFFFFFFF
 #define CLEAR_POINTER_TAG(p) ((void *) ((uintptr_t) (p) & UNSET_BITS_49_UNTIL_64))
-#define LIKELY(cond) __builtin_expect((uint64_t)(void*)(cond), 1)
-#define UNLIKELY(cond) __builtin_expect((uint64_t)(void*)(cond), 0)
+#define LIKELY(cond) __builtin_expect((_Bool)(cond), 1)
+#define UNLIKELY(cond) __builtin_expect((_Bool)(cond), 0)
 
 #ifdef LIBUS_USE_EPOLL
 #define GET_READY_POLL(loop, index) (struct us_poll_t *) loop->ready_polls[index].data.ptr

packages/bun-usockets/src/eventing/libuv.c

@@ -0,0 +1,330 @@
+/*
+ * Authored by Alex Hultman, 2018-2021.
+ * Intellectual property of third-party.
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+
+ *     http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "internal/internal.h"
+#include "libusockets.h"
+#include <stdlib.h>
+
+#ifdef LIBUS_USE_LIBUV
+
+/* uv_poll_t->data always (except for most times after calling us_poll_stop)
+ * points to the us_poll_t */
+static void poll_cb(uv_poll_t *p, int status, int events) {
+  us_internal_dispatch_ready_poll((struct us_poll_t *)p->data, status < 0,
+                                  events);
+}
+
+static void prepare_cb(uv_prepare_t *p) {
+  struct us_loop_t *loop = p->data;
+  us_internal_loop_pre(loop);
+}
+
+/* Note: libuv timers execute AFTER the post callback */
+static void check_cb(uv_check_t *p) {
+  struct us_loop_t *loop = p->data;
+  us_internal_loop_post(loop);
+}
+
+/* Not used for polls, since polls need two frees */
+static void close_cb_free(uv_handle_t *h) { free(h->data); }
+
+/* This one is different for polls, since we need two frees here */
+static void close_cb_free_poll(uv_handle_t *h) {
+  /* It is only in case we called us_poll_stop then quickly us_poll_free that we
+   * enter this. Most of the time, actual freeing is done by us_poll_free. */
+  if (h->data) {
+    free(h->data);
+    free(h);
+  }
+}
+
+static void timer_cb(uv_timer_t *t) {
+  struct us_internal_callback_t *cb = t->data;
+  cb->cb(cb);
+}
+
+static void async_cb(uv_async_t *a) {
+  struct us_internal_callback_t *cb = a->data;
+  // internal asyncs give their loop, not themselves
+  cb->cb((struct us_internal_callback_t *)cb->loop);
+}
+
+// poll
+void us_poll_init(struct us_poll_t *p, LIBUS_SOCKET_DESCRIPTOR fd,
+                  int poll_type) {
+  p->poll_type = poll_type;
+  p->fd = fd;
+}
+
+void us_poll_free(struct us_poll_t *p, struct us_loop_t *loop) {
+  /* The idea here is like so; in us_poll_stop we call uv_close after setting
+   * data of uv-poll to 0. This means that in close_cb_free we call free on 0
+   * with does nothing, since us_poll_stop should not really free the poll.
+   * HOWEVER, if we then call us_poll_free while still closing the uv-poll, we
+   * simply change back the data to point to our structure so that we actually
+   * do free it like we should. */
+  if (uv_is_closing((uv_handle_t *)p->uv_p)) {
+    p->uv_p->data = p;
+  } else {
+    free(p->uv_p);
+    free(p);
+  }
+}
+
+void us_poll_start(struct us_poll_t *p, struct us_loop_t *loop, int events) {
+  p->poll_type = us_internal_poll_type(p) |
+                 ((events & LIBUS_SOCKET_READABLE) ? POLL_TYPE_POLLING_IN : 0) |
+                 ((events & LIBUS_SOCKET_WRITABLE) ? POLL_TYPE_POLLING_OUT : 0);
+
+  uv_poll_init_socket(loop->uv_loop, p->uv_p, p->fd);
+  uv_poll_start(p->uv_p, events, poll_cb);
+}
+
+void us_poll_change(struct us_poll_t *p, struct us_loop_t *loop, int events) {
+  if (us_poll_events(p) != events) {
+    p->poll_type =
+        us_internal_poll_type(p) |
+        ((events & LIBUS_SOCKET_READABLE) ? POLL_TYPE_POLLING_IN : 0) |
+        ((events & LIBUS_SOCKET_WRITABLE) ? POLL_TYPE_POLLING_OUT : 0);
+
+    uv_poll_start(p->uv_p, events, poll_cb);
+  }
+}
+
+void us_poll_stop(struct us_poll_t *p, struct us_loop_t *loop) {
+  uv_poll_stop(p->uv_p);
+
+  /* We normally only want to close the poll here, not free it. But if we stop
+   * it, then quickly "free" it with us_poll_free, we postpone the actual
+   * freeing to close_cb_free_poll whenever it triggers. That's why we set data
+   * to null here, so that us_poll_free can reset it if needed */
+  p->uv_p->data = 0;
+  uv_close((uv_handle_t *)p->uv_p, close_cb_free_poll);
+}
+
+int us_poll_events(struct us_poll_t *p) {
+  return ((p->poll_type & POLL_TYPE_POLLING_IN) ? LIBUS_SOCKET_READABLE : 0) |
+         ((p->poll_type & POLL_TYPE_POLLING_OUT) ? LIBUS_SOCKET_WRITABLE : 0);
+}
+
+unsigned int us_internal_accept_poll_event(struct us_poll_t *p) { return 0; }
+
+int us_internal_poll_type(struct us_poll_t *p) { return p->poll_type & 3; }
+
+void us_internal_poll_set_type(struct us_poll_t *p, int poll_type) {
+  p->poll_type = poll_type | (p->poll_type & 12);
+}
+
+LIBUS_SOCKET_DESCRIPTOR us_poll_fd(struct us_poll_t *p) { return p->fd; }
+
+void us_loop_pump(struct us_loop_t *loop) {
+  uv_run(loop->uv_loop, UV_RUN_NOWAIT);
+}
+
+struct us_loop_t *us_create_loop(void *hint,
+                                 void (*wakeup_cb)(struct us_loop_t *loop),
+                                 void (*pre_cb)(struct us_loop_t *loop),
+                                 void (*post_cb)(struct us_loop_t *loop),
+                                 unsigned int ext_size) {
+  struct us_loop_t *loop =
+      (struct us_loop_t *)malloc(sizeof(struct us_loop_t) + ext_size);
+
+  loop->uv_loop = hint ? hint : uv_loop_new();
+  loop->is_default = hint != 0;
+
+  loop->uv_pre = malloc(sizeof(uv_prepare_t));
+  uv_prepare_init(loop->uv_loop, loop->uv_pre);
+  uv_prepare_start(loop->uv_pre, prepare_cb);
+  uv_unref((uv_handle_t *)loop->uv_pre);
+  loop->uv_pre->data = loop;
+
+  loop->uv_check = malloc(sizeof(uv_check_t));
+  uv_check_init(loop->uv_loop, loop->uv_check);
+  uv_unref((uv_handle_t *)loop->uv_check);
+  uv_check_start(loop->uv_check, check_cb);
+  loop->uv_check->data = loop;
+
+  // here we create two unreffed handles - timer and async
+  us_internal_loop_data_init(loop, wakeup_cb, pre_cb, post_cb);
+
+  // if we do not own this loop, we need to integrate and set up timer
+  if (hint) {
+    us_loop_integrate(loop);
+  }
+
+  return loop;
+}
+
+// based on if this was default loop or not
+void us_loop_free(struct us_loop_t *loop) {
+  // ref and close down prepare and check
+  uv_ref((uv_handle_t *)loop->uv_pre);
+  uv_prepare_stop(loop->uv_pre);
+  loop->uv_pre->data = loop->uv_pre;
+  uv_close((uv_handle_t *)loop->uv_pre, close_cb_free);
+
+  uv_ref((uv_handle_t *)loop->uv_check);
+  uv_check_stop(loop->uv_check);
+  loop->uv_check->data = loop->uv_check;
+  uv_close((uv_handle_t *)loop->uv_check, close_cb_free);
+
+  us_internal_loop_data_free(loop);
+
+  // we need to run the loop one last round to call all close callbacks
+  // we cannot do this if we do not own the loop, default
+  if (!loop->is_default) {
+    uv_run(loop->uv_loop, UV_RUN_NOWAIT);
+    uv_loop_delete(loop->uv_loop);
+  }
+
+  // now we can free our part
+  free(loop);
+}
+
+void us_loop_run(struct us_loop_t *loop) {
+  us_loop_integrate(loop);
+
+  uv_run(loop->uv_loop, UV_RUN_NOWAIT);
+}
+
+struct us_poll_t *us_create_poll(struct us_loop_t *loop, int fallthrough,
+                                 unsigned int ext_size) {
+  struct us_poll_t *p =
+      (struct us_poll_t *)malloc(sizeof(struct us_poll_t) + ext_size);
+  p->uv_p = malloc(sizeof(uv_poll_t));
+  p->uv_p->data = p;
+  return p;
+}
+
+/* If we update our block position we have to updarte the uv_poll data to point
+ * to us */
+struct us_poll_t *us_poll_resize(struct us_poll_t *p, struct us_loop_t *loop,
+                                 unsigned int ext_size) {
+
+  struct us_poll_t *new_p = realloc(p, sizeof(struct us_poll_t) + ext_size);
+  new_p->uv_p->data = new_p;
+
+  return new_p;
+}
+
+// timer
+struct us_timer_t *us_create_timer(struct us_loop_t *loop, int fallthrough,
+                                   unsigned int ext_size) {
+  struct us_internal_callback_t *cb = malloc(
+      sizeof(struct us_internal_callback_t) + sizeof(uv_timer_t) + ext_size);
+
+  cb->loop = loop;
+  cb->cb_expects_the_loop = 0; // never read?
+  cb->leave_poll_ready = 0;    // never read?
+
+  uv_timer_t *uv_timer = (uv_timer_t *)(cb + 1);
+  uv_timer_init(loop->uv_loop, uv_timer);
+  uv_timer->data = cb;
+
+  if (fallthrough) {
+    uv_unref((uv_handle_t *)uv_timer);
+  }
+
+  return (struct us_timer_t *)cb;
+}
+
+void *us_timer_ext(struct us_timer_t *timer) {
+  return ((char *)timer) + sizeof(struct us_internal_callback_t) +
+         sizeof(uv_timer_t);
+}
+
+void us_timer_close(struct us_timer_t *t) {
+  struct us_internal_callback_t *cb = (struct us_internal_callback_t *)t;
+
+  uv_timer_t *uv_timer = (uv_timer_t *)(cb + 1);
+
+  // always ref the timer before closing it
+  uv_ref((uv_handle_t *)uv_timer);
+
+  uv_timer_stop(uv_timer);
+
+  uv_timer->data = cb;
+  uv_close((uv_handle_t *)uv_timer, close_cb_free);
+}
+
+void us_timer_set(struct us_timer_t *t, void (*cb)(struct us_timer_t *t),
+                  int ms, int repeat_ms) {
+  struct us_internal_callback_t *internal_cb =
+      (struct us_internal_callback_t *)t;
+
+  internal_cb->cb = (void (*)(struct us_internal_callback_t *))cb;
+
+  uv_timer_t *uv_timer = (uv_timer_t *)(internal_cb + 1);
+  if (!ms) {
+    uv_timer_stop(uv_timer);
+  } else {
+    uv_timer_start(uv_timer, timer_cb, ms, repeat_ms);
+  }
+}
+
+struct us_loop_t *us_timer_loop(struct us_timer_t *t) {
+  struct us_internal_callback_t *internal_cb =
+      (struct us_internal_callback_t *)t;
+
+  return internal_cb->loop;
+}
+
+// async (internal only)
+struct us_internal_async *us_internal_create_async(struct us_loop_t *loop,
+                                                   int fallthrough,
+                                                   unsigned int ext_size) {
+  struct us_internal_callback_t *cb = malloc(
+      sizeof(struct us_internal_callback_t) + sizeof(uv_async_t) + ext_size);
+
+  cb->loop = loop;
+  return (struct us_internal_async *)cb;
+}
+
+void us_internal_async_close(struct us_internal_async *a) {
+  struct us_internal_callback_t *cb = (struct us_internal_callback_t *)a;
+
+  uv_async_t *uv_async = (uv_async_t *)(cb + 1);
+
+  // always ref the async before closing it
+  uv_ref((uv_handle_t *)uv_async);
+
+  uv_async->data = cb;
+  uv_close((uv_handle_t *)uv_async, close_cb_free);
+}
+
+void us_internal_async_set(struct us_internal_async *a,
+                           void (*cb)(struct us_internal_async *)) {
+  struct us_internal_callback_t *internal_cb =
+      (struct us_internal_callback_t *)a;
+
+  internal_cb->cb = (void (*)(struct us_internal_callback_t *))cb;
+
+  uv_async_t *uv_async = (uv_async_t *)(internal_cb + 1);
+  uv_async_init(internal_cb->loop->uv_loop, uv_async, async_cb);
+  uv_unref((uv_handle_t *)uv_async);
+  uv_async->data = internal_cb;
+}
+
+void us_internal_async_wakeup(struct us_internal_async *a) {
+  struct us_internal_callback_t *internal_cb =
+      (struct us_internal_callback_t *)a;
+
+  uv_async_t *uv_async = (uv_async_t *)(internal_cb + 1);
+  uv_async_send(uv_async);
+}
+
+#endif

packages/bun-usockets/src/internal/eventing/libuv.h

@@ -0,0 +1,47 @@
+/*
+ * Authored by Alex Hultman, 2018-2019.
+ * Intellectual property of third-party.
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+
+ *     http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef LIBUV_H
+#define LIBUV_H
+
+#include "internal/loop_data.h"
+
+#include <uv.h>
+#define LIBUS_SOCKET_READABLE UV_READABLE
+#define LIBUS_SOCKET_WRITABLE UV_WRITABLE
+
+struct us_loop_t {
+  alignas(LIBUS_EXT_ALIGNMENT) struct us_internal_loop_data_t data;
+
+  uv_loop_t *uv_loop;
+  int is_default;
+
+  uv_prepare_t *uv_pre;
+  uv_check_t *uv_check;
+};
+
+// it is no longer valid to cast a pointer to us_poll_t to a pointer of
+// uv_poll_t
+struct us_poll_t {
+  /* We need to hold a pointer to this uv_poll_t since we need to be able to
+   * resize our block */
+  uv_poll_t *uv_p;
+  LIBUS_SOCKET_DESCRIPTOR fd;
+  unsigned char poll_type;
+};
+
+#endif // LIBUV_H

packages/bun-usockets/src/internal/internal.h

@@ -18,9 +18,10 @@
 #ifndef INTERNAL_H
 #define INTERNAL_H
 
-
 #if defined(_MSC_VER)
+#ifndef __cplusplus
 #define alignas(x) __declspec(align(x))
+#endif
 #else
 #include <stdalign.h>
 #endif
@@ -32,7 +33,11 @@
 #if defined(LIBUS_USE_EPOLL) || defined(LIBUS_USE_KQUEUE)
 #define LIBUS_MAX_READY_POLLS 1024
 
-void us_internal_loop_update_pending_ready_polls(struct us_loop_t *loop, struct us_poll_t *old_poll, struct us_poll_t *new_poll, int old_events, int new_events);
+void us_internal_loop_update_pending_ready_polls(struct us_loop_t *loop,
+                                                 struct us_poll_t *old_poll,
+                                                 struct us_poll_t *new_poll,
+                                                 int old_events,
+                                                 int new_events);
 #endif
 
 /* We only have one networking implementation so far */
@@ -43,35 +48,47 @@ void us_internal_loop_update_pending_ready_polls(struct us_loop_t *loop, struct
 #include "internal/eventing/epoll_kqueue.h"
 #endif
 
+#ifdef LIBUS_USE_LIBUV
+#include "internal/eventing/libuv.h"
+#endif
+
 /* Poll type and what it polls for */
 enum {
-    /* Two first bits */
-    POLL_TYPE_SOCKET = 0,
-    POLL_TYPE_SOCKET_SHUT_DOWN = 1,
-    POLL_TYPE_SEMI_SOCKET = 2,
-    POLL_TYPE_CALLBACK = 3,
+  /* Two first bits */
+  POLL_TYPE_SOCKET = 0,
+  POLL_TYPE_SOCKET_SHUT_DOWN = 1,
+  POLL_TYPE_SEMI_SOCKET = 2,
+  POLL_TYPE_CALLBACK = 3,
 
-    /* Two last bits */
-    POLL_TYPE_POLLING_OUT = 4,
-    POLL_TYPE_POLLING_IN = 8
+  /* Two last bits */
+  POLL_TYPE_POLLING_OUT = 4,
+  POLL_TYPE_POLLING_IN = 8
 };
 
 /* Loop related */
-void us_internal_dispatch_ready_poll(struct us_poll_t *p, int error, int events);
+void us_internal_dispatch_ready_poll(struct us_poll_t *p, int error,
+                                     int events);
 void us_internal_timer_sweep(struct us_loop_t *loop);
 void us_internal_free_closed_sockets(struct us_loop_t *loop);
-void us_internal_loop_link(struct us_loop_t *loop, struct us_socket_context_t *context);
-void us_internal_loop_unlink(struct us_loop_t *loop, struct us_socket_context_t *context);
-void us_internal_loop_data_init(struct us_loop_t *loop, void (*wakeup_cb)(struct us_loop_t *loop),
-    void (*pre_cb)(struct us_loop_t *loop), void (*post_cb)(struct us_loop_t *loop));
+void us_internal_loop_link(struct us_loop_t *loop,
+                           struct us_socket_context_t *context);
+void us_internal_loop_unlink(struct us_loop_t *loop,
+                             struct us_socket_context_t *context);
+void us_internal_loop_data_init(struct us_loop_t *loop,
+                                void (*wakeup_cb)(struct us_loop_t *loop),
+                                void (*pre_cb)(struct us_loop_t *loop),
+                                void (*post_cb)(struct us_loop_t *loop));
 void us_internal_loop_data_free(struct us_loop_t *loop);
 void us_internal_loop_pre(struct us_loop_t *loop);
 void us_internal_loop_post(struct us_loop_t *loop);
 
 /* Asyncs (old) */
-struct us_internal_async *us_internal_create_async(struct us_loop_t *loop, int fallthrough, unsigned int ext_size);
+struct us_internal_async *us_internal_create_async(struct us_loop_t *loop,
+                                                   int fallthrough,
+                                                   unsigned int ext_size);
 void us_internal_async_close(struct us_internal_async *a);
-void us_internal_async_set(struct us_internal_async *a, void (*cb)(struct us_internal_async *));
+void us_internal_async_set(struct us_internal_async *a,
+                           void (*cb)(struct us_internal_async *));
 void us_internal_async_wakeup(struct us_internal_async *a);
 
 /* Eventing related */
@@ -84,78 +101,94 @@ void us_internal_init_loop_ssl_data(struct us_loop_t *loop);
 void us_internal_free_loop_ssl_data(struct us_loop_t *loop);
 
 /* Socket context related */
-void us_internal_socket_context_link_socket(struct us_socket_context_t *context, struct us_socket_t *s);
-void us_internal_socket_context_unlink_socket(struct us_socket_context_t *context, struct us_socket_t *s);
+void us_internal_socket_context_link_socket(struct us_socket_context_t *context,
+                                            struct us_socket_t *s);
+void us_internal_socket_context_unlink_socket(
+    struct us_socket_context_t *context, struct us_socket_t *s);
 
 /* Sockets are polls */
 struct us_socket_t {
-    alignas(LIBUS_EXT_ALIGNMENT) struct us_poll_t p; // 4 bytes
-    unsigned char timeout; // 1 byte
-    unsigned char long_timeout; // 1 byte
-    unsigned short low_prio_state; /* 0 = not in low-prio queue, 1 = is in low-prio queue, 2 = was in low-prio queue in this iteration */
-    struct us_socket_context_t *context;
-    struct us_socket_t *prev, *next;
+  alignas(LIBUS_EXT_ALIGNMENT) struct us_poll_t p; // 4 bytes
+  unsigned char timeout;                           // 1 byte
+  unsigned char long_timeout;                      // 1 byte
+  unsigned short
+      low_prio_state; /* 0 = not in low-prio queue, 1 = is in low-prio queue, 2
+                         = was in low-prio queue in this iteration */
+  struct us_socket_context_t *context;
+  struct us_socket_t *prev, *next;
 };
 
 struct us_wrapped_socket_context_t {
-    struct us_socket_events_t events;
-    struct us_socket_events_t old_events;
+  struct us_socket_events_t events;
+  struct us_socket_events_t old_events;
 };
 
 #if defined(LIBUS_USE_KQUEUE)
 /* Internal callback types are polls just like sockets */
 struct us_internal_callback_t {
-    alignas(LIBUS_EXT_ALIGNMENT) struct us_poll_t p;
-    struct us_loop_t *loop;
-    int cb_expects_the_loop;
-    int leave_poll_ready;
-    void (*cb)(struct us_internal_callback_t *cb);
-    mach_port_t port;
-    void* machport_buf;
+  alignas(LIBUS_EXT_ALIGNMENT) struct us_poll_t p;
+  struct us_loop_t *loop;
+  int cb_expects_the_loop;
+  int leave_poll_ready;
+  void (*cb)(struct us_internal_callback_t *cb);
+  mach_port_t port;
+  void *machport_buf;
 };
 
 #else
 
 struct us_internal_callback_t {
-    alignas(LIBUS_EXT_ALIGNMENT) struct us_poll_t p;
-    struct us_loop_t *loop;
-    int cb_expects_the_loop;
-    int leave_poll_ready;
-    void (*cb)(struct us_internal_callback_t *cb);
+  alignas(LIBUS_EXT_ALIGNMENT) struct us_poll_t p;
+  struct us_loop_t *loop;
+  int cb_expects_the_loop;
+  int leave_poll_ready;
+  void (*cb)(struct us_internal_callback_t *cb);
 };
 
 #endif
 
+#if __cplusplus
+extern "C" {
+#endif
+int us_internal_raw_root_certs(struct us_cert_string_t **out);
+
+#if __cplusplus
+}
+#endif
+
 /* Listen sockets are sockets */
 struct us_listen_socket_t {
-    alignas(LIBUS_EXT_ALIGNMENT) struct us_socket_t s;
-    unsigned int socket_ext_size;
+  alignas(LIBUS_EXT_ALIGNMENT) struct us_socket_t s;
+  unsigned int socket_ext_size;
 };
 
 /* Listen sockets are keps in their own list */
-void us_internal_socket_context_link_listen_socket(struct us_socket_context_t *context, struct us_listen_socket_t *s);
-void us_internal_socket_context_unlink_listen_socket(struct us_socket_context_t *context, struct us_listen_socket_t *s);
+void us_internal_socket_context_link_listen_socket(
+    struct us_socket_context_t *context, struct us_listen_socket_t *s);
+void us_internal_socket_context_unlink_listen_socket(
+    struct us_socket_context_t *context, struct us_listen_socket_t *s);
 
 struct us_socket_context_t {
-    alignas(LIBUS_EXT_ALIGNMENT) struct us_loop_t *loop;
-    uint32_t global_tick;
-    unsigned char timestamp;
-    unsigned char long_timestamp;
-    struct us_socket_t *head_sockets;
-    struct us_listen_socket_t *head_listen_sockets;
-    struct us_socket_t *iterator;
-    struct us_socket_context_t *prev, *next;
+  alignas(LIBUS_EXT_ALIGNMENT) struct us_loop_t *loop;
+  uint32_t global_tick;
+  unsigned char timestamp;
+  unsigned char long_timestamp;
+  struct us_socket_t *head_sockets;
+  struct us_listen_socket_t *head_listen_sockets;
+  struct us_socket_t *iterator;
+  struct us_socket_context_t *prev, *next;
 
-    struct us_socket_t *(*on_open)(struct us_socket_t *, int is_client, char *ip, int ip_length);
-    struct us_socket_t *(*on_data)(struct us_socket_t *, char *data, int length);
-    struct us_socket_t *(*on_writable)(struct us_socket_t *);
-    struct us_socket_t *(*on_close)(struct us_socket_t *, int code, void *reason);
-    //void (*on_timeout)(struct us_socket_context *);
-    struct us_socket_t *(*on_socket_timeout)(struct us_socket_t *);
-    struct us_socket_t *(*on_socket_long_timeout)(struct us_socket_t *);
-    struct us_socket_t *(*on_end)(struct us_socket_t *);
-    struct us_socket_t *(*on_connect_error)(struct us_socket_t *, int code);
-    int (*is_low_prio)(struct us_socket_t *);
+  struct us_socket_t *(*on_open)(struct us_socket_t *, int is_client, char *ip,
+                                 int ip_length);
+  struct us_socket_t *(*on_data)(struct us_socket_t *, char *data, int length);
+  struct us_socket_t *(*on_writable)(struct us_socket_t *);
+  struct us_socket_t *(*on_close)(struct us_socket_t *, int code, void *reason);
+  // void (*on_timeout)(struct us_socket_context *);
+  struct us_socket_t *(*on_socket_timeout)(struct us_socket_t *);
+  struct us_socket_t *(*on_socket_long_timeout)(struct us_socket_t *);
+  struct us_socket_t *(*on_end)(struct us_socket_t *);
+  struct us_socket_t *(*on_connect_error)(struct us_socket_t *, int code);
+  int (*is_low_prio)(struct us_socket_t *);
 };
 
 /* Internal SSL interface */
@@ -163,83 +196,142 @@ struct us_socket_context_t {
 
 struct us_internal_ssl_socket_context_t;
 struct us_internal_ssl_socket_t;
+typedef void (*us_internal_on_handshake_t)(
+    struct us_internal_ssl_socket_t *, int success,
+    struct us_bun_verify_error_t verify_error, void *custom_data);
 
 /* SNI functions */
-void us_internal_ssl_socket_context_add_server_name(struct us_internal_ssl_socket_context_t *context, const char *hostname_pattern, struct us_socket_context_options_t options, void *user);
-void us_bun_internal_ssl_socket_context_add_server_name(struct us_internal_ssl_socket_context_t *context, const char *hostname_pattern, struct us_bun_socket_context_options_t options, void *user);
-void us_internal_ssl_socket_context_remove_server_name(struct us_internal_ssl_socket_context_t *context, const char *hostname_pattern);
-void us_internal_ssl_socket_context_on_server_name(struct us_internal_ssl_socket_context_t *context, void (*cb)(struct us_internal_ssl_socket_context_t *, const char *));
-void *us_internal_ssl_socket_get_sni_userdata(struct us_internal_ssl_socket_t *s);
-void *us_internal_ssl_socket_context_find_server_name_userdata(struct us_internal_ssl_socket_context_t *context, const char *hostname_pattern);
+void us_internal_ssl_socket_context_add_server_name(
+    struct us_internal_ssl_socket_context_t *context,
+    const char *hostname_pattern, struct us_socket_context_options_t options,
+    void *user);
+void us_bun_internal_ssl_socket_context_add_server_name(
+    struct us_internal_ssl_socket_context_t *context,
+    const char *hostname_pattern,
+    struct us_bun_socket_context_options_t options, void *user);
+void us_internal_ssl_socket_context_remove_server_name(
+    struct us_internal_ssl_socket_context_t *context,
+    const char *hostname_pattern);
+void us_internal_ssl_socket_context_on_server_name(
+    struct us_internal_ssl_socket_context_t *context,
+    void (*cb)(struct us_internal_ssl_socket_context_t *, const char *));
+void *
+us_internal_ssl_socket_get_sni_userdata(struct us_internal_ssl_socket_t *s);
+void *us_internal_ssl_socket_context_find_server_name_userdata(
+    struct us_internal_ssl_socket_context_t *context,
+    const char *hostname_pattern);
 
-void *us_internal_ssl_socket_get_native_handle(struct us_internal_ssl_socket_t *s);
-void *us_internal_ssl_socket_context_get_native_handle(struct us_internal_ssl_socket_context_t *context);
-struct us_bun_verify_error_t us_internal_verify_error(struct us_internal_ssl_socket_t *s);
-struct us_internal_ssl_socket_context_t *us_internal_create_ssl_socket_context(struct us_loop_t *loop,
-    int context_ext_size, struct us_socket_context_options_t options);
-struct us_internal_ssl_socket_context_t *us_internal_bun_create_ssl_socket_context(struct us_loop_t *loop,
-    int context_ext_size, struct us_bun_socket_context_options_t options);
+void *
+us_internal_ssl_socket_get_native_handle(struct us_internal_ssl_socket_t *s);
+void *us_internal_ssl_socket_context_get_native_handle(
+    struct us_internal_ssl_socket_context_t *context);
+struct us_bun_verify_error_t
+us_internal_verify_error(struct us_internal_ssl_socket_t *s);
+struct us_internal_ssl_socket_context_t *us_internal_create_ssl_socket_context(
+    struct us_loop_t *loop, int context_ext_size,
+    struct us_socket_context_options_t options);
+struct us_internal_ssl_socket_context_t *
+us_internal_bun_create_ssl_socket_context(
+    struct us_loop_t *loop, int context_ext_size,
+    struct us_bun_socket_context_options_t options);
 
-void us_internal_ssl_socket_context_free(struct us_internal_ssl_socket_context_t *context);
-void us_internal_ssl_socket_context_on_open(struct us_internal_ssl_socket_context_t *context,
-    struct us_internal_ssl_socket_t *(*on_open)(struct us_internal_ssl_socket_t *s, int is_client, char *ip, int ip_length));
+void us_internal_ssl_socket_context_free(
+    struct us_internal_ssl_socket_context_t *context);
+void us_internal_ssl_socket_context_on_open(
+    struct us_internal_ssl_socket_context_t *context,
+    struct us_internal_ssl_socket_t *(*on_open)(
+        struct us_internal_ssl_socket_t *s, int is_client, char *ip,
+        int ip_length));
 
-void us_internal_ssl_socket_context_on_close(struct us_internal_ssl_socket_context_t *context,
-    struct us_internal_ssl_socket_t *(*on_close)(struct us_internal_ssl_socket_t *s, int code, void *reason));
+void us_internal_ssl_socket_context_on_close(
+    struct us_internal_ssl_socket_context_t *context,
+    struct us_internal_ssl_socket_t *(*on_close)(
+        struct us_internal_ssl_socket_t *s, int code, void *reason));
 
-void us_internal_ssl_socket_context_on_data(struct us_internal_ssl_socket_context_t *context,
-    struct us_internal_ssl_socket_t *(*on_data)(struct us_internal_ssl_socket_t *s, char *data, int length));
+void us_internal_ssl_socket_context_on_data(
+    struct us_internal_ssl_socket_context_t *context,
+    struct us_internal_ssl_socket_t *(*on_data)(
+        struct us_internal_ssl_socket_t *s, char *data, int length));
 
-void us_internal_ssl_handshake(struct us_internal_ssl_socket_t *s, void (*on_handshake)(struct us_internal_ssl_socket_t *, int success, struct us_bun_verify_error_t verify_error, void* custom_data), void* custom_data);
-void us_internal_on_ssl_handshake(struct us_internal_ssl_socket_context_t * context, void (*on_handshake)(struct us_internal_ssl_socket_t *, int success, struct us_bun_verify_error_t verify_error, void* custom_data), void* custom_data);
+void us_internal_ssl_handshake(struct us_internal_ssl_socket_t *s);
+void us_internal_on_ssl_handshake(
+    struct us_internal_ssl_socket_context_t *context,
+    us_internal_on_handshake_t onhandshake, void *custom_data);
 
-void us_internal_ssl_socket_context_on_writable(struct us_internal_ssl_socket_context_t *context,
-    struct us_internal_ssl_socket_t *(*on_writable)(struct us_internal_ssl_socket_t *s));
+void us_internal_ssl_socket_context_on_writable(
+    struct us_internal_ssl_socket_context_t *context,
+    struct us_internal_ssl_socket_t *(*on_writable)(
+        struct us_internal_ssl_socket_t *s));
 
-void us_internal_ssl_socket_context_on_timeout(struct us_internal_ssl_socket_context_t *context,
-    struct us_internal_ssl_socket_t *(*on_timeout)(struct us_internal_ssl_socket_t *s));
+void us_internal_ssl_socket_context_on_timeout(
+    struct us_internal_ssl_socket_context_t *context,
+    struct us_internal_ssl_socket_t *(*on_timeout)(
+        struct us_internal_ssl_socket_t *s));
 
-void us_internal_ssl_socket_context_on_long_timeout(struct us_internal_ssl_socket_context_t *context,
-    struct us_internal_ssl_socket_t *(*on_timeout)(struct us_internal_ssl_socket_t *s));
+void us_internal_ssl_socket_context_on_long_timeout(
+    struct us_internal_ssl_socket_context_t *context,
+    struct us_internal_ssl_socket_t *(*on_timeout)(
+        struct us_internal_ssl_socket_t *s));
 
-void us_internal_ssl_socket_context_on_end(struct us_internal_ssl_socket_context_t *context,
-    struct us_internal_ssl_socket_t *(*on_end)(struct us_internal_ssl_socket_t *s));
+void us_internal_ssl_socket_context_on_end(
+    struct us_internal_ssl_socket_context_t *context,
+    struct us_internal_ssl_socket_t *(*on_end)(
+        struct us_internal_ssl_socket_t *s));
 
-void us_internal_ssl_socket_context_on_connect_error(struct us_internal_ssl_socket_context_t *context,
-    struct us_internal_ssl_socket_t *(*on_connect_error)(struct us_internal_ssl_socket_t *s, int code));
+void us_internal_ssl_socket_context_on_connect_error(
+    struct us_internal_ssl_socket_context_t *context,
+    struct us_internal_ssl_socket_t *(*on_connect_error)(
+        struct us_internal_ssl_socket_t *s, int code));
 
-struct us_listen_socket_t *us_internal_ssl_socket_context_listen(struct us_internal_ssl_socket_context_t *context,
-    const char *host, int port, int options, int socket_ext_size);
+struct us_listen_socket_t *us_internal_ssl_socket_context_listen(
+    struct us_internal_ssl_socket_context_t *context, const char *host,
+    int port, int options, int socket_ext_size);
 
-struct us_listen_socket_t *us_internal_ssl_socket_context_listen_unix(struct us_internal_ssl_socket_context_t *context,
-    const char *path, int options, int socket_ext_size);
+struct us_listen_socket_t *us_internal_ssl_socket_context_listen_unix(
+    struct us_internal_ssl_socket_context_t *context, const char *path,
+    int options, int socket_ext_size);
 
-struct us_internal_ssl_socket_t *us_internal_ssl_socket_context_connect(struct us_internal_ssl_socket_context_t *context,
-    const char *host, int port, const char *source_host, int options, int socket_ext_size);
+struct us_internal_ssl_socket_t *us_internal_ssl_socket_context_connect(
+    struct us_internal_ssl_socket_context_t *context, const char *host,
+    int port, const char *source_host, int options, int socket_ext_size);
 
-    
-struct us_internal_ssl_socket_t *us_internal_ssl_socket_context_connect_unix(struct us_internal_ssl_socket_context_t *context,
-    const char *server_path, int options, int socket_ext_size);
+struct us_internal_ssl_socket_t *us_internal_ssl_socket_context_connect_unix(
+    struct us_internal_ssl_socket_context_t *context, const char *server_path,
+    int options, int socket_ext_size);
 
-int us_internal_ssl_socket_write(struct us_internal_ssl_socket_t *s, const char *data, int length, int msg_more);
-int us_internal_ssl_socket_raw_write(struct us_internal_ssl_socket_t *s, const char *data, int length, int msg_more);
+int us_internal_ssl_socket_write(struct us_internal_ssl_socket_t *s,
+                                 const char *data, int length, int msg_more);
+int us_internal_ssl_socket_raw_write(struct us_internal_ssl_socket_t *s,
+                                     const char *data, int length,
+                                     int msg_more);
 
-void us_internal_ssl_socket_timeout(struct us_internal_ssl_socket_t *s, unsigned int seconds);
-void *us_internal_ssl_socket_context_ext(struct us_internal_ssl_socket_context_t *s);
-struct us_internal_ssl_socket_context_t *us_internal_ssl_socket_get_context(struct us_internal_ssl_socket_t *s);
+void us_internal_ssl_socket_timeout(struct us_internal_ssl_socket_t *s,
+                                    unsigned int seconds);
+void *
+us_internal_ssl_socket_context_ext(struct us_internal_ssl_socket_context_t *s);
+struct us_internal_ssl_socket_context_t *
+us_internal_ssl_socket_get_context(struct us_internal_ssl_socket_t *s);
 void *us_internal_ssl_socket_ext(struct us_internal_ssl_socket_t *s);
 int us_internal_ssl_socket_is_shut_down(struct us_internal_ssl_socket_t *s);
 void us_internal_ssl_socket_shutdown(struct us_internal_ssl_socket_t *s);
 
-struct us_internal_ssl_socket_t *us_internal_ssl_socket_context_adopt_socket(struct us_internal_ssl_socket_context_t *context,
+struct us_internal_ssl_socket_t *us_internal_ssl_socket_context_adopt_socket(
+    struct us_internal_ssl_socket_context_t *context,
     struct us_internal_ssl_socket_t *s, int ext_size);
 
-struct us_internal_ssl_socket_t *us_internal_ssl_socket_wrap_with_tls(struct us_socket_t *s, struct us_bun_socket_context_options_t options, struct us_socket_events_t events, int socket_ext_size);
-struct us_internal_ssl_socket_context_t *us_internal_create_child_ssl_socket_context(struct us_internal_ssl_socket_context_t *context, int context_ext_size);
-struct us_loop_t *us_internal_ssl_socket_context_loop(struct us_internal_ssl_socket_context_t *context);
-struct us_internal_ssl_socket_t* us_internal_ssl_socket_open(struct us_internal_ssl_socket_t * s, int is_client, char* ip, int ip_length);
+struct us_internal_ssl_socket_t *us_internal_ssl_socket_wrap_with_tls(
+    struct us_socket_t *s, struct us_bun_socket_context_options_t options,
+    struct us_socket_events_t events, int socket_ext_size);
+struct us_internal_ssl_socket_context_t *
+us_internal_create_child_ssl_socket_context(
+    struct us_internal_ssl_socket_context_t *context, int context_ext_size);
+struct us_loop_t *us_internal_ssl_socket_context_loop(
+    struct us_internal_ssl_socket_context_t *context);
+struct us_internal_ssl_socket_t *
+us_internal_ssl_socket_open(struct us_internal_ssl_socket_t *s, int is_client,
+                            char *ip, int ip_length);
 
-int us_raw_root_certs(struct us_cert_string_t**out);
+int us_raw_root_certs(struct us_cert_string_t **out);
 #endif
 
 #endif // INTERNAL_H

packages/bun-usockets/src/internal/networking/bsd.h

@@ -90,6 +90,7 @@ LIBUS_SOCKET_DESCRIPTOR bsd_accept_socket(LIBUS_SOCKET_DESCRIPTOR fd, struct bsd
 
 int bsd_recv(LIBUS_SOCKET_DESCRIPTOR fd, void *buf, int length, int flags);
 int bsd_send(LIBUS_SOCKET_DESCRIPTOR fd, const char *buf, int length, int msg_more);
+int bsd_write2(LIBUS_SOCKET_DESCRIPTOR fd, const char *header, int header_length, const char *payload, int payload_length);
 int bsd_would_block();
 
 // return LIBUS_SOCKET_ERROR or the fd that represents listen socket

packages/bun-usockets/src/libusockets.h

@@ -153,6 +153,12 @@ struct us_socket_context_options_t {
     int ssl_prefer_low_memory_usage; /* Todo: rename to prefer_low_memory_usage and apply for TCP as well */
 };
 
+struct us_bun_verify_error_t {
+    long error;
+    const char* code;
+    const char* reason;
+};
+
 struct us_socket_events_t {
     struct us_socket_t *(*on_open)(struct us_socket_t *, int is_client, char *ip, int ip_length);
     struct us_socket_t *(*on_data)(struct us_socket_t *, char *data, int length);
@@ -166,11 +172,6 @@ struct us_socket_events_t {
     void (*on_handshake)(struct us_socket_t*, int success, struct us_bun_verify_error_t verify_error, void* custom_data);
 };
 
-struct us_bun_verify_error_t {
-    long error;
-    const char* code;
-    const char* reason;
-};
 
 struct us_bun_socket_context_options_t {
     const char *key_file_name;
@@ -231,7 +232,7 @@ void us_socket_context_on_long_timeout(int ssl, struct us_socket_context_t *cont
 void us_socket_context_on_connect_error(int ssl, struct us_socket_context_t *context,
     struct us_socket_t *(*on_connect_error)(struct us_socket_t *s, int code));
 
-void us_socket_context_on_handshake(int ssl, struct us_socket_context_t *context, void (*on_handshake)(struct us_socket_context_t *, int success, struct us_bun_verify_error_t verify_error, void* custom_data), void* custom_data);
+void us_socket_context_on_handshake(int ssl, struct us_socket_context_t *context, void (*on_handshake)(struct us_socket_t *, int success, struct us_bun_verify_error_t verify_error, void* custom_data), void* custom_data);
 
 /* Emitted when a socket has been half-closed */
 void us_socket_context_on_end(int ssl, struct us_socket_context_t *context, struct us_socket_t *(*on_end)(struct us_socket_t *s));
@@ -344,6 +345,9 @@ void *us_socket_get_native_handle(int ssl, struct us_socket_t *s);
  * Set hint msg_more if you have more immediate data to write. */
 int us_socket_write(int ssl, struct us_socket_t *s, const char *data, int length, int msg_more);
 
+/* Special path for non-SSL sockets. Used to send header and payload in one go. Works like us_socket_write. */
+int us_socket_write2(int ssl, struct us_socket_t *s, const char *header, int header_length, const char *payload, int payload_length);
+
 /* Set a low precision, high performance timer on a socket. A socket can only have one single active timer
  * at any given point in time. Will remove any such pre set timer */
 void us_socket_timeout(int ssl, struct us_socket_t *s, unsigned int seconds);
@@ -382,6 +386,7 @@ int us_socket_local_port(int ssl, struct us_socket_t *s);
 
 /* Copy remote (IP) address of socket, or fail with zero length. */
 void us_socket_remote_address(int ssl, struct us_socket_t *s, char *buf, int *length);
+void us_socket_local_address(int ssl, struct us_socket_t *s, char *buf, int *length);
 
 /* Bun extras */
 struct us_socket_t *us_socket_pair(struct us_socket_context_t *ctx, int socket_ext_size, LIBUS_SOCKET_DESCRIPTOR* fds);

packages/bun-usockets/src/loop.c

@@ -18,7 +18,9 @@
 #include "libusockets.h"
 #include "internal/internal.h"
 #include <stdlib.h>
+#ifndef WIN32
 #include <sys/ioctl.h>
+#endif
 
 /* The loop has 2 fallthrough polls */
 void us_internal_loop_data_init(struct us_loop_t *loop, void (*wakeup_cb)(struct us_loop_t *loop),

packages/bun-usockets/src/socket.c

@@ -48,6 +48,16 @@ void us_socket_remote_address(int ssl, struct us_socket_t *s, char *buf, int *le
     }
 }
 
+void us_socket_local_address(int ssl, struct us_socket_t *s, char *buf, int *length) {
+    struct bsd_addr_t addr;
+    if (bsd_local_addr(us_poll_fd(&s->p), &addr) || *length < bsd_addr_get_ip_length(&addr)) {
+        *length = 0;
+    } else {
+        *length = bsd_addr_get_ip_length(&addr);
+        memcpy(buf, bsd_addr_get_ip(&addr), *length);
+    }
+}
+
 struct us_socket_context_t *us_socket_context(int ssl, struct us_socket_t *s) {
     return s->context;
 }
@@ -140,22 +150,90 @@ struct us_socket_t *us_socket_close(int ssl, struct us_socket_t *s, int code, vo
     return s;
 }
 
+// This function is the same as us_socket_close but:
+// - does not emit on_close event
+// - does not close
+struct us_socket_t *us_socket_detach(int ssl, struct us_socket_t *s) {
+    if (!us_socket_is_closed(0, s)) {
+        if (s->low_prio_state == 1) {
+            /* Unlink this socket from the low-priority queue */
+            if (!s->prev) s->context->loop->data.low_prio_head = s->next;
+            else s->prev->next = s->next;
+
+            if (s->next) s->next->prev = s->prev;
+
+            s->prev = 0;
+            s->next = 0;
+            s->low_prio_state = 0;
+        } else {
+            us_internal_socket_context_unlink_socket(s->context, s);
+        }
+        us_poll_stop((struct us_poll_t *) s, s->context->loop);
+
+        /* Link this socket to the close-list and let it be deleted after this iteration */
+        s->next = s->context->loop->data.closed_head;
+        s->context->loop->data.closed_head = s;
+
+        /* Any socket with prev = context is marked as closed */
+        s->prev = (struct us_socket_t *) s->context;
+
+        return s;
+    }
+    return s;
+}
+
+// This function is used for moving a socket between two different event loops
+struct us_socket_t *us_socket_attach(int ssl, LIBUS_SOCKET_DESCRIPTOR client_fd, struct us_socket_context_t *ctx, int flags, int socket_ext_size) {
+    struct us_poll_t *accepted_p = us_create_poll(ctx->loop, 0, sizeof(struct us_socket_t) - sizeof(struct us_poll_t) + socket_ext_size);
+    us_poll_init(accepted_p, client_fd, POLL_TYPE_SOCKET);
+    us_poll_start(accepted_p, ctx->loop, flags);
+
+    struct us_socket_t *s = (struct us_socket_t *) accepted_p;
+
+    s->context = ctx;
+    s->timeout = 0;
+    s->low_prio_state = 0;
+
+    /* We always use nodelay */
+    bsd_socket_nodelay(client_fd, 1);
+    us_internal_socket_context_link_socket(ctx, s);
+
+    if (ctx->on_open) ctx->on_open(s, 0, 0, 0);
+
+    return s;
+}
+
 struct us_socket_t *us_socket_pair(struct us_socket_context_t *ctx, int socket_ext_size, LIBUS_SOCKET_DESCRIPTOR* fds) {
-#ifdef LIBUS_USE_LIBUV
+#if defined(LIBUS_USE_LIBUV) || defined(WIN32)
     return 0;
-#endif 
+#else
     if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) != 0) {
         return 0;
     }
 
     return us_socket_from_fd(ctx, socket_ext_size, fds[0]);
+#endif
 }
 
+/* This is not available for SSL sockets as it makes no sense. */
+int us_socket_write2(int ssl, struct us_socket_t *s, const char *header, int header_length, const char *payload, int payload_length) {
+
+    if (us_socket_is_closed(ssl, s) || us_socket_is_shut_down(ssl, s)) {
+        return 0;
+    }
+
+    int written = bsd_write2(us_poll_fd(&s->p), header, header_length, payload, payload_length);
+    if (written != header_length + payload_length) {
+        us_poll_change(&s->p, s->context->loop, LIBUS_SOCKET_READABLE | LIBUS_SOCKET_WRITABLE);
+    }
+
+    return written < 0 ? 0 : written;
+}
 
 struct us_socket_t *us_socket_from_fd(struct us_socket_context_t *ctx, int socket_ext_size, LIBUS_SOCKET_DESCRIPTOR fd) {
-#ifdef LIBUS_USE_LIBUV
+#if defined(LIBUS_USE_LIBUV) || defined(WIN32)
     return 0;
-#endif
+#else
     struct us_poll_t *p1 = us_create_poll(ctx->loop, 0, sizeof(struct us_socket_t) + socket_ext_size);
     us_poll_init(p1, fd, POLL_TYPE_SOCKET);
     us_poll_start(p1, ctx->loop, LIBUS_SOCKET_READABLE | LIBUS_SOCKET_WRITABLE);
@@ -176,6 +254,7 @@ struct us_socket_t *us_socket_from_fd(struct us_socket_context_t *ctx, int socke
     }
 
     return s;
+#endif
 }
 
 
@@ -301,4 +380,4 @@ unsigned int us_get_remote_address_info(char *buf, struct us_socket_t *s, const
     *port = bsd_addr_get_port(&addr);
 
     return length;
-}
+}