Merge branch 'main' into jarred/serve-https-test

* fix intcast on ptr value of zero-length strings

* Make this better

---------

Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Co-authored-by: Jarred Sumner <jarred@jarredsumner.com>

.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

@@ -17,37 +17,31 @@
 *.mjs text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.mts text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 
+*.lockb binary diff=lockb
+
 .vscode/launch.json linguist-generated
 src/api/schema.d.ts linguist-generated
 fixture.*.c linguist-generated
 src/api/schema.js linguist-generated
-src/bun.js/bindings/sqlite/sqlite3.c linguist-vendored
-src/bun.js/bindings/sqlite/sqlite3_local.h linguist-vendored
-*.lockb binary diff=lockb
-src/bun.js/bindings/simdutf.cpp linguist-vendored
-src/bun.js/bindings/simdutf.h linguist-vendored
-
-src/js/out/WebCoreJSBuiltins.cpp linguist-generated
-src/js/out/WebCoreJSBuiltins.h linguist-generated
-src/js/out/WebCoreJSBuiltins.d.ts linguist-generated
-
-src/bun.js/bindings/ZigGeneratedClasses.h linguist-generated
-src/bun.js/bindings/ZigGeneratedClasses.cpp linguist-generated
-
+*-fixture* linguist-generated
 src/bun.js/bindings/ZigGeneratedCode.h linguist-generated
 src/bun.js/bindings/ZigGeneratedCode.cpp linguist-generated
-
 src/bun.js/bindings/headers.h linguist-generated
 src/bun.js/bindings/headers.zig linguist-generated
 
-src/bun.js/bindings/JSSink.h linguist-generated
-src/bun.js/bindings/JSSink.zig linguist-generated
+packages/bun-uws/fuzzing/seed-corpus/**/* linguist-generated
 
-src/bun.js/bindings/ZigGeneratedClasses+DOMClientIsoSubspaces.h linguist-generated
-src/bun.js/bindings/ZigGeneratedClasses+DOMIsoSubspaces.h linguist-generated
-src/bun.js/bindings/ZigGeneratedClasses+lazyStructureHeader.h linguist-generated
-src/bun.js/bindings/ZigGeneratedClasses+lazyStructureImpl.h linguist-generated
+src/bun.js/bindings/sqlite/sqlite3.c linguist-vendored
+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
 
 docs/**/* linguist-documentation
 
-packages/bun-uws/fuzzing/seed-corpus/**/* linguist-generated
+# Don't count tests in the language stats - https://github.com/github-linguist/linguist/blob/master/docs/overrides.md
+test/**/* linguist-documentation
+bench/**/* linguist-documentation
+examples/**/* linguist-documentation
+
+src/deps/*.c linguist-vendored
+src/deps/brotli/** linguist-vendored

.github/ISSUE_TEMPLATE/3-typescript-bug-report.yml

@@ -0,0 +1,45 @@
+name: 🇹 TypeScript Type Bug Report
+description: Report an issue with TypeScript types
+labels: [bug, typescript]
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thank you for submitting a bug report. It helps make Bun better.
+
+      If you need help or support using Bun, and are not reporting a bug, please
+      join our [Discord](https://discord.gg/CXdq2DP29u) server, where you can ask questions in the [`#help`](https://discord.gg/32EtH6p7HN) forum.
+
+      Make sure you are running the [latest](https://bun.sh/docs/installation#upgrading) version of Bun.
+      The bug you are experiencing may already have been fixed.
+
+      Please try to include as much information as possible.
+
+- type: input
+  attributes:
+    label: What version of Bun is running?
+    description: Copy the output of `bun --revision`
+- type: input
+  attributes:
+    label: What platform is your computer?
+    description: |
+      For MacOS and Linux: copy the output of `uname -mprs`
+      For Windows: copy the output of `"$([Environment]::OSVersion | ForEach-Object VersionString) $(if ([Environment]::Is64BitOperatingSystem) { "x64" } else { "x86" })"` in the PowerShell console
+- type: textarea
+  attributes:
+    label: What steps can reproduce the bug?
+    description: Explain the bug and provide a code snippet that can reproduce it.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: What is the expected behavior?
+    description: If possible, please provide text instead of a screenshot.
+- type: textarea
+  attributes:
+    label: What do you see instead?
+    description: If possible, please provide text instead of a screenshot.
+- type: textarea
+  attributes:
+    label: Additional information
+    description: Is there anything else you think we should know?

.github/actions/setup-bun/action.yml

@@ -0,0 +1,50 @@
+name: Setup Bun
+description: An internal version of the 'oven-sh/setup-bun' action.
+
+inputs:
+  bun-version:
+    type: string
+    description: "The version of bun to install: 'latest', 'canary', 'bun-v1.0.0', etc."
+    default: latest
+    required: false
+  baseline:
+    type: boolean
+    description: "Whether to use the baseline version of bun."
+    default: false
+    required: false
+  download-url:
+    type: string
+    description: "The base URL to download bun from."
+    default: "https://pub-5e11e972747a44bf9aaf9394f185a982.r2.dev/releases"
+    required: false
+
+runs:
+  using: composite
+  steps:
+    - name: Setup Bun
+      shell: bash
+      run: |
+        case "$(uname -s)" in
+          Linux*)  os=linux;;
+          Darwin*) os=darwin;;
+          *)       os=windows;;
+        esac
+        case "$(uname -m)" in
+          arm64 | aarch64)  arch=arm64;;
+          *)                arch=x64;;
+        esac
+        case "${{ inputs.baseline }}" in
+          true | 1) target="bun-${os}-${arch}-baseline";;
+          *)        target="bun-${os}-${arch}";;
+        esac
+        case "${{ inputs.bun-version }}" in
+          latest) release="latest";;
+          canary) release="canary";;
+          *)      release="bun-v${{ inputs.bun-version }}";;
+        esac
+        curl -LO "${{ inputs.download-url }}/${release}/${target}.zip"
+        unzip ${target}.zip
+        mkdir -p ${{ runner.temp }}/.bun/bin
+        mv ${target}/bun* ${{ runner.temp }}/.bun/bin/
+        chmod +x ${{ runner.temp }}/.bun/bin/*
+        echo "${{ runner.temp }}/.bun/bin" >> ${GITHUB_PATH}

.github/pull_request_template.md

@@ -19,18 +19,17 @@ This adds a new flag --bail to bun test. When set, it will stop running tests af
 
 <!-- If JavaScript/TypeScript modules or builtins changed:
 
-- [ ] I ran `make js` and committed the transpiled changes
-- [ ] I or my editor ran Prettier on the changed files (or I ran `bun fmt`)
-- [ ] I included a test for the new code, or an existing test covers it
+- [ ] I included a test for the new code, or existing tests cover it
+- [ ] I ran my tests locally and they pass (`bun-debug test test-file-name.test`)
 
 -->
 
 <!-- If Zig files changed:
 
 - [ ] I checked the lifetime of memory allocated to verify it's (1) freed and (2) only freed when it should be
-- [ ] I or my editor ran `zig fmt` on the changed files
 - [ ] I included a test for the new code, or an existing test covers it
 - [ ] JSValue used outside outside of the stack is either wrapped in a JSC.Strong or is JSValueProtect'ed
+- [ ] I wrote TypeScript/JavaScript tests and they pass locally (`bun-debug test test-file-name.test`)
 -->
 
 <!-- If new methods, getters, or setters were added to a publicly exposed class:
@@ -43,17 +42,6 @@ This adds a new flag --bail to bun test. When set, it will stop running tests af
 - [ ] I made sure that specific versions of dependencies are used instead of ranged or tagged versions
 -->
 
-<!-- If functions were added to exports.zig or bindings.zig
-
-- [ ] I ran `make headers` to regenerate the C header file
-
--->
-
-<!-- If \*.classes.ts files were added or changed:
-
-- [ ] I ran `make codegen` to regenerate the C++ and Zig code
--->
-
 <!-- If a new builtin ESM/CJS module was added:
 
 - [ ] I updated Aliases in `module_loader.zig` to include the new module

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

@@ -4,18 +4,30 @@ 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:
       - main
     paths:
+      - ".github/workflows/bun-linux-aarch64.yml"
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
+      - "packages/bun-uws/src/**/*"
+      - "CMakeLists.txt"
+      - "build.zig"
+      - "Makefile"
+      - "Dockerfile"
+  pull_request:
+    branches:
+      - main
+    paths:
+      - ".github/workflows/bun-linux-aarch64.yml"
+      - "src/**/*"
+      - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
+      - "packages/bun-uws/src/**/*"
+      - "CMakeLists.txt"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -37,15 +49,16 @@ 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
+      - uses: actions/checkout@v4
         with:
-          submodules: recursive
-      - uses: docker/setup-buildx-action@v2
+          submodules: false
+          ref: ${{github.sha}}
+          clean: true
+      - run: |
+          bash ./scripts/update-submodules.sh
+      - uses: docker/setup-buildx-action@v3
         id: buildx
         with:
           install: true
@@ -53,7 +66,7 @@ jobs:
         run: |
           rm -rf ${{runner.temp}}/release
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -61,7 +74,7 @@ jobs:
       - run: |
           mkdir -p /tmp/.buildx-cache-${{matrix.tag}}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: false
@@ -72,9 +85,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
@@ -102,22 +113,16 @@ jobs:
 
           zip -r bun-${{matrix.tag}}-profile.zip bun-${{matrix.tag}}-profile
           zip -r bun-${{matrix.tag}}.zip bun-${{matrix.tag}}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: bun-${{matrix.tag}}-profile
           path: ${{runner.temp}}/release/bun-${{matrix.tag}}-profile.zip
-      - uses: actions/upload-artifact@v3
+          if-no-files-found: "error"
+      - uses: actions/upload-artifact@v4
         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
+          if-no-files-found: "error"
       - name: Release
         id: release
         uses: ncipollo/release-action@v1

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

@@ -4,18 +4,17 @@ 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:
       - main
     paths:
+      - ".github/workflows/bun-linux-build.yml"
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
+      - "packages/bun-uws/src/**/*"
+      - "CMakeLists.txt"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -23,8 +22,12 @@ on:
     branches:
       - main
     paths:
+      - ".github/workflows/bun-linux-build.yml"
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
+      - "packages/bun-uws/src/**/*"
+      - "CMakeLists.txt"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -46,56 +49,75 @@ jobs:
             tag: linux-x64
             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"
+            runner: namespace-profile-bun-linux-x64
             build_machine_arch: x86_64
+            assertions: "OFF"
+            zig_optimize: "ReleaseFast"
+            target: "artifact"
           - 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"
+            runner: namespace-profile-bun-linux-x64
             build_machine_arch: x86_64
+            assertions: "OFF"
+            zig_optimize: "ReleaseFast"
+            target: "artifact"
+          # - cpu: haswell
+          #   tag: linux-x64-assertions
+          #   arch: x86_64
+          #   build_arch: amd64
+          #   runner: big-ubuntu
+          #   build_machine_arch: x86_64
+          #   assertions: "ON"
+          #   zig_optimize: "ReleaseSafe"
+          #   target: "artifact-assertions"
+          # - cpu: nehalem
+          #   tag: linux-x64-baseline-assertions
+          #   arch: x86_64
+          #   build_arch: amd64
+          #   runner: big-ubuntu
+          #   build_machine_arch: x86_64
+          #   assertions: "ON"
+          #   zig_optimize: "ReleaseSafe"
+          #   target: "artifact-assertions"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: docker/setup-buildx-action@v2
-        id: buildx
-        with:
-          install: true
+          ref: ${{github.sha}}
+          clean: true
       - name: Run
         run: |
           rm -rf ${{runner.temp}}/release
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - run: |
-          mkdir -p /tmp/.buildx-cache-${{matrix.tag}}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: false
-          cache-from: type=local,src=/tmp/.buildx-cache-${{matrix.tag}}
-          cache-to: type=local,dest=/tmp/.buildx-cache-${{matrix.tag}}
           build-args: |
             ARCH=${{matrix.arch}}
             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}}
+            ASSERTIONS=${{matrix.assertions}}
+            ZIG_OPTIMIZE=${{matrix.zig_optimize}}
           platforms: linux/${{matrix.build_arch}}
-          target: artifact
+          target: ${{matrix.target}}
           outputs: type=local,dest=${{runner.temp}}/release
+      - id: bun-version-check
+        name: Bun version check
+        run: |
+          # If this hangs, it means something is seriously wrong with the build
+          ${{runner.temp}}/release/bun-profile --version
       - name: Zip
         run: |
           # if zip is not found
@@ -120,22 +142,16 @@ jobs:
 
           zip -r bun-${{matrix.tag}}-profile.zip bun-${{matrix.tag}}-profile
           zip -r bun-${{matrix.tag}}.zip bun-${{matrix.tag}}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: bun-${{matrix.tag}}-profile
           path: ${{runner.temp}}/release/bun-${{matrix.tag}}-profile.zip
-      - uses: actions/upload-artifact@v3
+          if-no-files-found: "error"
+      - uses: actions/upload-artifact@v4
         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
+          if-no-files-found: "error"
       - name: Release
         id: release
         uses: ncipollo/release-action@v1
@@ -174,7 +190,7 @@ jobs:
             [Commit ${{github.sha}}](https://github.com/oven-sh/bun/commits/${{github.sha}})
   linux-test:
     name: Tests ${{matrix.tag}}
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-bun-linux-x64
     needs: [linux]
     if: github.event_name == 'pull_request'
     timeout-minutes: 20
@@ -189,15 +205,18 @@ jobs:
         include:
           - tag: linux-x64
           - tag: linux-x64-baseline
+          # - tag: linux-x64-assertions
+          # - tag: linux-x64-baseline-assertions
     steps:
       - id: checkout
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: false
+          clean: true
       - id: download
         name: Download
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bun-${{matrix.tag}}
           path: ${{runner.temp}}/release
@@ -209,7 +228,11 @@ jobs:
           cd bun-${{matrix.tag}}
           chmod +x bun
           pwd >> $GITHUB_PATH
-          ./bun --version
+      - id: bun-version-check
+        name: Bun version check
+        run: |
+          # If this hangs, it means something is seriously wrong with the build
+          bun --version
       - id: install-dependnecies
         name: Install dependencies
         run: |
@@ -217,15 +240,35 @@ jobs:
           bun install --verbose
           bun install --cwd=test --verbose
           bun install --cwd=packages/bun-internal-test --verbose
+
+          bun install --cwd=test/js/third_party/prisma --verbose
+
+      # This is disabled because the cores are ~5.5gb each
+      # so it is easy to hit 50gb coredump downloads. Only enable if you need to retrive one
+
+      # - name: Set core dumps to get stored in /cores
+      #   run: |
+      #     sudo mkdir /cores
+      #     sudo chmod 777 /cores
+      #     # Core filenames will be of the form executable.pid.timestamp:
+      #     sudo bash -c 'echo "/cores/%e.%p.%t" > /proc/sys/kernel/core_pattern'
+
       - id: test
         name: Test (node runner)
         env:
           SMTP_SENDGRID_SENDER: ${{ secrets.SMTP_SENDGRID_SENDER }}
+          TMPDIR: ${{runner.temp}}
           TLS_MONGODB_DATABASE_URL: ${{ secrets.TLS_MONGODB_DATABASE_URL }}
           TLS_POSTGRES_DATABASE_URL: ${{ secrets.TLS_POSTGRES_DATABASE_URL }}
         # if: ${{github.event.inputs.use_bun == 'false'}}
         run: |
           node packages/bun-internal-test/src/runner.node.mjs || true
+      # - uses: actions/upload-artifact@v4
+      #   if: steps.test.outputs.failing_tests != ''
+      #   with:
+      #     name: cores
+      #     path: /cores
+      #     if-no-files-found: "error"
       - uses: sarisia/actions-status-discord@v1
         if: always() && steps.test.outputs.failing_tests != '' && github.event_name == 'pull_request'
         with:

.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,9 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
+      - "packages/bun-uws/src/**/*"
+      - "CMakeLists.txt"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -23,6 +25,9 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
+      - "packages/bun-uws/src/**/*"
+      - "CMakeLists.txt"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -30,79 +35,136 @@ on:
   workflow_dispatch:
 
 jobs:
-  macos-object-files:
-    name: macOS Object
-    runs-on: med-ubuntu
+  macOS-zig:
+    name: macOS Zig Object
+    runs-on: namespace-profile-zig-build
     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
-        id: buildx
-        with:
-          install: true
-      - name: Run
-        run: |
-          rm -rf ${{runner.temp}}/release
+      - uses: actions/checkout@v4
+      # - name: Checkout submodules
+      #   run: git submodule update --init --recursive --depth=1 --progress --force
+
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        if: runner.arch == 'X64'
+
+      - name: Compile Zig Object
+        uses: docker/build-push-action@v5
         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@v4
         with:
           name: ${{ matrix.tag }}
-          path: ${{runner.temp}}/release/bun.o
+          path: ${{runner.temp}}/release/bun-zig.o
+          if-no-files-found: "error"
+
+  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-13-xlarge
+    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 go 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
+
+          curl -LO "$BUN_DOWNLOAD_URL_BASE/bun-darwin-aarch64.zip"
+          unzip bun-darwin-aarch64.zip
+          mkdir -p ${{ runner.temp }}/.bun/bin
+          mv bun-darwin-aarch64/bun ${{ runner.temp }}/.bun/bin/bun
+          chmod +x ${{ runner.temp }}/.bun/bin/bun
+          echo "${{ runner.temp }}/.bun/bin" >> $GITHUB_PATH
+
+      - 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@v4
+        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@v4
+        with:
+          path: ${{runner.temp}}/bun-deps
+          key: ${{ steps.cache-deps-restore.outputs.cache-primary-key }}
+
+      - name: Upload submodule dependencies
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.tag }}-deps
+          path: ${{runner.temp}}/bun-deps
+          if-no-files-found: "error"
+
   macOS-cpp:
     name: macOS C++
     runs-on: ${{ matrix.runner }}
@@ -111,271 +173,171 @@ 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
+            runner: macos-13-xlarge
     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 go 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@16)/bin" >> $GITHUB_PATH
-          brew link --overwrite llvm@16
+          echo "$(brew --prefix llvm@$LLVM_VERSION)/bin" >> $GITHUB_PATH
+          brew link --overwrite llvm@$LLVM_VERSION
+
+          curl -LO "$BUN_DOWNLOAD_URL_BASE/bun-darwin-aarch64.zip"
+          unzip bun-darwin-aarch64.zip
+          mkdir -p ${{ runner.temp }}/.bun/bin
+          mv bun-darwin-aarch64/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
         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 \
+            -DUSE_LTO=ON \
+            -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
+        uses: actions/upload-artifact@v4
         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
+          if-no-files-found: "error"
+  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
+            runner: macos-13-xlarge
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.sha}}
+          clean: true
       - 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
+        uses: actions/download-artifact@v4
         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
-        uses: actions/download-artifact@v3
+
+      - name: Download Zig Object
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.obj }}
           path: ${{ runner.temp }}/release
+
+      - name: Downloaded submodule dependencies
+        uses: actions/download-artifact@v4
+        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 \
+            -DUSE_LTO=ON \
+            -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
 
           zip -r ${{matrix.tag}}-profile.zip ${{matrix.tag}}-profile
           zip -r ${{matrix.tag}}.zip ${{matrix.tag}}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{matrix.tag}}-profile
-          path: ${{runner.temp}}/release/${{matrix.tag}}-profile.zip
-      - uses: actions/upload-artifact@v3
+          path: ${{runner.temp}}/link-build/${{matrix.tag}}-profile.zip
+          if-no-files-found: "error"
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{matrix.tag}}
-          path: ${{runner.temp}}/release/${{matrix.tag}}.zip
+          path: ${{runner.temp}}/link-build/${{matrix.tag}}.zip
+          if-no-files-found: "error"
       - name: Release
         id: release
         uses: ncipollo/release-action@v1
@@ -392,7 +354,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 +377,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
@@ -428,16 +390,16 @@ jobs:
       matrix:
         include:
           - tag: bun-darwin-aarch64
-            runner: macos-arm64
+            runner: macos-13-xlarge
     steps:
       - id: checkout
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: false
       - id: download
         name: Download
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{matrix.tag}}
           path: ${{runner.temp}}/release
@@ -449,7 +411,11 @@ jobs:
           cd ${{matrix.tag}}
           chmod +x bun
           pwd >> $GITHUB_PATH
-          ./bun --version
+      - id: bun-version-check
+        name: Bun version check
+        run: |
+          # If this hangs, it means something is seriously wrong with the build
+          bun --version
       - id: install
         name: Install dependencies
         run: |
@@ -460,6 +426,7 @@ jobs:
         name: Test (node runner)
         env:
           SMTP_SENDGRID_SENDER: ${{ secrets.SMTP_SENDGRID_SENDER }}
+          TMPDIR: ${{runner.temp}}
           TLS_MONGODB_DATABASE_URL: ${{ secrets.TLS_MONGODB_DATABASE_URL }}
           TLS_POSTGRES_DATABASE_URL: ${{ secrets.TLS_POSTGRES_DATABASE_URL }}
         # if: ${{github.event.inputs.use_bun == 'false'}}

.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,9 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
+      - "packages/bun-uws/src/**/*"
+      - "CMakeLists.txt"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -23,6 +25,9 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
+      - "packages/bun-uws/src/**/*"
+      - "CMakeLists.txt"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -32,7 +37,7 @@ on:
 jobs:
   macos-object-files:
     name: macOS Object
-    runs-on: med-ubuntu
+    runs-on: namespace-profile-zig-build
     if: github.repository_owner == 'oven-sh'
     strategy:
       matrix:
@@ -47,62 +52,109 @@ jobs:
           #   arch: aarch64
           #   tag: bun-obj-darwin-aarch64
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - uses: docker/setup-buildx-action@v2
-        id: buildx
-        with:
-          install: true
-      - name: Run
-        run: |
-          rm -rf ${{runner.temp}}/release
+      - uses: actions/checkout@v4
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        if: runner.arch == 'X64'
+      - name: Compile Zig Object
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=min
           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@v4
         with:
           name: ${{ matrix.tag }}
-          path: ${{runner.temp}}/release/bun.o
+          path: ${{runner.temp}}/release/bun-zig.o
+          if-no-files-found: "error"
+  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-large
+            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@v4
+        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@v4
+        with:
+          path: ${{runner.temp}}/bun-deps
+          key: ${{ steps.cache-deps-restore.outputs.cache-primary-key }}
+
+      - name: Upload submodule dependencies
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.tag }}-deps
+          path: ${{runner.temp}}/bun-deps
+          if-no-files-found: "error"
+
   macOS-cpp:
     name: macOS C++
     runs-on: ${{ matrix.runner }}
@@ -115,138 +167,70 @@ jobs:
             arch: x86_64
             tag: bun-darwin-x64-baseline
             obj: bun-obj-darwin-x64-baseline
-            runner: macos-12
+            runner: macos-12-large
             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 ccache)/bin" >> $GITHUB_PATH
+          # echo "$(brew --prefix sccache)/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-baseline.zip"
+          unzip bun-darwin-x64-baseline.zip
+          mkdir -p ${{ runner.temp }}/.bun/bin
+          mv bun-darwin-x64-baseline/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 \
+            -DUSE_LTO=ON \
+            -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
+        uses: actions/upload-artifact@v4
         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
+          if-no-files-found: "error"
   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:
@@ -257,129 +241,89 @@ jobs:
             tag: bun-darwin-x64-baseline
             obj: bun-obj-darwin-x64-baseline
             package: bun-darwin-x64
-            runner: macos-12
+            runner: macos-12-large
             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
+      - 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 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-baseline.zip"
+          unzip bun-darwin-x64-baseline.zip
+          mkdir -p ${{ runner.temp }}/.bun/bin
+          mv bun-darwin-x64-baseline/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
+        uses: actions/download-artifact@v4
         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
-        uses: actions/download-artifact@v3
+
+      - name: Download Zig Object
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.obj }}
           path: ${{ runner.temp }}/release
+
+      - name: Downloaded submodule dependencies
+        uses: actions/download-artifact@v4
+        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 \
+            -DUSE_LTO=ON \
+            -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
 
           zip -r ${{matrix.tag}}-profile.zip ${{matrix.tag}}-profile
           zip -r ${{matrix.tag}}.zip ${{matrix.tag}}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{matrix.tag}}-profile
-          path: ${{runner.temp}}/release/${{matrix.tag}}-profile.zip
-      - uses: actions/upload-artifact@v3
+          path: ${{runner.temp}}/link-build/${{matrix.tag}}-profile.zip
+          if-no-files-found: "error"
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{matrix.tag}}
-          path: ${{runner.temp}}/release/${{matrix.tag}}.zip
+          path: ${{runner.temp}}/link-build/${{matrix.tag}}.zip
+          if-no-files-found: "error"
       - name: Release
         id: release
         uses: ncipollo/release-action@v1
@@ -396,7 +340,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,10 +361,11 @@ 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'
+    # if: github.event_name == 'pull_request' && github.repository_owner == 'oven-sh'
+    if: false
     permissions:
       pull-requests: write
     timeout-minutes: 30
@@ -432,16 +377,16 @@ jobs:
       matrix:
         include:
           - tag: bun-darwin-x64-baseline
-            runner: macos-12
+            runner: macos-12-large
     steps:
       - id: checkout
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: false
       - id: download
         name: Download
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{matrix.tag}}
           path: ${{runner.temp}}/release
@@ -453,7 +398,11 @@ jobs:
           cd ${{matrix.tag}}
           chmod +x bun
           pwd >> $GITHUB_PATH
-          ./bun --version
+      - id: bun-version-check
+        name: Bun version check
+        run: |
+          # If this hangs, it means something is seriously wrong with the build
+          bun --version
       - id: install
         name: Install dependencies
         run: |
@@ -464,6 +413,7 @@ jobs:
         name: Test (node runner)
         env:
           SMTP_SENDGRID_SENDER: ${{ secrets.SMTP_SENDGRID_SENDER }}
+          TMPDIR: ${{runner.temp}}
           TLS_MONGODB_DATABASE_URL: ${{ secrets.TLS_MONGODB_DATABASE_URL }}
           TLS_POSTGRES_DATABASE_URL: ${{ secrets.TLS_POSTGRES_DATABASE_URL }}
         # if: ${{github.event.inputs.use_bun == 'false'}}

.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,9 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
+      - "packages/bun-uws/src/**/*"
+      - "CMakeLists.txt"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -23,6 +25,9 @@ on:
     paths:
       - "src/**/*"
       - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
+      - "packages/bun-uws/src/**/*"
+      - "CMakeLists.txt"
       - "build.zig"
       - "Makefile"
       - "Dockerfile"
@@ -30,9 +35,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  macos-object-files:
-    name: macOS Object
-    runs-on: med-ubuntu
+  macOS-zig:
+    name: macOS Zig Object
+    runs-on: namespace-profile-zig-build
     if: github.repository_owner == 'oven-sh'
     strategy:
       matrix:
@@ -43,66 +48,111 @@ 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
-        id: buildx
-        with:
-          install: true
-      - name: Run
-        run: |
-          rm -rf ${{runner.temp}}/release
+      - uses: actions/checkout@v4
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        if: runner.arch == 'X64'
+      - name: Compile Zig Object
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=min
           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@v4
         with:
           name: ${{ matrix.tag }}
-          path: ${{runner.temp}}/release/bun.o
+          path: ${{runner.temp}}/release/bun-zig.o
+          if-no-files-found: "error"
+
+  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-large
+            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@v4
+        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@v4
+        with:
+          path: ${{runner.temp}}/bun-deps
+          key: ${{ steps.cache-deps-restore.outputs.cache-primary-key }}
+
+      - name: Upload submodule dependencies
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.tag }}-deps
+          path: ${{runner.temp}}/bun-deps
+          if-no-files-found: "error"
+
   macOS-cpp:
     name: macOS C++
     runs-on: ${{ matrix.runner }}
@@ -111,277 +161,167 @@ 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
+            runner: macos-12-large
             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 \
+            -DUSE_LTO=ON \
+            -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
+        uses: actions/upload-artifact@v4
         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
+          if-no-files-found: "error"
   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
             obj: bun-obj-darwin-x64
             package: bun-darwin-x64
-            runner: macos-12
+            runner: macos-12-large
             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
+      - 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 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-baseline.zip"
+          unzip bun-darwin-x64-baseline.zip
+          mkdir -p ${{ runner.temp }}/.bun/bin
+          mv bun-darwin-x64-baseline/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
+        uses: actions/download-artifact@v4
         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
-        uses: actions/download-artifact@v3
+
+      - name: Download Zig Object
+        uses: actions/download-artifact@v4
         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@v4
         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 \
+            -DUSE_LTO=ON \
+            -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
 
           zip -r ${{matrix.tag}}-profile.zip ${{matrix.tag}}-profile
           zip -r ${{matrix.tag}}.zip ${{matrix.tag}}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{matrix.tag}}-profile
-          path: ${{runner.temp}}/release/${{matrix.tag}}-profile.zip
-      - uses: actions/upload-artifact@v3
+          path: ${{runner.temp}}/link-build/${{matrix.tag}}-profile.zip
+          if-no-files-found: "error"
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{matrix.tag}}
-          path: ${{runner.temp}}/release/${{matrix.tag}}.zip
+          path: ${{runner.temp}}/link-build/${{matrix.tag}}.zip
+          if-no-files-found: "error"
       - name: Release
         id: release
         uses: ncipollo/release-action@v1
@@ -398,7 +338,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:
@@ -434,16 +374,16 @@ jobs:
       matrix:
         include:
           - tag: bun-darwin-x64
-            runner: macos-12
+            runner: macos-12-large
     steps:
       - id: checkout
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: false
       - id: download
         name: Download
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{matrix.tag}}
           path: ${{runner.temp}}/release
@@ -455,7 +395,11 @@ jobs:
           cd ${{matrix.tag}}
           chmod +x bun
           pwd >> $GITHUB_PATH
-          ./bun --version
+      - id: bun-version-check
+        name: Bun version check
+        run: |
+          # If this hangs, it means something is seriously wrong with the build
+          bun --version
       - id: install
         name: Install dependencies
         run: |
@@ -467,6 +411,7 @@ jobs:
         env:
           SMTP_SENDGRID_SENDER: ${{ secrets.SMTP_SENDGRID_SENDER }}
           TLS_MONGODB_DATABASE_URL: ${{ secrets.TLS_MONGODB_DATABASE_URL }}
