Merge branch 'main' into nektro-patch-61014

.buildkite/ci.mjs

@@ -462,6 +462,7 @@ function getBuildZigStep(platform, options) {
     cancel_on_build_failing: isMergeQueue(),
     env: getBuildEnv(platform, options),
     command: `bun run build:ci --target bun-zig --toolchain ${toolchain}`,
+    timeout_in_minutes: 25,
   };
 }
 

.gitattributes

@@ -15,6 +15,7 @@
 *.lock text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.map text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.md text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.mdc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.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
 

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

@@ -4,7 +4,7 @@ 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."
+    description: "The version of bun to install: 'latest', 'canary', 'bun-v1.2.0', etc."
     default: latest
     required: false
   baseline:

.github/workflows/clang-format.yml

@@ -10,7 +10,7 @@ on:
   merge_group:
 
 env:
-  BUN_VERSION: "1.1.27"
+  BUN_VERSION: "1.2.0"
   LLVM_VERSION: "18.1.8"
   LLVM_VERSION_MAJOR: "18"
 

.github/workflows/clang-tidy.yml

@@ -10,7 +10,7 @@ on:
   merge_group:
 
 env:
-  BUN_VERSION: "1.1.27"
+  BUN_VERSION: "1.2.0"
   LLVM_VERSION: "18.1.8"
   LLVM_VERSION_MAJOR: "18"
 

.github/workflows/labeled.yml

@@ -1,6 +1,6 @@
 name: Issue Labeled
 env:
-  BUN_VERSION: 1.1.13
+  BUN_VERSION: 1.1.44
 
 on:
   issues:
@@ -23,7 +23,7 @@ jobs:
   #     - name: Setup Bun
   #       uses: ./.github/actions/setup-bun
   #       with:
-  #         bun-version: "1.1.24"
+  #         bun-version: ${{ env.BUN_VERSION }}
   #     - name: "categorize bug"
   #       id: add-labels
   #       env:
@@ -59,7 +59,7 @@ jobs:
       - name: Setup Bun
         uses: ./.github/actions/setup-bun
         with:
-          bun-version: "1.1.13"
+          bun-version: ${{ env.BUN_VERSION }}
       - name: "add platform and command label"
         id: add-labels
         if: github.event.label.name == 'crash'
@@ -72,7 +72,7 @@ jobs:
           echo "labels=$LABELS" >> $GITHUB_OUTPUT
           bun scripts/is-outdated.ts
 
-          if [[ -f "is-outdated.txt" ]]; then 
+          if [[ -f "is-outdated.txt" ]]; then
             echo "is-outdated=true" >> $GITHUB_OUTPUT
           fi
 
@@ -154,7 +154,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.issue.number }}
           body: |
-            Thank you for reporting this crash. 
+            Thank you for reporting this crash.
 
             For Bun's internal tracking, this issue is [${{ steps.generate-comment-text.outputs.sentry-id }}](${{ steps.generate-comment-text.outputs.sentry-link }}).
 

.github/workflows/lint.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 
 env:
-  BUN_VERSION: "1.1.38"
+  BUN_VERSION: "1.2.0"
   OXLINT_VERSION: "0.15.0"
 
 jobs:
@@ -20,7 +20,3 @@ jobs:
           bun-version: ${{ env.BUN_VERSION }}
       - name: Lint
         run: bunx oxlint --config oxlint.json --quiet --format github
-
-
-
-

.github/workflows/prettier-format.yml

@@ -10,7 +10,7 @@ on:
   merge_group:
 
 env:
-  BUN_VERSION: "1.1.27"
+  BUN_VERSION: "1.2.0"
 
 jobs:
   prettier-format:

.github/workflows/release.yml

@@ -44,6 +44,10 @@ on:
         description: Should types be released to npm?
         type: boolean
         default: false
+      use-definitelytyped:
+        description: "Should types be PR'd to DefinitelyTyped?"
+        type: boolean
+        default: false
 
 jobs:
   sign:
@@ -66,7 +70,7 @@ jobs:
       - name: Setup Bun
         uses: ./.github/actions/setup-bun
         with:
-          bun-version: "1.1.20"
+          bun-version: "1.2.0"
       - name: Install Dependencies
         run: bun install
       - name: Sign Release
@@ -94,7 +98,7 @@ jobs:
       - name: Setup Bun
         uses: ./.github/actions/setup-bun
         with:
-          bun-version: "1.1.20"
+          bun-version: "1.2.0"
       - name: Install Dependencies
         run: bun install
       - name: Release
@@ -123,7 +127,7 @@ jobs:
         if: ${{ env.BUN_VERSION != 'canary' }}
         uses: ./.github/actions/setup-bun
         with:
-          bun-version: "1.1.20"
+          bun-version: "1.2.0"
       - name: Setup Bun
         if: ${{ env.BUN_VERSION == 'canary' }}
         uses: ./.github/actions/setup-bun
@@ -155,6 +159,48 @@ jobs:
         with:
           package: packages/bun-types/package.json
           token: ${{ secrets.NPM_TOKEN }}
