Merge branch 'main' into claude/fix-resolves-rejects-return-promise

Author: pfgithub

.claude/hooks/pre-bash-zig-build.js

@@ -92,7 +92,39 @@ if (argv0 === "timeout") {
 
   // Check if it's "bun bd" or "bun-debug bd" without other positional args
   if (actualCommand === "bun" || actualCommand.includes("bun-debug")) {
-    const positionalArgs = restArgs.filter(arg => !arg.startsWith("-"));
+    // Claude is a sneaky fucker
+    let positionalArgs = restArgs.filter(arg => !arg.startsWith("-"));
+    const redirectStderrToStdoutIndex = positionalArgs.findIndex(arg => arg === "2>&1");
+    if (redirectStderrToStdoutIndex !== -1) {
+      positionalArgs.splice(redirectStderrToStdoutIndex, 1);
+    }
+    const redirectStdoutToStderrIndex = positionalArgs.findIndex(arg => arg === "1>&2");
+    if (redirectStdoutToStderrIndex !== -1) {
+      positionalArgs.splice(redirectStdoutToStderrIndex, 1);
+    }
+
+    const redirectToFileIndex = positionalArgs.findIndex(arg => arg === ">");
+    if (redirectToFileIndex !== -1) {
+      positionalArgs.splice(redirectToFileIndex, 2);
+    }
+
+    const redirectToFileAppendIndex = positionalArgs.findIndex(arg => arg === ">>");
+    if (redirectToFileAppendIndex !== -1) {
+      positionalArgs.splice(redirectToFileAppendIndex, 2);
+    }
+
+    const redirectTOFileInlineIndex = positionalArgs.findIndex(arg => arg.startsWith(">"));
+    if (redirectTOFileInlineIndex !== -1) {
+      positionalArgs.splice(redirectTOFileInlineIndex, 1);
+    }
+
+    const pipeIndex = positionalArgs.findIndex(arg => arg === "|");
+    if (pipeIndex !== -1) {
+      positionalArgs = positionalArgs.slice(0, pipeIndex);
+    }
+
+    positionalArgs = positionalArgs.map(arg => arg.trim()).filter(Boolean);
+
     if (positionalArgs.length === 1 && positionalArgs[0] === "bd") {
       denyWithReason("error: Run `bun bd` without a timeout");
     }

.github/workflows/claude.yml

@@ -57,8 +57,7 @@ jobs:
           git reset --hard origin/${{ github.event.pull_request.head.ref }}
       - name: Run Claude Code
         id: claude
-        # TODO: switch this out once they merge their v1
-        uses: km-anthropic/claude-code-action@v1-dev
+        uses: anthropics/claude-code-action@v1
         with:
           timeout_minutes: "180"
           claude_args: |

.github/workflows/labeled.yml

@@ -142,16 +142,16 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const closeAction = JSON.parse('${{ steps.add-labels.outputs.close-action }}');
-            
+            const closeAction = ${{ fromJson(steps.add-labels.outputs.close-action) }};
+
             // Comment with the reason
             await github.rest.issues.createComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
               issue_number: context.issue.number,
               body: closeAction.comment
             });
-            
+
             // Close the issue
             await github.rest.issues.update({
               owner: context.repo.owner,

LATEST

@@ -1 +1 @@
-1.2.23
+1.3.0

cmake/targets/BuildBun.cmake

@@ -1045,7 +1045,6 @@ if(APPLE)
     -Wl,-no_compact_unwind
     -Wl,-stack_size,0x1200000
     -fno-keep-static-consts
-    -Wl,-map,${bun}.linker-map
   )
 
   if(DEBUG)
@@ -1065,6 +1064,7 @@ if(APPLE)
     target_link_options(${bun} PUBLIC
       -dead_strip
       -dead_strip_dylibs
+      -Wl,-map,${bun}.linker-map
     )
   endif()
 endif()
@@ -1098,6 +1098,17 @@ if(LINUX)
     )
   endif()
 
+  if (ENABLE_LTO)
+    # We are optimizing for size at a slight debug-ability cost
+    target_link_options(${bun} PUBLIC
+      -Wl,--no-eh-frame-hdr
+    )
+  else()
+    target_link_options(${bun} PUBLIC
+      -Wl,--eh-frame-hdr
+    )
+  endif()
+
   target_link_options(${bun} PUBLIC
     --ld-path=${LLD_PROGRAM}
     -fno-pic
@@ -1112,11 +1123,9 @@ if(LINUX)
     # make debug info faster to load
     -Wl,--gdb-index
     -Wl,-z,combreloc
-    -Wl,--no-eh-frame-hdr
     -Wl,--sort-section=name
     -Wl,--hash-style=both
     -Wl,--build-id=sha1  # Better for debugging than default
-    -Wl,-Map=${bun}.linker-map
   )
 
   # don't strip in debug, this seems to be needed so that the Zig std library
@@ -1131,6 +1140,7 @@ if(LINUX)
   if (NOT DEBUG AND NOT ENABLE_ASAN AND NOT ENABLE_VALGRIND)
     target_link_options(${bun} PUBLIC
       -Wl,-icf=safe
+      -Wl,-Map=${bun}.linker-map
     )
   endif()
 
