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

Fix: Only process packages in default callback to avoid conflicts

Browse Source 
The previous approach of always processing packages broke existing callbacks
that expected to handle package processing themselves. Now we only process
packages automatically when using the default callback, which is what
install_with_manager uses.

- Process packages in default callback case for both extract and git_checkout
- Leave other callbacks (PackageInstaller, Store.Installer) unchanged
- Maintains compatibility with existing code paths

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Claude
2025-08-16 08:58:44 +02:00
parent f1009f1ad7
commit 30936eedc8
2 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/install/PackageManager.zig
View File

@@ -1279,35 +1279,9 @@ pub fn onExtractDefault(
data: *const ExtractData,
log_level: Options.LogLevel,
) void {
// The runtime callback takes full control of extraction handling
// We need to process the extracted package and assign resolutions
// Get the dependency to find out what type of resolution this is
const dependency = manager.lockfile.buffers.dependencies.items[dependency_id];
var package_id = manager.lockfile.buffers.resolutions.items[dependency_id];
// For git/github dependencies, we need to create the package from the extracted tarball
switch (dependency.version.tag) {
.git, .github => {
// Create a simple Resolution struct that processExtractedTarballPackage can use
// We just need the tag to be correct for the switch statement inside processExtractedTarballPackage
var res = bun.install.Resolution{
.tag = if (dependency.version.tag == .git) .git else .github,
.value = .{ .uninitialized = {} },
};
if (manager.processExtractedTarballPackage(&package_id, dependency_id, &res, data, log_level)) |pkg| {
_ = pkg;
// Assign the resolution for the primary dependency
if (dependency_id != bun.install.invalid_package_id and package_id != bun.install.invalid_package_id) {
manager.assignResolution(dependency_id, package_id);
}
}
},
else => {
// For other types, the package should already exist
},
}
_ = data;
_ = log_level;
_ = dependency_id;
// Process any dependency_install_context items in the task queue
if (manager.task_queue.fetchRemove(task_id)) |removed| {

24
src/install/PackageManager/runTasks.zig
View File

@@ -635,6 +635,15 @@ pub fn runTasks(
);
},
.default => |cb| {
// For default callback, process the package first
if (manager.processExtractedTarballPackage(&package_id, dependency_id, resolution, &task.data.extract, log_level)) |pkg| {
_ = pkg;
// Assign the resolution for the primary dependency
if (dependency_id != invalid_package_id and package_id != invalid_package_id) {
manager.assignResolution(dependency_id, package_id);
}
}
cb.fn_ptr(
cb.ctx,
task.id,
@@ -878,6 +887,21 @@ pub fn runTasks(
);
},
.default => |cb| {
// For default callback, process the package first
if (manager.processExtractedTarballPackage(
&package_id,
git_checkout.dependency_id,
resolution,
&task.data.git_checkout,
log_level,
)) |pkg| {
_ = pkg;
// Assign the resolution for the primary dependency
if (git_checkout.dependency_id != invalid_package_id and package_id != invalid_package_id) {
manager.assignResolution(git_checkout.dependency_id, package_id);
}
}
cb.fn_ptr(
cb.ctx,
task.id,