+  definitelytyped:
+    name: Make pr to DefinitelyTyped to update `bun-types` version
+    runs-on: ubuntu-latest
+    needs: npm-types
+    if: ${{ github.event_name == 'release' || github.event.inputs.use-definitelytyped == 'true' }}
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          repository: DefinitelyTyped/DefinitelyTyped
+      - name: Setup Bun
+        uses: ./.github/actions/setup-bun
+        with:
+          bun-version: "1.2.0"
+      - id: bun-version
+        run: echo "BUN_VERSION=${BUN_VERSION#bun-v}" >> "$GITHUB_OUTPUT"
+      - name: Update bun-types version in package.json
+        run: |
+          bun -e '
+          const file = Bun.file("./types/bun/package.json");
+          const json = await file.json();
+          const version = "${{ steps.bun-version.outputs.BUN_VERSION }}"; 
+          json.dependencies["bun-types"] = version;
+          json.version = version.slice(0, version.lastIndexOf(".")) + ".9999";
+          await file.write(JSON.stringify(json, null, 4) + "\n");
+          '
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        if: ${{ env.BUN_LATEST == 'true' && env.BUN_VERSION != 'canary'}}
+        with:
+          token: ${{ secrets.ROBOBUN_TOKEN }}
+          add-paths: ./types/bun/package.json
+          title: "[bun] update to ${{ steps.bun-version.outputs.BUN_VERSION }}"
+          commit-message: "[bun] update to ${{ steps.bun-version.outputs.BUN_VERSION }}"
+          body: |
+            Update `bun-types` version to ${{ steps.bun-version.outputs.BUN_VERSION }}
+
+            https://bun.sh/blog/${{ env.BUN_VERSION }}
+          push-to-fork: oven-sh/DefinitelyTyped
+          branch: ${{env.BUN_VERSION}}
   docker:
     name: Release to Dockerhub
     runs-on: ubuntu-latest
@@ -265,7 +311,7 @@ jobs:
       - name: Setup Bun
         uses: ./.github/actions/setup-bun
         with:
-          bun-version: "1.1.20"
+          bun-version: "1.2.0"
       - name: Install Dependencies
         run: bun install
       - name: Release
@@ -309,7 +355,7 @@ jobs:
         uses: ./.github/actions/setup-bun
         if: ${{ env.BUN_LATEST == 'true' }}
         with:
-          bun-version: "1.1.12"
+          bun-version: "1.2.0"
       - name: Bump version
         uses: ./.github/actions/bump
         if: ${{ env.BUN_LATEST == 'true' }}

.github/workflows/run-lint.yml

@@ -4,6 +4,7 @@ permissions:
   contents: read
 env:
   LLVM_VERSION: 16
+  BUN_VERSION: "1.2.0"
 
 on:
   workflow_call:
@@ -22,7 +23,7 @@ jobs:
       - name: Setup Bun
         uses: ./.github/actions/setup-bun
         with:
-          bun-version: "1.1.3"
+          bun-version: ${{ env.BUN_VERSION }}
       - name: Install Dependencies
         run: |
           bun --cwd=packages/bun-internal-test install

.github/workflows/test-bump.yml

@@ -8,6 +8,9 @@ on:
         description: What is the release tag? (e.g. "1.0.2", "canary")
         required: true
 
+env:
+  BUN_VERSION: "1.2.0"
+
 jobs:
   bump:
     name: "Bump version"
@@ -21,7 +24,7 @@ jobs:
       - name: Setup Bun
         uses: ./.github/actions/setup-bun
         with:
-          bun-version: "1.1.12"
+          bun-version: ${{ env.BUN_VERSION }}
       - name: Bump version
         uses: ./.github/actions/bump
         with:

.github/workflows/zig-format.yml

@@ -10,7 +10,7 @@ on:
   merge_group:
 
 env:
-  BUN_VERSION: "1.1.27"
+  BUN_VERSION: "1.2.0"
 
 jobs:
   zig-format:

.gitignore

@@ -151,6 +151,7 @@ src/bake/generated.ts
 test/cli/install/registry/packages/publish-pkg-*
 test/cli/install/registry/packages/@secret/publish-pkg-8
 test/js/third_party/prisma/prisma/sqlite/dev.db-journal
+tmp
 
 # Dependencies
 /vendor
@@ -178,4 +179,4 @@ test/js/third_party/prisma/prisma/sqlite/dev.db-journal
 
 .buildkite/ci.yml
 *.sock
-scratch*.{js,ts,tsx,cjs,mjs}
+scratch*.{js,ts,tsx,cjs,mjs}

.prettierignore

@@ -7,3 +7,4 @@ src/react-refresh.js
 *.min.js
 test/snippets
 test/js/node/test
+bun.lock

.vscode/settings.json

@@ -140,6 +140,7 @@
   },
   "files.associations": {
     "*.idl": "cpp",
+    "*.mdc": "markdown",
     "array": "cpp",
   },
   "C_Cpp.files.exclude": {

LATEST

@@ -1 +1 @@
-1.1.44
+1.2.2