aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alex Lam S.L <alexlamsl@gmail.com> 2023-08-25 03:18:51 +0300
committerGravatar GitHub <noreply@github.com> 2023-08-24 17:18:51 -0700
commit213f5bef9d58ce90add3a83f5476f61f361ec3ef (patch)
treec5a14ba5952f75b8edde4550ecb58763b39679a2
parente115638cba41e77a667d5798a0ca8cae9b38db9f (diff)
downloadbun-213f5bef9d58ce90add3a83f5476f61f361ec3ef.tar.gz
bun-213f5bef9d58ce90add3a83f5476f61f361ec3ef.tar.zst
bun-213f5bef9d58ce90add3a83f5476f61f361ec3ef.zip
[install] fix stale life-cycle scripts from lockfile (#4307)
fixes #4269
-rw-r--r--src/install/install.zig8
-rw-r--r--src/install/lockfile.zig11
-rw-r--r--src/install/resolvers/folder_resolver.zig4
-rw-r--r--test/cli/install/bun-install.test.ts100
4 files changed, 117 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) {
diff --git a/test/cli/install/bun-install.test.ts b/test/cli/install/bun-install.test.ts
index 09c5fa770..a530cac38 100644
--- a/test/cli/install/bun-install.test.ts
+++ b/test/cli/install/bun-install.test.ts
@@ -775,6 +775,7 @@ it("should handle life-cycle scripts during re-installation", async () => {
});
expect(stderr1).toBeDefined();
const err1 = await new Response(stderr1).text();
+ expect(err1).not.toContain("error:");
expect(err1).toContain("Saved lockfile");
expect(stdout1).toBeDefined();
const out1 = await new Response(stdout1).text();
@@ -856,6 +857,105 @@ it("should handle life-cycle scripts during re-installation", async () => {
await access(join(package_dir, "bun.lockb"));
});
+it("should use updated life-cycle scripts during re-installation", async () => {
+ await writeFile(
+ join(package_dir, "package.json"),
+ JSON.stringify({
+ name: "Foo",
+ scripts: {
+ install: [bunExe(), "foo.js"].join(" "),
+ },
+ workspaces: ["bar"],
+ }),
+ );
+ await writeFile(join(package_dir, "foo.js"), 'console.log("[scripts:run] Foo");');
+ await mkdir(join(package_dir, "bar"));
+ await writeFile(
+ join(package_dir, "bar", "package.json"),
+ JSON.stringify({
+ name: "Bar",
+ scripts: {
+ preinstall: [bunExe(), "bar.js"].join(" "),
+ },
+ }),
+ );
+ await writeFile(join(package_dir, "bar", "bar.js"), 'console.log("[scripts:run] Bar");');
+ const {
+ stdout: stdout1,
+ stderr: stderr1,
+ exited: exited1,
+ } = spawn({
+ cmd: [bunExe(), "install"],
+ cwd: package_dir,
+ stdout: null,
+ stdin: "pipe",
+ stderr: "pipe",
+ env,
+ });
+ expect(stderr1).toBeDefined();
+ const err1 = await new Response(stderr1).text();
+ expect(err1).not.toContain("error:");
+ expect(err1).toContain("Saved lockfile");
+ expect(stdout1).toBeDefined();
+ const out1 = await new Response(stdout1).text();
+ expect(out1.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\r?\n/)).toEqual([
+ "[scripts:run] Bar",
+ " + Bar@workspace:bar",
+ "[scripts:run] Foo",
+ "",
+ " 1 packages installed",
+ ]);
+ expect(await exited1).toBe(0);
+ expect(requested).toBe(0);
+ expect(await readdirSorted(join(package_dir, "node_modules"))).toEqual([".cache", "Bar"]);
+ expect(await readlink(join(package_dir, "node_modules", "Bar"))).toBe(join("..", "bar"));
+ await access(join(package_dir, "bun.lockb"));
+ // Perform `bun install` with outdated lockfile
+ await rm(join(package_dir, "node_modules"), { force: true, recursive: true });
+ await writeFile(
+ join(package_dir, "bar", "package.json"),
+ JSON.stringify({
+ name: "Bar",
+ scripts: {
+ preinstall: [bunExe(), "baz.js"].join(" "),
+ postinstall: [bunExe(), "bar.js"].join(" "),
+ },
+ }),
+ );
+ await writeFile(join(package_dir, "bar", "baz.js"), 'console.log("[scripts:run] Baz");');
+ const {
+ stdout: stdout2,
+ stderr: stderr2,
+ exited: exited2,
+ } = spawn({
+ cmd: [bunExe(), "install"],
+ cwd: package_dir,
+ stdout: null,
+ stdin: "pipe",
+ stderr: "pipe",
+ env,
+ });
+ expect(stderr2).toBeDefined();
+ const err2 = await new Response(stderr2).text();
+ expect(err2).not.toContain("error:");
+ expect(err2).toContain("Saved lockfile");
+ expect(stdout2).toBeDefined();
+ const out2 = await new Response(stdout2).text();
+ expect(out2.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\r?\n/)).toEqual([
+ "[scripts:run] Baz",
+ " + Bar@workspace:bar",
+ "[scripts:run] Foo",
+ "[scripts:run] Bar",
+ "",
+ " 1 packages installed",
+ ]);
+ expect(await exited2).toBe(0);
+ expect(requested).toBe(0);
+ expect(await readdirSorted(join(package_dir, "node_modules"))).toEqual([".cache", "Bar"]);
+ expect(await readlink(join(package_dir, "node_modules", "Bar"))).toBe(join("..", "bar"));
+ await access(join(package_dir, "bun.lockb"));
+});
+
it("should ignore workspaces within workspaces", async () => {
await writeFile(
join(package_dir, "package.json"),