@@ -1452,7 +1462,7 @@ if(NOT BUN_CPP_ONLY)
       list(APPEND bunFiles ${bun}.dSYM)
     endif()
 
-    if(APPLE OR LINUX)
+    if((APPLE OR LINUX) AND NOT ENABLE_ASAN)
       list(APPEND bunFiles ${bun}.linker-map)
     endif()
 

cmake/targets/BuildLibuv.cmake

@@ -4,8 +4,8 @@ register_repository(
   REPOSITORY
     libuv/libuv
   COMMIT
-    # Corresponds to v1.51.0
-    5152db2cbfeb5582e9c27c5ea1dba2cd9e10759b
+    # Latest HEAD (includes recursion bug fix #4784)
+    f3ce527ea940d926c40878ba5de219640c362811
 )
 
 if(WIN32)

docs/cli/init.md

@@ -2,20 +2,29 @@ Scaffold an empty Bun project with the interactive `bun init` command.
 
 ```bash
 $ bun init
-bun init helps you get started with a minimal project and tries to
-guess sensible defaults. Press ^C anytime to quit.
 
-package name (quickstart):
-entry point (index.ts):
+? Select a project template - Press return to submit.
+❯ Blank
+  React
+  Library
 
-Done! A package.json file was saved in the current directory.
- + index.ts
- + .gitignore
- + tsconfig.json (for editor auto-complete)
- + README.md
+✓ Select a project template: Blank
+
++ .gitignore
++ index.ts
++ tsconfig.json (for editor autocomplete)
++ README.md
 
 To get started, run:
-  bun run index.ts
+
+    bun run index.ts
+
+bun install v$BUN_LATEST_VERSION
+
++ @types/bun@$BUN_LATEST_VERSION
++ [email protected]
+
+7 packages installed
 ```
 
 Press `enter` to accept the default answer for each prompt, or pass the `-y` flag to auto-accept the defaults.

docs/quickstart.md

@@ -9,20 +9,29 @@ Run `bun init` to scaffold a new project. It's an interactive tool; for this tut
 
 ```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):
+? Select a project template - Press return to submit.
+❯ Blank
+  React
+  Library
 
-Done! A package.json file was saved in the current directory.
- + index.ts
- + .gitignore
- + tsconfig.json (for editor auto-complete)
- + README.md
+✓ Select a project template: Blank
+
++ .gitignore
++ index.ts
++ tsconfig.json (for editor autocomplete)
++ README.md
 
 To get started, run:
-  bun run index.ts
+
+    bun run index.ts
+
+bun install v$BUN_LATEST_VERSION
+
++ @types/bun@$BUN_LATEST_VERSION
++ [email protected]
+
+7 packages installed
 ```
 
 Since our entry point is a `*.ts` file, Bun generates a `tsconfig.json` for you. If you're using plain JavaScript, it will generate a [`jsconfig.json`](https://code.visualstudio.com/docs/languages/jsconfig) instead.
@@ -88,11 +97,15 @@ Bun can also execute `"scripts"` from your `package.json`. Add the following scr
     "name": "quickstart",
     "module": "index.ts",
     "type": "module",
+    "private": true,
 +   "scripts": {
 +     "start": "bun run index.ts"
 +   },
     "devDependencies": {
       "@types/bun": "latest"
+    },
+    "peerDependencies": {
+      "typescript": "^5"
     }
   }
 ```

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "bun",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "workspaces": [
     "./packages/bun-types",
     "./packages/@types/bun"

packages/bun-usockets/src/bsd.c

@@ -1467,12 +1467,39 @@ static int is_loopback(struct sockaddr_storage *sockaddr) {
 }
 #endif
 
-LIBUS_SOCKET_DESCRIPTOR bsd_create_connect_socket(struct sockaddr_storage *addr, int options) {
+LIBUS_SOCKET_DESCRIPTOR bsd_create_connect_socket(struct sockaddr_storage *addr, int options, struct sockaddr_storage *local_addr) {
     LIBUS_SOCKET_DESCRIPTOR fd = bsd_create_socket(addr->ss_family, SOCK_STREAM, 0, NULL);
     if (fd == LIBUS_SOCKET_ERROR) {
         return LIBUS_SOCKET_ERROR;
     }
 
+    // Bind to local address if specified
+    if (local_addr != NULL) {
+        socklen_t addr_len;
+        if (local_addr->ss_family == AF_INET) {
+            addr_len = sizeof(struct sockaddr_in);
+        } else if (local_addr->ss_family == AF_INET6) {
+            addr_len = sizeof(struct sockaddr_in6);
+        } else {
+            bsd_close_socket(fd);
+#ifdef _WIN32
+            WSASetLastError(WSAEAFNOSUPPORT);
+#endif
+            errno = EAFNOSUPPORT;
+            return LIBUS_SOCKET_ERROR;
+        }
+
+        int bind_result;
+        do {
+            bind_result = bind(fd, (struct sockaddr *)local_addr, addr_len);
+        } while (IS_EINTR(bind_result));
+
+        if (bind_result != 0) {
+            bsd_close_socket(fd);
+            return LIBUS_SOCKET_ERROR;
+        }
+    }
+
 #ifdef _WIN32
     win32_set_nonblocking(fd);