From 1df8ad01996f28e28cd6fc7b53d30f459bb46cde Mon Sep 17 00:00:00 2001 From: RiskyMH Date: Sat, 19 Jul 2025 03:11:39 +1000 Subject: [PATCH] . --- src/install/lockfile/bun.lock.zig | 2 +- src/install/npm.zig | 14 +++++--------- test/cli/install/bun-install-registry.test.ts | 6 ++++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/install/lockfile/bun.lock.zig b/src/install/lockfile/bun.lock.zig index c07ed94d68..27cf9f3054 100644 --- a/src/install/lockfile/bun.lock.zig +++ b/src/install/lockfile/bun.lock.zig @@ -751,7 +751,7 @@ pub const Stringifier = struct { ); } - if (meta.libc != .all) { + if (meta.libc != .all and meta.libc != .none) { if (any) { try writer.writeByte(','); } else { diff --git a/src/install/npm.zig b/src/install/npm.zig index d7918934d8..c39245430b 100644 --- a/src/install/npm.zig +++ b/src/install/npm.zig @@ -680,6 +680,8 @@ pub const OperatingSystem = enum(u16) { pub const sunos: u16 = 1 << 6; pub const win32: u16 = 1 << 7; pub const android: u16 = 1 << 8; + // some more in use on npm: + // netbsd, haiku, cygwin pub const all_value: u16 = aix | darwin | freebsd | linux | openbsd | sunos | win32 | android; @@ -831,12 +833,10 @@ pub const Architecture = enum(u16) { pub const s390x: u16 = 1 << 9; pub const x32: u16 = 1 << 10; pub const x64: u16 = 1 << 11; - pub const wasm32: u16 = 1 << 12; - pub const riscv64: u16 = 1 << 13; - pub const loong64: u16 = 1 << 14; - pub const mips64el: u16 = 1 << 15; + // some more in use on npm: + // wasm32, riscv64, loong64, mips64el, sparc - pub const all_value: u16 = arm | arm64 | ia32 | mips | mipsel | ppc | ppc64 | s390 | s390x | x32 | x64 | wasm32 | riscv64 | loong64 | mips64el; + pub const all_value: u16 = arm | arm64 | ia32 | mips | mipsel | ppc | ppc64 | s390 | s390x | x32 | x64; pub const current: Architecture = switch (Environment.arch) { .arm64 => @enumFromInt(arm64), @@ -862,10 +862,6 @@ pub const Architecture = enum(u16) { .{ "s390x", s390x }, .{ "x32", x32 }, .{ "x64", x64 }, - .{ "wasm32", wasm32 }, - .{ "riscv64", riscv64 }, - .{ "loong64", loong64 }, - .{ "mips64el", mips64el }, }); pub const validValuesString = blk: { diff --git a/test/cli/install/bun-install-registry.test.ts b/test/cli/install/bun-install-registry.test.ts index 9add152fcb..6e2dd7bb4f 100644 --- a/test/cli/install/bun-install-registry.test.ts +++ b/test/cli/install/bun-install-registry.test.ts @@ -3326,7 +3326,9 @@ test("it should install with missing bun.lockb, node_modules, and/or cache", asy expect(out.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\r?\n/)).toEqual([ expect.stringContaining("bun install v1."), "", - expect.stringContaining("Checked 19 installs across 23 packages (no changes)"), + isLinux + ? expect.stringContaining("Checked 18 installs across 23 packages (no changes)") + : expect.stringContaining("Checked 19 installs across 23 packages (no changes)"), ]); expect(await exited).toBe(0); @@ -6099,7 +6101,7 @@ test("missing package on reinstall, some with binaries", async () => { expect.stringContaining("+ uses-what-bin@1.5.0"), expect.stringContaining("+ what-bin@1.0.0"), "", - "19 packages installed", + isLinux ? "18 packages installed" : "19 packages installed", "", "Blocked 1 postinstall. Run `bun pm untrusted` for details.", "",