diff options
| author |  Alex Lam S.L <alexlamsl@gmail.com>
| 2023-08-25 03:18:51 +0300 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-08-24 17:18:51 -0700 |
| commit | 213f5bef9d58ce90add3a83f5476f61f361ec3ef (patch) | |
| tree | c5a14ba5952f75b8edde4550ecb58763b39679a2 /src | |
| parent | e115638cba41e77a667d5798a0ca8cae9b38db9f (diff) | |
| download | bun-213f5bef9d58ce90add3a83f5476f61f361ec3ef.tar.gz bun-213f5bef9d58ce90add3a83f5476f61f361ec3ef.tar.zst bun-213f5bef9d58ce90add3a83f5476f61f361ec3ef.zip | |
[install] fix stale life-cycle scripts from lockfile (#4307)
fixes #4269
Diffstat (limited to 'src')
| -rw-r--r-- | src/install/install.zig | 8 | ||||
| -rw-r--r-- | src/install/lockfile.zig | 11 | ||||
| -rw-r--r-- | src/install/resolvers/folder_resolver.zig | 4 |
3 files changed, 17 insertions, 6 deletions
diff --git a/src/install/install.zig b/src/install/install.zig index baa35b869..06a171646 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -7557,16 +7557,14 @@ pub const PackageManager = struct { // Split this into two passes because the below may allocate memory or invalidate pointers if (manager.summary.add > 0 or manager.summary.update > 0) { - var remaining = mapping; - var dependency_i: PackageID = off; const changes = @as(PackageID, @truncate(mapping.len)); + var counter_i: PackageID = 0; _ = manager.getCacheDirectory(); _ = manager.getTemporaryDirectory(); - var counter_i: PackageID = 0; while (counter_i < changes) : (counter_i += 1) { - if (remaining[counter_i] == invalid_package_id) { - dependency_i = counter_i + off; + if (mapping[counter_i] == invalid_package_id) { + const dependency_i = counter_i + off; const dependency = manager.lockfile.buffers.dependencies.items[dependency_i]; try manager.enqueueDependencyWithMain( dependency_i, diff --git a/src/install/lockfile.zig b/src/install/lockfile.zig index 363418976..5a085d92b 100644 --- a/src/install/lockfile.zig +++ b/src/install/lockfile.zig @@ -2488,6 +2488,17 @@ pub const Package = extern struct { summary.add = @truncate(to_deps.len - (from_deps.len - summary.remove)); + inline for (Package.Scripts.Hooks) |hook| { + if (!@field(to.scripts, hook).eql( + @field(from.scripts, hook), + to_lockfile.buffers.string_bytes.items, + from_lockfile.buffers.string_bytes.items, + )) { + // We found a changed life-cycle script + summary.update += 1; + } + } + return summary; } }; diff --git a/src/install/resolvers/folder_resolver.zig b/src/install/resolvers/folder_resolver.zig index 335a40864..e25d233dc 100644 --- a/src/install/resolvers/folder_resolver.zig +++ b/src/install/resolvers/folder_resolver.zig @@ -185,10 +185,12 @@ pub const FolderResolution = union(Tag) { ); if (manager.lockfile.getPackageID(package.name_hash, version, &package.resolution)) |existing_id| { + package.meta.id = existing_id; + manager.lockfile.packages.set(existing_id, package); return manager.lockfile.packages.get(existing_id); } - return manager.lockfile.appendPackage(package) catch unreachable; + return manager.lockfile.appendPackage(package); } pub const GlobalOrRelative = union(enum) { |