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

[install] fix stale root life-cycle script in lockfile (#4411)

Browse Source 
fixes #4319
This commit is contained in:
Alex Lam S.L
2023-08-31 03:35:28 +03:00
committed by GitHub
parent 04215e2f3a
commit 037463fc48
2 changed files with 187 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/install/install.zig
View File

@@ -7524,13 +7524,6 @@ pub const PackageManager = struct {
package_json_source,
Features.main,
);
if (!root.scripts.filled) {
maybe_root.scripts.enqueue(
manager.lockfile,
lockfile.buffers.string_bytes.items,
strings.withoutTrailingSlash(Fs.FileSystem.instance.top_level_dir),
);
}
var mapping = try manager.lockfile.allocator.alloc(PackageID, maybe_root.dependencies.len);
@memset(mapping, invalid_package_id);
@@ -7565,6 +7558,8 @@ pub const PackageManager = struct {
new_dep.count(lockfile.buffers.string_bytes.items, *Lockfile.StringBuilder, builder);
}
maybe_root.scripts.count(lockfile.buffers.string_bytes.items, *Lockfile.StringBuilder, builder);
const off = @as(u32, @truncate(manager.lockfile.buffers.dependencies.items.len));
const len = @as(u32, @truncate(new_dependencies.len));
var packages = manager.lockfile.packages.slice();
@@ -7598,6 +7593,12 @@ pub const PackageManager = struct {
}
}
manager.lockfile.packages.items(.scripts)[0] = maybe_root.scripts.clone(
lockfile.buffers.string_bytes.items,
*Lockfile.StringBuilder,
builder,
);
builder.clamp();
// Split this into two passes because the below may allocate memory or invalidate pointers
@@ -7619,6 +7620,16 @@ pub const PackageManager = struct {
}
}
}
if (manager.summary.update > 0) root.scripts = .{};
}
if (!root.scripts.filled) {
maybe_root.scripts.enqueue(
manager.lockfile,
lockfile.buffers.string_bytes.items,
strings.withoutTrailingSlash(Fs.FileSystem.instance.top_level_dir),
);
}
}
},

170
test/cli/install/bun-install.test.ts
View File

@@ -857,7 +857,141 @@ 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 () => {
it("should use updated life-cycle scripts in root 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, "package.json"),
JSON.stringify({
name: "Foo",
scripts: {
install: [bunExe(), "moo.js"].join(" "),
postinstall: [bunExe(), "foo.js"].join(" "),
},
workspaces: ["bar"],
}),
);
await writeFile(join(package_dir, "moo.js"), 'console.log("[scripts:run] Moo");');
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] Bar",
" + Bar@workspace:bar",
"[scripts:run] Moo",
"[scripts:run] Foo",
"",
" 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"));
// Perform `bun install --production` with lockfile from before
const bun_lockb = await file(join(package_dir, "bun.lockb")).arrayBuffer();
await rm(join(package_dir, "node_modules"), { force: true, recursive: true });
const {
stdout: stdout3,
stderr: stderr3,
exited: exited3,
} = spawn({
cmd: [bunExe(), "install", "--production"],
cwd: package_dir,
stdout: null,
stdin: "pipe",
stderr: "pipe",
env,
});
expect(stderr3).toBeDefined();
const err3 = await new Response(stderr3).text();
expect(err3).not.toContain("error:");
expect(err3).not.toContain("Saved lockfile");
expect(stdout3).toBeDefined();
const out3 = await new Response(stdout3).text();
expect(out3.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\r?\n/)).toEqual([
"[scripts:run] Bar",
" + Bar@workspace:bar",
"[scripts:run] Moo",
"[scripts:run] Foo",
"",
" 1 packages installed",
]);
expect(await exited3).toBe(0);
expect(requested).toBe(0);
expect(await readdirSorted(join(package_dir, "node_modules"))).toEqual(["Bar"]);
expect(await readlink(join(package_dir, "node_modules", "Bar"))).toBe(join("..", "bar"));
expect(await file(join(package_dir, "bun.lockb")).arrayBuffer()).toEqual(bun_lockb);
});
it("should use updated life-cycle scripts in dependency during re-installation", async () => {
await writeFile(
join(package_dir, "package.json"),
JSON.stringify({
@@ -954,6 +1088,40 @@ it("should use updated life-cycle scripts during re-installation", async () => {
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 --production` with lockfile from before
const bun_lockb = await file(join(package_dir, "bun.lockb")).arrayBuffer();
await rm(join(package_dir, "node_modules"), { force: true, recursive: true });
const {
stdout: stdout3,
stderr: stderr3,
exited: exited3,
} = spawn({
cmd: [bunExe(), "install", "--production"],
cwd: package_dir,
stdout: null,
stdin: "pipe",
stderr: "pipe",
env,
});
expect(stderr3).toBeDefined();
const err3 = await new Response(stderr3).text();
expect(err3).not.toContain("error:");
expect(err3).not.toContain("Saved lockfile");
expect(stdout3).toBeDefined();
const out3 = await new Response(stdout3).text();
expect(out3.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 exited3).toBe(0);
expect(requested).toBe(0);
expect(await readdirSorted(join(package_dir, "node_modules"))).toEqual(["Bar"]);
expect(await readlink(join(package_dir, "node_modules", "Bar"))).toBe(join("..", "bar"));
expect(await file(join(package_dir, "bun.lockb")).arrayBuffer()).toEqual(bun_lockb);
});
it("should ignore workspaces within workspaces", async () => {