+          TMPDIR: ${{runner.temp}}
           TLS_POSTGRES_DATABASE_URL: ${{ secrets.TLS_POSTGRES_DATABASE_URL }}
         # if: ${{github.event.inputs.use_bun == 'false'}}
         run: |

.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:
@@ -51,7 +51,7 @@ jobs:
         working-directory: packages/bun-release
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup GPG
         uses: crazy-max/ghaction-import-gpg@v5
         with:
@@ -60,7 +60,7 @@ jobs:
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
         with:
-          bun-version: latest
+          bun-version: "1.0.21"
       - name: Install Dependencies
         run: bun install
       - name: Sign Release
@@ -81,11 +81,11 @@ jobs:
         working-directory: packages/bun-release
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
         with:
-          bun-version: latest
+          bun-version: "1.0.21"
       - name: Install Dependencies
         run: bun install
       - name: Release
@@ -105,15 +105,21 @@ jobs:
         working-directory: packages/bun-types
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
           node-version: latest
       - name: Setup Bun
+        if: ${{ env.BUN_VERSION != 'canary' }}
         uses: oven-sh/setup-bun@v1
         with:
-          bun-version: latest
+          bun-version: "1.0.21"
+      - name: Setup Bun
+        if: ${{ env.BUN_VERSION == 'canary' }}
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: "canary" # Must be 'canary' so tag is correct
       - name: Install Dependencies
         run: bun install
       - name: Setup Tag
@@ -131,14 +137,14 @@ jobs:
         if: ${{ env.BUN_VERSION == 'canary' }}
         uses: JS-DevTools/npm-publish@v1
         with:
-          package: packages/bun-types/dist/package.json
+          package: packages/bun-types/package.json
           token: ${{ secrets.NPM_TOKEN }}
           tag: canary
       - name: Release (latest)
         if: ${{ env.BUN_LATEST == 'true' }}
         uses: JS-DevTools/npm-publish@v1
         with:
-          package: packages/bun-types/dist/package.json
+          package: packages/bun-types/package.json
           token: ${{ secrets.NPM_TOKEN }}
   docker:
     name: Release to Dockerhub
@@ -152,7 +158,7 @@ jobs:
       matrix:
         include:
           - variant: debian
-            suffix: ''
+            suffix: ""
           - variant: debian
             suffix: -debian
           - variant: slim
@@ -164,12 +170,12 @@ jobs:
             suffix: -distroless
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Docker emulator
         uses: docker/setup-qemu-action@v2
       - id: buildx
         name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           platforms: linux/amd64,linux/arm64
       - id: metadata
@@ -186,12 +192,12 @@ jobs:
             type=match,pattern=(bun-v)?(canary|\d+.\d+),group=2,value=${{ env.BUN_VERSION }},suffix=${{ matrix.suffix }}
             type=match,pattern=(bun-v)?(canary|\d+),group=2,value=${{ env.BUN_VERSION }},suffix=${{ matrix.suffix }}
       - name: Login to Docker
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Push to Docker
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: ./dockerhub/${{ matrix.dir || matrix.variant }}
           platforms: linux/amd64,linux/arm64
