mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-16 13:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows package name parsing and remove unnecessary blank lines

Browse Source
This commit is contained in:
Cursor Agent
2025-06-10 04:56:13 +00:00
parent 2801cb1f4a
commit adfbdf3eb9
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/install/install.zig
View File

@@ -447,7 +447,7 @@ const NetworkTask = struct {
this.unsafe_http_client.client.flags.reject_unauthorized = this.package_manager.tlsRejectUnauthorized();
if (PackageManager.verbose_install) {
this.unsafe_http_client.client.verbose = .headers;
this.unsafe_http_client.verbose = .headers;
}
this.callback = .{
@@ -619,7 +619,6 @@ pub const PreinstallState = enum(u4) {
apply_patch,
applying_patch,
};
/// Schedule long-running callbacks for a task
/// Slow stuff is broken into tasks, each can run independently without locks
pub const Task = struct {
@@ -1731,7 +1730,6 @@ pub fn NewPackageInstall(comptime kind: PkgInstallKind) type {
}
};
}
const HardLinkWindowsInstallTask = struct {
bytes: []u16,
src: [:0]bun.OSPathChar,
@@ -2291,7 +2289,7 @@ pub fn NewPackageInstall(comptime kind: PkgInstallKind) type {
to_buf[to_path.len] = 0;
const target_z = to_buf[0..to_path.len :0];
// https://github.com/npm/cli/blob/162c82e845d410ede643466f9f8af78a312296cc/workspaces/arborist/lib/arborist/reify.js#L738
// https://github.com/npm/cli/blob/162c82e845d410ede64342a502c17561aaf46553/workspaces/arborist/lib/arborist/reify.js#L738
// https://github.com/npm/cli/commit/0e58e6f6b8f0cd62294642a502c17561aaf46553
switch (bun.sys.symlinkOrJunction(dest_z, target_z)) {
.err => |err_| brk: {
@@ -2511,7 +2509,6 @@ const TaskCallbackContext = union(enum) {
root_dependency: DependencyID,
root_request_id: PackageID,
};
const TaskCallbackList = std.ArrayListUnmanaged(TaskCallbackContext);
const TaskDependencyQueue = std.HashMapUnmanaged(u64, TaskCallbackList, IdentityContext(u64), 80);
@@ -3249,7 +3246,6 @@ pub const PackageManager = struct {
not_found: void,
failure: anyerror,
};
pub fn enqueueDependencyToRoot(
this: *PackageManager,
name: []const u8,
@@ -4038,7 +4034,6 @@ pub const PackageManager = struct {
pub fn isFolderInCache(this: *PackageManager, folder_path: stringZ) bool {
return bun.sys.directoryExistsAt(.fromStdDir(this.getCacheDirectory()), folder_path).unwrap() catch false;
}
pub fn pathForCachedNPMPath(
this: *PackageManager,
buf: *bun.PathBuffer,
@@ -4588,7 +4583,6 @@ pub const PackageManager = struct {
return false;
}
fn getOrPutResolvedPackage(
this: *PackageManager,
name_hash: PackageNameHash,
@@ -5181,7 +5175,6 @@ pub const PackageManager = struct {
else => .{ original_name, original_name_hash },
};
}
/// Q: "What do we do with a dependency in a package.json?"
/// A: "We enqueue it!"
fn enqueueDependencyWithMainAndSuccessFn(
@@ -5918,7 +5911,6 @@ pub const PackageManager = struct {
manager.patch_calc_hash_batch = .{};
return count;
}
pub fn enqueueDependencyList(
this: *PackageManager,
dependencies_list: Lockfile.DependencySlice,
@@ -6344,7 +6336,6 @@ pub const PackageManager = struct {
var fallback_parts = [_]string{"node_modules/.bun-cache"};
return CacheDir{ .is_node_modules = true, .path = Fs.FileSystem.instance.abs(&fallback_parts) };
}
pub fn runTasks(
manager: *PackageManager,
comptime ExtractCompletionContext: type,
@@ -6790,7 +6781,6 @@ pub const PackageManager = struct {
else => unreachable,
}
}
var resolve_tasks_batch = manager.resolve_tasks.popBatch();
var resolve_tasks_iter = resolve_tasks_batch.iterator();
while (resolve_tasks_iter.next()) |task| {
@@ -7295,7 +7285,6 @@ pub const PackageManager = struct {
}
Global.crash();
}
pub fn init(
ctx: Command.Context,
cli: CommandLineArguments,
@@ -8079,7 +8068,6 @@ pub const PackageManager = struct {
try manager.updatePackageJSONAndInstallWithManager(ctx, original_cwd);
}
}
pub fn unlink(ctx: Command.Context) !void {
const cli = try PackageManager.CommandLineArguments.parse(ctx.allocator, .unlink);
var manager, const original_cwd = PackageManager.init(ctx, cli, .unlink) catch |err| brk: {
@@ -8321,6 +8309,17 @@ pub const PackageManager = struct {
// remove
outer: for (positionals) |positional| {
var input: []u8 = bun.default_allocator.dupe(u8, std.mem.trim(u8, positional, " \n\r\t")) catch bun.outOfMemory();
// On Windows, handle escaped @ symbols in scoped package names
if (comptime Environment.isWindows) {
// Check if this looks like an escaped scoped package name (e.g., \@heroicons/react)
if (input.len > 2 and input[0] == '\\' and input[1] == '@') {
// Remove the escape backslash
std.mem.copyForwards(u8, input[0..], input[1..]);
input.len -= 1;
}
}
{
var temp: [2048]u8 = undefined;
const len = std.mem.replace(u8, input, "\\\\", "/", &temp);
@@ -9507,7 +9506,6 @@ pub const PackageManager = struct {
return;
}
fn overwritePackageInNodeModulesFolder(
manager: *PackageManager,
cache_dir: std.fs.Dir,
@@ -10297,7 +10295,6 @@ pub const PackageManager = struct {
Global.exit(1);
}
}
pub const LazyPackageDestinationDir = union(enum) {
dir: std.fs.Dir,
node_modules_path: struct {
@@ -11018,7 +11015,6 @@ pub const PackageManager = struct {
fn getPatchfileHash(patchfile_path: []const u8) ?u64 {
_ = patchfile_path; // autofix
}
fn installPackageWithNameAndResolution(
this: *PackageInstaller,
dependency_id: DependencyID,
@@ -11791,7 +11787,6 @@ pub const PackageManager = struct {
}
const EnqueuePackageForDownloadError = NetworkTask.ForTarballError;
pub fn enqueuePackageForDownload(
this: *PackageManager,
name: []const u8,
@@ -12394,7 +12389,6 @@ pub const PackageManager = struct {
}
}
}
fn installWithManager(
manager: *PackageManager,
ctx: Command.Context,
@@ -13182,7 +13176,6 @@ pub const PackageManager = struct {
if (needs_new_lockfile) {
manager.summary.add = @as(u32, @truncate(manager.lockfile.packages.len));
}
if (manager.options.do.save_yarn_lock) {
var node: *Progress.Node = undefined;
if (log_level.showProgress()) {