@@ -210,7 +216,7 @@ jobs:
     if: ${{ github.event_name == 'release' || github.event.inputs.use-homebrew == 'true' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: oven-sh/homebrew-bun
           token: ${{ secrets.ROBOBUN_TOKEN }}
@@ -246,11 +252,11 @@ jobs:
         working-directory: packages/bun-release
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
         with:
-          bun-version: latest
+          bun-version: "1.0.21"
       - name: Install Dependencies
         run: bun install
       - name: Release

.github/workflows/bun-types-tests.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install bun
         uses: oven-sh/setup-bun@v1

.github/workflows/bun-windows.yml

@@ -0,0 +1,501 @@
+name: bun-windows
+
+concurrency:
+  group: bun-windows-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  # note: in other files, this version is only the major version, but for windows it is the full version
+  LLVM_VERSION: 16.0.6
+  BUN_DOWNLOAD_URL_BASE: https://pub-5e11e972747a44bf9aaf9394f185a982.r2.dev/releases/latest
+
+  tag: bun-windows
+  # TODO: wire this up to workflow_dispatch.
+  # github's expression syntax makes this hard to set a default to true
+  canary: true
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - "src/**/*"
+      - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
+      - "packages/bun-uws/src/**/*"
+      - "CMakeLists.txt"
+      - "build.zig"
+      - "Makefile"
+      - "Dockerfile"
+  pull_request:
+    branches: [main]
+    paths:
+      - "src/**/*"
+      - "test/**/*"
+      - "packages/bun-usockets/src/**/*"
+      - "packages/bun-uws/src/**/*"
+      - "CMakeLists.txt"
+      - "build.zig"
+      - "Makefile"
+      - "Dockerfile"
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+    # inputs:
+    #   is-canary:
+    #     type: boolean
+    #     description: Is Canary Build?
+    #     default: true
+
+jobs:
+  windows-zig:
+    strategy:
+      fail-fast: false
+      matrix:
+        cpu: [haswell, nehalem]
+        arch: [x86_64]
+    name: Zig Build
+    runs-on: namespace-profile-zig-build
+    timeout-minutes: 60
+    if: github.repository_owner == 'oven-sh'
+    steps:
+      - run: git config --global core.autocrlf false && git config --global core.eol lf
+      - uses: actions/checkout@v4
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Calculate Canary Revision
+        if: ${{ env.canary == 'true' }}
+        id: canary
+        run: |
+          echo "canary_revision=$(GITHUB_TOKEN="${{ secrets.GITHUB_TOKEN }}" bash ./scripts/calculate-canary-revision.sh --raw)" >> $GITHUB_OUTPUT
+
+      - name: Compile Zig Object
+        uses: docker/build-push-action@v5
+        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 }}
+            CANARY=${{ env.canary == 'true' && steps.canary.outputs.canary_revision || '0' }}
+            ZIG_OPTIMIZE=ReleaseSafe
+          # TODO(@paperdave): enable ASSERTIONS=1
+          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@v4
+        with:
+          name: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}-zig${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}
+          path: ${{runner.temp}}/release/bun-zig.o
+          if-no-files-found: "error"
+
+  windows-dependencies:
+    name: Dependencies
+    runs-on: windows
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        cpu: [haswell, nehalem]
+        arch: [x86_64]
+    steps:
+      - run: git config --global core.autocrlf false && git config --global core.eol lf
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Clone Submodules
+        run: .\scripts\update-submodules.ps1
+      - name: Hash submodule versions
+        shell: pwsh
+        run: |
+          $data = "$(& {
+            git submodule | Where-Object { $_ -notmatch 'WebKit' }
+            clang --version
+            rustc --version
+            Get-Content -Path (Get-ChildItem -Path 'scripts/build*.ps1', 'scripts/all-dependencies.ps1', 'scripts/env.ps1' | Sort-Object -Property Name).FullName | Out-String
+            echo 1
+          })"
+          $hash = ( -join ((New-Object -TypeName System.Security.Cryptography.SHA1CryptoServiceProvider).ComputeHash([System.Text.Encoding]::UTF8.GetBytes($data)) | ForEach-Object { $_.ToString("x2") } )).Substring(0, 10)
+          echo "sha=${hash}" >> $env:GITHUB_OUTPUT
+        id: submodule-versions
+
+      - name: Try fetch dependencies
+        id: cache-deps-restore
+        uses: actions/cache/restore@v4
+        with:
+          path: bun-deps
+          key: bun-deps-${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}-${{ steps.submodule-versions.outputs.sha }}
+
+      - name: Install LLVM ${{ env.LLVM_VERSION }}
+        if: ${{ !steps.cache-deps-restore.outputs.cache-hit }}
+        uses: KyleMayes/install-llvm-action@1a3da29f56261a1e1f937ec88f0856a9b8321d7e
+        with:
+          version: ${{ env.LLVM_VERSION }}
+
+      - name: Install Ninja
+        if: ${{ !steps.cache-deps-restore.outputs.cache-hit }}
+        run: choco install -y ninja
+
+      - name: Build Dependencies
+        if: ${{ !steps.cache-deps-restore.outputs.cache-hit }}
+        run: |
+          .\scripts\env.ps1 ${{ matrix.cpu == 'nehalem' && '-Baseline' || '' }}
+          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
+
+      - name: Upload Dependencies
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}-deps${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}
+          path: bun-deps/
+          if-no-files-found: "error"
+
+      - name: Cache Dependencies
+        if: ${{ !steps.cache-deps-restore.outputs.cache-hit }}
+        id: cache-deps-save
+        uses: actions/cache/save@v4
+        with:
+          path: bun-deps
+          key: ${{ steps.cache-deps-restore.outputs.cache-primary-key }}
+
+  # TODO(@paperdave): stop relying on this and use bun.exe to build itself.
+  # we cant do that now because there isn't a tagged release to use.
+  #
+  # and at the time of writing, the minimum canary required to work is not
+  # yet released as it is the one *this* commit.
+  windows-codegen:
+    name: Codegen
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    if: github.repository_owner == 'oven-sh'
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86_64]
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          curl -fsSL $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
+      # Sort of a hack to do this step in the codegen stage
+      - name: Calculate Canary Revision
+        if: ${{ env.canary == 'true' }}
+        run: |
+          echo "canary_revision=$(GITHUB_TOKEN="${{ secrets.GITHUB_TOKEN }}" bash ./scripts/calculate-canary-revision.sh --raw)" > build-codegen-win32-x64/.canary_revision
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}-codegen
+          path: build-codegen-win32-x64/
+          if-no-files-found: "error"
+
+  windows-cpp:
+    name: C++ Build
+    needs: [windows-codegen]
+    runs-on: windows
+    if: github.repository_owner == 'oven-sh'
+    timeout-minutes: 90
+    strategy:
+      fail-fast: false
+      matrix:
+        cpu: [haswell, nehalem]
+        arch: [x86_64]
+    steps:
+      - run: git config --global core.autocrlf false && git config --global core.eol lf
+      - uses: actions/checkout@v4
+      - uses: KyleMayes/install-llvm-action@1a3da29f56261a1e1f937ec88f0856a9b8321d7e
+        with:
+          version: ${{ env.LLVM_VERSION }}
+      - run: choco install -y ninja
+      - name: Download Codegen
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}-codegen
+          path: build
+      - name: Build C++
+        run: |
+          # Using SCCache was blocked by an issue that is fixed in a newer version.
+          # TODO UPDATE
+          # $sczip = "sccache-v0.6.0-x86_64-pc-windows-msvc"
+                    
+          # Invoke-WebRequest -Uri "https://github.com/mozilla/sccache/releases/download/v0.6.0/${sczip}.zip" -OutFile "${sczip}.zip"
+          # Expand-Archive "${sczip}.zip"
+          # $env:SCCACHE_BUCKET="bun"
+          # $env:SCCACHE_REGION="auto"
+          # $env:SCCACHE_S3_USE_SSL="true"
+          # $env:SCCACHE_ENDPOINT="${{ secrets.CACHE_S3_ENDPOINT }}"
+          # $env:AWS_ACCESS_KEY_ID="${{ secrets.CACHE_S3_ACCESS_KEY_ID }}"
+          # $env:AWS_SECRET_ACCESS_KEY="${{ secrets.CACHE_S3_SECRET_ACCESS_KEY }}"
+          # $SCCACHE="$PWD/${sczip}/${sczip}/sccache.exe"
+
+          $CANARY_REVISION = if (Test-Path build/.canary_revision) { Get-Content build/.canary_revision } else { "0" }
+
+          .\scripts\env.ps1 ${{ matrix.cpu == 'nehalem' && '-Baseline' || '' }}
+          .\scripts\update-submodules.ps1
+          .\scripts\build-libuv.ps1 -CloneOnly $True
+          cd build
+          # "-DCCACHE_PROGRAM=${SCCACHE}"
+          cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release `
+            -DNO_CODEGEN=1 `
+            -DNO_CONFIGURE_DEPENDS=1 `
+            "-DCANARY=${CANARY_REVISION}" `
+            -DBUN_CPP_ONLY=1 ${{ matrix.cpu == 'nehalem' && '-DUSE_BASELINE_BUILD=1' || '' }}
+          if ($LASTEXITCODE -ne 0) { throw "CMake configuration failed" }
+          .\compile-cpp-only.ps1 -v
+          if ($LASTEXITCODE -ne 0) { throw "C++ compilation failed" }
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}-cpp${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}
+          path: build/bun-cpp-objects.a
+          if-no-files-found: "error"
+
+  windows-link:
+    strategy:
+      fail-fast: false
+      matrix:
+        cpu: [haswell, nehalem]
+        arch: [x86_64]
+    name: Link
+    needs: [windows-dependencies, windows-codegen, windows-cpp, windows-zig]
+    runs-on: windows-small
+    if: github.repository_owner == 'oven-sh'
+    timeout-minutes: 30
+    permissions: write-all
+    steps:
+      - run: git config --global core.autocrlf false && git config --global core.eol lf
+      - uses: actions/checkout@v4
+      - uses: KyleMayes/install-llvm-action@1a3da29f56261a1e1f937ec88f0856a9b8321d7e
+        with:
+          version: ${{ env.LLVM_VERSION }}
+      - run: choco install -y ninja
+      - name: Download Codegen
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}-codegen
+          path: build
+      - name: Download Dependencies
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}-deps${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}
+          path: bun-deps
+      - name: Download Zig Object
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}-zig${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}
+          path: bun-zig
+      - name: Download C++ Objects
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}-cpp${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}
+          path: bun-cpp
+      - name: Link
+        run: |
+          .\scripts\update-submodules.ps1
+          .\scripts\env.ps1 ${{ matrix.cpu == 'nehalem' && '-Baseline' || '' }}
+          Set-Location build
+          $CANARY_REVISION = if (Test-Path build/.canary_revision) { Get-Content build/.canary_revision } else { "0" }
+          cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release `
+            -DNO_CODEGEN=1 `
+            -DNO_CONFIGURE_DEPENDS=1 `
+            "-DCANARY=${CANARY_REVISION}" `
+            -DBUN_LINK_ONLY=1 `
+            "-DBUN_DEPS_OUT_DIR=$(Resolve-Path ../bun-deps)" `
+            "-DBUN_CPP_ARCHIVE=$(Resolve-Path ../bun-cpp/bun-cpp-objects.a)" `
+            "-DBUN_ZIG_OBJ=$(Resolve-Path ../bun-zig/bun-zig.o)" `
+            ${{ matrix.cpu == 'nehalem' && '-DUSE_BASELINE_BUILD=1' || '' }}
+          if ($LASTEXITCODE -ne 0) { throw "CMake configuration failed" }
+          ninja -v
+          if ($LASTEXITCODE -ne 0) { throw "Link failed!" }
+      - name: Package
+        run: |
+          $Dist = mkdir -Force "${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}"
+          cp -r build\bun.exe "$Dist\bun.exe"
+          Compress-Archive "$Dist" "${Dist}.zip"
+          $Dist = "$Dist-profile"
+          MkDir -Force "$Dist"
+          cp -r build\bun.exe "$Dist\bun.exe"
+          cp -r build\bun.pdb "$Dist\bun.pdb"
+          Compress-Archive "$Dist" "$Dist.zip"
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}
+          path: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}.zip
+          if-no-files-found: "error"
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}-profile
+          path: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}-profile.zip
+          if-no-files-found: "error"
+      - name: Release
+        id: release
+        uses: ncipollo/release-action@v1
+        if: |
+          github.repository_owner == 'oven-sh'
+          && github.ref == 'refs/heads/main'
+        with:
+          prerelease: true
+          body: "This canary release of Bun corresponds to the commit [${{ github.sha }}]"
+          allowUpdates: true
+          replacesArtifacts: true
+          generateReleaseNotes: true
+          artifactErrorsFailBuild: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+          name: "Canary (${{github.sha}})"
+          tag: "canary"
+          artifacts: "${{env.tag}}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}.zip,${{env.tag}}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}-profile.zip"
+      - uses: sarisia/actions-status-discord@v1
+        if: failure() && github.repository_owner == 'oven-sh' && github.event_name == 'pull_request'
+        with:
+          title: ""
+          webhook: ${{ secrets.DISCORD_WEBHOOK }}
+          status: ${{ job.status }}
+          noprefix: true
+          nocontext: true
+          description: |
+            ### [${{github.event.pull_request.title}}](https://github.com/oven-sh/bun/pull/${{github.event.number}})
+
+            @${{ github.actor }}
+
+            Build failed on Windows ${{ matrix.arch }}${{ matrix.cpu == 'nehalem' && ' Baseline' || '' }}
+
+            **[Build Output](https://github.com/oven-sh/bun/actions/runs/${{github.run_id}})** | [Commit](https://github.com/oven-sh/bun/commits/${{github.sha}})
+  windows-test:
+    name: Test
+    runs-on: windows-small
+    needs: [windows-link]
+    if: github.event_name == 'pull_request' && github.repository_owner == 'oven-sh'
+    permissions:
+      pull-requests: write
+    timeout-minutes: 180
+    outputs:
+      failing_tests: ${{ steps.test.outputs.failing_tests }}
+      failing_tests_count: ${{ steps.test.outputs.failing_tests_count }}
+    strategy:
+      fail-fast: false
+      matrix:
+        # TODO: test baseline, disabled due to noise
+        cpu: [haswell]
+        arch: [x86_64]
+    steps:
+      - run: git config --global core.autocrlf false && git config --global core.eol lf
+      - id: checkout
+        name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+      - id: download
+        name: Download Release
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.tag }}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}-profile
+          path: ${{runner.temp}}/release
+      - name: Install Bun
+        run: |
+          cd ${{runner.temp}}/release
+          unzip ${{env.tag}}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}-profile.zip
+          cd ${{env.tag}}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}-profile
+          pwd >> $env:GITHUB_PATH
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - uses: secondlife/setup-cygwin@v1
+        with:
+          packages: bash
+      - name: Install dependencies
+        run: |
+          # bun install --verbose
+          # bun install --cwd=test --verbose
+          # bun install --cwd=packages/bun-internal-test --verbose
+
+          npm install
+          cd test && npm install
+          cd ../packages/bun-internal-test && npm install
+          cd ../..
+      - id: test
+        name: Run tests
+        env:
+          SMTP_SENDGRID_SENDER: ${{ secrets.SMTP_SENDGRID_SENDER }}
+          TMPDIR: ${{runner.temp}}
+          TLS_MONGODB_DATABASE_URL: ${{ secrets.TLS_MONGODB_DATABASE_URL }}
+          TLS_POSTGRES_DATABASE_URL: ${{ secrets.TLS_POSTGRES_DATABASE_URL }}
+          SHELLOPTS: igncr
+          BUN_PATH_BASE: ${{runner.temp}}
+          BUN_PATH: release/${{env.tag}}-${{ matrix.arch == 'x86_64' && 'x64' || 'aarch64' }}${{ matrix.cpu == 'nehalem' && '-baseline' || '' }}-profile/bun.exe
+        run: |
+          node packages/bun-internal-test/src/runner.node.mjs  || true
+        shell: bash
+      - uses: sarisia/actions-status-discord@v1
+        if: always() && steps.test.outputs.failing_tests != '' && github.event_name == 'pull_request'
+        with:
+          title: ""
+          webhook: ${{ secrets.DISCORD_WEBHOOK_WINTEST }}
+          status: "failure"
+          noprefix: true
+          nocontext: true
+          description: |
+            ### ❌🪟 [${{github.event.pull_request.title}}](https://github.com/oven-sh/bun/pull/${{github.event.number}})
+
+            @${{ github.actor }}, there are **${{ steps.test.outputs.failing_test_count }} failing tests** on Windows ${{ matrix.arch }}${{ matrix.cpu == 'nehalem' && ' Baseline' || '' }}
+
+            ${{ steps.test.outputs.failing_tests }}
+
+            [Full Test Output](https://github.com/oven-sh/bun/actions/runs/${{github.run_id}})
+      - uses: sarisia/actions-status-discord@v1
+        if: always() && steps.test.outputs.regressing_tests != '' && github.event_name == 'pull_request'
+        with:
+          title: ""
+          webhook: ${{ secrets.DISCORD_WEBHOOK }}
+          status: "failure"
+          noprefix: true
+          nocontext: true
+          description: |
+            ### ❌🪟 [${{github.event.pull_request.title}}](https://github.com/oven-sh/bun/pull/${{github.event.number}})
+
+            @${{ github.actor }}, there are **${{ steps.test.outputs.regressing_test_count }} test regressions** on Windows ${{ matrix.arch }}${{ matrix.cpu == 'nehalem' && ' Baseline' || '' }}
+
+            ${{ steps.test.outputs.regressing_tests }}
+
+            [Full Test Output](https://github.com/oven-sh/bun/actions/runs/${{github.run_id}})
+      - name: Comment on PR
+        if: always() && steps.test.outputs.regressing_tests != '' && github.event_name == 'pull_request'
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          comment_tag: test-windows-${{ matrix.arch }}-${{ matrix.cpu }}
+          message: |
+            ### ❌🪟 @${{ github.actor }}, there are **${{ steps.test.outputs.regressing_test_count }} test regressions** on Windows ${{ matrix.arch }}${{ matrix.cpu == 'nehalem' && ' Baseline' || '' }}
+
+            ${{ steps.test.outputs.regressing_tests }}
+
+            [Full Test Output](https://github.com/oven-sh/bun/actions/runs/${{github.run_id}})
+      - name: Uncomment on PR
+        if: steps.test.outputs.regressing_tests == '' && github.event_name == 'pull_request'
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          comment_tag: test-windows-${{ matrix.arch }}-${{ matrix.cpu }}
+          mode: upsert
+          create_if_not_exists: false
+          message: |
+            ✅🪟 Test regressions on Windows ${{ matrix.arch }}${{ matrix.cpu == 'nehalem' && ' Baseline' || '' }} have been resolved.
+      - id: fail
+        name: Fail the build
+        if: steps.test.outputs.regressing_tests != '' && github.event_name == 'pull_request'
+        run: exit 1

.github/workflows/format.yml

@@ -0,0 +1,46 @@
+name: autofix.ci # Must be named this for autofix.ci to work
+
+permissions:
+  contents: read
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+
+env:
+  ZIG_VERSION: 0.12.0-dev.1828+225fe6ddb
+
+jobs:
+  format:
+    name: format
+    runs-on: ${{ vars.RUNNER_LINUX_X64 || 'ubuntu-latest' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            .github
+            src
+            packages
+            test
+            bench
+      - name: Setup Bun
+        uses: ./.github/actions/setup-bun
+        with:
+          bun-version: "1.0.21"
+      - name: Setup Zig
+        uses: goto-bus-stop/setup-zig@c7b6cdd3adba8f8b96984640ff172c37c93f73ee
+        with:
+          version: ${{ env.ZIG_VERSION }}
+      - name: Install Dependencies
+        run: |
+          bun install
+      - name: Format
+        run: |
+          bun fmt
+          bun fmt:zig
+      - name: Commit # https://autofix.ci/
+        uses: autofix-ci/action@d3e591514b99d0fca6779455ff8338516663f7cc

.github/workflows/prettier-fmt.yml

@@ -1,78 +0,0 @@
-name: prettier
-
-on:
-  pull_request:
-    branches:
-      - main
-      - jarred/test-actions
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  prettier-fmt:
-    name: prettier
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    outputs:
-      prettier_fmt_errs: ${{ steps.fmt.outputs.prettier_fmt_errs }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - id: setup
-        name: Setup
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: latest
-      - id: install
-        name: Install prettier
-        run: bun install
-      - name: Run prettier
-        id: fmt
-        run: |
-          rm -f .failed
-          bun prettier --check "./bench/**/*.{ts,tsx,js,jsx,mjs}" "./test/**/*.{ts,tsx,js,jsx,mjs}" "./src/**/*.{ts,tsx,js,jsx}" --config .prettierrc.cjs 2> prettier-fmt.err > prettier-fmt1.err || echo 'failed' > .failed 
-
-          if [ -s .failed ]; then
-            delimiter="$(openssl rand -hex 8)"
-            echo "prettier_fmt_errs<<${delimiter}" >> "${GITHUB_OUTPUT}"
-            cat prettier-fmt.err >> "${GITHUB_OUTPUT}"
-            cat prettier-fmt1.err >> "${GITHUB_OUTPUT}"
-            echo "${delimiter}" >> "${GITHUB_OUTPUT}"
-          fi
-      - name: Comment on PR
-        if: steps.fmt.outputs.prettier_fmt_errs != ''
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          comment_tag: prettier-fmt
-          message: |
-            ❌ @${{ github.actor }} `prettier` reported errors
-
-            ```js
-            ${{ steps.fmt.outputs.prettier_fmt_errs }}
-            ```
-
-            To one-off fix this manually, run:
-            ```sh
-            bun fmt
-            ```
-
-            You might need to run `bun install` locally and configure your text editor to [auto-format on save](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode).
-
-            <sup>[#${{github.sha}}](https://github.com/oven-sh/bun/commits/${{github.sha}})</sup>
-      - name: Uncomment on PR
-        if: steps.fmt.outputs.prettier_fmt_errs == ''
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          comment_tag: prettier-fmt
-          mode: upsert
-          create_if_not_exists: false
-          message: |
-            ✅ `prettier` errors have been resolved. Thank you.
-
-            <sup>[#${{github.sha}}](https://github.com/oven-sh/bun/commits/${{github.sha}})</sup>
-      - name: Fail the job
-        if: steps.fmt.outputs.prettier_fmt_errs != ''
-        run: exit 1

.github/workflows/zig-fmt.yml

@@ -1,89 +0,0 @@
-name: zig-fmt
-
-env:
-  ZIG_VERSION: 0.12.0-dev.163+6780a6bbf
-
-on:
-  pull_request:
-    branches:
-      - main
-      - jarred/test-actions
-    paths:
-      - "src/**/*.zig"
-      - "src/*.zig"
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  zig-fmt:
-    name: zig fmt
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    outputs:
-      zig_fmt_errs: ${{ steps.fmt.outputs.zig_fmt_errs }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Install zig
-        run: |
-          curl https://ziglang.org/builds/zig-linux-x86_64-${{env.ZIG_VERSION}}.tar.xz -L -o zig.tar.xz
-          tar -xf zig.tar.xz
-          echo "$(pwd)/zig-linux-x86_64-${{env.ZIG_VERSION}}" >> $GITHUB_PATH
-      - name: Run zig fmt
-        id: fmt
-        run: |
-          zig fmt --check src/*.zig src/**/*.zig 2> zig-fmt.err > zig-fmt.err2 || echo "Failed"
-          delimiter="$(openssl rand -hex 8)"
-          echo "zig_fmt_errs<<${delimiter}" >> "${GITHUB_OUTPUT}"
-
-          if [ -s zig-fmt.err ]; then
-            echo "// The following errors occurred:" >> "${GITHUB_OUTPUT}"
-            cat zig-fmt.err >> "${GITHUB_OUTPUT}"
-          fi
-
-          if [ -s zig-fmt.err2 ]; then
-            echo "// The following files were not formatted:" >> "${GITHUB_OUTPUT}"
-            cat zig-fmt.err2 >> "${GITHUB_OUTPUT}"
-          fi
-
-          echo "${delimiter}" >> "${GITHUB_OUTPUT}"
-      - name: Comment on PR
-        if: steps.fmt.outputs.zig_fmt_errs != ''
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          comment_tag: zig-fmt
-          message: |
-            ❌ @${{ github.actor }} `zig fmt` reported errors. Consider configuring your text editor to [auto-format on save](https://github.com/ziglang/vscode-zig)
-
-            ```zig
-            // # zig fmt --check src/*.zig src/**/*.zig
-            ${{ steps.fmt.outputs.zig_fmt_errs }}
-            ```
-
-            To one-off fix this manually, run:
-
-            ```sh
-            zig fmt src/*.zig src/**/*.zig
-            ```
-
-            <sup>[#${{github.sha}}](https://github.com/oven-sh/bun/commits/${{github.sha}})</sup>
-            <sup>zig v${{env.ZIG_VERSION}}</sup>
-
-      - name: Uncomment on PR
-        if: steps.fmt.outputs.zig_fmt_errs == ''
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          comment_tag: zig-fmt
-          mode: upsert
-          create_if_not_exists: false
-          message: |
-            ✅ `zig fmt` errors have been resolved. Thank you.
-
-            <sup>[#${{github.sha}}](https://github.com/oven-sh/bun/commits/${{github.sha}})</sup>
-            <sup>zig v${{env.ZIG_VERSION}}</sup>
-
-      - name: Fail the job
-        if: steps.fmt.outputs.zig_fmt_errs != ''
-        run: exit 1

.gitignore

@@ -1,137 +1,169 @@
-.DS_Store
-zig-cache
-packages/*/*.wasm
-*.o
-*.a
-profile.json
-
-node_modules
-.envrc
-.swcrc
-yarn.lock
-dist
-*.tmp
-*.log
-*.out.js
-*.out.refresh.js
-**/package-lock.json
-build
-*.wat
-zig-out
-pnpm-lock.yaml
-README.md.template
-src/deps/zig-clap/example
-src/deps/zig-clap/README.md
-src/deps/zig-clap/.github
-src/deps/zig-clap/.gitattributes
-out
-outdir
-
-.trace
-cover
-coverage
-coverv
-*.trace
-github
-out.*
-out
-.parcel-cache
-esbuilddir
-*.bun
-parceldist
-esbuilddir
-outdir/
-outcss
-.next
-txt.js
-.idea
-.vscode/cpp*
-.vscode/clang*
-
-node_modules_*
-*.jsb
-*.zip
-bun-zigld
-bun-singlehtreaded
-bun-nomimalloc
-bun-mimalloc
-examples/lotta-modules/bun-yday
-examples/lotta-modules/bun-old
-examples/lotta-modules/bun-nofscache
-
-src/node-fallbacks/out/*
-src/node-fallbacks/node_modules
-sign.json
-release/
-*.dmg
-sign.*.json
-packages/debug-*
-packages/bun-cli/postinstall.js
-packages/bun-*/bun
-packages/bun-*/bun-profile
-packages/bun-*/debug-bun
-packages/bun-*/*.o
-packages/bun-cli/postinstall.js
-
-packages/bun-cli/bin/*
-bun-test-scratch
-misctools/fetch
-
-src/deps/libiconv
-src/deps/openssl
-src/tests.zig
-*.blob
-src/deps/s2n-tls
-.npm
-.npm.gz
-
-bun-binary
-
-src/deps/PLCrashReporter/
-
-*.dSYM
-*.crash
-misctools/sha
-packages/bun-wasm/*.mjs
-packages/bun-wasm/*.cjs
-packages/bun-wasm/*.map
-packages/bun-wasm/*.js
-packages/bun-wasm/*.d.ts
-packages/bun-wasm/*.d.cts
-packages/bun-wasm/*.d.mts
-*.bc
-
-src/fallback.version
-src/runtime.version
-*.sqlite
-*.database
-*.db
-misctools/machbench
-*.big
-.eslintcache
-
-bun-webkit
-
-src/deps/c-ares/build
-src/bun.js/bindings-obj
-src/bun.js/debug-bindings-obj
-
-failing-tests.txt
-test.txt
-myscript.sh
-
-cold-jsc-start
-cold-jsc-start.d
-
-/test.ts
-/test.js
-
-src/js/out/modules*
-src/js/out/functions*
-src/js/out/tmp
-src/js/out/DebugPath.h
-
-make-dev-stats.csv
-
-.uuid
-tsconfig.tsbuildinfo
+.DS_Store
+zig-cache
+packages/*/*.wasm
+*.o
+*.a
+profile.json
+
+.env
+node_modules
+.envrc
+.swcrc
+yarn.lock
+dist
+*.tmp
+*.log
+*.out.js
+*.out.refresh.js
+**/package-lock.json
+build
+*.wat
+zig-out
+pnpm-lock.yaml
+README.md.template
+src/deps/zig-clap/example
+src/deps/zig-clap/README.md
+src/deps/zig-clap/.github
+src/deps/zig-clap/.gitattributes
+out
+outdir
+
+.trace
+cover
+coverage
+coverv
+*.trace
+github
+out.*
+out
+.parcel-cache
+esbuilddir
+*.bun
+parceldist
+esbuilddir
+outdir/
+outcss
+.next
+txt.js
+.idea
+.vscode/cpp*
+.vscode/clang*
+
+node_modules_*
+*.jsb
+*.zip
+bun-zigld
+bun-singlehtreaded
+bun-nomimalloc
+bun-mimalloc
+examples/lotta-modules/bun-yday
+examples/lotta-modules/bun-old
+examples/lotta-modules/bun-nofscache
+
+src/node-fallbacks/out/*
+src/node-fallbacks/node_modules
+sign.json
+release/
+*.dmg
+sign.*.json
+packages/debug-*
+packages/bun-cli/postinstall.js
+packages/bun-*/bun
+packages/bun-*/bun-profile
+packages/bun-*/debug-bun
+packages/bun-*/*.o
+packages/bun-cli/postinstall.js
+
+packages/bun-cli/bin/*
+bun-test-scratch
+misctools/fetch
+
+src/deps/libiconv
+src/deps/openssl
+src/tests.zig
+*.blob
+src/deps/s2n-tls
+.npm
+.npm.gz
+
+bun-binary
+
+src/deps/PLCrashReporter/
+
+*.dSYM
+*.crash
+misctools/sha
+packages/bun-wasm/*.mjs
+packages/bun-wasm/*.cjs
+packages/bun-wasm/*.map
+packages/bun-wasm/*.js
+packages/bun-wasm/*.d.ts
+packages/bun-wasm/*.d.cts
+packages/bun-wasm/*.d.mts
+*.bc
+
+src/fallback.version
+src/runtime.version
+*.sqlite
+*.database
+*.db
+misctools/machbench
+*.big
+.eslintcache
+
+/bun-webkit
+
+src/deps/c-ares/build
+src/bun.js/bindings-obj
+src/bun.js/debug-bindings-obj
+
+failing-tests.txt
+test.txt
+myscript.sh
+
+cold-jsc-start
+cold-jsc-start.d
+
+/testdir
+/test.ts
+/test.js
+
+src/js/out/modules*
+src/js/out/functions*
+src/js/out/tmp
+src/js/out/DebugPath.h
+
+make-dev-stats.csv
+
+.uuid
+tsconfig.tsbuildinfo
+
+test/js/bun/glob/fixtures
+*.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
+/.cache
+/src/deps/libuv
+/build-*/
+/kcov-out
+
+.vs
+
+**/.verdaccio-db.json
+/test-report.md
+/test-report.json

.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,30 @@ 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
+[submodule "src/deps/ls-hpack"]
+path = src/deps/ls-hpack
+url = https://github.com/litespeedtech/ls-hpack.git
+ignore = dirty
+depth = 1
+shallow = true
+fetchRecurseSubmodules = false

.prettierignore

@@ -1,13 +1,5 @@
-src/fallback.html
 src/bun.js/WebKit
-src/js/out
-src/*.out.js
-src/*out.*.js
 src/deps
-src/test/fixtures
-src/react-refresh.js
 test/snapshots
-test/snapshots-no-hmr
-test/js/deno/*.test.ts
-test/js/deno/**/*.test.ts
-bench/react-hello-world/react-hello-world.node.js
+test/js/deno
+src/react-refresh.js

.prettierrc

@@ -0,0 +1,15 @@
+{
+  "arrowParens": "avoid",
+  "printWidth": 120,
+  "trailingComma": "all",
+  "useTabs": false,
+  "quoteProps": "preserve",
+  "overrides": [
+    {
+      "files": ["*.md"],
+      "options": {
+        "printWidth": 80
+      }
+    }
+  ]
+}

.prettierrc.cjs

@@ -1,15 +0,0 @@
-module.exports = {
-  arrowParens: "avoid",
-  printWidth: 120,
-  trailingComma: "all",
-  useTabs: false,
-  quoteProps: "preserve",
-  overrides: [
-    {
-      files: ["*.md"],
-      options: {
-        printWidth: 80,
-      },
-    },
-  ],
-};

.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,65 @@
 {
   "configurations": [
     {
-      "name": "Mac",
+      "name": "Debug",
+      "forcedInclude": ["${workspaceFolder}/src/bun.js/bindings/root.h"],
+      "compileCommands": "${workspaceFolder}/build/compile_commands.json",
+      "includePath": [
+        "${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}/../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/webcore/",
         "${workspaceFolder}/src/bun.js/bindings/sqlite/",
@@ -26,13 +75,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 +96,7 @@
           "${workspaceFolder}/src/napi"
         ],
         "limitSymbolsToIncludedHeaders": true,
-        "databaseFilename": ".vscode/cppdb"
+        "databaseFilename": ".vscode/cppdb_debug"
       },
       "defines": [
         "STATICALLY_LINKED_WITH_JavaScriptCore=1",
@@ -59,7 +106,7 @@
         "ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS=0",
         "BUILDING_JSCONLY__",
         "USE_FOUNDATION=1",
-        "ASSERT_ENABLED=0",
+        "ASSERT_ENABLED=1",
         "DU_DISABLE_RENAMING=1"
       ],
       "macFrameworkPath": [],

.vscode/extensions.json

@@ -1,10 +1,33 @@
 {
   "recommendations": [
+    // Zig
     "ziglang.vscode-zig",
-    "esbenp.prettier-vscode",
+
+    // C/C++
+    "clang.clangd",
+    "ms-vscode.cmake-tools",
     "xaver.clang-format",
     "vadimcn.vscode-lldb",
-    "bierner.comment-tagged-templates",
-    "ms-vscode.cpptools"
+
+    // JavaScript
+    "oven.bun-vscode",
+    "esbenp.prettier-vscode",
+
+    // TypeScript
+    "better-ts-errors.better-ts-errors",
+    "MylesMurphy.prettify-ts",
+
+    // Markdown
+    "bierner.markdown-preview-github-styles",
+    "bierner.markdown-emoji",
+    "bierner.emojisense",
+    "bierner.markdown-checkbox",
+    "bierner.jsdoc-markdown-highlighting",
+
+    // TOML
+    "tamasfe.even-better-toml",
+
+    // Other
+    "bierner.comment-tagged-templates"
   ]
 }

.vscode/settings.json

@@ -1,51 +1,89 @@
 {
-  "git.autoRepositoryDetection": "openEditors",
+  // Editor
+  "editor.tabSize": 2,
+  "editor.insertSpaces": true,
+  "editor.formatOnSave": true,
+  "editor.formatOnSaveMode": "file",
+
+  // Search
   "search.quickOpen.includeSymbols": false,
   "search.seedWithNearestWord": true,
   "search.smartCase": true,
-  "search.exclude": {},
+  "search.exclude": {
+    "node_modules": true,
+    ".git": true,
+    "src/bun.js/WebKit": true,
+    "src/deps/*/**": true
+  },
   "search.followSymlinks": false,
   "search.useIgnoreFiles": true,
+
+  // Git
+  "git.autoRepositoryDetection": "openEditors",
+  "git.ignoreSubmodules": true,
+  "git.ignoreLimitWarning": true,
+
+  // Zig
+  "zig.initialSetupDone": 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.buildOption": "build",
   "zig.buildFilePath": "${workspaceFolder}/build.zig",
+  "zig.path": "${workspaceFolder}/.cache/zig/zig.exe",
+  "zig.formattingProvider": "zls",
+  "zig.zls.enableInlayHints": false,
   "[zig]": {
     "editor.tabSize": 4,
     "editor.useTabStops": false,
-    "editor.defaultFormatter": "ziglang.vscode-zig",
-    "editor.formatOnSave": true
+    "editor.defaultFormatter": "ziglang.vscode-zig"
   },
-  "[ts]": {
+
+  // C++
+  "lldb.verboseLogging": false,
+  "cmake.configureOnOpen": false,
+  "C_Cpp.errorSquiggles": "enabled",  
+  "[cpp]": {
+    "editor.defaultFormatter": "xaver.clang-format"
+  },
+  "[c]": {
+    "editor.defaultFormatter": "xaver.clang-format"
+  },
+  "[h]": {
+    "editor.defaultFormatter": "xaver.clang-format"
+  },
+
+  // JavaScript
+  "prettier.enable": true,
+  "eslint.workingDirectories": ["${workspaceFolder}/packages/bun-types"],
+  "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true
   },
-  "[js]": {
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+
+  // TypeScript
+  "typescript.tsdk": "${workspaceFolder}/node_modules/typescript/lib",
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+
+  // JSON
+  "[json]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true
   },
-  "zig.zls.enableInlayHints": false,
-  "zig.zls.enabled": true,
-  "git.ignoreSubmodules": true,
-  "[jsx]": {
+  "[jsonc]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true
-  },
-  "[tsx]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true
-  },
-  "[yaml]": {
-    "editor.formatOnSave": true
   },
+  
+  // Markdown
   "[markdown]": {
-    "editor.unicodeHighlight.ambiguousCharacters": false,
-    "editor.unicodeHighlight.invisibleCharacters": false,
-    "diffEditor.ignoreTrimWhitespace": false,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true,
+    "editor.unicodeHighlight.ambiguousCharacters": true,
+    "editor.unicodeHighlight.invisibleCharacters": true,
+    "diffEditor.ignoreTrimWhitespace": false,
     "editor.wordWrap": "on",
     "editor.quickSuggestions": {
       "comments": "off",
@@ -53,7 +91,18 @@
       "other": "off"
     }
   },
-  "lldb.verboseLogging": false,
+
+  // TOML
+  "[toml]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+  },
+
+  // YAML
+  "[yaml]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+  },
+
+  // Files
   "files.exclude": {
     "**/.git": true,
     "**/.svn": true,
@@ -63,10 +112,7 @@
     "**/Thumbs.db": true,
     "**/*.xcworkspacedata": true,
     "**/*.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,
@@ -79,152 +125,28 @@
     "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
+    "**/*.i": true,
+    "packages/bun-uws/fuzzing/seed-corpus": true
+  },
+  "files.associations": {
+    "*.idl": "cpp"
   },
   "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"
-  },
-  "[h]": {
-    "editor.defaultFormatter": "xaver.clang-format"
-  },
-  "[c]": {
-    "editor.defaultFormatter": "xaver.clang-format"
-  },
-  "files.associations": {
-    "*.lock": "yarnlock",
-    "*.idl": "cpp",
-    "memory": "cpp",
-    "iostream": "cpp",
-    "algorithm": "cpp",
-    "random": "cpp",
-    "ios": "cpp",
-    "filesystem": "cpp",
-    "__locale": "cpp",
-    "type_traits": "cpp",
-    "__mutex_base": "cpp",
-    "__string": "cpp",
-    "string": "cpp",
-    "string_view": "cpp",
-    "typeinfo": "cpp",
-    "__config": "cpp",
-    "__nullptr": "cpp",
-    "exception": "cpp",
-    "__bit_reference": "cpp",
-    "atomic": "cpp",
-    "utility": "cpp",
-    "sstream": "cpp",
-    "__functional_base": "cpp",
-    "new": "cpp",
-    "__debug": "cpp",
-    "__errc": "cpp",
-    "__hash_table": "cpp",
-    "__node_handle": "cpp",
-    "__split_buffer": "cpp",
-    "__threading_support": "cpp",
-    "__tuple": "cpp",
-    "array": "cpp",
-    "bit": "cpp",
-    "bitset": "cpp",
-    "cctype": "cpp",
-    "chrono": "cpp",
-    "clocale": "cpp",
-    "cmath": "cpp",
-    "complex": "cpp",
-    "condition_variable": "cpp",
-    "cstdarg": "cpp",
-    "cstddef": "cpp",
-    "cstdint": "cpp",
-    "cstdio": "cpp",
-    "cstdlib": "cpp",
-    "cstring": "cpp",
-    "ctime": "cpp",
-    "cwchar": "cpp",
-    "cwctype": "cpp",
-    "deque": "cpp",
-    "fstream": "cpp",
-    "functional": "cpp",
-    "initializer_list": "cpp",
-    "iomanip": "cpp",
-    "iosfwd": "cpp",
-    "istream": "cpp",
-    "iterator": "cpp",
-    "limits": "cpp",
-    "locale": "cpp",
-    "mutex": "cpp",
-    "optional": "cpp",
-    "ostream": "cpp",
-    "ratio": "cpp",
-    "stack": "cpp",
-    "stdexcept": "cpp",
-    "streambuf": "cpp",
-    "system_error": "cpp",
-    "thread": "cpp",
-    "tuple": "cpp",
-    "unordered_map": "cpp",
-    "unordered_set": "cpp",
-    "vector": "cpp",
-    "__bits": "cpp",
-    "__tree": "cpp",
-    "map": "cpp",
-    "numeric": "cpp",
-    "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",
-    "typeindex": "cpp",
-    "__verbose_abort": "cpp",
-    "__std_stream": "cpp",
-    "any": "cpp",
-    "charconv": "cpp",
-    "csignal": "cpp",
-    "format": "cpp",
-    "forward_list": "cpp",
-    "future": "cpp",
-    "regex": "cpp",
-    "span": "cpp",
-    "valarray": "cpp",
-    "codecvt": "cpp"
-  },
-  "cmake.configureOnOpen": false,
-  "C_Cpp.errorSquiggles": "enabled",
-  "eslint.workingDirectories": ["packages/bun-types"],
-  "typescript.tsdk": "node_modules/typescript/lib"
 }

.vscode/tasks.json

@@ -2,33 +2,51 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "build",
       "type": "process",
-      "command": "zig",
-      "args": ["build"],
-      "presentation": {
-        "echo": true,
-        "reveal": "silent",
-        "focus": false,
-        "panel": "shared",
-        "showReuseMessage": false,
-        "clear": false
+      "label": "Install Dependencies",
+      "command": "scripts/all-dependencies.sh",
+      "windows": {
+        "command": "scripts/all-dependencies.ps1"
+      },
+      "icon": {
+        "id": "arrow-down"
+      },
+      "options": {
+        "cwd": "${workspaceFolder}"
       },
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      }
     },
     {
-      "label": "run",
       "type": "process",
-      "command": "zig",
-      "args": ["run", "${file}"],
-      "group": "build",
-      "presentation": {
-        "showReuseMessage": false,
-        "clear": true
-      }
-    }
+      "label": "Setup Environment",
+      "dependsOn": ["Install Dependencies"],
+      "command": "scripts/setup.sh",
+      "windows": {
+        "command": "scripts/setup.ps1"
+      },
+      "icon": {
+        "id": "check"
+      },
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
+    },
+    {
+      "type": "process",
+      "label": "Build Bun",
+      "dependsOn": ["Setup Environment"],
+      "command": "bun",
+      "args": ["run", "build"],
+      "icon": {
+        "id": "gear"
+      },
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
+      "isBuildCommand": true,
+      "runOptions": {
+        "instanceLimit": 1,
+        "reevaluateOnRerun": true,
+      },
+    },
   ]
 }

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))
 
@@ -18,7 +18,7 @@ The JavaScript transpiler & module resolver is mostly independent from the runti
 
 ## Getting started
 
-Please refer to [Bun's Development Guide](https://bun.sh/docs/project/development) to get your dev environment setup!
+Please refer to [Bun's Development Guide](https://bun.sh/docs/project/contributing) to get your dev environment setup!
 
 ## Memory management in Bun
 

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)
@@ -463,7 +455,8 @@ ARCHIVE_FILES_WITHOUT_LIBCRYPTO = $(MINIMUM_ARCHIVE_FILES) \
 		-lusockets \
 		-lcares \
 		-lzstd \
-		$(BUN_DEPS_OUT_DIR)/libuwsockets.o
+		$(BUN_DEPS_OUT_DIR)/libuwsockets.o \
+		$(BUN_DEPS_OUT_DIR)/liblshpack.a
 
 ARCHIVE_FILES = $(ARCHIVE_FILES_WITHOUT_LIBCRYPTO)
 
@@ -680,7 +673,7 @@ assert-deps:
 	@echo "You have the dependencies installed! Woo"
 
 # the following allows you to run `make submodule` to update or init submodules. but we will exclude webkit
-# unless you explicity clone it yourself (a huge download)
+# unless you explicitly clone it yourself (a huge download)
 SUBMODULE_NAMES=$(shell cat .gitmodules | grep 'path = ' | awk '{print $$3}')
 ifeq ("$(wildcard src/bun.js/WebKit/.git)", "")
 	SUBMODULE_NAMES := $(filter-out src/bun.js/WebKit, $(SUBMODULE_NAMES))
@@ -757,14 +750,24 @@ wasm: api mimalloc-wasm build-obj-wasm-small
 build-obj-safe:
 	$(ZIG) build obj -Doptimize=ReleaseSafe -Dcpu="$(CPU_TARGET)"
 
-UWS_CC_FLAGS = -pthread  -DLIBUS_USE_OPENSSL=1 -DUWS_HTTPRESPONSE_NO_WRITEMARK=1  -DLIBUS_USE_BORINGSSL=1 -DWITH_BORINGSSL=1 -Wpedantic -Wall -Wextra -Wsign-conversion -Wconversion $(UWS_INCLUDE) -DUWS_WITH_PROXY
+UWS_CC_FLAGS = -pthread  -DLIBUS_USE_OPENSSL=1 -DUWS_HTTPRESPONSE_NO_WRITEMARK=1 -DLIBUS_USE_BORINGSSL=1 -DWITH_BORINGSSL=1 -Wpedantic -Wall -Wextra -Wsign-conversion -Wconversion $(UWS_INCLUDE) -DUWS_WITH_PROXY
 UWS_CXX_FLAGS = $(UWS_CC_FLAGS) -std=$(CXX_VERSION) -fno-exceptions -fno-rtti
 UWS_LDFLAGS = -I$(BUN_DEPS_DIR)/boringssl/include -I$(ZLIB_INCLUDE_DIR)
 USOCKETS_DIR = $(BUN_DIR)/packages/bun-usockets
 USOCKETS_SRC_DIR = $(USOCKETS_DIR)/src
 
+
+LSHPACK_SRC_DIR = $(BUN_DEPS_DIR)/ls-hpack
+LSHPACK_CC_FLAGS = -DXXH_HEADER_NAME="<xxhash.h>"
+LSHPACK_LDFLAGS = -I$(LSHPACK_SRC_DIR) -I$(LSHPACK_SRC_DIR)/deps/xxhash
+
+lshpack:
+	rm -rf $(LSHPACK_SRC_DIR)/*.i $(LSHPACK_SRC_DIR)/*.bc $(LSHPACK_SRC_DIR)/*.o $(LSHPACK_SRC_DIR)/*.s $(LSHPACK_SRC_DIR)/*.ii $(LSHPACK_SRC_DIR)/*.s
+	cd $(LSHPACK_SRC_DIR) && $(CC_WITH_CCACHE) -I$(LSHPACK_SRC_DIR)  -fno-builtin-malloc -fno-builtin-free -fno-builtin-realloc $(EMIT_LLVM_FOR_RELEASE)  $(MACOS_MIN_FLAG) -fPIC $(CFLAGS) $(LSHPACK_CC_FLAGS) -save-temps -I$(BUN_DEPS_DIR)/uws/lshpack/src $(LSHPACK_LDFLAGS) -g $(DEFAULT_LINKER_FLAGS) $(PLATFORM_LINKER_FLAGS) $(OPTIMIZATION_LEVEL) -c $(wildcard $(LSHPACK_SRC_DIR)/lshpack.c) $(wildcard $(LSHPACK_SRC_DIR)/deps/**/*.c)
+	cd $(LSHPACK_SRC_DIR) && $(AR) rcvs $(BUN_DEPS_OUT_DIR)/liblshpack.a $(LSHPACK_SRC_DIR)/*.{o,bc}
+
 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}
@@ -820,7 +823,6 @@ fmt: fmt-cpp fmt-zig
 api:
 	./node_modules/.bin/peechy --schema src/api/schema.peechy --esm src/api/schema.js --ts src/api/schema.d.ts --zig src/api/schema.zig
 	$(ZIG) fmt src/api/schema.zig
-	$(PRETTIER) --config=.prettierrc.cjs --write src/api/schema.js src/api/schema.d.ts
 
 .PHONY: node-fallbacks
 node-fallbacks:
@@ -833,17 +835,7 @@ 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
-
-.PHONY: runtime_js_dev
-runtime_js_dev:
-	@NODE_ENV=development $(ESBUILD) --define:process.env.NODE_ENV="development" --target=esnext  --bundle src/runtime/index.ts --format=iife --platform=browser --global-name=BUN_RUNTIME --external:/bun:* > src/runtime.out.js; cat src/runtime.footer.js >> src/runtime.out.js
-	@NODE_ENV=development $(ESBUILD) --define:process.env.NODE_ENV="development" --target=esnext  --bundle src/runtime/index-with-refresh.ts --format=iife --platform=browser --global-name=BUN_RUNTIME --external:/bun:* > src/runtime.out.refresh.js; cat src/runtime.footer.with-refresh.js >> src/runtime.out.refresh.js
-	@NODE_ENV=development $(ESBUILD) --define:process.env.NODE_ENV="development" --target=esnext  --bundle src/runtime/index-without-hmr.ts --format=iife --platform=node --global-name=BUN_RUNTIME --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=development $(ESBUILD) --define:process.env.NODE_ENV="development" --target=esnext  --bundle src/runtime/index-without-hmr.ts --format=iife --platform=node --global-name=BUN_RUNTIME --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.bun.js --format=esm --platform=node --minify --external:/bun:* > src/runtime.out.js
 
 .PHONY: bun_error
 bun_error:
@@ -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
@@ -1251,6 +1246,7 @@ jsc-build-mac-compile-debug:
 			-DENABLE_FTL_JIT=ON \
 			-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
 			-DUSE_BUN_JSC_ADDITIONS=ON \
+			-DENABLE_BUN_SKIP_FAILING_ASSERTIONS=ON \
 			-DALLOW_LINE_AND_COLUMN_NUMBER_IN_BUILTINS=ON \
 			-G Ninja \
 			$(CMAKE_FLAGS_WITHOUT_RELEASE) \
@@ -1326,7 +1322,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
@@ -1360,7 +1356,7 @@ mimalloc-debug:
 			-GNinja \
 			. \
 			&& ninja
-	cp $(BUN_DEPS_DIR)/mimalloc/$(_MIMALLOC_DEBUG_FILE) $(BUN_DEPS_OUT_DIR)/$(MIMALLOC_FILE)
+	cp $(BUN_DEPS_DIR)/mimalloc/$(_MIMALLOC_DEBUG_FILE) $(BUN_DEPS_OUT_DIR)/$(_MIMALLOC_DEBUG_FILE)
 
 
 # mimalloc is built as object files so that it can overload the system malloc on linux
@@ -1485,12 +1481,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
@@ -1726,7 +1722,7 @@ sizegen:
 # Linux uses bundled SQLite3
 ifeq ($(OS_NAME),linux)
 sqlite:
-	$(CC) $(EMIT_LLVM_FOR_RELEASE) $(CFLAGS) $(INCLUDE_DIRS) -DSQLITE_ENABLE_COLUMN_METADATA= -DSQLITE_MAX_VARIABLE_NUMBER=250000 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_ENABLE_JSON1=1 $(SRC_DIR)/sqlite/sqlite3.c -c -o $(SQLITE_OBJECT)
+	$(CC) $(EMIT_LLVM_FOR_RELEASE) $(CFLAGS) $(INCLUDE_DIRS) -DSQLITE_ENABLE_COLUMN_METADATA= -DSQLITE_MAX_VARIABLE_NUMBER=250000 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_ENABLE_JSON1=1 -DSQLITE_ENABLE_MATH_FUNCTIONS=1 $(SRC_DIR)/sqlite/sqlite3.c -c -o $(SQLITE_OBJECT)
 endif
 
 picohttp:
@@ -1900,7 +1896,7 @@ cold-jsc-start:
 		misctools/cold-jsc-start.cpp -o cold-jsc-start
 
 .PHONY: vendor-without-npm
-vendor-without-npm: node-fallbacks runtime_js fallback_decoder bun_error mimalloc picohttp zlib boringssl libarchive lolhtml sqlite usockets uws tinycc c-ares zstd base64
+vendor-without-npm: node-fallbacks runtime_js fallback_decoder bun_error mimalloc picohttp zlib boringssl libarchive lolhtml sqlite usockets uws lshpack tinycc c-ares zstd base64
 
 
 .PHONY: vendor-without-check
@@ -1913,46 +1909,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

@@ -24,9 +24,9 @@
 
 ## What is Bun?
 
-> **​​Bun is under active development.** Use it to speed up your development workflows or run simpler production code in resource-constrained environments like serverless functions. We're working on more complete Node.js compatibility and integration with existing frameworks. Join the [Discord](https://bun.sh/discord) and watch the [GitHub repository](https://github.com/oven-sh/bun) to keep tabs on future releases.
+> **Bun is under active development.** Use it to speed up your development workflows or run simpler production code in resource-constrained environments like serverless functions. We're working on more complete Node.js compatibility and integration with existing frameworks. Join the [Discord](https://bun.sh/discord) and watch the [GitHub repository](https://github.com/oven-sh/bun) to keep tabs on future releases.
 
-Bun is an all-in-one toolkit for JavaScript and TypeScript apps. It ships as a single executable called `bun​`.
+Bun is an all-in-one toolkit for JavaScript and TypeScript apps. It ships as a single executable called `bun`.
 
 At its core is the _Bun runtime_, a fast JavaScript runtime designed as a drop-in replacement for Node.js. It's written in Zig and powered by JavaScriptCore under the hood, dramatically reducing startup times and memory usage.
 
@@ -34,12 +34,12 @@ At its core is the _Bun runtime_, a fast JavaScript runtime designed as a drop-i
 bun run index.tsx             # TS and JSX supported out-of-the-box
 ```
 
-​​The `bun​` command-line tool also implements a test runner, script runner, and Node.js-compatible package manager. Instead of 1,000 node_modules for development, you only need `bun`. Bun's built-in tools are significantly faster than existing options and usable in existing Node.js projects with little to no changes.
+The `bun` command-line tool also implements a test runner, script runner, and Node.js-compatible package manager. Instead of 1,000 node_modules for development, you only need `bun`. Bun's built-in tools are significantly faster than existing options and usable in existing Node.js projects with little to no changes.
 
 ```bash
 bun test                      # run tests
 bun run start                 # run the `start` script in `package.json`
-bun install <pkg>​             # install a package
+bun install <pkg>             # install a package
 bunx cowsay 'Hello, world!'   # execute a package
 ```
 
@@ -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)
@@ -128,7 +128,7 @@ bun upgrade --canary
 
 ## Contributing
 
-Refer to the [Project > Development](https://bun.sh/docs/project/development) guide to start contributing to Bun.
+Refer to the [Project > Contributing](https://bun.sh/docs/project/contributing) guide to start contributing to Bun.
 
 ## License
 

bench/emitter/realworld_stream.mjs

@@ -1,7 +1,7 @@
 import { bench, run } from "mitata";
 import { groupForEmitter } from "./implementations.mjs";
 
-// Psuedo RNG is derived from https://stackoverflow.com/a/424445
+// Pseudo RNG is derived from https://stackoverflow.com/a/424445
 let rngState = 123456789;
 function nextInt() {
   const m = 0x80000000; // 2**31;

bench/glob/braces.mjs

@@ -0,0 +1,37 @@
+import braces from "braces";
+import { group, bench, run } from "mitata";
+
+// const iterations = 1000;
+const iterations = 100;
+
+const simplePattern = "foo.{js,jsx,ts,tsx}";
+const complexPattern = "{a,b,HI{c,e,LMAO{d,f}Q}} wow {a,b}";
+const veryComplexPattern = "{a,b,HI{c,e,LMAO{d,f}Q}}{1,2,{3,4},5}";
+
+console.log(braces(complexPattern, { expand: true }));
+function benchPattern(pattern, name) {
+  group({ name: `${name} pattern: "${pattern}"`, summary: true }, () => {
+    if (typeof Bun !== "undefined")
+      bench("Bun", () => {
+        for (let i = 0; i < iterations; i++) {
+          Bun.$.braces(pattern);
+        }
+      });
+
+    bench("micromatch/braces", () => {
+      for (let i = 0; i < iterations; i++) {
+        braces(pattern, { expand: true });
+      }
+    });
+  });
+}
+
+benchPattern(simplePattern, "simple");
+benchPattern(complexPattern, "complex");
+benchPattern(veryComplexPattern, "very complex pattern");
+
+await run({
+  avg: true,
+  min_max: true,
+  percentiles: true,
+});

bench/glob/match.mjs

@@ -0,0 +1,19 @@
+import micromatch from "micromatch";
+import { bench, run } from "mitata";
+
+const Glob = typeof Bun !== "undefined" ? Bun.Glob : undefined;
+const doMatch = typeof Bun === "undefined" ? micromatch.isMatch : (a, b) => new Glob(b).match(a);
+
+bench((Glob ? "Bun.Glob - " : "micromatch - ") + "**/*.js", () => {
+  doMatch("foo/bar.js", "**/*.js");
+});
+
+bench((Glob ? "Bun.Glob - " : "micromatch - ") + "*.js", () => {
+  doMatch("bar.js", "*.js");
+});
+
+await run({
+  avg: true,
+  min_max: true,
+  percentiles: true,
+});

bench/glob/scan.mjs

@@ -0,0 +1,113 @@
+import { run, bench, group } from "mitata";
+import fg from "fast-glob";
+import { fdir } from "fdir";
+
+const normalPattern = "*.ts";
+const recursivePattern = "**/*.ts";
+const nodeModulesPattern = "**/node_modules/**/*.js";
+
+const benchFdir = false;
+const cwd = undefined;
+
+const bunOpts = {
+  cwd,
+  followSymlinks: false,
+  absolute: true,
+};
+
+const fgOpts = {
+  cwd,
+  followSymbolicLinks: false,
+  onlyFiles: false,
+  absolute: true,
+};
+
+const Glob = "Bun" in globalThis ? globalThis.Bun.Glob : undefined;
+
+group({ name: `async pattern="${normalPattern}"`, summary: true }, () => {
+  bench("fast-glob", async () => {
+    const entries = await fg.glob([normalPattern], fgOpts);
+  });
+
+  if (Glob)
+    bench("Bun.Glob", async () => {
+      const entries = await Array.fromAsync(new Glob(normalPattern).scan(bunOpts));
+    });
+
+  if (benchFdir)
+    bench("fdir", async () => {
+      const entries = await new fdir().withFullPaths().glob(normalPattern).crawl(process.cwd()).withPromise();
+    });
+});
+
+group({ name: `async-recursive pattern="${recursivePattern}"`, summary: true }, () => {
+  bench("fast-glob", async () => {
+    const entries = await fg.glob([recursivePattern], fgOpts);
+  });
+
+  if (Glob)
+    bench("Bun.Glob", async () => {
+      const entries = await Array.fromAsync(new Glob(recursivePattern).scan(bunOpts));
+    });
+
+  if (benchFdir)
+    bench("fdir", async () => {
+      const entries = await new fdir().withFullPaths().glob(recursivePattern).crawl(process.cwd()).withPromise();
+    });
+});
+
+group({ name: `sync pattern="${normalPattern}"`, summary: true }, () => {
+  bench("fast-glob", () => {
+    const entries = fg.globSync([normalPattern], fgOpts);
+  });
+
+  if (Glob)
+    bench("Bun.Glob", () => {
+      const entries = [...new Glob(normalPattern).scanSync(bunOpts)];
+    });
+
+  if (benchFdir)
+    bench("fdir", async () => {
+      const entries = new fdir().withFullPaths().glob(normalPattern).crawl(process.cwd()).sync();
+    });
+});
+
+group({ name: `sync-recursive pattern="${recursivePattern}"`, summary: true }, () => {
+  bench("fast-glob", () => {
+    const entries = fg.globSync([recursivePattern], fgOpts);
+  });
+
+  if (Glob)
+    bench("Bun.Glob", () => {
+      const entries = [...new Glob(recursivePattern).scanSync(bunOpts)];
+    });
+
+  if (benchFdir)
+    bench("fdir", async () => {
+      const entries = new fdir().withFullPaths().glob(recursivePattern).crawl(process.cwd()).sync();
+    });
+});
+
+group({ name: `node_modules pattern="${nodeModulesPattern}"`, summary: true }, () => {
+  bench("fast-glob", async () => {
+    const entries = await fg.glob([nodeModulesPattern], fgOpts);
+  });
+
+  if (Glob)
+    bench("Bun.Glob", async () => {
+      const entries = await Array.fromAsync(new Glob(nodeModulesPattern).scan(bunOpts));
+    });
+
+  if (benchFdir)
+    bench("fdir", async () => {
+      const entries = await new fdir().withFullPaths().glob(nodeModulesPattern).crawl(process.cwd()).withPromise();
+    });
+});
+
+await run({
+  avg: true,
+  colors: false,
+  min_max: true,
+  collect: true,
+  percentiles: true,
+});

bench/hot-module-reloading/css-stress-test/color-looper.emotion.zig

@@ -25,7 +25,7 @@ pub var all_timestamps: [RUN_COUNT + 1]usize = undefined;
 // 1. file path
 // 2. Byte offset in file
 // 3. ms update interval
-var color_buf: [8096 + SIMULATE_LONG_FILE.len]u8 = undefined;
+var color_buf: [8192 + SIMULATE_LONG_FILE.len]u8 = undefined;
 
 pub fn main() anyerror!void {
     var allocator = std.heap.c_allocator;

bench/hot-module-reloading/css-stress-test/color-looper.zig

@@ -25,7 +25,7 @@ pub var all_timestamps: [RUN_COUNT + 1]usize = undefined;
 // 1. file path
 // 2. Byte offset in file
 // 3. ms update interval
-var color_buf: [8096 + SIMULATE_LONG_FILE.len]u8 = undefined;
+var color_buf: [8192 + SIMULATE_LONG_FILE.len]u8 = undefined;
 
 pub fn main() anyerror!void {
     var allocator = std.heap.c_allocator;

bench/hot-module-reloading/css-stress-test/timings/bun-cli@0.0.34.32ms.darwin-x64.json

@@ -7,280 +7,166 @@
     "version": "0.0.34"
   },
   "timestamps": [
-    16336202536562, 16336202536908, 16336202537294, 16336202537705,
-    16336202538114, 16336202538534, 16336202538941, 16336202539323,
-    16336202539742, 16336202540159, 16336202540877, 16336202541310,
-    16336202541749, 16336202542159, 16336202542565, 16336202542996,
-    16336202543333, 16336202543761, 16336202544159, 16336202544534,
-    16336202544944, 16336202545345, 16336202545744, 16336202546159,
-    16336202546573, 16336202546986, 16336202547399, 16336202547781,
-    16336202548202, 16336202548564, 16336202548949, 16336202549329,
-    16336202549762, 16336202550168, 16336202550534, 16336202550887,
-    16336202551305, 16336202551659, 16336202552060, 16336202552449,
-    16336202552854, 16336202553270, 16336202553609, 16336202554034,
-    16336202554437, 16336202554783, 16336202555191, 16336202555623,
-    16336202556034, 16336202556449, 16336202556890, 16336202557283,
-    16336202557669, 16336202558084, 16336202558496, 16336202558863,
-    16336202559271, 16336202559659, 16336202560051, 16336202560452,
-    16336202560873, 16336202561290, 16336202561659, 16336202562035,
-    16336202562440, 16336202562862, 16336202563284, 16336202563659,
-    16336202564034, 16336202564444, 16336202564853, 16336202565245,
-    16336202565659, 16336202566034, 16336202566455, 16336202566873,
-    16336202567284, 16336202567659, 16336202568034, 16336202568386,
-    16336202568790, 16336202569204, 16336202569620, 16336202570384,
-    16336202570768, 16336202571188, 16336202571551, 16336202572327,
-    16336202572717, 16336202573116, 16336202573541, 16336202573959,
-    16336202574319, 16336202574682, 16336202575040, 16336202575375,
-    16336202577001, 16336202577342, 16336202577680, 16336202578066,
-    16336202578451, 16336202579166, 16336202579534, 16336202579960,
-    16336202580370, 16336202580789, 16336202581159, 16336202581576,
-    16336202581949, 16336202582294, 16336202583087, 16336202583496,
-    16336202583858, 16336202584203, 16336202584606, 16336202585034,
-    16336202585386, 16336202585788, 16336202586211, 16336202586604,
-    16336202587034, 16336202587459, 16336202587869, 16336202588295,
-    16336202588668, 16336202589092, 16336202589452, 16336202589831,
-    16336202590197, 16336202590608, 16336202591034, 16336202591460,
-    16336202591880, 16336202592295, 16336202592727, 16336202593172,
-    16336202593567, 16336202593994, 16336202594397, 16336202594795,
-    16336202595224, 16336202595659, 16336202596058, 16336202596463,
-    16336202596890, 16336202597322, 16336202597732, 16336202598159,
-    16336202598534, 16336202598951, 16336202599365, 16336202599785,
-    16336202600159, 16336202600593, 16336202601005, 16336202601402,
-    16336202601807, 16336202602214, 16336202602556, 16336202602895,
-    16336202603307, 16336202603661, 16336202604075, 16336202604491,
-    16336202604853, 16336202605268, 16336202605670, 16336202606034,
-    16336202606393, 16336202606748, 16336202607170, 16336202607568,
-    16336202607982, 16336202608411, 16336202608836, 16336202609197,
-    16336202609596, 16336202609965, 16336202610333, 16336202610740,
-    16336202611159, 16336202611573, 16336202611975, 16336202612317,
-    16336202612691, 16336202613060, 16336202613474, 16336202613903,
-    16336202614341, 16336202614707, 16336202615094, 16336202615534,
-    16336202615883, 16336202616296, 16336202616671, 16336202617034,
-    16336202617391, 16336202617727, 16336202618159, 16336202618534,
-    16336202618937, 16336202619360, 16336202619770, 16336202620179,
-    16336202620716, 16336202621143, 16336202621534, 16336202622303,
-    16336202622659, 16336202623085, 16336202623498, 16336202623850,
-    16336202624220, 16336202624606, 16336202625034, 16336202625387,
-    16336202625805, 16336202626210, 16336202626599, 16336202627034,
-    16336202627386, 16336202627748, 16336202628159, 16336202628534,
-    16336202628954, 16336202629373, 16336202629809, 16336202630197,
-    16336202630535, 16336202630916, 16336202631290, 16336202631666,
-    16336202632034, 16336202632369, 16336202633152, 16336202633534,
-    16336202633883, 16336202634309, 16336202634717, 16336202635106,
-    16336202635871, 16336202636253, 16336202636671, 16336202637070,
-    16336202637434, 16336202637798, 16336202638184, 16336202638539,
-    16336202638938, 16336202639307, 16336202639666, 16336202640095,
-    16336202640534, 16336202640962, 16336202641307, 16336202641659,
-    16336202642087, 16336202642521, 16336202642886, 16336202643309,
-    16336202643662, 16336202644067, 16336202644491, 16336202644853,
-    16336202645226, 16336202645659, 16336202646074, 16336202646497,
-    16336202646890, 16336202647311, 16336202647749, 16336202648169,
-    16336202648976, 16336202649378, 16336202649810, 16336202650165,
-    16336202650534, 16336202650875, 16336202651250, 16336202651659,
-    16336202652093, 16336202652516, 16336202652921, 16336202653332,
-    16336202653722, 16336202654142, 16336202654534, 16336202654880,
-    16336202655221, 16336202655562, 16336202655997, 16336202656378,
-    16336202656811, 16336202657161, 16336202657588, 16336202657944,
-    16336202658360, 16336202658708, 16336202659089, 16336202659428,
-    16336202659849, 16336202660273, 16336202660685, 16336202661105,
-    16336202661534, 16336202661873, 16336202662228, 16336202662658,
-    16336202663438, 16336202663843, 16336202664219, 16336202664646,
-    16336202665050, 16336202665487, 16336202665838, 16336202666211,
-    16336202666573, 16336202666927, 16336202667334, 16336202667746,
-    16336202668158, 16336202668563, 16336202668980, 16336202669406,
-    16336202669753, 16336202670192, 16336202670554, 16336202670903,
-    16336202671324, 16336202671734, 16336202672159, 16336202672573,
-    16336202672982, 16336202673346, 16336202673680, 16336202674087,
-    16336202674499, 16336202674909, 16336202675260, 16336202676110,
-    16336202676535, 16336202676913, 16336202677312, 16336202677658,
-    16336202678044, 16336202678413, 16336202678793, 16336202679208,
-    16336202679604, 16336202680034, 16336202680385, 16336202680799,
-    16336202681213, 16336202681595, 16336202682004, 16336202682346,
-    16336202682726, 16336202683158, 16336202683586, 16336202683990,
-    16336202684323, 16336202684742, 16336202685175, 16336202685578,
-    16336202685979, 16336202686805, 16336202687206, 16336202687614,
-    16336202688038, 16336202688473, 16336202688848, 16336202689221,
-    16336202689559, 16336202689971, 16336202690368, 16336202690776,
-    16336202691159, 16336202691585, 16336202692010, 16336202692373,
-    16336202692780, 16336202693179, 16336202693580, 16336202693991,
-    16336202694324, 16336202694727, 16336202695159, 16336202695588,
-    16336202695991, 16336202696335, 16336202697160, 16336202697542,
-    16336202697929, 16336202698323, 16336202698674, 16336202699060,
-    16336202699492, 16336202699835, 16336202700238, 16336202700658,
-    16336202701059, 16336202701420, 16336202701815, 16336202702229,
-    16336202702659, 16336202703857, 16336202704256, 16336202704659,
-    16336202705497, 16336202706309, 16336202706660, 16336202707085,
-    16336202707511, 16336202707866, 16336202708210, 16336202708552,
-    16336202708925, 16336202709287, 16336202709670, 16336202710045,
-    16336202710402, 16336202710802, 16336202711167, 16336202711533,
-    16336202712249, 16336202712660, 16336202713088, 16336202713519,
-    16336202713936, 16336202714355, 16336202714740, 16336202715160,
-    16336202715533, 16336202715878, 16336202716290, 16336202716708,
-    16336202717102, 16336202718290, 16336202718699, 16336202719052,
-    16336202719388, 16336202719808, 16336202720225, 16336202720659,
-    16336202721052, 16336202721414, 16336202721828, 16336202722925,
-    16336202723664, 16336202724063, 16336202724405, 16336202726003,
-    16336202726736, 16336202727158, 16336202727543, 16336202727930,
-    16336202728336, 16336202728703, 16336202729061, 16336202729483,
-    16336202729832, 16336202730222, 16336202730659, 16336202731084,
-    16336202731500, 16336202731911, 16336202732326, 16336202733158,
-    16336202733585, 16336202734001, 16336202734691, 16336202735042,
-    16336202735442, 16336202735863, 16336202736255, 16336202736671,
-    16336202737043, 16336202737884, 16336202738671, 16336202739110,
-    16336202739533, 16336202739886, 16336202740283, 16336202740706,
-    16336202741143, 16336202741534, 16336202741942, 16336202742352,
-    16336202742697, 16336202743103, 16336202743940, 16336202745172,
-    16336202745542, 16336202745937, 16336202746339, 16336202746758,
-    16336202747531, 16336202747877, 16336202748232, 16336202748658,
-    16336202749055, 16336202749468, 16336202749859, 16336202750416,
-    16336202750839, 16336202751178, 16336202751572, 16336202752002,
-    16336202752419, 16336202753269, 16336202753678, 16336202754086,
-    16336202754432, 16336202754835, 16336202755260, 16336202755683,
-    16336202756059, 16336202756402, 16336202756837, 16336202758084,
-    16336202758507, 16336202758879, 16336202759270, 16336202759674,
-    16336202760044, 16336202760400, 16336202760801, 16336202761659,
-    16336202762053, 16336202762397, 16336202763199, 16336202763547,
-    16336202763948, 16336202764714, 16336202765113, 16336202765947,
-    16336202766329, 16336202766664, 16336202767085, 16336202768233,
-    16336202769056, 16336202769758, 16336202770178, 16336202770585,
-    16336202770929, 16336202771325, 16336202772158, 16336202772594,
-    16336202773033, 16336202773403, 16336202773801, 16336202774179,
-    16336202774555, 16336202774989, 16336202775393, 16336202775809,
-    16336202776209, 16336202776618, 16336202777033, 16336202777421,
-    16336202777845, 16336202778246, 16336202778658, 16336202779055,
-    16336202779411, 16336202779761, 16336202780175, 16336202780594,
-    16336202781002, 16336202781848, 16336202782658, 16336202783033,
-    16336202783857, 16336202784211, 16336202784557, 16336202784972,
-    16336202785377, 16336202785810, 16336202786172, 16336202786934,
-    16336202787343, 16336202787765, 16336202788201, 16336202788563,
-    16336202788970, 16336202789329, 16336202789672, 16336202790055,
-    16336202790456, 16336202790802, 16336202791580, 16336202791920,
-    16336202792326, 16336202793158, 16336202793953, 16336202794368,
-    16336202795187, 16336202795622, 16336202796033, 16336202796393,
-    16336202796777, 16336202797173, 16336202797540, 16336202797975,
-    16336202798317, 16336202798739, 16336202799158, 16336202799567,
-    16336202799966, 16336202800378, 16336202800803, 16336202801232,
-    16336202801658, 16336202802033, 16336202802374, 16336202802759,
-    16336202803158, 16336202803533, 16336202803947, 16336202804354,
-    16336202804729, 16336202805158, 16336202805534, 16336202805950,
-    16336202806390, 16336202806805, 16336202807219, 16336202807643,
-    16336202808033, 16336202808377, 16336202808790, 16336202809211,
-    16336202809560, 16336202809920, 16336202810355, 16336202810758,
-    16336202811187, 16336202811596, 16336202811943, 16336202812348,
-    16336202812710, 16336202813060, 16336202813398, 16336202813791,
-    16336202814158, 16336202814533, 16336202814878, 16336202815246,
-    16336202815658, 16336202816079, 16336202816851, 16336202817202,
-    16336202817540, 16336202817905, 16336202818244, 16336202818663,
-    16336202819068, 16336202819418, 16336202819777, 16336202820193,
-    16336202820599, 16336202821033, 16336202821395, 16336202821745,
-    16336202822158, 16336202822590, 16336202822996, 16336202823396,
-    16336202823804, 16336202824210, 16336202824581, 16336202824991,
-    16336202825406, 16336202825806, 16336202826210, 16336202826598,
-    16336202827033, 16336202827446, 16336202827839, 16336202828201,
-    16336202828577, 16336202828968, 16336202829362, 16336202829709,
-    16336202830096, 16336202830533, 16336202830917, 16336202831290,
-    16336202831699, 16336202832035, 16336202832406, 16336202832804,
-    16336202833200, 16336202833604, 16336202834033, 16336202834386,
-    16336202834759, 16336202835190, 16336202835621, 16336202836033,
-    16336202836405, 16336202837191, 16336202837613, 16336202838033,
-    16336202838374, 16336202838798, 16336202839200, 16336202839603,
-    16336202840034, 16336202840389, 16336202840783, 16336202841200,
-    16336202841617, 16336202842034, 16336202842390, 16336202842737,
-    16336202843158, 16336202843585, 16336202843923, 16336202844313,
-    16336202844724, 16336202845158, 16336202845576, 16336202845939,
-    16336202846368, 16336202846728, 16336202847158, 16336202847568,
-    16336202847911, 16336202848291, 16336202848695, 16336202849103,
-    16336202849533, 16336202849942, 16336202850368, 16336202850747,
-    16336202851158, 16336202851549, 16336202851978, 16336202852383,
-    16336202852725, 16336202853158, 16336202853554, 16336202853961,
-    16336202854308, 16336202854704, 16336202855060, 16336202855418,
-    16336202855776, 16336202856203, 16336202856617, 16336202857036,
-    16336202857455, 16336202857884, 16336202858262, 16336202858658,
-    16336202859071, 16336202859847, 16336202860237, 16336202860658,
-    16336202861037, 16336202861452, 16336202861869, 16336202862218,
-    16336202862590, 16336202863001, 16336202863422, 16336202863857,
-    16336202864219, 16336202864658, 16336202865047, 16336202865404,
-    16336202865789, 16336202866210, 16336202866624, 16336202867033,
-    16336202867380, 16336202867797, 16336202868227, 16336202868658,
-    16336202869083, 16336202869500, 16336202869906, 16336202870246,
-    16336202870658, 16336202871086, 16336202871441, 16336202871820,
-    16336202872204, 16336202872546, 16336202872943, 16336202873380,
-    16336202873811, 16336202874213, 16336202874566, 16336202874918,
-    16336202875261, 16336202875655, 16336202876047, 16336202876771,
-    16336202877202, 16336202877612, 16336202878033, 16336202878412,
-    16336202878846, 16336202879241, 16336202879658, 16336202880072,
-    16336202880508, 16336202880901, 16336202881308, 16336202881725,
-    16336202882158, 16336202882579, 16336202882945, 16336202883286,
-    16336202883657, 16336202884048, 16336202884404, 16336202884752,
-    16336202885158, 16336202885533, 16336202885938, 16336202886364,
-    16336202886759, 16336202887175, 16336202887585, 16336202887929,
-    16336202888345, 16336202888743, 16336202889157, 16336202889570,
-    16336202889970, 16336202890382, 16336202890761, 16336202891187,
-    16336202891600, 16336202892033, 16336202892454, 16336202892794,
-    16336202893178, 16336202893533, 16336202893903, 16336202894264,
-    16336202894668, 16336202895049, 16336202895400, 16336202895774,
-    16336202896157, 16336202896537, 16336202896883, 16336202897232,
-    16336202897658, 16336202898065, 16336202898493, 16336202898884,
-    16336202899251, 16336202899673, 16336202900047, 16336202900467,
-    16336202900883, 16336202901300, 16336202901676, 16336202902068,
-    16336202902479, 16336202902902, 16336202903260, 16336202903675,
-    16336202904094, 16336202904476, 16336202904824, 16336202905158,
-    16336202905533, 16336202905934, 16336202906289, 16336202906717,
-    16336202907158, 16336202907547, 16336202907904, 16336202908294,
-    16336202908717, 16336202909157, 16336202909582, 16336202910005,
-    16336202910399, 16336202910800, 16336202911220, 16336202911657,
-    16336202912064, 16336202912405, 16336202912779, 16336202913158,
-    16336202913553, 16336202913966, 16336202914376, 16336202914719,
-    16336202915091, 16336202915515, 16336202915887, 16336202916293,
-    16336202916649, 16336202917438, 16336202917869, 16336202918221,
-    16336202919053, 16336202919425, 16336202919833, 16336202920234,
-    16336202920658, 16336202921033, 16336202921433, 16336202921801,
-    16336202922161, 16336202922589, 16336202923017, 16336202923418,
-    16336202923804, 16336202924199, 16336202924593, 16336202925033,
-    16336202925449, 16336202925818, 16336202926223, 16336202926662,
-    16336202927431, 16336202927812, 16336202928227, 16336202928658,
-    16336202929061, 16336202929473, 16336202929891, 16336202930241,
-    16336202930657, 16336202931057, 16336202931396, 16336202931811,
-    16336202932225, 16336202932657, 16336202933058, 16336202933445,
-    16336202933790, 16336202934157, 16336202934562, 16336202934988,
-    16336202935391, 16336202935777, 16336202936160, 16336202936562,
-    16336202936986, 16336202937396, 16336202937751, 16336202938158,
-    16336202938578, 16336202938985, 16336202939396, 16336202939752,
-    16336202940157, 16336202940585
+    16336202536562, 16336202536908, 16336202537294, 16336202537705, 16336202538114, 16336202538534, 16336202538941,
+    16336202539323, 16336202539742, 16336202540159, 16336202540877, 16336202541310, 16336202541749, 16336202542159,
+    16336202542565, 16336202542996, 16336202543333, 16336202543761, 16336202544159, 16336202544534, 16336202544944,
+    16336202545345, 16336202545744, 16336202546159, 16336202546573, 16336202546986, 16336202547399, 16336202547781,
+    16336202548202, 16336202548564, 16336202548949, 16336202549329, 16336202549762, 16336202550168, 16336202550534,
+    16336202550887, 16336202551305, 16336202551659, 16336202552060, 16336202552449, 16336202552854, 16336202553270,
+    16336202553609, 16336202554034, 16336202554437, 16336202554783, 16336202555191, 16336202555623, 16336202556034,
+    16336202556449, 16336202556890, 16336202557283, 16336202557669, 16336202558084, 16336202558496, 16336202558863,
+    16336202559271, 16336202559659, 16336202560051, 16336202560452, 16336202560873, 16336202561290, 16336202561659,
+    16336202562035, 16336202562440, 16336202562862, 16336202563284, 16336202563659, 16336202564034, 16336202564444,
+    16336202564853, 16336202565245, 16336202565659, 16336202566034, 16336202566455, 16336202566873, 16336202567284,
+    16336202567659, 16336202568034, 16336202568386, 16336202568790, 16336202569204, 16336202569620, 16336202570384,
+    16336202570768, 16336202571188, 16336202571551, 16336202572327, 16336202572717, 16336202573116, 16336202573541,
+    16336202573959, 16336202574319, 16336202574682, 16336202575040, 16336202575375, 16336202577001, 16336202577342,
+    16336202577680, 16336202578066, 16336202578451, 16336202579166, 16336202579534, 16336202579960, 16336202580370,
+    16336202580789, 16336202581159, 16336202581576, 16336202581949, 16336202582294, 16336202583087, 16336202583496,
+    16336202583858, 16336202584203, 16336202584606, 16336202585034, 16336202585386, 16336202585788, 16336202586211,
+    16336202586604, 16336202587034, 16336202587459, 16336202587869, 16336202588295, 16336202588668, 16336202589092,
+    16336202589452, 16336202589831, 16336202590197, 16336202590608, 16336202591034, 16336202591460, 16336202591880,
+    16336202592295, 16336202592727, 16336202593172, 16336202593567, 16336202593994, 16336202594397, 16336202594795,
+    16336202595224, 16336202595659, 16336202596058, 16336202596463, 16336202596890, 16336202597322, 16336202597732,
+    16336202598159, 16336202598534, 16336202598951, 16336202599365, 16336202599785, 16336202600159, 16336202600593,
+    16336202601005, 16336202601402, 16336202601807, 16336202602214, 16336202602556, 16336202602895, 16336202603307,
+    16336202603661, 16336202604075, 16336202604491, 16336202604853, 16336202605268, 16336202605670, 16336202606034,
+    16336202606393, 16336202606748, 16336202607170, 16336202607568, 16336202607982, 16336202608411, 16336202608836,
+    16336202609197, 16336202609596, 16336202609965, 16336202610333, 16336202610740, 16336202611159, 16336202611573,
+    16336202611975, 16336202612317, 16336202612691, 16336202613060, 16336202613474, 16336202613903, 16336202614341,
+    16336202614707, 16336202615094, 16336202615534, 16336202615883, 16336202616296, 16336202616671, 16336202617034,
+    16336202617391, 16336202617727, 16336202618159, 16336202618534, 16336202618937, 16336202619360, 16336202619770,
+    16336202620179, 16336202620716, 16336202621143, 16336202621534, 16336202622303, 16336202622659, 16336202623085,
+    16336202623498, 16336202623850, 16336202624220, 16336202624606, 16336202625034, 16336202625387, 16336202625805,
+    16336202626210, 16336202626599, 16336202627034, 16336202627386, 16336202627748, 16336202628159, 16336202628534,
+    16336202628954, 16336202629373, 16336202629809, 16336202630197, 16336202630535, 16336202630916, 16336202631290,
+    16336202631666, 16336202632034, 16336202632369, 16336202633152, 16336202633534, 16336202633883, 16336202634309,
+    16336202634717, 16336202635106, 16336202635871, 16336202636253, 16336202636671, 16336202637070, 16336202637434,
+    16336202637798, 16336202638184, 16336202638539, 16336202638938, 16336202639307, 16336202639666, 16336202640095,
+    16336202640534, 16336202640962, 16336202641307, 16336202641659, 16336202642087, 16336202642521, 16336202642886,
+    16336202643309, 16336202643662, 16336202644067, 16336202644491, 16336202644853, 16336202645226, 16336202645659,
+    16336202646074, 16336202646497, 16336202646890, 16336202647311, 16336202647749, 16336202648169, 16336202648976,
+    16336202649378, 16336202649810, 16336202650165, 16336202650534, 16336202650875, 16336202651250, 16336202651659,
+    16336202652093, 16336202652516, 16336202652921, 16336202653332, 16336202653722, 16336202654142, 16336202654534,
+    16336202654880, 16336202655221, 16336202655562, 16336202655997, 16336202656378, 16336202656811, 16336202657161,
+    16336202657588, 16336202657944, 16336202658360, 16336202658708, 16336202659089, 16336202659428, 16336202659849,
+    16336202660273, 16336202660685, 16336202661105, 16336202661534, 16336202661873, 16336202662228, 16336202662658,
+    16336202663438, 16336202663843, 16336202664219, 16336202664646, 16336202665050, 16336202665487, 16336202665838,
+    16336202666211, 16336202666573, 16336202666927, 16336202667334, 16336202667746, 16336202668158, 16336202668563,
+    16336202668980, 16336202669406, 16336202669753, 16336202670192, 16336202670554, 16336202670903, 16336202671324,
+    16336202671734, 16336202672159, 16336202672573, 16336202672982, 16336202673346, 16336202673680, 16336202674087,
+    16336202674499, 16336202674909, 16336202675260, 16336202676110, 16336202676535, 16336202676913, 16336202677312,
+    16336202677658, 16336202678044, 16336202678413, 16336202678793, 16336202679208, 16336202679604, 16336202680034,
+    16336202680385, 16336202680799, 16336202681213, 16336202681595, 16336202682004, 16336202682346, 16336202682726,
+    16336202683158, 16336202683586, 16336202683990, 16336202684323, 16336202684742, 16336202685175, 16336202685578,
+    16336202685979, 16336202686805, 16336202687206, 16336202687614, 16336202688038, 16336202688473, 16336202688848,
+    16336202689221, 16336202689559, 16336202689971, 16336202690368, 16336202690776, 16336202691159, 16336202691585,
+    16336202692010, 16336202692373, 16336202692780, 16336202693179, 16336202693580, 16336202693991, 16336202694324,
+    16336202694727, 16336202695159, 16336202695588, 16336202695991, 16336202696335, 16336202697160, 16336202697542,
+    16336202697929, 16336202698323, 16336202698674, 16336202699060, 16336202699492, 16336202699835, 16336202700238,
+    16336202700658, 16336202701059, 16336202701420, 16336202701815, 16336202702229, 16336202702659, 16336202703857,
+    16336202704256, 16336202704659, 16336202705497, 16336202706309, 16336202706660, 16336202707085, 16336202707511,
+    16336202707866, 16336202708210, 16336202708552, 16336202708925, 16336202709287, 16336202709670, 16336202710045,
+    16336202710402, 16336202710802, 16336202711167, 16336202711533, 16336202712249, 16336202712660, 16336202713088,
+    16336202713519, 16336202713936, 16336202714355, 16336202714740, 16336202715160, 16336202715533, 16336202715878,
+    16336202716290, 16336202716708, 16336202717102, 16336202718290, 16336202718699, 16336202719052, 16336202719388,
+    16336202719808, 16336202720225, 16336202720659, 16336202721052, 16336202721414, 16336202721828, 16336202722925,
+    16336202723664, 16336202724063, 16336202724405, 16336202726003, 16336202726736, 16336202727158, 16336202727543,
+    16336202727930, 16336202728336, 16336202728703, 16336202729061, 16336202729483, 16336202729832, 16336202730222,
+    16336202730659, 16336202731084, 16336202731500, 16336202731911, 16336202732326, 16336202733158, 16336202733585,
+    16336202734001, 16336202734691, 16336202735042, 16336202735442, 16336202735863, 16336202736255, 16336202736671,
+    16336202737043, 16336202737884, 16336202738671, 16336202739110, 16336202739533, 16336202739886, 16336202740283,
+    16336202740706, 16336202741143, 16336202741534, 16336202741942, 16336202742352, 16336202742697, 16336202743103,
+    16336202743940, 16336202745172, 16336202745542, 16336202745937, 16336202746339, 16336202746758, 16336202747531,
+    16336202747877, 16336202748232, 16336202748658, 16336202749055, 16336202749468, 16336202749859, 16336202750416,
+    16336202750839, 16336202751178, 16336202751572, 16336202752002, 16336202752419, 16336202753269, 16336202753678,
+    16336202754086, 16336202754432, 16336202754835, 16336202755260, 16336202755683, 16336202756059, 16336202756402,
+    16336202756837, 16336202758084, 16336202758507, 16336202758879, 16336202759270, 16336202759674, 16336202760044,
+    16336202760400, 16336202760801, 16336202761659, 16336202762053, 16336202762397, 16336202763199, 16336202763547,
+    16336202763948, 16336202764714, 16336202765113, 16336202765947, 16336202766329, 16336202766664, 16336202767085,
+    16336202768233, 16336202769056, 16336202769758, 16336202770178, 16336202770585, 16336202770929, 16336202771325,
+    16336202772158, 16336202772594, 16336202773033, 16336202773403, 16336202773801, 16336202774179, 16336202774555,
+    16336202774989, 16336202775393, 16336202775809, 16336202776209, 16336202776618, 16336202777033, 16336202777421,
+    16336202777845, 16336202778246, 16336202778658, 16336202779055, 16336202779411, 16336202779761, 16336202780175,
+    16336202780594, 16336202781002, 16336202781848, 16336202782658, 16336202783033, 16336202783857, 16336202784211,
+    16336202784557, 16336202784972, 16336202785377, 16336202785810, 16336202786172, 16336202786934, 16336202787343,
+    16336202787765, 16336202788201, 16336202788563, 16336202788970, 16336202789329, 16336202789672, 16336202790055,
+    16336202790456, 16336202790802, 16336202791580, 16336202791920, 16336202792326, 16336202793158, 16336202793953,
+    16336202794368, 16336202795187, 16336202795622, 16336202796033, 16336202796393, 16336202796777, 16336202797173,
+    16336202797540, 16336202797975, 16336202798317, 16336202798739, 16336202799158, 16336202799567, 16336202799966,
+    16336202800378, 16336202800803, 16336202801232, 16336202801658, 16336202802033, 16336202802374, 16336202802759,
+    16336202803158, 16336202803533, 16336202803947, 16336202804354, 16336202804729, 16336202805158, 16336202805534,
+    16336202805950, 16336202806390, 16336202806805, 16336202807219, 16336202807643, 16336202808033, 16336202808377,
+    16336202808790, 16336202809211, 16336202809560, 16336202809920, 16336202810355, 16336202810758, 16336202811187,
+    16336202811596, 16336202811943, 16336202812348, 16336202812710, 16336202813060, 16336202813398, 16336202813791,
+    16336202814158, 16336202814533, 16336202814878, 16336202815246, 16336202815658, 16336202816079, 16336202816851,
+    16336202817202, 16336202817540, 16336202817905, 16336202818244, 16336202818663, 16336202819068, 16336202819418,
+    16336202819777, 16336202820193, 16336202820599, 16336202821033, 16336202821395, 16336202821745, 16336202822158,
+    16336202822590, 16336202822996, 16336202823396, 16336202823804, 16336202824210, 16336202824581, 16336202824991,
+    16336202825406, 16336202825806, 16336202826210, 16336202826598, 16336202827033, 16336202827446, 16336202827839,
+    16336202828201, 16336202828577, 16336202828968, 16336202829362, 16336202829709, 16336202830096, 16336202830533,
+    16336202830917, 16336202831290, 16336202831699, 16336202832035, 16336202832406, 16336202832804, 16336202833200,
+    16336202833604, 16336202834033, 16336202834386, 16336202834759, 16336202835190, 16336202835621, 16336202836033,
+    16336202836405, 16336202837191, 16336202837613, 16336202838033, 16336202838374, 16336202838798, 16336202839200,
+    16336202839603, 16336202840034, 16336202840389, 16336202840783, 16336202841200, 16336202841617, 16336202842034,
+    16336202842390, 16336202842737, 16336202843158, 16336202843585, 16336202843923, 16336202844313, 16336202844724,
+    16336202845158, 16336202845576, 16336202845939, 16336202846368, 16336202846728, 16336202847158, 16336202847568,
+    16336202847911, 16336202848291, 16336202848695, 16336202849103, 16336202849533, 16336202849942, 16336202850368,
+    16336202850747, 16336202851158, 16336202851549, 16336202851978, 16336202852383, 16336202852725, 16336202853158,
+    16336202853554, 16336202853961, 16336202854308, 16336202854704, 16336202855060, 16336202855418, 16336202855776,
+    16336202856203, 16336202856617, 16336202857036, 16336202857455, 16336202857884, 16336202858262, 16336202858658,
+    16336202859071, 16336202859847, 16336202860237, 16336202860658, 16336202861037, 16336202861452, 16336202861869,
+    16336202862218, 16336202862590, 16336202863001, 16336202863422, 16336202863857, 16336202864219, 16336202864658,
+    16336202865047, 16336202865404, 16336202865789, 16336202866210, 16336202866624, 16336202867033, 16336202867380,
+    16336202867797, 16336202868227, 16336202868658, 16336202869083, 16336202869500, 16336202869906, 16336202870246,
+    16336202870658, 16336202871086, 16336202871441, 16336202871820, 16336202872204, 16336202872546, 16336202872943,
+    16336202873380, 16336202873811, 16336202874213, 16336202874566, 16336202874918, 16336202875261, 16336202875655,
+    16336202876047, 16336202876771, 16336202877202, 16336202877612, 16336202878033, 16336202878412, 16336202878846,
+    16336202879241, 16336202879658, 16336202880072, 16336202880508, 16336202880901, 16336202881308, 16336202881725,
+    16336202882158, 16336202882579, 16336202882945, 16336202883286, 16336202883657, 16336202884048, 16336202884404,
+    16336202884752, 16336202885158, 16336202885533, 16336202885938, 16336202886364, 16336202886759, 16336202887175,
+    16336202887585, 16336202887929, 16336202888345, 16336202888743, 16336202889157, 16336202889570, 16336202889970,
+    16336202890382, 16336202890761, 16336202891187, 16336202891600, 16336202892033, 16336202892454, 16336202892794,
+    16336202893178, 16336202893533, 16336202893903, 16336202894264, 16336202894668, 16336202895049, 16336202895400,
+    16336202895774, 16336202896157, 16336202896537, 16336202896883, 16336202897232, 16336202897658, 16336202898065,
+    16336202898493, 16336202898884, 16336202899251, 16336202899673, 16336202900047, 16336202900467, 16336202900883,
+    16336202901300, 16336202901676, 16336202902068, 16336202902479, 16336202902902, 16336202903260, 16336202903675,
+    16336202904094, 16336202904476, 16336202904824, 16336202905158, 16336202905533, 16336202905934, 16336202906289,
+    16336202906717, 16336202907158, 16336202907547, 16336202907904, 16336202908294, 16336202908717, 16336202909157,
+    16336202909582, 16336202910005, 16336202910399, 16336202910800, 16336202911220, 16336202911657, 16336202912064,
+    16336202912405, 16336202912779, 16336202913158, 16336202913553, 16336202913966, 16336202914376, 16336202914719,
+    16336202915091, 16336202915515, 16336202915887, 16336202916293, 16336202916649, 16336202917438, 16336202917869,
+    16336202918221, 16336202919053, 16336202919425, 16336202919833, 16336202920234, 16336202920658, 16336202921033,
+    16336202921433, 16336202921801, 16336202922161, 16336202922589, 16336202923017, 16336202923418, 16336202923804,
+    16336202924199, 16336202924593, 16336202925033, 16336202925449, 16336202925818, 16336202926223, 16336202926662,
+    16336202927431, 16336202927812, 16336202928227, 16336202928658, 16336202929061, 16336202929473, 16336202929891,
+    16336202930241, 16336202930657, 16336202931057, 16336202931396, 16336202931811, 16336202932225, 16336202932657,
+    16336202933058, 16336202933445, 16336202933790, 16336202934157, 16336202934562, 16336202934988, 16336202935391,
+    16336202935777, 16336202936160, 16336202936562, 16336202936986, 16336202937396, 16336202937751, 16336202938158,
+    16336202938578, 16336202938985, 16336202939396, 16336202939752, 16336202940157, 16336202940585
   ],
   "frameTimes": [
-    346, 411, 420, 382, 417, 433, 410, 431, 428, 375, 401, 415, 413, 382, 362,
-    380, 406, 353, 354, 389, 416, 425, 346, 432, 415, 393, 415, 367, 388, 401,
-    417, 376, 422, 375, 410, 392, 375, 418, 375, 352, 414, 764, 420, 776, 399,
-    418, 363, 335, 341, 386, 715, 426, 419, 417, 345, 409, 345, 428, 402, 393,
-    425, 426, 424, 379, 411, 426, 415, 445, 427, 398, 435, 405, 432, 427, 417,
-    420, 434, 397, 407, 339, 354, 416, 415, 364, 355, 398, 429, 361, 369, 407,
-    414, 342, 369, 429, 366, 440, 413, 363, 336, 375, 423, 409, 427, 769, 426,
-    352, 386, 353, 405, 435, 362, 375, 419, 388, 381, 376, 335, 382, 426, 389,
-    382, 399, 364, 355, 369, 429, 428, 352, 434, 423, 405, 362, 433, 423, 421,
-    420, 402, 355, 341, 409, 423, 411, 420, 346, 341, 381, 350, 356, 348, 339,
-    424, 420, 339, 430, 405, 427, 437, 373, 354, 412, 405, 426, 439, 349, 410,
-    414, 364, 407, 410, 850, 378, 346, 369, 415, 430, 414, 382, 342, 432, 404,
-    419, 403, 826, 408, 435, 373, 412, 408, 426, 363, 399, 411, 403, 429, 344,
-    382, 394, 386, 343, 420, 361, 414, 1198, 403, 812, 425, 355, 342, 362, 375,
-    400, 366, 411, 431, 419, 420, 345, 418, 1188, 353, 420, 434, 362, 1097, 399,
-    1598, 422, 387, 367, 422, 390, 425, 411, 832, 416, 351, 421, 416, 841, 439,
-    353, 423, 391, 410, 406, 1232, 395, 419, 346, 426, 413, 557, 339, 430, 850,
-    408, 403, 423, 343, 1247, 372, 404, 356, 858, 344, 348, 766, 834, 335, 1148,
-    702, 407, 396, 436, 370, 378, 434, 416, 409, 388, 401, 397, 350, 419, 846,
-    375, 354, 415, 433, 762, 422, 362, 359, 383, 346, 340, 832, 415, 435, 360,
-    396, 435, 422, 409, 412, 429, 375, 385, 375, 407, 429, 416, 415, 424, 344,
-    421, 360, 403, 409, 405, 350, 393, 375, 368, 421, 351, 365, 419, 350, 416,
-    434, 350, 432, 400, 406, 410, 400, 388, 413, 362, 391, 347, 437, 373, 336,
-    398, 404, 353, 431, 412, 786, 420, 424, 403, 355, 417, 417, 347, 427, 390,
-    434, 363, 360, 410, 380, 408, 409, 379, 391, 405, 433, 407, 396, 358, 427,
-    419, 429, 396, 776, 421, 415, 349, 411, 435, 439, 357, 421, 409, 417, 431,
-    417, 340, 428, 379, 342, 437, 402, 352, 394, 724, 410, 379, 395, 414, 393,
-    417, 421, 341, 391, 348, 375, 426, 416, 344, 398, 413, 412, 426, 433, 340,
-    355, 361, 381, 374, 380, 349, 407, 391, 422, 420, 417, 392, 423, 415, 382,
-    334, 401, 428, 389, 390, 440, 423, 401, 437, 341, 379, 413, 343, 424, 406,
-    789, 352, 372, 401, 375, 368, 428, 401, 395, 440, 369, 439, 381, 431, 412,
-    350, 400, 415, 432, 387, 367, 426, 386, 402, 410, 407, 407, 356, 428
+    346, 411, 420, 382, 417, 433, 410, 431, 428, 375, 401, 415, 413, 382, 362, 380, 406, 353, 354, 389, 416, 425, 346,
+    432, 415, 393, 415, 367, 388, 401, 417, 376, 422, 375, 410, 392, 375, 418, 375, 352, 414, 764, 420, 776, 399, 418,
+    363, 335, 341, 386, 715, 426, 419, 417, 345, 409, 345, 428, 402, 393, 425, 426, 424, 379, 411, 426, 415, 445, 427,
+    398, 435, 405, 432, 427, 417, 420, 434, 397, 407, 339, 354, 416, 415, 364, 355, 398, 429, 361, 369, 407, 414, 342,
+    369, 429, 366, 440, 413, 363, 336, 375, 423, 409, 427, 769, 426, 352, 386, 353, 405, 435, 362, 375, 419, 388, 381,
+    376, 335, 382, 426, 389, 382, 399, 364, 355, 369, 429, 428, 352, 434, 423, 405, 362, 433, 423, 421, 420, 402, 355,
+    341, 409, 423, 411, 420, 346, 341, 381, 350, 356, 348, 339, 424, 420, 339, 430, 405, 427, 437, 373, 354, 412, 405,
+    426, 439, 349, 410, 414, 364, 407, 410, 850, 378, 346, 369, 415, 430, 414, 382, 342, 432, 404, 419, 403, 826, 408,
+    435, 373, 412, 408, 426, 363, 399, 411, 403, 429, 344, 382, 394, 386, 343, 420, 361, 414, 1198, 403, 812, 425, 355,
+    342, 362, 375, 400, 366, 411, 431, 419, 420, 345, 418, 1188, 353, 420, 434, 362, 1097, 399, 1598, 422, 387, 367,
+    422, 390, 425, 411, 832, 416, 351, 421, 416, 841, 439, 353, 423, 391, 410, 406, 1232, 395, 419, 346, 426, 413, 557,
+    339, 430, 850, 408, 403, 423, 343, 1247, 372, 404, 356, 858, 344, 348, 766, 834, 335, 1148, 702, 407, 396, 436, 370,
+    378, 434, 416, 409, 388, 401, 397, 350, 419, 846, 375, 354, 415, 433, 762, 422, 362, 359, 383, 346, 340, 832, 415,
+    435, 360, 396, 435, 422, 409, 412, 429, 375, 385, 375, 407, 429, 416, 415, 424, 344, 421, 360, 403, 409, 405, 350,
+    393, 375, 368, 421, 351, 365, 419, 350, 416, 434, 350, 432, 400, 406, 410, 400, 388, 413, 362, 391, 347, 437, 373,
+    336, 398, 404, 353, 431, 412, 786, 420, 424, 403, 355, 417, 417, 347, 427, 390, 434, 363, 360, 410, 380, 408, 409,
+    379, 391, 405, 433, 407, 396, 358, 427, 419, 429, 396, 776, 421, 415, 349, 411, 435, 439, 357, 421, 409, 417, 431,
+    417, 340, 428, 379, 342, 437, 402, 352, 394, 724, 410, 379, 395, 414, 393, 417, 421, 341, 391, 348, 375, 426, 416,
+    344, 398, 413, 412, 426, 433, 340, 355, 361, 381, 374, 380, 349, 407, 391, 422, 420, 417, 392, 423, 415, 382, 334,
+    401, 428, 389, 390, 440, 423, 401, 437, 341, 379, 413, 343, 424, 406, 789, 352, 372, 401, 375, 368, 428, 401, 395,
+    440, 369, 439, 381, 431, 412, 350, 400, 415, 432, 387, 367, 426, 386, 402, 410, 407, 407, 356, 428
   ],
   "percentileMs": {
     "50": 40.7,

bench/package.json

@@ -5,9 +5,15 @@
     "@babel/preset-react": "^7.16.7",
     "@swc/core": "^1.2.133",
     "benchmark": "^2.1.4",
+    "braces": "^3.0.2",
     "esbuild": "^0.14.12",
     "eventemitter3": "^5.0.0",
-    "mitata": "^0.1.6"
+    "execa": "^8.0.1",
+    "fast-glob": "3.3.1",
+    "fdir": "^6.1.0",
+    "mitata": "^0.1.6",
+    "string-width": "7.1.0",
+    "zx": "^7.2.3"
   },
   "scripts": {
     "ffi": "cd ffi && bun run deps && bun run build && bun run bench",
@@ -19,6 +25,5 @@
   },
   "devDependencies": {
     "fast-deep-equal": "^3.1.3"
-  },
-  "prettier": "../.prettierrc.cjs"
+  }
 }

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/buffer-concat.mjs

@@ -0,0 +1,54 @@
+import { bench, run } from "./runner.mjs";
+
+for (let size of [32, 2048, 1024 * 16, 1024 * 1024 * 2, 1024 * 1024 * 16]) {
+  const first = Buffer.allocUnsafe(size);
+  const second = Buffer.allocUnsafe(size);
+  const third = Buffer.allocUnsafe(size);
+  first.fill(1);
+  second.fill(2);
+  third.fill(3);
+
+  const check = true;
+
+  const buffers = [first, second, third];
+
+  const fmt =
+    size > 1024 * 1024
+      ? new Intl.NumberFormat(undefined, { unit: "megabyte", style: "unit" })
+      : size > 1024
+        ? new Intl.NumberFormat(undefined, { unit: "kilobyte", style: "unit" })
+        : new Intl.NumberFormat(undefined, { unit: "byte", style: "unit" });
+
+  bench(
+    `Buffer.concat(${fmt.format(
+      Number((size > 1024 * 1024 ? size / 1024 / 1024 : size > 1024 ? size / 1024 : size).toFixed(2)),
+    )} x 3)`,
+    () => {
+      const result = Buffer.concat(buffers);
+      if (check) {
+        if (result.byteLength != size * 3) throw new Error("Wrong length");
+        if (result[0] != 1) throw new Error("Wrong first byte");
+        if (result[size] != 2) throw new Error("Wrong second byte");
+        if (result[size * 2] != 3) throw new Error("Wrong third byte");
+
+        result[0] = 10;
+        if (first[0] != 1) throw new Error("First buffer was modified");
+
+        result[size] = 20;
+        if (second[0] != 2) throw new Error("Second buffer was modified");
+
+        result[size * 2] = 30;
+        if (third[0] != 3) throw new Error("Third buffer was modified");
+      }
+    },
+  );
+}
+
+const chunk = Buffer.alloc(16);
+chunk.fill("3");
+const array = Array.from({ length: 100 }, () => chunk);
+bench("Buffer.concat 100 tiny chunks", () => {
+  return Buffer.concat(array);
+});
+
+await run();

bench/snippets/cp.mjs

@@ -1,9 +1,10 @@
-import { mkdirSync, writeFileSync } from "fs";
-import { bench, run } from "./runner.mjs";
+import { mkdirSync, rmSync, writeFileSync } from "fs";
 import { cp } from "fs/promises";
-import { join } from "path";
 import { tmpdir } from "os";
+import { join, resolve } from "path";
+import { bench, run } from "./runner.mjs";
 
+import { fileURLToPath } from "url";
 const hugeDirectory = (() => {
   const root = join(tmpdir(), "huge");
   const base = join(root, "directory", "for", "benchmarks", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10");
@@ -18,14 +19,21 @@ const hugeDirectory = (() => {
 const hugeFilePath = join(tmpdir(), "huge-file-0.txt");
 const hugeText = "Hello, world!".repeat(1000000);
 writeFileSync(hugeFilePath, hugeText);
+let base = process.argv.at(-1);
+if (resolve(base) === fileURLToPath(import.meta.url)) {
+  base = tmpdir();
+} else {
+  rmSync(base, { recursive: true, force: true });
+  mkdirSync(base, { recursive: true });
+}
 
 var hugeCopyI = 0;
 bench("cp -r (1000 files)", async b => {
-  await cp(hugeDirectory, join(tmpdir(), "huge-copy" + hugeCopyI++), { recursive: true });
+  await cp(hugeDirectory, join(base, "huge-copy" + hugeCopyI++), { recursive: true });
 });
 
 bench("cp 1 " + ((hugeText.length / 1024) | 0) + " KB file", async b => {
-  await cp(hugeFilePath, join(tmpdir(), "huge-file" + hugeCopyI++));
+  await cp(hugeFilePath, join(base, "huge-file" + hugeCopyI++));
 });
 
 await run();

bench/snippets/crypto-randomUUID.mjs

@@ -0,0 +1,7 @@
+import { bench, run } from "./runner.mjs";
+
+bench("crypto.randomUUID()", () => {
+  return crypto.randomUUID();
+});
+
+await run();

bench/snippets/headers.mjs

@@ -1,9 +1,9 @@
 import { bench, run } from "../node_modules/mitata/src/cli.mjs";
 
 // pure JS implementation will optimze this out
-// bench("new Headers", function () {
-//   return new Headers();
-// });
+bench("new Headers", function () {
+  return new Headers();
+});
 
 var big = new Headers({
   "Content-Type": "text/plain",
@@ -17,17 +17,128 @@ var big = new Headers({
   "X-Yet-Another-Custom-Headz": "Hello Worlda",
 });
 
-// bench("Header.get", function () {
-//   return big.get("Content-Type");
-// });
+bench("new Headers([])", () => {
+  return new Headers([]);
+});
 
-// bench("Header.set (standard)", function () {
-//   return big.set("Content-Type", "text/html");
-// });
+bench("new Headers({})", () => {
+  return new Headers({});
+});
 
-// bench("Header.set (non-standard)", function () {
-//   return big.set("X-My-Custom", "text/html123");
-// });
+bench("new Headers(object)", () => {
+  return new Headers({
+    "Content-Type": "text/plain",
+    "Content-Length": "123",
+    "User-Agent": "node-fetch/1.0",
+  });
+});
+
+bench("new Headers(hugeObject)", () => {
+  return new Headers({
+    "Accept": "123",
+    "Accept-Charset": "123",
+    "Accept-Language": "123",
+    "Accept-Encoding": "123",
+    "Accept-Ranges": "123",
+    "Access-Control-Allow-Credentials": "123",
+    "Access-Control-Allow-Headers": "123",
+    "Access-Control-Allow-Methods": "123",
+    "Access-Control-Allow-Origin": "123",
+    "Access-Control-Expose-Headers": "123",
+    "Access-Control-Max-Age": "123",
+    "Access-Control-Request-Headers": "123",
+    "Access-Control-Request-Method": "123",
+    "Age": "123",
+    "Authorization": "123",
+    "Cache-Control": "123",
+    "Connection": "123",
+    "Content-Disposition": "123",
+    "Content-Encoding": "123",
+    "Content-Language": "123",
+    "Content-Length": "123",
+    "Content-Location": "123",
+    "Content-Security-Policy": "123",
+    "Content-Security-Policy-Report-Only": "123",
+    "Content-Type": "123",
+    "Content-Range": "123",
+    "Cookie": "123",
+    "Cookie2": "123",
+    "Cross-Origin-Embedder-Policy": "123",
+    "Cross-Origin-Embedder-Policy-Report-Only": "123",
+    "Cross-Origin-Opener-Policy": "123",
+    "Cross-Origin-Opener-Policy-Report-Only": "123",
+    "Cross-Origin-Resource-Policy": "123",
+    "Date": "123",
+    "DNT": "123",
+    "Default-Style": "123",
+    "ETag": "123",
+    "Expect": "123",
+    "Expires": "123",
+    "Host": "123",
+    "If-Match": "123",
+    "If-Modified-Since": "123",
+    "If-None-Match": "123",
+    "If-Range": "123",
+    "If-Unmodified-Since": "123",
+    "Keep-Alive": "123",
+    "Last-Event-ID": "123",
+    "Last-Modified": "123",
+    "Link": "123",
+    "Location": "123",
+    "Origin": "123",
+    "Ping-From": "123",
+    "Ping-To": "123",
+    "Purpose": "123",
+    "Pragma": "123",
+    "Proxy-Authorization": "123",
+    "Range": "123",
+    "Referer": "123",
+    "Referrer-Policy": "123",
+    "Refresh": "123",
+    "Report-To": "123",
+    "Sec-Fetch-Dest": "123",
+    "Sec-Fetch-Mode": "123",
+    "Sec-WebSocket-Accept": "123",
+    "Sec-WebSocket-Extensions": "123",
+    "Sec-WebSocket-Key": "123",
+    "Sec-WebSocket-Protocol": "123",
+    "Sec-WebSocket-Version": "123",
+    "Server-Timing": "123",
+    "Service-Worker": "123",
+    "Service-Worker-Allowed": "123",
+    "Service-Worker-Navigation-Preload": "123",
+    "Set-Cookie": "123",
+    "Set-Cookie2": "123",
+    "SourceMap": "123",
+    "TE": "123",
+    "Timing-Allow-Origin": "123",
+    "Trailer": "123",
+    "Transfer-Encoding": "123",
+    "Upgrade": "123",
+    "Upgrade-Insecure-Requests": "123",
+    "User-Agent": "123",
+    "Vary": "123",
+    "Via": "123",
+    "X-Content-Type-Options": "123",
+    "X-DNS-Prefetch-Control": "123",
+    "X-Frame-Options": "123",
+    "X-SourceMap": "123",
+    "X-XSS-Protection": "123",
+    "X-Temp-Tablet": "123",
+  });
+});
+
+bench("Header.get", function () {
+  return big.get("Content-Type");
+});
+
+bench("Header.set (standard)", function () {
+  return big.set("Content-Type", "text/html");
+});
+
+bench("Header.set (non-standard)", function () {
+  return big.set("X-My-Custom", "text/html123");
+});
 
 if (big.toJSON)
   bench("Headers.toJSON", function () {
@@ -42,4 +153,4 @@ bench("Object.fromEntries(headers)", function () {
   return Object.fromEntries(big);
 });
 
-run();
+await run();

bench/snippets/http-hello.node.mjs

@@ -4,5 +4,9 @@ var i = 0;
 const server = createServer((req, res) => {
   res.writeHead(200);
   res.end("Hello, World!" + i);
-  if (i++ === 200_000 - 1) queueMicrotask(() => process.exit(0));
+  if (i++ === 200_000 - 1)
+    setTimeout(() => {
+      console.log("RSS", (process.memoryUsage().rss / 1024 / 1024) | 0, "MB");
+      process.exit(0);
+    }, 0);
 }).listen(parseInt(process.env.PORT || "3000", 10));

bench/snippets/native-overhead.mjs

@@ -5,6 +5,11 @@ const lazy = globalThis[Symbol.for("Bun.lazy")];
 const noop = lazy("noop");
 const fn = noop.function;
 const regular = noop.functionRegular;
+const callback = noop.callback;
+
+bench("C++ callback into JS", () => {
+  callback(() => {});
+});
 
 bench("C++ fn regular", () => {
   regular();

bench/snippets/new-incomingmessage.mjs

@@ -0,0 +1,52 @@
+import { bench, run } from "./runner.mjs";
+import { IncomingMessage } from "node:http";
+
+const headers = {
+  date: "Mon, 06 Nov 2023 05:12:49 GMT",
+  expires: "-1",
+  "cache-control": "private, max-age=0",
+  "content-type": "text/html; charset=ISO-8859-1",
+  "content-security-policy-report-only":
+    "object-src 'none';base-uri 'self';script-src 'nonce-lcrU7l9xScCq4urW13K9gw' 'strict-dynamic' 'report-sample' 'unsafe-eval' 'unsafe-inline' https: http:;report-uri https://csp.withgoogle.com/csp/gws/other-hp",
+  "x-xss-protection": "0",
+  "x-frame-options": "SAMEORIGIN",
+  "accept-ranges": "none",
+  vary: "Accept-Encoding",
+  "transfer-encoding": "chunked",
+  "set-cookie": [
+    "1P_JAR=2023-11-06-05; expires=Wed, 06-Dec-2023 05:12:49 GMT; path=/; domain=.google.com; Secure",
+    "AEC=Ackid1TiuGtRsmu1yaDCAdL1u1J4eM4S67simzDHfWaMPQzH-UB4DZkRwm8; expires=Sat, 04-May-2024 05:12:49 GMT; path=/; domain=.google.com; Secure; HttpOnly; SameSite=lax",
+    "NID=511=jQcg9cM7vjKawWnf6f3qhs3WDIIN2gaRq3i4bdMiVRWFkaFNYmiI-Xquf1kAmWGcmDN0skldS7uHheru3CMJrWjMt56VaaqO6Pilb54jFjQS_ZJRfG3Uc7dGV5WXGV-slUGE1Bicxlajdn0E_R8tZOoWiFzFDQW7YGmyfRqWQ2k; expires=Tue, 07-May-2024 05:12:49 GMT; path=/; domain=.google.com; HttpOnly",
+  ],
+  p3p: 'CP="This is not a P3P policy! See g.co/p3phelp for more info."',
+  server: "gws",
+  "alt-svc": 'h3=":443"; ma=2592000,h3-29=":443"; ma=2592000',
+};
+
+const request = new Request("https://www.google.com/", {
+  headers: new Headers(headers),
+  method: "GET",
+});
+
+// const server = Bun.serve({
+//   port: 8080,
+//   async fetch(request) {
+//     // bench("new IncomingMessage()", b => {
+//     //   for (let i = 0; i < 1000; i++) {
+//     //     new IncomingMessage(request);
+//     //   }
+//     // });
+//     const msg = new IncomingMessage(request);
+//     console.log(msg.headers, msg.rawHeaders, msg.url);
+//     // await run();
+//     return new Response("Hello, world!");
+//   },
+// });
+
+bench("new IncomingMessage()", b => {
+  for (let i = 0; i < 1000; i++) {
+    new IncomingMessage(request);
+  }
+});
+
+await run();

bench/snippets/peek-promise.mjs

@@ -0,0 +1,31 @@
+import { bench, run } from "mitata";
+import { peek } from "bun";
+
+let pending = Bun.sleep(1000);
+let resolved = Promise.resolve(1);
+
+bench("Bun.peek - pending", () => {
+  return peek(pending);
+});
+
+bench("Bun.peek - resolved", () => {
+  return peek(resolved);
+});
+
+bench("Bun.peek - non-promise", () => {
+  return peek(1);
+});
+
+bench("Bun.peek.status - resolved", () => {
+  return peek.status(pending);
+});
+
+bench("Bun.peek.status - pending", () => {
+  return peek.status(resolved);
+});
+
+bench("Bun.peek.status - non-promise", () => {
+  return peek.status(1);
+});
+
+await run();

bench/snippets/read-file-chunk.mjs

@@ -0,0 +1,73 @@
+import { tmpdir } from "node:os";
+import { bench, group, run } from "./runner.mjs";
+import { createReadStream, writeFileSync } from "node:fs";
+import { sep } from "node:path";
+
+if (!Promise.withResolvers) {
+  Promise.withResolvers = function () {
+    let resolve, reject;
+    const promise = new Promise((res, rej) => {
+      resolve = res;
+      reject = rej;
+    });
+    return { promise, resolve, reject };
+  };
+}
+
+const ALLOW_BUN = typeof Bun !== "undefined";
+const ALLOW_NODE = true;
+
+const dir = tmpdir() + sep;
+
+var short = (function () {
+  const text = "Hello World!";
+  const path = dir + "bun-bench-short.text";
+  writeFileSync(path, text, "utf8");
+  return { path, length: text.length };
+})();
+var shortUTF16 = (function () {
+  const text = "Hello World 💕💕💕";
+  const path = dir + "bun-bench-shortUTF16.text";
+  writeFileSync(path, text, "utf8");
+  return { path, length: text.length };
+})();
+var long = (function () {
+  const text = "Hello World!".repeat(1024);
+  const path = dir + "bun-bench-long.text";
+  writeFileSync(path, text, "utf8");
+  return { path, length: text.length };
+})();
+var longUTF16 = (function () {
+  const text = "Hello World 💕💕💕".repeat(15 * 70192);
+  const path = dir + "bun-bench-longUTF16.text";
+  writeFileSync(path, text, "utf8");
+  return { path, length: text.length };
+})();
+
+async function bun(path) {
+  for await (const chunk of Bun.file(path).stream()) {
+    chunk;
+  }
+}
+
+async function node(path) {
+  const { promise, resolve } = Promise.withResolvers();
+  const stream = createReadStream(path);
+  stream.on("data", chunk => {});
+  stream.on("end", () => resolve());
+  await promise;
+}
+
+ALLOW_BUN && bench("short - bun", () => bun(short.path));
+ALLOW_NODE && bench("short - node", () => node(short.path));
+
+ALLOW_BUN && bench("shortUTF16 - bun", () => bun(shortUTF16.path));
+ALLOW_NODE && bench("shortUTF16 - node", () => node(shortUTF16.path));
+
+ALLOW_BUN && bench("long - bun", () => bun(long.path));
+ALLOW_NODE && bench("long - node", () => node(long.path));
+
+ALLOW_BUN && bench("longUTF16 - bun", () => bun(longUTF16.path));
+ALLOW_NODE && bench("longUTF16 - node", () => node(longUTF16.path));
+
+await run();

bench/snippets/readdir.mjs

@@ -1,13 +1,50 @@
-import { readdirSync } from "fs";
+import { readdirSync, readdir as readdirCb } from "fs";
+import { readdir } from "fs/promises";
 import { bench, run } from "./runner.mjs";
 import { argv } from "process";
+import { fileURLToPath } from "url";
+import { relative, resolve } from "path";
+import { createHash } from "crypto";
 
-const dir = argv.length > 2 ? argv[2] : "/tmp";
+let dir = resolve(argv.length > 2 ? argv[2] : fileURLToPath(new URL("../../node_modules", import.meta.url)));
+if (dir.includes(process.cwd())) {
+  dir = relative(process.cwd(), dir);
+}
 
-const count = readdirSync(dir).length;
-bench(`readdir("${dir}")`, () => {
-  readdirSync(dir, { withFileTypes: true });
+const result = await readdir(dir, { recursive: true });
+const count = result.length;
+const syncCount = readdirSync(dir, { recursive: true }).length;
+
+const hash = createHash("sha256").update(result.sort().join("\n")).digest("hex");
+
+bench(`await readdir("${dir}", {recursive: true})`, async () => {
+  await readdir(dir, { recursive: true });
+});
+
+bench(`await readdir("${dir}", {recursive: true}) x 10`, async () => {
+  const promises = [
+    readdir(dir, { recursive: true }),
+    readdir(dir, { recursive: true }),
+    readdir(dir, { recursive: true }),
+    readdir(dir, { recursive: true }),
+    readdir(dir, { recursive: true }),
+    readdir(dir, { recursive: true }),
+    readdir(dir, { recursive: true }),
+    readdir(dir, { recursive: true }),
+    readdir(dir, { recursive: true }),
+    readdir(dir, { recursive: true }),
+    readdir(dir, { recursive: true }),
+  ];
+  await Promise.all(promises);
+});
+
+bench(`await readdir("${dir}", {recursive: false})`, async () => {
+  await readdir(dir, { recursive: false });
 });
 
 await run();
-console.log("\n\nFor", count, "files/dirs in", dir);
+console.log("\n", count, "files/dirs in", dir, "\n", "SHA256:", hash, "\n");
+
+if (count !== syncCount) {
+  throw new Error(`Mismatched file counts: ${count} async !== ${syncCount} sync`);
+}

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",
+    },
+  });
+}

bench/snippets/semver.mjs

@@ -0,0 +1,143 @@
+import { satisfies } from "semver";
+import { bench, run } from "./runner.mjs";
+const tests = [
+  ["~1.2.3", "1.2.3", true],
+  ["~1.2", "1.2.0", true],
+  ["~1", "1.0.0", true],
+  ["~1", "1.2.0", true],
+  ["~1", "1.2.999", true],
+  ["~0.2.3", "0.2.3", true],
+  ["~0.2", "0.2.0", true],
+  ["~0.2", "0.2.1", true],
+  ["~0 ", "0.0.0", true],
+
+  ["~1.2.3", "1.3.0", false],
+  ["~1.2", "1.3.0", false],
+  ["~1", "2.0.0", false],
+  ["~0.2.3", "0.3.0", false],
+  ["~0.2.3", "1.0.0", false],
+  ["~0 ", "1.0.0", false],
+  ["~0.2", "0.1.0", false],
+  ["~0.2", "0.3.0", false],
+
+  ["~3.0.5", "3.3.0", false],
+
+  ["^1.1.4", "1.1.4", true],
+
+  [">=3", "3.5.0", true],
+  [">=3", "2.999.999", false],
+  [">=3", "3.5.1", true],
+  [">=3.x.x", "3.x.x", false],
+
+  ["<6 >= 5", "5.0.0", true],
+  ["<6 >= 5", "4.0.0", false],
+  ["<6 >= 5", "6.0.0", false],
+  ["<6 >= 5", "6.0.1", false],
+
+  [">2", "3", false],
+  [">2", "2.1", false],
+  [">2", "2", false],
+  [">2", "1.0", false],
+  [">1.3", "1.3.1", false],
+  [">1.3", "2.0.0", true],
+  [">2.1.0", "2.2.0", true],
+  ["<=2.2.99999", "2.2.0", true],
+  [">=2.1.99999", "2.2.0", true],
+  ["<2.2.99999", "2.2.0", true],
+  [">2.1.99999", "2.2.0", true],
+  [">1.0.0", "2.0.0", true],
+  ["1.0.0", "1.0.0", true],
+  ["1.0.0", "2.0.0", false],
+
+  ["1.0.0 || 2.0.0", "1.0.0", true],
+  ["2.0.0 || 1.0.0", "1.0.0", true],
+  ["1.0.0 || 2.0.0", "2.0.0", true],
+  ["2.0.0 || 1.0.0", "2.0.0", true],
+  ["2.0.0 || >1.0.0", "2.0.0", true],
+
+  [">1.0.0 <2.0.0 <2.0.1 >1.0.1", "1.0.2", true],
+
+  ["2.x", "2.0.0", true],
+  ["2.x", "2.1.0", true],
+  ["2.x", "2.2.0", true],
+  ["2.x", "2.3.0", true],
+  ["2.x", "2.1.1", true],
+  ["2.x", "2.2.2", true],
+  ["2.x", "2.3.3", true],
+
+  ["<2.0.1 >1.0.0", "2.0.0", true],
+  ["<=2.0.1 >=1.0.0", "2.0.0", true],
+
+  ["^2", "2.0.0", true],
+  ["^2", "2.9.9", true],
+  ["~2", "2.0.0", true],
+  ["~2", "2.1.0", true],
+  ["~2.2", "2.2.1", true],
+
+  ["2.1.0 || > 2.2 || >3", "2.1.0", true],
+  [" > 2.2 || >3 || 2.1.0", "2.1.0", true],
+  [" > 2.2 || 2.1.0 || >3", "2.1.0", true],
+  ["> 2.2 || 2.1.0 || >3", "2.3.0", true],
+  ["> 2.2 || 2.1.0 || >3", "2.2.1", false],
+  ["> 2.2 || 2.1.0 || >3", "2.2.0", false],
+  ["> 2.2 || 2.1.0 || >3", "2.3.0", true],
+  ["> 2.2 || 2.1.0 || >3", "3.0.1", true],
+  ["~2", "2.0.0", true],
+  ["~2", "2.1.0", true],
+
+  ["1.2.0 - 1.3.0", "1.2.2", true],
+  ["1.2 - 1.3", "1.2.2", true],
+  ["1 - 1.3", "1.2.2", true],
+  ["1 - 1.3", "1.3.0", true],
+  ["1.2 - 1.3", "1.3.1", true],
+  ["1.2 - 1.3", "1.4.0", false],
+  ["1 - 1.3", "1.3.1", true],
+
+  ["1.2 - 1.3 || 5.0", "6.4.0", false],
+  ["1.2 - 1.3 || 5.0", "1.2.1", true],
+  ["5.0 || 1.2 - 1.3", "1.2.1", true],
+  ["1.2 - 1.3 || 5.0", "5.0", false],
+  ["5.0 || 1.2 - 1.3", "5.0", false],
+  ["1.2 - 1.3 || 5.0", "5.0.2", true],
+  ["5.0 || 1.2 - 1.3", "5.0.2", true],
+  ["1.2 - 1.3 || 5.0", "5.0.2", true],
+  ["5.0 || 1.2 - 1.3", "5.0.2", true],
+  ["5.0 || 1.2 - 1.3 || >8", "9.0.2", true],
+];
+
+bench("semver.satisfies x " + tests.length, () => {
+  for (const [range, version, expected] of tests) {
+    if (satisfies(version, range) !== expected) {
+      throw new Error("Unexpected result for " + range + " " + version);
+    }
+  }
+});
+
+if (typeof Bun !== "undefined") {
+  const satisfies = Bun.semver.satisfies;
+  bench("Bun.semver.satisfies x " + tests.length, () => {
+    for (const [range, version, expected] of tests) {
+      if (satisfies(version, range) !== expected) {
+        throw new Error("Unexpected result for " + range + " " + version);
+      }
+    }
+  });
+}
+
+bench("semver.satisfies", () => {
+  const [range, version, expected] = tests[0];
+  if (satisfies(version, range) !== expected) {
+    throw new Error("Unexpected result for " + range + " " + version);
+  }
+});
+if (typeof Bun !== "undefined") {
+  const satisfies = Bun.semver.satisfies;
+  bench("Bun.semver.satisfies", () => {
+    const [range, version, expected] = tests[0];
+    if (satisfies(version, range) !== expected) {
+      throw new Error("Unexpected result for " + range + " " + version);
+    }
+  });
+}
+
+await run();

bench/snippets/shell-spawn.mjs

@@ -0,0 +1,37 @@
+import { $ as zx } from "zx";
+import { $ as execa$ } from "execa";
+import { bench, run, group } from "./runner.mjs";
+
+const execa = execa$({ stdio: "ignore", cwd: import.meta.dirname });
+
+group("echo hi", () => {
+  if (typeof Bun !== "undefined")
+    bench("$`echo hi`", async () => {
+      await Bun.$`echo hi`.quiet();
+    });
+
+  bench("execa`echo hi`", async () => {
+    await execa`echo hi`;
+  });
+
+  bench("zx`echo hi`", async () => {
+    await zx`echo hi`.quiet();
+  });
+});
+
+group("ls .", () => {
+  if (typeof Bun !== "undefined")
+    bench("$`ls .`", async () => {
+      await Bun.$`ls .`.quiet();
+    });
+
+  bench("execa`ls .`", async () => {
+    await execa`ls .`;
+  });
+
+  bench("zx`ls .`", async () => {
+    await zx`ls .`.quiet();
+  });
+});
+
+await run();

bench/snippets/string-width.mjs

@@ -0,0 +1,41 @@
+import { bench, run } from "./runner.mjs";
+import npmStringWidth from "string-width";
+
+const bunStringWidth = globalThis?.Bun?.stringWidth;
+
+const stringWidth = bunStringWidth || npmStringWidth;
+const formatter = new Intl.NumberFormat();
+const format = n => {
+  return formatter.format(n);
+};
+
+const inputs = [
+  ["hello", "ascii"],
+  ["[31mhello", "ascii+ansi"],
+  ["hello😀", "ascii+emoji"],
+  ["[31m😀😀", "ansi+emoji"],
+  ["😀hello😀[31m😀😀😀", "ansi+emoji+ascii"],
+];
+
+const repeatCounts = [1, 10, 100, 1000, 5000];
+
+const maxInputLength = Math.max(...inputs.map(([input]) => input.repeat(Math.max(...repeatCounts)).length));
+
+for (const [input, textLabel] of inputs) {
+  for (let repeatCount of repeatCounts) {
+    const label = bunStringWidth ? "Bun.stringWidth" : "npm/string-width";
+
+    const str = input.repeat(repeatCount);
+    const name = `${label} ${format(str.length).padStart(format(maxInputLength).length, " ")} chars ${textLabel}`;
+
+    bench(name, () => {
+      stringWidth(str);
+    });
+
+    if (bunStringWidth && bunStringWidth(str) !== npmStringWidth(str)) {
+      throw new Error("string-width mismatch");
+    }
+  }
+}
+
+await run();

bench/snippets/urlsearchparams.mjs

@@ -0,0 +1,113 @@
+import { bench, run } from "./runner.mjs";
+
+// bench("new URLSearchParams({})", () => {
+//   return new URLSearchParams({});
+// });
+
+bench("new URLSearchParams(obj)", () => {
+  return new URLSearchParams({
+    "Content-Type": "text/plain",
+    "Content-Length": "123",
+    "User-Agent": "node-fetch/1.0",
+    "Accept-Encoding": "gzip,deflate",
+    "Content-Length": "0",
+    "Content-Range": "bytes 0-9/10",
+  });
+});
+
+bench("new URLSearchParams(absurdlyHugeObject)", () => {
+  return new URLSearchParams({
+    "Accept": "123",
+    "Accept-Charset": "123",
+    "Accept-Language": "123",
+    "Accept-Encoding": "123",
+    "Accept-Ranges": "123",
+    "Access-Control-Allow-Credentials": "123",
+    "Access-Control-Allow-Headers": "123",
+    "Access-Control-Allow-Methods": "123",
+    "Access-Control-Allow-Origin": "123",
+    "Access-Control-Expose-Headers": "123",
+    "Access-Control-Max-Age": "123",
+    "Access-Control-Request-Headers": "123",
+    "Access-Control-Request-Method": "123",
+    "Age": "123",
+    "Authorization": "123",
+    "Cache-Control": "123",
+    "Connection": "123",
+    "Content-Disposition": "123",
+    "Content-Encoding": "123",
+    "Content-Language": "123",
+    "Content-Length": "123",
+    "Content-Location": "123",
+    "Content-Security-Policy": "123",
+    "Content-Security-Policy-Report-Only": "123",
+    "Content-Type": "123",
+    "Content-Range": "123",
+    "Cookie": "123",
+    "Cookie2": "123",
+    "Cross-Origin-Embedder-Policy": "123",
+    "Cross-Origin-Embedder-Policy-Report-Only": "123",
+    "Cross-Origin-Opener-Policy": "123",
+    "Cross-Origin-Opener-Policy-Report-Only": "123",
+    "Cross-Origin-Resource-Policy": "123",
+    "Date": "123",
+    "DNT": "123",
+    "Default-Style": "123",
+    "ETag": "123",
+    "Expect": "123",
+    "Expires": "123",
+    "Host": "123",
+    "If-Match": "123",
+    "If-Modified-Since": "123",
+    "If-None-Match": "123",
+    "If-Range": "123",
+    "If-Unmodified-Since": "123",
+    "Keep-Alive": "123",
+    "Last-Event-ID": "123",
+    "Last-Modified": "123",
+    "Link": "123",
+    "Location": "123",
+    "Origin": "123",
+    "Ping-From": "123",
+    "Ping-To": "123",
+    "Purpose": "123",
+    "Pragma": "123",
+    "Proxy-Authorization": "123",
+    "Range": "123",
+    "Referer": "123",
+    "Referrer-Policy": "123",
+    "Refresh": "123",
+    "Report-To": "123",
+    "Sec-Fetch-Dest": "123",
+    "Sec-Fetch-Mode": "123",
+    "Sec-WebSocket-Accept": "123",
+    "Sec-WebSocket-Extensions": "123",
+    "Sec-WebSocket-Key": "123",
+    "Sec-WebSocket-Protocol": "123",
+    "Sec-WebSocket-Version": "123",
+    "Server-Timing": "123",
+    "Service-Worker": "123",
+    "Service-Worker-Allowed": "123",
+    "Service-Worker-Navigation-Preload": "123",
+    "Set-Cookie": "123",
+    "Set-Cookie2": "123",
+    "SourceMap": "123",
+    "TE": "123",
+    "Timing-Allow-Origin": "123",
+    "Trailer": "123",
+    "Transfer-Encoding": "123",
+    "Upgrade": "123",
+    "Upgrade-Insecure-Requests": "123",
+    "User-Agent": "123",
+    "Vary": "123",
+    "Via": "123",
+    "X-Content-Type-Options": "123",
+    "X-DNS-Prefetch-Control": "123",
+    "X-Frame-Options": "123",
+    "X-SourceMap": "123",
+    "X-XSS-Protection": "123",
+    "X-Temp-Tablet": "123",
+  });
+});
+
+await run();

bench/sqlite/bun.js

@@ -1,7 +1,8 @@
 import { run, bench } from "mitata";
 import { Database } from "bun:sqlite";
+import { join } from "path";
 
-const db = Database.open("./src/northwind.sqlite");
+const db = Database.open(join(import.meta.dir, "src", "northwind.sqlite"));
 
 {
   const sql = db.prepare(`SELECT * FROM "Order"`);

bench/sqlite/package.json

@@ -7,8 +7,8 @@
     "build": "exit 0",
     "bench:bun": "$BUN bun.js",
     "bench:node": "$NODE node.mjs",
-    "deps": "npm install && sh src/download.sh",
-    "bench:deno": "$DENO run -A --unstable deno.js",
+    "deps": "npm install && bash src/download.sh",
+    "bench:deno": "$DENO run -A --unstable-ffi deno.js",
     "bench": "bun run bench:bun && bun run bench:node && bun run bench:deno"
   }
 }

build.zig

@@ -1,31 +1,22 @@
 const std = @import("std");
 const pathRel = std.fs.path.relative;
-const Wyhash = @import("./src/wyhash.zig").Wyhash;
+const builtin = @import("builtin");
+const Wyhash11 = @import("./src/wyhash.zig").Wyhash11;
+
+const zig_version = builtin.zig_version;
+
+/// Do not rename this constant. It is scanned by some scripts to determine which zig version to install.
+const recommended_zig_version = "0.12.0-dev.1828+225fe6ddb";
+
 var is_debug_build = false;
-fn moduleSource(comptime out: []const u8) FileSource {
-    if (comptime std.fs.path.dirname(@src().file)) |base| {
-        const outpath = comptime base ++ std.fs.path.sep_str ++ out;
-        return FileSource.relative(outpath);
-    } else {
-        return FileSource.relative(out);
-    }
+
+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" },
-    &.{ "b", "1m" },
-    &.{ "d", "2m" },
-    &.{ "cyan", "36m" },
-    &.{ "green", "32m" },
-    &.{ "magenta", "35m" },
-    &.{ "red", "31m" },
-    &.{ "white", "37m" },
-    &.{ "yellow", "33m" },
-});
-
 fn addInternalPackages(b: *Build, step: *CompileStep, _: std.mem.Allocator, _: []const u8, target: anytype) !void {
-    var io: *Module = brk: {
+    const io: *Module = brk: {
         if (target.isDarwin()) {
             break :brk b.createModule(.{
                 .source_file = FileSource.relative("src/io/io_darwin.zig"),
@@ -46,23 +37,54 @@ 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") });
+    });
+
+    const 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,
+    is_canary: bool = false,
+    canary_revision: u32 = 0,
     sha: [:0]const u8 = "",
+    version: []const u8 = "",
     baseline: bool = false,
     bindgen: bool = false,
     sizegen: bool = false,
     base_path: [:0]const u8 = "",
+    tracy_callstack_depth: u16,
 
     runtime_js_version: u64 = 0,
     fallback_html_version: u64 = 0,
 
+    tinycc: bool = true,
+    project: [:0]const u8 = "",
+
     pub fn updateRuntime(this: *BunBuildOptions) anyerror!void {
         if (std.fs.cwd().openFile("src/runtime.out.js", .{ .mode = .read_only })) |file| {
             defer file.close();
-            const runtime_hash = Wyhash.hash(
+            const runtime_hash = Wyhash11.hash(
                 0,
                 try file.readToEndAlloc(std.heap.page_allocator, try file.getEndPos()),
             );
@@ -75,7 +97,7 @@ const BunBuildOptions = struct {
 
         if (std.fs.cwd().openFile("src/fallback.out.js", .{ .mode = .read_only })) |file| {
             defer file.close();
-            const fallback_hash = Wyhash.hash(
+            const fallback_hash = Wyhash11.hash(
                 0,
                 try file.readToEndAlloc(std.heap.page_allocator, try file.getEndPos()),
             );
@@ -89,7 +111,13 @@ 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(@TypeOf(this.is_canary), "is_canary", this.is_canary);
+        opts.addOption(@TypeOf(this.canary_revision), "canary_revision", this.canary_revision);
+        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,35 +125,15 @@ 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;
     }
 };
 
 // relative to the prefix
 var output_dir: []const u8 = "";
-fn panicIfNotFound(comptime filepath: []const u8) []const u8 {
-    var file = std.fs.cwd().openFile(filepath, .{ .optimize = .read_only }) catch |err| {
-        std.debug.panic("error: {s} opening {s}. Please ensure you've downloaded git submodules, and ran `make vendor`, `make jsc`.", .{ filepath, @errorName(err) });
-    };
-    file.close();
 
-    return filepath;
-}
-
-const fmt = struct {
-    pub usingnamespace @import("std").fmt;
-
-    pub fn hexInt(value: anytype) @TypeOf(std.fmt.fmtSliceHexLower("")) {
-        return std.fmt.fmtSliceHexLower(std.mem.asBytes(&value));
-    }
-
-    pub fn hexIntUp(value: anytype) @TypeOf(std.fmt.fmtSliceHexUpper("")) {
-        return std.fmt.fmtSliceHexUpper(std.mem.asBytes(&value));
-    }
-};
-
-var x64 = "x64";
-var optimize: std.builtin.OptimizeMode = undefined;
+var optimize: std.builtin.OptimizeMode = .Debug;
 
 const Build = std.Build;
 const CrossTarget = std.zig.CrossTarget;
@@ -146,6 +154,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 ++ ". Please follow the instructions at https://bun.sh/docs/project/contributing. You may need to re-run `bun setup`.");
+        },
+        .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 are following the instructions at https://bun.sh/docs/project/contributing\n{s}You can update to the right version using 'zigup {s}'\n\n",
+                .{
+                    if (colors) "\x1b[1;33m" else "",
+                    recommended_zig_version,
+                    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,47 +183,65 @@ pub fn build_(b: *Build) !void {
     // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
     optimize = b.standardOptimizeOption(.{});
 
+    var generated_code_directory = b.option([]const u8, "generated-code", "Set the generated code directory") orelse "";
+
+    if (generated_code_directory.len == 0) {
+        generated_code_directory = b.pathFromRoot("build/codegen");
+    }
+
     var output_dir_buf = std.mem.zeroes([4096]u8);
-    var bin_label = if (optimize == std.builtin.OptimizeMode.Debug) "packages/debug-bun-" else "packages/bun-";
+    const bin_label = if (optimize == std.builtin.OptimizeMode.Debug) "packages/debug-bun-" else "packages/bun-";
 
     var triplet_buf: [64]u8 = undefined;
-    var os_tagname = @tagName(target.getOs().tag);
 
     const arch: std.Target.Cpu.Arch = target.getCpuArch();
 
-    if (std.mem.eql(u8, os_tagname, "macos")) {
-        os_tagname = "darwin";
-        target.os_version_min = std.zig.CrossTarget.OsVersion{ .semver = .{ .major = 11, .minor = 0, .patch = 0 } };
-    } else if (target.isLinux()) {
-        target.setGnuLibCVersion(2, 27, 0);
+    var os_tagname = @tagName(target.getOs().tag);
+
+    switch (target.getOs().tag) {
+        .macos => {
+            os_tagname = "darwin";
+            target.os_version_min = std.zig.CrossTarget.OsVersion{ .semver = .{ .major = 11, .minor = 0, .patch = 0 } };
+        },
+        .windows => {
+            target.os_version_min = std.zig.CrossTarget.OsVersion{
+                // Windows 1809
+                // Minimum version for a syscall related to bun.sys.renameat
+                // if you update this please update install.ps1
+                .windows = .win10_rs5,
+            };
+        },
+        .linux => {
+            target.setGnuLibCVersion(2, 27, 0);
+        },
+        else => {},
     }
-    std.mem.copy(
-        u8,
-        &triplet_buf,
-        os_tagname,
-    );
-    var osname = triplet_buf[0..os_tagname.len];
+
+    @memcpy(triplet_buf[0..].ptr, os_tagname);
+    const osname = triplet_buf[0..os_tagname.len];
     triplet_buf[osname.len] = '-';
 
-    std.mem.copy(u8, triplet_buf[osname.len + 1 ..], @tagName(target.getCpuArch()));
+    @memcpy(triplet_buf[osname.len + 1 ..].ptr, @tagName(target.getCpuArch()));
     var cpuArchName = triplet_buf[osname.len + 1 ..][0..@tagName(target.getCpuArch()).len];
     std.mem.replaceScalar(u8, cpuArchName, '_', '-');
     if (std.mem.eql(u8, cpuArchName, "x86-64")) {
-        std.mem.copy(u8, cpuArchName, "x64");
+        @memcpy(cpuArchName.ptr, "x64");
         cpuArchName = cpuArchName[0..3];
     }
 
-    var triplet = triplet_buf[0 .. osname.len + cpuArchName.len + 1];
+    const 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 +263,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 +298,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,13 +313,22 @@ pub fn build_(b: *Build) !void {
             }
         }
 
-        const is_canary = (std.os.getenvZ("BUN_CANARY") orelse "0")[0] == '1';
+        const is_canary, const canary_revision = if (b.option(u32, "canary", "Treat this as a canary build")) |rev|
+            if (rev == 0)
+                .{ false, 0 }
+            else
+                .{ true, rev }
+        else
+            .{ false, 0 };
         break :brk .{
-            .canary = is_canary,
+            .is_canary = is_canary,
+            .canary_revision = canary_revision,
+            .version = b.option([]const u8, "version", "Value of `Bun.version`") orelse "0.0.0",
             .sha = git_sha,
             .baseline = is_baseline,
             .bindgen = false,
             .base_path = try b.allocator.dupeZ(u8, b.pathFromRoot(".")),
+            .tracy_callstack_depth = b.option(u16, "tracy_callstack_depth", "") orelse 10,
         };
     };
 
@@ -269,10 +345,12 @@ pub fn build_(b: *Build) !void {
             obj.target.cpu_model = .{ .explicit = &std.Target.x86.cpu.x86_64_v2 };
         } else if (arch.isX86()) {
             obj.target.cpu_model = .{ .explicit = &std.Target.x86.cpu.haswell };
-        } else if (arch.isAARCH64() and target.isDarwin()) {
-            obj.target.cpu_model = .{ .explicit = &std.Target.aarch64.cpu.apple_m1 };
-        } else if (arch.isAARCH64() and target.isLinux()) {
-            obj.target.cpu_model = .{ .explicit = &std.Target.aarch64.cpu.generic };
+        } else if (arch.isAARCH64()) {
+            if (target.isDarwin()) {
+                obj.target.cpu_model = .{ .explicit = &std.Target.aarch64.cpu.apple_m1 };
+            } else {
+                obj.target.cpu_model = .{ .explicit = &std.Target.aarch64.cpu.generic };
+            }
         }
 
         try default_build_options.updateRuntime();
@@ -283,8 +361,8 @@ 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 v{s}\n", .{builtin.zig_version_string}) catch {};
 
         defer obj_step.dependOn(&obj.step);
 
@@ -301,15 +379,26 @@ pub fn build_(b: *Build) !void {
             actual_build_options.sizegen = true;
         }
 
+        actual_build_options.project = "bun";
         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("ZigGeneratedClasses", b.createModule(.{
+            .source_file = .{ .path = b.pathJoin(&.{ generated_code_directory, "ZigGeneratedClasses.zig" }) },
+        }));
+        obj.addModule("ResolvedSourceTag", b.createModule(.{
+            .source_file = .{ .path = b.pathJoin(&.{ generated_code_directory, "ResolvedSourceTag.zig" }) },
+        }));
 
+        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 +420,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 +437,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 +456,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 +470,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 +484,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 +498,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 +512,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 +526,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 +540,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);
@@ -461,14 +550,14 @@ pub fn build_(b: *Build) !void {
     {
         const headers_step = b.step("test", "Build test");
 
-        var test_file = b.option([]const u8, "test-file", "Input file for test");
-        var test_bin_ = b.option([]const u8, "test-bin", "Emit bin to");
-        var test_filter = b.option([]const u8, "test-filter", "Filter for test");
+        const test_file = b.option([]const u8, "test-file", "Input file for test");
+        const test_bin_ = b.option([]const u8, "test-bin", "Emit bin to");
+        const test_filter = b.option([]const u8, "test-filter", "Filter for test");
 
         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| {
@@ -490,7 +579,20 @@ pub fn build_(b: *Build) !void {
         headers_obj.addOptions("build_options", default_build_options.step(b));
     }
 
-    b.default_step.dependOn(obj_step);
+    // Running `zig build` with no arguments is almost always a mistake.
+    const mistake_message = b.addSystemCommand(&.{
+        "echo",
+        \\
+        \\error: To build Bun from source, please use `bun run setup` instead of `zig build`"
+        \\
+        \\If you want to build the zig code only, run:
+        \\  'zig build obj -Dgenerated-code=./build/codegen [...opts]'
+        \\
+        \\For more info, see https://bun.sh/docs/project/contributing
+        \\
+    });
+
+    b.default_step.dependOn(&mistake_message.step);
 }
 
 pub var original_make_fn: ?*const fn (step: *std.build.Step) anyerror!void = null;

bunfig.toml

@@ -6,3 +6,4 @@
 #
 # Instead, we can only scan the test directory for Bun's runtime tests
 root = "test"
+preload = "./test/preload.ts"

completions/bun.bash

@@ -1,15 +1,17 @@
 #/usr/bin/env bash
 
 _file_arguments() {
-    shopt -s extglob globstar
-    local extensions="${1}";
+    local extensions="${1}"
+    local reset=$(shopt -p globstar)
+    shopt -s globstar
 
     if [[ -z "${cur_word}" ]]; then
         COMPREPLY=( $(compgen -fG -X "${extensions}" -- "${cur_word}") );
     else
         COMPREPLY=( $(compgen -f -X "${extensions}" -- "${cur_word}") );
     fi
-    shopt -u extglob globstar
+
+    $reset
 }
 
 _long_short_completion() {
@@ -43,9 +45,7 @@ _read_scripts_in_package_json() {
         local package_json_compreply;
         local matched="${BASH_REMATCH[@]:1}";
         local scripts="${matched%%\}*}";
-        shopt -s extglob;
         scripts="${scripts//@(\"|\')/}";
-        shopt -u extglob;
         readarray -td, scripts <<<"${scripts}";
         for completion in "${scripts[@]}"; do
             package_json_compreply+=( "${completion%:*}" );
@@ -84,7 +84,7 @@ _bun_completions() {
 
     local SUBCOMMANDS="dev bun create run install add remove upgrade completions discord help init pm x";
 
-    GLOBAL_OPTIONS[LONG_OPTIONS]="--use --cwd --bunfile --server-bunfile --config --disable-react-fast-refresh --disable-hmr --extension-order --jsx-factory --jsx-fragment --extension-order --jsx-factory --jsx-fragment --jsx-import-source --jsx-production --jsx-runtime --main-fields --no-summary --version --platform --public-dir --tsconfig-override --define --external --help --inject --loader --origin --port --dump-environment-variables --dump-limits --disable-bun-js";
+    GLOBAL_OPTIONS[LONG_OPTIONS]="--use --cwd --bunfile --server-bunfile --config --disable-react-fast-refresh --disable-hmr --env-file --extension-order --jsx-factory --jsx-fragment --extension-order --jsx-factory --jsx-fragment --jsx-import-source --jsx-production --jsx-runtime --main-fields --no-summary --version --platform --public-dir --tsconfig-override --define --external --help --inject --loader --origin --port --dump-environment-variables --dump-limits --disable-bun-js";
     GLOBAL_OPTIONS[SHORT_OPTIONS]="-c -v -d -e -h -i -l -u -p";
 
     PACKAGE_OPTIONS[ADD_OPTIONS_LONG]="--development --optional";

completions/bun.fish

@@ -51,7 +51,7 @@ function __bun_last_cmd --argument-names n
 end
 
 set -l bun_install_boolean_flags yarn production optional development no-save dry-run force no-cache silent verbose global
-set -l bun_install_boolean_flags_descriptions "Write a yarn.lock file (yarn v1)" "Don't install devDependencies" "Add dependency to optionalDependencies" "Add dependency to devDependencies" "Don't install devDependencies" "Don't install anything" "Always request the latest versions from the registry & reinstall all dependenices" "Ignore manifest cache entirely" "Don't output anything" "Excessively verbose logging" "Use global folder"
+set -l bun_install_boolean_flags_descriptions "Write a yarn.lock file (yarn v1)" "Don't install devDependencies" "Add dependency to optionalDependencies" "Add dependency to devDependencies" "Don't install devDependencies" "Don't install anything" "Always request the latest versions from the registry & reinstall all dependencies" "Ignore manifest cache entirely" "Don't output anything" "Excessively verbose logging" "Use global folder"
 
 set -l bun_builtin_cmds dev create help bun upgrade discord run install remove add init link unlink pm x
 set -l bun_builtin_cmds_without_run dev create help bun upgrade discord install remove add init pm x

completions/bun.zsh

@@ -406,6 +406,7 @@ _bun_run_completion() {
         '--cwd[Absolute path to resolve files & entry points from. This just changes the process cwd]:cwd' \
         '--config[Config file to load bun from (e.g. -c bunfig.toml]: :->config' \
         '-c[Config file to load bun from (e.g. -c bunfig.toml]: :->config' \
+        '--env-file[Load environment variables from the specified file(s)]:env-file' \
         '--extension-order[Defaults to: .tsx,.ts,.jsx,.js,.json]:extension-order' \
         '--jsx-factory[Changes the function called when compiling JSX elements using the classic JSX runtime]:jsx-factory' \
         '--jsx-fragment[Changes the function called when compiling JSX fragments]:jsx-fragment' \
@@ -572,6 +573,7 @@ _bun_test_completion() {
         '--cwd[Set a specific cwd]:cwd' \
         '-c[Load config(bunfig.toml)]: :->config' \
         '--config[Load config(bunfig.toml)]: :->config' \
+        '--env-file[Load environment variables from the specified file(s)]:env-file' \
         '--extension-order[Defaults to: .tsx,.ts,.jsx,.js,.json]:extension-order' \
         '--jsx-factory[Changes the function called when compiling JSX elements using the classic JSX runtime]:jsx-factory' \
         '--jsx-fragment[Changes the function called when compiling JSX fragments]:jsx-fragment' \

completions/spec.yaml

@@ -2,7 +2,7 @@
 name: bun
 appspec: { version: "0.001" }
 plugins: [-Meta]
-title: A tool for installing and managing Python packages
+title: A tool for installing and managing JavaScript packages
 
 options:
   - version|V                  --Show version and exit
@@ -78,6 +78,9 @@ subcommands:
       - name: server-bunfile
         type: string
         summary: "Use a specific .bun file for SSR in bun dev (default: node_modules.server.bun)"
+      - name: env-file
+        type: string
+        summary: "Load environment variables from the specified file(s)"
       - name: extension-order
         type: string
         summary: "defaults to: .tsx,.ts,.jsx,.js,.json"
@@ -118,7 +121,7 @@ subcommands:
       - frozen-lockfile -- "Disallow changes to lockfile"
       - no-save --
       - dry-run -- "Don't install anything"
-      - force -- "Always request the latest versions from the registry & reinstall all dependenices"
+      - force -- "Always request the latest versions from the registry & reinstall all dependencies"
       - name: cache-dir
         type: string
         summary: "Store & load cached data from a specific directory path"
@@ -153,7 +156,7 @@ subcommands:
       - frozen-lockfile -- "Disallow changes to lockfile"
       - no-save --
       - dry-run -- "Don't install anything"
-      - force -- "Always request the latest versions from the registry & reinstall all dependenices"
+      - force -- "Always request the latest versions from the registry & reinstall all dependencies"
       - no-cache -- "Ignore manifest cache entirely"
       - silent -- "Don't output anything"
       - verbose -- "Excessively verbose logging"
@@ -191,7 +194,7 @@ subcommands:
       - frozen-lockfile -- "Disallow changes to lockfile"
       - no-save --
       - dry-run -- "Don't install anything"
-      - force -- "Always request the latest versions from the registry & reinstall all dependenices"
+      - force -- "Always request the latest versions from the registry & reinstall all dependencies"
       - name: cache-dir
         type: string
         summary: "Store & load cached data from a specific directory path"

dockerhub/alpine/Dockerfile

@@ -91,18 +91,21 @@ RUN apk --no-cache add \
 
 FROM alpine:3.18
 
-COPY --from=build /tmp/glibc.apk /tmp/
-COPY --from=build /tmp/glibc-bin.apk /tmp/
+# Disable the runtime transpiler cache by default inside Docker containers.
+# On ephemeral containers, the cache is not useful
+ARG BUN_RUNTIME_TRANSPILER_CACHE_PATH=0
+ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=${BUN_RUNTIME_TRANSPILER_CACHE_PATH}
+
 COPY --from=build /usr/local/bin/bun /usr/local/bin/
 COPY docker-entrypoint.sh /usr/local/bin/
 
-RUN addgroup -g 1000 bun \
+# Temporarily use the `build`-stage /tmp folder to access the glibc APKs:
+RUN --mount=type=bind,from=build,source=/tmp,target=/tmp \
+    addgroup -g 1000 bun \
     && adduser -u 1000 -G bun -s /bin/sh -D bun \
     && apk --no-cache --force-overwrite --allow-untrusted add \
       /tmp/glibc.apk \
       /tmp/glibc-bin.apk \
-    && rm /tmp/glibc.apk \
-    && rm /tmp/glibc-bin.apk \
     && ln -s /usr/local/bin/bun /usr/local/bin/bunx \
     && which bun \
     && which bunx \

dockerhub/debian-slim/Dockerfile

@@ -57,6 +57,11 @@ RUN apt-get update -qq \
 
 FROM debian:bullseye-slim
 
+# Disable the runtime transpiler cache by default inside Docker containers.
+# On ephemeral containers, the cache is not useful
+ARG BUN_RUNTIME_TRANSPILER_CACHE_PATH=0
+ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=${BUN_RUNTIME_TRANSPILER_CACHE_PATH}
+
 COPY docker-entrypoint.sh /usr/local/bin
 COPY --from=build /usr/local/bin/bun /usr/local/bin/bun
 

dockerhub/debian/Dockerfile

@@ -58,6 +58,11 @@ FROM debian:bullseye
 COPY docker-entrypoint.sh /usr/local/bin
 COPY --from=build /usr/local/bin/bun /usr/local/bin/bun
 
+# Disable the runtime transpiler cache by default inside Docker containers.
+# On ephemeral containers, the cache is not useful
+ARG BUN_RUNTIME_TRANSPILER_CACHE_PATH=0
+ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=${BUN_RUNTIME_TRANSPILER_CACHE_PATH}
+
 RUN groupadd bun \
       --gid 1000 \
     && useradd bun \

dockerhub/distroless/Dockerfile

@@ -57,6 +57,11 @@ RUN apt-get update -qq \
 
 FROM gcr.io/distroless/base-nossl-debian11
 
+# Disable the runtime transpiler cache by default inside Docker containers.
+# On ephemeral containers, the cache is not useful
+ARG BUN_RUNTIME_TRANSPILER_CACHE_PATH=0
+ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=${BUN_RUNTIME_TRANSPILER_CACHE_PATH}
+
 COPY --from=build /usr/local/bin/bun /usr/local/bin/
 
 # Temporarily use the `build`-stage image binaries to create a symlink:

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)`.
@@ -49,7 +49,6 @@ Despite the name, it isn't an array and supports none of the array methods and o
 
 ```ts
 const buf = new ArrayBuffer(8);
-
 buf.byteLength; // => 8
 
 const slice = buf.slice(0, 4); // returns new ArrayBuffer
@@ -66,19 +65,19 @@ Below we create a new `DataView` and set the first byte to 5.
 
 ```ts
 const buf = new ArrayBuffer(4);
-// [0x0, 0x0, 0x0, 0x0]
+// [0b00000000, 0b00000000, 0b00000000, 0b00000000]
 
 const dv = new DataView(buf);
 dv.setUint8(0, 3); // write value 3 at byte offset 0
 dv.getUint8(0); // => 3
-// [0x11, 0x0, 0x0, 0x0]
+// [0b00000011, 0b00000000, 0b00000000, 0b00000000]
 ```
 
 Now let's write a `Uint16` at byte offset `1`. This requires two bytes. We're using the value `513`, which is `2 * 256 + 1`; in bytes, that's `00000010 00000001`.
 
 ```ts
 dv.setUint16(1, 513);
-// [0x11, 0x10, 0x1, 0x0]
+// [0b00000011, 0b00000010, 0b00000001, 0b00000000]
 
 console.log(dv.getUint16(1)); // => 513
 ```

docs/api/ffi.md

@@ -58,17 +58,18 @@ Pass a path to the shared library and a map of symbols to import into `dlopen`:
 
 ```ts
 import { dlopen, FFIType, suffix } from "bun:ffi";
+const { i32 } = FFIType;
 
 const path = `libadd.${suffix}`;
 
 const lib = dlopen(path, {
   add: {
-    args: [FFIType.i32, FFIType.i32],
-    returns: FFIType.i32,
+    args: [i32, i32],
+    returns: i32,
   },
 });
 
-lib.symbols.add(1, 2);
+console.log(lib.symbols.add(1, 2));
 ```
 
 ### Rust
@@ -76,7 +77,7 @@ lib.symbols.add(1, 2);
 ```rust
 // add.rs
 #[no_mangle]
-pub extern "C" fn add(a: isize, b: isize) -> isize {
+pub extern "C" fn add(a: i32, b: i32) -> i32 {
     a + b
 }
 ```
@@ -87,6 +88,22 @@ To compile:
 $ rustc --crate-type cdylib add.rs
 ```
 
+### C++
+
+```c
+#include <cstdint>
+
+extern "C" int32_t add(int32_t a, int32_t b) {
+    return a + b;
+}
+```
+
+To compile:
+
+```bash
+$ zig build-lib add.cpp -dynamic -lc -lc++
+```
+
 ## FFI types
 
 The following `FFIType` values are supported.

docs/api/file-io.md

@@ -249,6 +249,42 @@ writer.unref();
 writer.ref();
 ```
 
+## Directories
+
+Bun's implementation of `node:fs` is fast, and we haven't implemented a Bun-specific API for reading directories just yet. For now, you should use `node:fs` for working with directories in Bun.
+
+### Reading directories (readdir)
+
+To read a directory in Bun, use `readdir` from `node:fs`.
+
+```ts
+import { readdir } from "node:fs/promises";
+
+// read all the files in the current directory
+const files = await readdir(import.meta.dir);
+```
+
+#### Reading directories recursively
+
+To recursively read a directory in Bun, use `readdir` with `recursive: true`.
+
+```ts
+import { readdir } from "node:fs/promises";
+
+// read all the files in the current directory, recursively
+const files = await readdir("../", { recursive: true });
+```
+
+### Creating directories (mkdir)
+
+To recursively create a directory, use `mkdir` in `node:fs`:
+
+```ts
+import { mkdir } from "node:fs/promises";
+
+await mkdir("path/to/dir", { recursive: true });
+```
+
 ## Benchmarks
 
 The following is a 3-line implementation of the Linux `cat` command.
@@ -300,7 +336,7 @@ interface BunFile {
   readonly type: string;
 
   text(): Promise<string>;
-  stream(): Promise<ReadableStream>;
+  stream(): ReadableStream;
   arrayBuffer(): Promise<ArrayBuffer>;
   json(): Promise<any>;
   writer(params: { highWaterMark?: number }): FileSink;

docs/api/file-system-router.md

@@ -46,7 +46,7 @@ router.match("/settings?foo=bar");
   kind: "dynamic",
   name: "/settings",
   pathname: "/settings?foo=bar",
-  src: "https://mydomain.com/_next/static/pages/settings.tsx"
+  src: "https://mydomain.com/_next/static/pages/settings.tsx",
   query: {
     foo: "bar"
   }
@@ -64,7 +64,7 @@ router.match("/blog/my-cool-post");
   kind: "dynamic",
   name: "/blog/[slug]",
   pathname: "/blog/my-cool-post",
-  src: "https://mydomain.com/_next/static/pages/blog/[slug].tsx"
+  src: "https://mydomain.com/_next/static/pages/blog/[slug].tsx",
   params: {
     slug: "my-cool-post"
   }

docs/api/glob.md

@@ -0,0 +1,157 @@
+Bun includes a fast native implementation of file globbing.
+
+## Quickstart
+
+**Scan a directory for files matching `*.ts`**:
+
+```ts
+import { Glob } from "bun";
+
+const glob = new Glob("**/*.ts");
+
+// Scans the current working directory and each of its sub-directories recursively
+for await (const file of glob.scan(".")) {
+  console.log(file); // => "index.ts"
+}
+```
+
+**Match a string against a glob pattern**:
+
+```ts
+import { Glob } from "bun";
+
+const glob = new Glob("*.ts");
+
+glob.match("index.ts"); // => true
+glob.match("index.js"); // => false
+```
+
+`Glob` is a class which implements the following interface:
+
+```ts
+class Glob {
+  scan(root: string | ScanOptions): AsyncIterable<string>;
+  scanSync(root: string | ScanOptions): Iterable<string>;
+
+  match(path: string): boolean;
+}
+
+interface ScanOptions {
+  /**
+   * The root directory to start matching from. Defaults to `process.cwd()`
+   */
+  cwd?: string;
+
+  /**
+   * Allow patterns to match entries that begin with a period (`.`).
+   *
+   * @default false
+   */
+  dot?: boolean;
+
+  /**
+   * Return the absolute path for entries.
+   *
+   * @default false
+   */
+  absolute?: boolean;
+
+  /**
+   * Indicates whether to traverse descendants of symbolic link directories.
+   *
+   * @default false
+   */
+  followSymlinks?: boolean;
+
+  /**
+   * Throw an error when symbolic link is broken
+   *
+   * @default false
+   */
+  throwErrorOnBrokenSymlink?: boolean;
+
+  /**
+   * Return only files.
+   *
+   * @default true
+   */
+  onlyFiles?: boolean;
+}
+```
+
+## Supported Glob Patterns
+
+Bun supports the following glob patterns:
+
+### `?` - Match any single character
+
+```ts
+const glob = new Glob("???.ts");
+glob.match("foo.ts"); // => true
+glob.match("foobar.ts"); // => false
+```
+
+### `*` - Matches zero or more characters, except for path separators (`/` or `\`)
+
+```ts
+const glob = new Glob("*.ts");
+glob.match("index.ts"); // => true
+glob.match("src/index.ts"); // => false
+```
+
+### `**` - Match any number of characters including `/`
+
+```ts
+const glob = new Glob("**/*.ts");
+glob.match("index.ts"); // => true
+glob.match("src/index.ts"); // => true
+glob.match("src/index.js"); // => false
+```
+
+### `[ab]` - Matches one of the characters contained in the brackets, as well as character ranges
+
+```ts
+const glob = new Glob("ba[rz].ts");
+glob.match("bar.ts"); // => true
+glob.match("baz.ts"); // => true
+glob.match("bat.ts"); // => false
+```
+
+You can use character ranges (e.g `[0-9]`, `[a-z]`) as well as the negation operators `^` or `!` to match anything _except_ the characters contained within the braces (e.g `[^ab]`, `[!a-z]`)
+
+```ts
+const glob = new Glob("ba[a-z][0-9][^4-9].ts");
+glob.match("bar01.ts"); // => true
+glob.match("baz83.ts"); // => true
+glob.match("bat22.ts"); // => true
+glob.match("bat24.ts"); // => false
+glob.match("ba0a8.ts"); // => false
+```
+
+### `{a,b,c}` - Match any of the given patterns
+
+```ts
+const glob = new Glob("{a,b,c}.ts");
+glob.match("a.ts"); // => true
+glob.match("b.ts"); // => true
+glob.match("c.ts"); // => true
+glob.match("d.ts"); // => false
+```
+
+These match patterns can be deeply nested (up to 10 levels), and contain any of the wildcards from above.
+
+### `!` - Negates the result at the start of a pattern
+
+```ts
+const glob = new Glob("!index.ts");
+glob.match("index.ts"); // => false
+glob.match("foo.ts"); // => true
+```
+
+### `\` - Escapes any of the special characters above
+
+```ts
+const glob = new Glob("\\!index.ts");
+glob.match("!index.ts"); // => true
+glob.match("index.ts"); // => false
+```

docs/api/http.md

@@ -171,14 +171,14 @@ Optionally, you can override the trusted CA certificates by passing a value for
   });
 ```
 
-To override Diffie-Helman parameters:
+To override Diffie-Hellman parameters:
 
 ```ts
 Bun.serve({
   // ...
   tls: {
     // other config
-    dhParamsFile: "/path/to/dhparams.pem", // path to Diffie Helman parameters
+    dhParamsFile: "/path/to/dhparams.pem", // path to Diffie Hellman parameters
   },
 });
 ```

docs/api/import-meta.md

@@ -23,6 +23,11 @@ import.meta.resolveSync("zod")
 
 ---
 
+- `import.meta.dirname`
+- An alias to `import.meta.dir`, for Node.js compatibility
+
+---
+
 - `import.meta.file`
 - The name of the current file, e.g. `index.tsx`
 
@@ -33,11 +38,26 @@ import.meta.resolveSync("zod")
 
 ---
 
+- `import.meta.filename`
+- An alias to `import.meta.path`, for Node.js compatibility
+
+---
+
+- `import.meta.url`
+- A string url to the current file, e.g. `file:///path/to/project/index.tx`
+
+---
+
 - `import.meta.main`
 - `boolean` Indicates whether the current file is the entrypoint to the current `bun` process. Is the file being directly executed by `bun run` or is it being imported?
 
 ---
 
+- `import.meta.env`
+- An alias to `process.env`.
+
+---
+
 - `import.meta.resolve{Sync}`
 - Resolve a module specifier (e.g. `"zod"` or `"./file.tsx"`) to an absolute path. While file would be imported if the specifier were imported from this file?
 

docs/api/semver.md

@@ -0,0 +1,52 @@
+Bun implements a semantic versioning API which can be used to compare versions and determine if a version is compatible with another range of versions. The versions and ranges are designed to be compatible with `node-semver`, which is used by npm clients.
+
+It's about 20x faster than `node-semver`.
+
+![Benchmark](https://github.com/oven-sh/bun/assets/709451/94746adc-8aba-4baf-a143-3c355f8e0f78)
+
+Currently, this API is two functions.
+
+#### `Bun.semver.satisfies(version: string, range: string): boolean`
+
+Returns `true` if `version` satisfies `range`, otherwise `false`.
+
+Example:
+
+```typescript
+import { semver } from "bun";
+
+semver.satisfies("1.0.0", "^1.0.0"); // true
+semver.satisfies("1.0.0", "^1.0.1"); // false
+semver.satisfies("1.0.0", "~1.0.0"); // true
+semver.satisfies("1.0.0", "~1.0.1"); // false
+semver.satisfies("1.0.0", "1.0.0"); // true
+semver.satisfies("1.0.0", "1.0.1"); // false
+semver.satisfies("1.0.1", "1.0.0"); // false
+semver.satisfies("1.0.0", "1.0.x"); // true
+semver.satisfies("1.0.0", "1.x.x"); // true
+semver.satisfies("1.0.0", "x.x.x"); // true
+semver.satisfies("1.0.0", "1.0.0 - 2.0.0"); // true
+semver.satisfies("1.0.0", "1.0.0 - 1.0.1"); // true
+```
+
+If `range` is invalid, it returns false. If `version` is invalid, it returns false.
+
+#### `Bun.semver.order(versionA: string, versionB: string): 0 | 1 | -1`
+
+Returns `0` if `versionA` and `versionB` are equal, `1` if `versionA` is greater than `versionB`, and `-1` if `versionA` is less than `versionB`.
+
+Example:
+
+```typescript
+import { semver } from "bun";
+
+semver.order("1.0.0", "1.0.0"); // 0
+semver.order("1.0.0", "1.0.1"); // -1
+semver.order("1.0.1", "1.0.0"); // 1
+
+const unsorted = ["1.0.0", "1.0.1", "1.0.0-alpha", "1.0.0-beta", "1.0.0-rc"];
+unsorted.sort(semver.order); // ["1.0.0-alpha", "1.0.0-beta", "1.0.0-rc", "1.0.0", "1.0.1"]
+console.log(unsorted);
+```
+
+If you need other semver functions, feel free to open an issue or pull request.

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/sqlite.md

@@ -57,6 +57,23 @@ import { Database } from "bun:sqlite";
 const db = new Database("mydb.sqlite", { create: true });
 ```
 
+### Load via ES module import
+
+You can also use an import attribute to load a database.
+
+```ts
+import db from "./mydb.sqlite" with {"type": "sqlite"};
+
+console.log(db.query("select * from users LIMIT 1").get());
+```
+
+This is equivalent to the following:
+
+```ts
+import { Database } from "bun:sqlite";
+const db = new Database("./mydb.sqlite");
+```
+
 ### `.close()`
 
 To close a database:

docs/api/streams.md

@@ -56,6 +56,45 @@ const stream = new ReadableStream({
 
 When using a direct `ReadableStream`, all chunk queueing is handled by the destination. The consumer of the stream receives exactly what is passed to `controller.write()`, without any encoding or modification.
 
+## Async generator streams
+
+Bun also supports async generator functions as a source for `Response` and `Request`. This is an easy way to create a `ReadableStream` that fetches data from an asynchronous source.
+
+```ts
+const response = new Response(async function* () {
+  yield "hello";
+  yield "world";
+}());
+
+await response.text(); // "helloworld"
+```
+
+You can also use `[Symbol.asyncIterator]` directly.
+
+```ts
+const response = new Response({
+  [Symbol.asyncIterator]: async function* () {
+    yield "hello";
+    yield "world";
+  },
+});
+
+await response.text(); // "helloworld"
+```
+
+If you need more granular control over the stream, `yield` will return the direct ReadableStream controller.
+
+```ts
+const response = new Response({
+  [Symbol.asyncIterator]: async function* () {
+    const controller = yield "hello";
+    await controller.end();
+  },
+});
+
+await response.text(); // "hello"
+```
+
 ## `Bun.ArrayBufferSink`
 
 The `Bun.ArrayBufferSink` class is a fast incremental writer for constructing an `ArrayBuffer` of unknown size.
@@ -73,10 +112,11 @@ sink.end();
 // ArrayBuffer(5) [ 104, 101, 108, 108, 111 ]
 ```
 
-To instead retrieve the data as a `Uint8Array`, pass the `asUint8Array` option to the constructor.
+To instead retrieve the data as a `Uint8Array`, pass the `asUint8Array` option to the `start` method.
 
 ```ts-diff
-const sink = new Bun.ArrayBufferSink({
+const sink = new Bun.ArrayBufferSink();
+sink.start({
 + asUint8Array: true
 });
 
@@ -103,7 +143,8 @@ sink.end();
 Once `.end()` is called, no more data can be written to the `ArrayBufferSink`. However, in the context of buffering a stream, it's useful to continuously write data and periodically `.flush()` the contents (say, into a `WriteableStream`). To support this, pass `stream: true` to the constructor.
 
 ```ts
-const sink = new Bun.ArrayBufferSink({
+const sink = new Bun.ArrayBufferSink();
+sink.start({
   stream: true,
 });
 
@@ -124,7 +165,8 @@ The `.flush()` method returns the buffered data as an `ArrayBuffer` (or `Uint8Ar
 To manually set the size of the internal buffer in bytes, pass a value for `highWaterMark`:
 
 ```ts
-const sink = new Bun.ArrayBufferSink({
+const sink = new Bun.ArrayBufferSink();
+sink.start({
   highWaterMark: 1024 * 1024, // 1 MB
 });
 ```

docs/api/tcp.md

@@ -115,7 +115,7 @@ Use `Bun.connect` to connect to a TCP server. Specify the server to connect to w
 
 ```ts
 // The client
-const socket = Bun.connect({
+const socket = await Bun.connect({
   hostname: "localhost",
   port: 8080,
 
@@ -138,7 +138,7 @@ To require TLS, specify `tls: true`.
 
 ```ts
 // The client
-const socket = Bun.connect({
+const socket = await Bun.connect({
   // ... config
   tls: true,
 });
@@ -164,7 +164,7 @@ server.reload({
 ```
 
 ```ts#Client
-const socket = Bun.connect({ /* config */ })
+const socket = await Bun.connect({ /* config */ })
 socket.reload({
   data(){
     // new 'data' handler
@@ -195,7 +195,10 @@ socket.write("hello");
 To simplify this for now, consider using Bun's `ArrayBufferSink` with the `{stream: true}` option:
 
 ```ts
-const sink = new ArrayBufferSink({ stream: true, highWaterMark: 1024 });
+import { ArrayBufferSink } from "bun";
+
+const sink = new ArrayBufferSink();
+sink.start({ stream: true, highWaterMark: 1024 });
 
 sink.write("h");
 sink.write("e");
@@ -204,10 +207,11 @@ sink.write("l");
 sink.write("o");
 
 queueMicrotask(() => {
-  var data = sink.flush();
-  if (!socket.write(data)) {
+  const data = sink.flush();
+  const wrote = socket.write(data);
+  if (wrote < data.byteLength) {
     // put it back in the sink if the socket is full
-    sink.write(data);
+    sink.write(data.subarray(wrote));
   }
 });
 ```

docs/api/transpiler.md

@@ -50,7 +50,7 @@ export default jsx(
 To override the default loader specified in the `new Bun.Transpiler()` constructor, pass a second argument to `.transformSync()`.
 
 ```ts
-await transpiler.transform("<div>hi!</div>", "tsx");
+transpiler.transformSync("<div>hi!</div>", "tsx");
 ```
 
 {% details summary="Nitty gritty" %}

docs/api/utils.md

@@ -261,6 +261,146 @@ This function is optimized for large input. On an M1X, it processes 480 MB/s -
 20 GB/s, depending on how much data is being escaped and whether there is non-ascii
 text. Non-string types will be converted to a string before escaping.
 
+## `Bun.stringWidth()` ~6,756x faster `string-width` alternative
+
+Get the column count of a string as it would be displayed in a terminal.
+Supports ANSI escape codes, emoji, and wide characters.
+
+Example usage:
+
+```ts
+Bun.stringWidth("hello"); // => 5
+Bun.stringWidth("\u001b[31mhello\u001b[0m"); // => 5
+Bun.stringWidth("\u001b[31mhello\u001b[0m", { countAnsiEscapeCodes: true }); // => 12
+```
+
+This is useful for:
+- Aligning text in a terminal
+- Quickly checking if a string contains ANSI escape codes
+- Measuring the width of a string in a terminal
+
+This API is designed to match the popular "string-width" package, so that
+existing code can be easily ported to Bun and vice versa.
+
+[In this benchmark](https://github.com/oven-sh/bun/blob/5147c0ba7379d85d4d1ed0714b84d6544af917eb/bench/snippets/string-width.mjs#L13), `Bun.stringWidth` is a ~6,756x faster than the `string-width` npm package for input larger than about 500 characters. Big thanks to [sindresorhus](https://github.com/sindresorhus) for their work on `string-width`!
+
+```ts
+❯ bun string-width.mjs
+cpu: 13th Gen Intel(R) Core(TM) i9-13900
+runtime: bun 1.0.29 (x64-linux)
+
+benchmark                                          time (avg)             (min … max)       p75       p99      p995
+------------------------------------------------------------------------------------- -----------------------------
+Bun.stringWidth     500 chars ascii              37.09 ns/iter   (36.77 ns … 41.11 ns)  37.07 ns  38.84 ns  38.99 ns
+
+❯ node string-width.mjs
+
+benchmark                                          time (avg)             (min … max)       p75       p99      p995
+------------------------------------------------------------------------------------- -----------------------------
+npm/string-width    500 chars ascii             249,710 ns/iter (239,970 ns … 293,180 ns) 250,930 ns  276,700 ns 281,450 ns
+```
+
+To make `Bun.stringWidth` fast, we've implemented it in Zig using optimized SIMD instructions, accounting for Latin1, UTF-16, and UTF-8 encodings. It passes `string-width`'s tests.
+
+{% details summary="View full benchmark" %}
+
+As a reminder, 1 nanosecond (ns) is 1 billionth of a second. Here's a quick reference for converting between units:
+
+| Unit | 1 Millisecond |
+| ---- | ------------- |
+| ns   | 1,000,000     |
+| µs   | 1,000         |
+| ms   | 1             |
+
+```js
+❯ bun string-width.mjs
+cpu: 13th Gen Intel(R) Core(TM) i9-13900
+runtime: bun 1.0.29 (x64-linux)
+
+benchmark                                          time (avg)             (min … max)       p75       p99      p995
+------------------------------------------------------------------------------------- -----------------------------
+Bun.stringWidth      5 chars ascii              16.45 ns/iter   (16.27 ns … 19.71 ns)  16.48 ns  16.93 ns  17.21 ns
+Bun.stringWidth     50 chars ascii              19.42 ns/iter   (18.61 ns … 27.85 ns)  19.35 ns   21.7 ns  22.31 ns
+Bun.stringWidth    500 chars ascii              37.09 ns/iter   (36.77 ns … 41.11 ns)  37.07 ns  38.84 ns  38.99 ns
+Bun.stringWidth  5,000 chars ascii              216.9 ns/iter  (215.8 ns … 228.54 ns) 216.23 ns 228.52 ns 228.53 ns
+Bun.stringWidth 25,000 chars ascii               1.01 µs/iter     (1.01 µs … 1.01 µs)   1.01 µs   1.01 µs   1.01 µs
+Bun.stringWidth      7 chars ascii+emoji         54.2 ns/iter   (53.36 ns … 58.19 ns)  54.23 ns  57.55 ns  57.94 ns
+Bun.stringWidth     70 chars ascii+emoji       354.26 ns/iter (350.51 ns … 363.96 ns) 355.93 ns 363.11 ns 363.96 ns
+Bun.stringWidth    700 chars ascii+emoji          3.3 µs/iter      (3.27 µs … 3.4 µs)    3.3 µs    3.4 µs    3.4 µs
+Bun.stringWidth  7,000 chars ascii+emoji        32.69 µs/iter   (32.22 µs … 45.27 µs)   32.7 µs  34.57 µs  34.68 µs
+Bun.stringWidth 35,000 chars ascii+emoji       163.35 µs/iter (161.17 µs … 170.79 µs) 163.82 µs 169.66 µs 169.93 µs
+Bun.stringWidth      8 chars ansi+emoji         66.15 ns/iter   (65.17 ns … 69.97 ns)  66.12 ns   69.8 ns  69.87 ns
+Bun.stringWidth     80 chars ansi+emoji        492.95 ns/iter  (488.05 ns … 499.5 ns)  494.8 ns 498.58 ns  499.5 ns
+Bun.stringWidth    800 chars ansi+emoji          4.73 µs/iter     (4.71 µs … 4.88 µs)   4.72 µs   4.88 µs   4.88 µs
+Bun.stringWidth  8,000 chars ansi+emoji         47.02 µs/iter   (46.37 µs … 67.44 µs)  46.96 µs  49.57 µs  49.63 µs
+Bun.stringWidth 40,000 chars ansi+emoji        234.45 µs/iter (231.78 µs … 240.98 µs) 234.92 µs 236.34 µs 236.62 µs
+Bun.stringWidth     19 chars ansi+emoji+ascii  135.46 ns/iter (133.67 ns … 143.26 ns) 135.32 ns 142.55 ns 142.77 ns
+Bun.stringWidth    190 chars ansi+emoji+ascii    1.17 µs/iter     (1.16 µs … 1.17 µs)   1.17 µs   1.17 µs   1.17 µs
+Bun.stringWidth  1,900 chars ansi+emoji+ascii   11.45 µs/iter   (11.26 µs … 20.41 µs)  11.45 µs  12.08 µs  12.11 µs
+Bun.stringWidth 19,000 chars ansi+emoji+ascii  114.06 µs/iter (112.86 µs … 120.06 µs) 114.25 µs 115.86 µs 116.15 µs
+Bun.stringWidth 95,000 chars ansi+emoji+ascii  572.69 µs/iter (565.52 µs … 607.22 µs) 572.45 µs 604.86 µs 605.21 µs
+```
+
+```ts
+❯ node string-width.mjs
+cpu: 13th Gen Intel(R) Core(TM) i9-13900
+runtime: node v21.4.0 (x64-linux)
+
+benchmark                                           time (avg)             (min … max)       p75       p99      p995
+-------------------------------------------------------------------------------------- -----------------------------
+npm/string-width      5 chars ascii               3.19 µs/iter     (3.13 µs … 3.48 µs)   3.25 µs   3.48 µs   3.48 µs
+npm/string-width     50 chars ascii              20.09 µs/iter  (18.93 µs … 435.06 µs)  19.49 µs  21.89 µs  22.59 µs
+npm/string-width    500 chars ascii             249.71 µs/iter (239.97 µs … 293.18 µs) 250.93 µs  276.7 µs 281.45 µs
+npm/string-width  5,000 chars ascii               6.69 ms/iter     (6.58 ms … 6.76 ms)   6.72 ms   6.76 ms   6.76 ms
+npm/string-width 25,000 chars ascii             139.57 ms/iter (137.17 ms … 143.28 ms) 140.49 ms 143.28 ms 143.28 ms
+npm/string-width      7 chars ascii+emoji          3.7 µs/iter     (3.62 µs … 3.94 µs)   3.73 µs   3.94 µs   3.94 µs
+npm/string-width     70 chars ascii+emoji        23.93 µs/iter   (22.44 µs … 331.2 µs)  23.15 µs  25.98 µs   30.2 µs
+npm/string-width    700 chars ascii+emoji       251.65 µs/iter (237.78 µs … 444.69 µs) 252.92 µs 325.89 µs 354.08 µs
+npm/string-width  7,000 chars ascii+emoji         4.95 ms/iter     (4.82 ms … 5.19 ms)      5 ms   5.04 ms   5.19 ms
+npm/string-width 35,000 chars ascii+emoji        96.93 ms/iter  (94.39 ms … 102.58 ms)  97.68 ms 102.58 ms 102.58 ms
+npm/string-width      8 chars ansi+emoji          3.92 µs/iter     (3.45 µs … 4.57 µs)   4.09 µs   4.57 µs   4.57 µs
+npm/string-width     80 chars ansi+emoji         24.46 µs/iter     (22.87 µs … 4.2 ms)  23.54 µs  25.89 µs  27.41 µs
+npm/string-width    800 chars ansi+emoji        259.62 µs/iter (246.76 µs … 480.12 µs) 258.65 µs 349.84 µs 372.55 µs
+npm/string-width  8,000 chars ansi+emoji          5.46 ms/iter     (5.41 ms … 5.57 ms)   5.48 ms   5.55 ms   5.57 ms
+npm/string-width 40,000 chars ansi+emoji        108.91 ms/iter  (107.55 ms … 109.5 ms) 109.25 ms  109.5 ms  109.5 ms
+npm/string-width     19 chars ansi+emoji+ascii    6.53 µs/iter     (6.35 µs … 6.75 µs)   6.54 µs   6.75 µs   6.75 µs
+npm/string-width    190 chars ansi+emoji+ascii   55.52 µs/iter  (52.59 µs … 352.73 µs)  54.19 µs  80.77 µs 167.21 µs
+npm/string-width  1,900 chars ansi+emoji+ascii  701.71 µs/iter (653.94 µs … 893.78 µs)  715.3 µs 855.37 µs  872.9 µs
+npm/string-width 19,000 chars ansi+emoji+ascii   27.19 ms/iter   (26.89 ms … 27.41 ms)  27.28 ms  27.41 ms  27.41 ms
+npm/string-width 95,000 chars ansi+emoji+ascii     3.68 s/iter        (3.66 s … 3.7 s)    3.69 s     3.7 s     3.7 s
+```
+
+{% /details %}
+
+
+TypeScript definition:
+
+```ts
+namespace Bun {
+  export function stringWidth(
+    /**
+     * The string to measure
+     */
+    input: string,
+    options?: {
+      /**
+       * If `true`, count ANSI escape codes as part of the string width. If `false`, ANSI escape codes are ignored when calculating the string width.
+       *
+       * @default false
+       */
+      countAnsiEscapeCodes?: boolean;
+      /**
+       * When it's ambiugous and `true`, count emoji as 1 characters wide. If `false`, emoji are counted as 2 character wide.
+       *
+       * @default true
+       */
+      ambiguousIsNarrow?: boolean;
+    },
+  ): number;
+}
+```
+
+
 <!-- ## `Bun.enableANSIColors()` -->
 
 ## `Bun.fileURLToPath()`
@@ -378,10 +518,10 @@ Decompresses a `Uint8Array` using zlib's GUNZIP algorithm.
 
 ```ts
 const buf = Buffer.from("hello".repeat(100)); // Buffer extends Uint8Array
-const compressed = Bun.gunzipSync(buf);
+const compressed = Bun.gzipSync(buf);
 
 const dec = new TextDecoder();
-const uncompressed = Bun.inflateSync(compressed);
+const uncompressed = Bun.gunzipSync(compressed);
 dec.decode(uncompressed);
 // => "hellohellohello..."
 ```
@@ -398,7 +538,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/api/websockets.md

@@ -182,12 +182,12 @@ const server = Bun.serve<{ username: string }>({
     open(ws) {
       const msg = `${ws.data.username} has entered the chat`;
       ws.subscribe("the-group-chat");
-      ws.publish("the-group-chat", msg);
+      server.publish("the-group-chat", msg);
     },
     message(ws, message) {
       // this is a group chat
       // so the server re-broadcasts incoming message to everyone
-      ws.publish("the-group-chat", `${ws.data.username}: ${message}`);
+      server.publish("the-group-chat", `${ws.data.username}: ${message}`);
     },
     close(ws) {
       const msg = `${ws.data.username} has left the chat`;
@@ -245,11 +245,35 @@ The `.send(message)` method of `ServerWebSocket` returns a `number` indicating t
 
 This gives you better control over backpressure in your server.
 
-## Connect to a `Websocket` server
+### Timeouts and limits
 
-{% callout %}
-**🚧** — The `WebSocket` client still does not pass the full [Autobahn test suite](https://github.com/crossbario/autobahn-testsuite) and should not be considered ready for production.
-{% /callout %}
+By default, Bun will close a WebSocket connection if it is idle for 120 seconds. This can be configured with the `idleTimeout` parameter.
+
+```ts
+Bun.serve({
+  fetch(req, server) {}, // upgrade logic
+  websocket: {
+    idleTimeout: 60, // 60 seconds
+
+    // ...
+  },
+});
+```
+
+Bun will also close a WebSocket connection if it receives a message that is larger than 16 MB. This can be configured with the `maxPayloadLength` parameter.
+
+```ts
+Bun.serve({
+  fetch(req, server) {}, // upgrade logic
+  websocket: {
+    maxPayloadLength: 1024 * 1024, // 1 MB
+
+    // ...
+  },
+});
+```
+
+## Connect to a `Websocket` server
 
 Bun implements the `WebSocket` class. To create a WebSocket client that connects to a `ws://` or `wss://` server, create an instance of `WebSocket`, as you would in the browser.
 
@@ -300,6 +324,14 @@ namespace Bun {
       close?: (ws: ServerWebSocket) => void;
       error?: (ws: ServerWebSocket, error: Error) => void;
       drain?: (ws: ServerWebSocket) => void;
+
+      maxPayloadLength?: number; // default: 16 * 1024 * 1024 = 16 MB
+      idleTimeout?: number; // default: 120 (seconds)
+      backpressureLimit?: number; // default: 1024 * 1024 = 1 MB
+      closeOnBackpressureLimit?: boolean; // default: false
+      sendPings?: boolean; // default: true
+      publishToSelf?: boolean; // default: false
+
       perMessageDeflate?:
         | boolean
         | {

docs/bundler/executables.md

@@ -26,12 +26,50 @@ All imported files and packages are bundled into the executable, along with a co
 **Note** — Currently, the `--compile` flag can only accept a single entrypoint at a time and does not support the following flags:
 
 - `--outdir` — use `outfile` instead.
-- `--external`
 - `--splitting`
 - `--public-path`
 
 {% /callout %}
 
+## Deploying to production
+
+Compiled executables reduce memory usage and improve Bun's start time.
+
+Normally, Bun reads and transpiles JavaScript and TypeScript files on `import` and `require`. This is part of what makes so much of Bun "just work", but it's not free. It costs time and memory to read files from disk, resolve file paths, parse, transpile, and print source code. 
+
+With compiled executables, you can move that cost from runtime to build-time.
+
+When deploying to production, we recommend the following:
+
+```sh
+bun build --compile --minify --sourcemap ./path/to/my/app.ts --outfile myapp
+```
+
+**What do these flags do?**
+
+The `--minify` argument optimizes the size of the transpiled output code. If you have a large application, this can save megabytes of space. For smaller applications, it might still improve start time a little.
+
+The `--sourcemap` argument embeds a sourcemap compressed with zstd, so that errors & stacktraces point to their original locations instead of the transpiled location. Bun will automatically decompress & resolve the sourcemap when an error occurs.
+
+## SQLite
+
+You can use `bun:sqlite` imports with `bun build --compile`.
+
+By default, the database is resolved relative to the current working directory of the process.
+
+```js
+import db from './my.db' with {type: "sqlite"};
+
+console.log(db.query("select * from users LIMIT 1").get());
+```
+
+That means if the executable is located at `/usr/bin/hello`, the user's terminal is located at `/home/me/Desktop`, it will look for `/home/me/Desktop/my.db`.
+
+```
+$ cd /home/me/Desktop
+$ ./hello
+```
+
 ## Embedding files
 
 Standalone executables support embedding files.
@@ -55,6 +93,30 @@ You may need to specify a `--loader` for it to be treated as a `"file"` loader (
 
 Embedded files can be read using `Bun.file`'s functions or the Node.js `fs.readFile` function (in `"node:fs"`).
 
+### Embedding SQLite databases
+
+If your application wants to embed a SQLite database, set `type: "sqlite"` in the import attribute and the `embed` attribute to `"true"`.
+
+```js
+import myEmbeddedDb from "./my.db" with {type: "sqlite", embed: "true"};
+
+console.log(myEmbeddedDb.query("select * from users LIMIT 1").get());
+```
+
+This database is read-write, but all changes are lost when the executable exits (since it's stored in memory).
+
+### Embedding N-API Addons
+
+As of Bun v1.0.23, you can embed `.node` files into executables.
+
+```js
+const addon = require("./addon.node");
+
+console.log(addon.hello());
+```
+
+Unfortunately, if you're using `@mapbox/node-pre-gyp` or other similar tools, you'll need to make sure the `.node` file is directly required or it won't bundle correctly.
+
 ## Minification
 
 To trim down the size of the executable a little, pass `--minify` to `bun build --compile`. This uses Bun's minifier to reduce the code size. Overall though, Bun's binary is still way too big and we need to make it smaller.

docs/bundler/index.md

@@ -43,7 +43,7 @@ Let's build our first bundle. You have the following two files, which implement
 import * as ReactDOM from 'react-dom/client';
 import {Component} from "./Component"
 
-const root = ReactDOM.createRoot(document.getElementById('root'));
+const root = ReactDOM.createRoot(document.getElementById('root')!);
 root.render(<Component message="Sup!" />)
 ```
 
@@ -155,7 +155,7 @@ Like the Bun runtime, the bundler supports an array of file types out of the box
 
 ---
 
-- `.js` `.cjs` `.mjs` `.mts` `.cts` `.ts` `.tsx`
+- `.js` `.jsx`, `.cjs` `.mjs` `.mts` `.cts` `.ts` `.tsx`
 - Uses Bun's built-in transpiler to parse the file and transpile TypeScript/JSX syntax to vanilla JavaScript. The bundler executes a set of default transforms, including dead code elimination, tree shaking, and environment variable inlining. At the moment Bun does not attempt to down-convert syntax; if you use recently ECMAScript syntax, that will be reflected in the bundled code.
 
 ---
@@ -276,15 +276,15 @@ const result = await Bun.build({
   entrypoints: ["./index.ts"],
 });
 
-for (const result of result.outputs) {
+for (const res of result.outputs) {
   // Can be consumed as blobs
-  await result.text();
+  await res.text();
 
   // Bun will set Content-Type and Etag headers
-  new Response(result);
+  new Response(res);
 
   // Can be written manually, but you should use `outdir` in this case.
-  Bun.write(path.join("out", result.path), result);
+  Bun.write(path.join("out", res.path), res);
 }
 ```
 
@@ -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"`.
 
 ---
 
@@ -337,10 +337,6 @@ Depending on the target, Bun will apply different module resolution rules and op
 
 {% /table %}
 
-{% callout %}
-
-{% /callout %}
-
 ### `format`
 
 Specifies the module format to be used in the generated bundles.
@@ -972,8 +968,6 @@ By specifying `.` as `root`, the generated file structure will look like this:
 
 A prefix to be appended to any import paths in bundled code.
 
-<!-- $ bun build ./index.tsx --outdir ./out --public-path https://cdn.example.com -->
-
 In many cases, generated bundles will contain no `import` statements. After all, the goal of bundling is to combine all of the code into a single file. However there are a number of cases with the generated bundles will contain `import` statements.
 
 - **Asset imports** — When importing an unrecognized file type like `*.svg`, the bundler defers to the [`file` loader](/docs/bundler/loaders#file), which copies the file into `outdir` as is. The import is converted into a variable
@@ -1011,7 +1005,7 @@ await Bun.build({
 ```
 
 ```bash#CLI
-n/a
+$ bun build ./index.tsx --outdir ./out --public-path https://cdn.example.com/
 ```
 
 {% /codetabs %}
@@ -1052,7 +1046,7 @@ $ bun build ./index.tsx --outdir ./out --define 'STRING="value"' --define "neste
 
 ### `loader`
 
-A map of file extensions to [built-in loader names](https://bun.sh/docs/bundler/loaders#built-in-loaders). This can be used to quickly customize how certain file files are loaded.
+A map of file extensions to [built-in loader names](https://bun.sh/docs/bundler/loaders#built-in-loaders). This can be used to quickly customize how certain files are loaded.
 
 {% codetabs %}
 

docs/bundler/loaders.md

@@ -171,6 +171,41 @@ console.log(addon);
 
 In the bundler, `.node` files are handled using the [`file`](#file) loader.
 
+### `sqlite`
+
+**SQLite loader**. `with { "type": "sqlite" }` import attribute
+
+In the runtime and bundler, SQLite databases can be directly imported. This will load the database using [`bun:sqlite`](/docs/api/sqlite.md).
+
+```ts
+import db from "./my.db" with {type: "sqlite"};
+```
+
+This is only supported when the `target` is `bun`.
+
+By default, the database is external to the bundle (so that you can potentially use a database loaded elsewhere), so the database file on-disk won't be bundled into the final output.
+
+You can change this behavior with the `"embed"` attribute:
+
+```ts
+// embed the database into the bundle
+import db from "./my.db" with {type: "sqlite", embed: "true"};
+```
+
+When using a [standalone executable](/docs/bundler/executables), the database is embedded into the single-file executable.
+
+Otherwise, the database to embed is copied into the `outdir` with a hashed filename.
+
+### `bunshell` loader
+
+**Bun Shell loader**. Default for `.bun.sh` files
+
+This loader is used to parse [Bun Shell](/docs/runtime/shell) scripts. It's only supported when starting bun itself, so it's not available in the bundler or in the runtime.
+
+```sh
+$ bun run ./script.bun.sh
+```
+
 ### `file`
 
 **File loader**. Default for all unrecognized file types.

docs/bundler/macros.md

@@ -119,7 +119,7 @@ export function returnFalse() {
 }
 ```
 
-...then bundling the following file will produce an empty bundle.
+...then bundling the following file will produce an empty bundle, provided that the minify syntax option is enabled.
 
 ```ts
 import {returnFalse} from './returnFalse.ts' with { type: 'macro' };

docs/bundler/vs-esbuild.md

@@ -7,7 +7,7 @@ There are a few behavioral differences to note.
 
 ## Performance
 
-With an performance-minded API coupled with the extensively optimized Zig-based JS/TS parser, Bun's bundler is 1.75x faster than esbuild on esbuild's [three.js benchmark](https://github.com/oven-sh/bun/tree/main/bench/bundle).
+With a performance-minded API coupled with the extensively optimized Zig-based JS/TS parser, Bun's bundler is 1.75x faster than esbuild on esbuild's [three.js benchmark](https://github.com/oven-sh/bun/tree/main/bench/bundle).
 
 {% image src="/images/bundler-speed.png" caption="Bundling 10 copies of three.js from scratch, with sourcemaps and minification" /%}
 

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 %}
@@ -268,7 +244,7 @@ ELSE IF local template
 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
+8. Run any tasks defined in `"bun-create": { "postinstall" }` 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.

docs/cli/bun-install.md

@@ -59,8 +59,11 @@ optional = true
 # Install local devDependencies (default: true)
 dev = true
 
-# Install peerDependencies (default: false)
-peer = false
+# Install peerDependencies (default: true)
+peer = true
+
+# Max number of concurrent lifecycle scripts (default: (cpu count or GOMAXPROCS) x2)
+concurrentScripts = 16
 
 # When using `bun install -g`, install packages here
 globalDir = "~/.bun/install/global"
@@ -170,7 +173,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/bundler.md

@@ -1,116 +0,0 @@
-Bundling is currently an important mechanism for building complex web apps.
-
-Modern apps typically consist of a large number of files and package dependencies. Despite the fact that modern browsers support [ES Module](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) imports, it's still too slow to fetch each file via individual HTTP requests. _Bundling_ is the process of concatenating several source files into a single large file that can be loaded in a single request.
-
-{% callout %}
-**On bundling** — Despite recent advances like [`modulepreload`](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/rel/modulepreload) and [HTTP/3](https://en.wikipedia.org/wiki/HTTP/3), bundling is still the most performant approach.
-{% /callout %}
-
-## Bundling your app
-
-Bun's approach to bundling is a little different from other bundlers. Start by passing your app's entrypoint to `bun bun`.
-
-```bash
-$ bun bun ./app.js
-```
-
-Your entrypoint can be any `js|jsx|ts|tsx|html` file. With this file as a starting point, Bun will construct a graph of imported files and packages, transpile everything, and generate a file called `node_modules.bun`.
-
-## What is `.bun`?
-
-{% callout %}
-**Note** — [This format may change soon](https://github.com/oven-sh/bun/issues/121)
-{% /callout %}
-
-A `.bun` file contains the pre-transpiled source code of your application, plus a bunch of binary-encoded metadata about your application's structure. as a contains:
-
-- all the bundled source code
-- all the bundled source code metadata
-- project metadata & configuration
-
-Here are some of the questions `.bun` files answer:
-
-- when I import `react/index.js`, where in the `.bun` is the code for that? (not resolving, just the code)
-- what modules of a package are used?
-- what framework is used? (e.g., Next.js)
-- where is the routes directory?
-- how big is each imported dependency?
-- what is the hash of the bundle’s contents? (for etags)
-- what is the name & version of every npm package exported in this bundle?
-- what modules from which packages are used in this project? ("project" is defined as all the entry points used to generate the .bun)
-
-All in one file.
-
-It’s a little like a build cache, but designed for reuse across builds.
-
-{% details summary="Position-independent code" %}
-
-From a design perspective, the most important part of the `.bun` format is how code is organized. Each module is exported by a hash like this:
-
-```js
-// preact/dist/preact.module.js
-export var $eb6819b = $$m({
-  "preact/dist/preact.module.js": (module, exports) => {
-    let n, l, u, i, t, o, r, f, e = {}, c = [], s = /acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i;
-    // ... rest of code
-```
-
-This makes bundled modules [position-independent](https://en.wikipedia.org/wiki/Position-independent_code). In theory, one could import only the exact modules in-use without reparsing code and without generating a new bundle. One bundle can dynamically become many bundles comprising only the modules in use on the webpage. Thanks to the metadata with the byte offsets, a web server can send each module to browsers [zero-copy](https://en.wikipedia.org/wiki/Zero-copy) using [sendfile](https://man7.org/linux/man-pages/man2/sendfile.2.html). Bun itself is not quite this smart yet, but these optimizations would be useful in production and potentially very useful for React Server Components.
-
-To see the schema inside, have a look at [`JavascriptBundleContainer`](./src/api/schema.d.ts#:~:text=export%20interface-,JavascriptBundleContainer,-%7B). You can find JavaScript bindings to read the metadata in [src/api/schema.js](./src/api/schema.js). This is not really an API yet. It’s missing the part where it gets the binary data from the bottom of the file. Someday, I want this to be usable by other tools too.
-{% /details %}
-
-## Where is the code?
-
-`.bun` files are marked as executable.
-
-To print out the code, run `./node_modules.bun` in your terminal or run `bun ./path-to-node_modules.bun`.
-
-Here is a copy-pastable example:
-
-```bash
-$ ./node_modules.bun > node_modules.js
-```
-
-This works because every `.bun` file starts with this:
-
-```
-#!/usr/bin/env bun
-```
-
-To deploy to production with Bun, you’ll want to get the code from the `.bun` file and stick that somewhere your web server can find it (or if you’re using Vercel or a Rails app, in a `public` folder).
-
-Note that `.bun` is a binary file format, so just opening it in VSCode or vim might render strangely.
-
-## Advanced
-
-By default, `bun bun` only bundles external dependencies that are `import`ed or `require`d in either app code or another external dependency. An "external dependency" is defined as, "A JavaScript-like file that has `/node_modules/` in the resolved file path and a corresponding `package.json`".
-
-To force Bun to bundle packages which are not located in a `node_modules` folder (i.e., the final, resolved path following all symlinks), add a `bun` section to the root project’s `package.json` with `alwaysBundle` set to an array of package names to always bundle. Here’s an example:
-
-```json
-{
-  "name": "my-package-name-in-here",
-  "bun": {
-    "alwaysBundle": ["@mybigcompany/my-workspace-package"]
-  }
-}
-```
-
-Bundled dependencies are not eligible for Hot Module Reloading. The code is served to browsers & Bun.js verbatim. But, in the future, it may be sectioned off into only parts of the bundle being used. That’s possible in the current version of the `.bun` file (so long as you know which files are necessary), but it’s not implemented yet. Longer-term, it will include all `import` and `export` of each module inside.
-
-## What is the module ID hash?
-
-The `$eb6819b` hash used here:
-
-```js
-export var $eb6819b = $$m({
-```
-
-Is generated like this:
-
-1. Murmur3 32-bit hash of `package.name@package.version`. This is the hash uniquely identifying the npm package.
-2. Wyhash 64 of the `package.hash` + `package_path`. `package_path` means "relative to the root of the npm package, where is the module imported?". For example, if you imported `react/jsx-dev-runtime.js`, the `package_path` is `jsx-dev-runtime.js`. `react-dom/cjs/react-dom.development.js` would be `cjs/react-dom.development.js`
-3. Truncate the hash generated above to a `u32`
-
-The implementation details of this module ID hash will vary between versions of Bun. The important part is the metadata contains the module IDs, the package paths, and the package hashes, so it shouldn’t really matter in practice if other tooling wants to make use of any of this.

docs/cli/bunx.md

@@ -63,6 +63,12 @@ $ bunx --bun my-cli # good
 $ bunx my-cli --bun # bad
 ```
 
+To force bun to always be used with a script, use a shebang.
+
+```
+#!/usr/bin/env bun
+```
+
 <!-- ## Environment variables
 
 Bun automatically loads environment variables from `.env` files before running a file, script, or executable. The following files are checked, in order:

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 %}