aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Dylan Conway <35280289+dylan-conway@users.noreply.github.com> 2023-10-11 20:41:12 -0700
committerGravatar GitHub <noreply@github.com> 2023-10-11 20:41:12 -0700
commit755e16d962667621039a73e9d336b7ae16dcc00f (patch)
treeb371b873a0c827ca13d862afbdc9930167db787a
parentb1063edf3e76a2ef68d2ba3eff686932f742c77c (diff)
downloadbun-755e16d962667621039a73e9d336b7ae16dcc00f.tar.gz
bun-755e16d962667621039a73e9d336b7ae16dcc00f.tar.zst
bun-755e16d962667621039a73e9d336b7ae16dcc00f.zip
fix #6416 (#6430)
* make sure latest is checked after prerelease * test and fix * test for when latest matches prerelease
-rw-r--r--src/install/npm.zig9
-rw-r--r--test/cli/install/bun-install.test.ts124
2 files changed, 132 insertions, 1 deletions
diff --git a/src/install/npm.zig b/src/install/npm.zig
index 75945ba74..4cf1c2b71 100644
--- a/src/install/npm.zig
+++ b/src/install/npm.zig
@@ -810,7 +810,14 @@ pub const PackageManifest = struct {
if (this.findByDistTag("latest")) |result| {
if (group.satisfies(result.version)) {
- return result;
+ if (group.flags.isSet(Semver.Query.Group.Flags.pre)) {
+ if (left.version.order(result.version, this.string_buf, this.string_buf) == .eq) {
+ // if prerelease, use latest if semver+tag match range exactly
+ return result;
+ }
+ } else {
+ return result;
+ }
}
}
diff --git a/test/cli/install/bun-install.test.ts b/test/cli/install/bun-install.test.ts
index dbc0fada0..a0d28bf70 100644
--- a/test/cli/install/bun-install.test.ts
+++ b/test/cli/install/bun-install.test.ts
@@ -1873,6 +1873,130 @@ it("should prefer latest-tagged dependency", async () => {
await access(join(package_dir, "bun.lockb"));
});
+it("should install latest with prereleases", async () => {
+ const urls: string[] = [];
+ setHandler(
+ dummyRegistry(urls, {
+ "1.0.0-0": { as: "0.0.3" },
+ "1.0.0-8": { as: "0.0.5" },
+ latest: "1.0.0-0",
+ }),
+ );
+ await writeFile(
+ join(package_dir, "package.json"),
+ JSON.stringify({
+ name: "foo",
+ version: "0.0.1",
+ }),
+ );
+
+ var { stdout, stderr, exited } = spawn({
+ cmd: [bunExe(), "install", "baz"],
+ cwd: package_dir,
+ stdout: null,
+ stdin: "pipe",
+ stderr: "pipe",
+ env,
+ });
+ expect(stderr).toBeDefined();
+ var err = await new Response(stderr).text();
+ expect(err).toContain("Saved lockfile");
+ expect(stdout).toBeDefined();
+ var out = await new Response(stdout).text();
+ expect(out.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\n/)).toEqual([
+ "",
+ " installed baz@1.0.0-0",
+ "",
+ "",
+ " 1 package installed",
+ ]);
+ expect(await exited).toBe(0);
+ expect(requested).toBe(2);
+ await rm(join(package_dir, "node_modules"), { recursive: true, force: true });
+ await rm(join(package_dir, "bun.lockb"), { recursive: true, force: true });
+ await writeFile(
+ join(package_dir, "package.json"),
+ JSON.stringify({
+ name: "foo",
+ version: "0.0.1",
+ dependencies: {
+ baz: "latest",
+ },
+ }),
+ );
+ ({ stdout, stderr, exited } = spawn({
+ cmd: [bunExe(), "install"],
+ cwd: package_dir,
+ stdout: null,
+ stdin: "pipe",
+ stderr: "pipe",
+ env,
+ }));
+ expect(stderr).toBeDefined();
+ err = await new Response(stderr).text();
+ expect(err).toContain("Saved lockfile");
+ expect(stdout).toBeDefined();
+ out = await new Response(stdout).text();
+ expect(out.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\n/)).toEqual([" + baz@1.0.0-0", "", " 1 package installed"]);
+ expect(await exited).toBe(0);
+ await rm(join(package_dir, "node_modules"), { recursive: true, force: true });
+ await rm(join(package_dir, "bun.lockb"), { recursive: true, force: true });
+ await writeFile(
+ join(package_dir, "package.json"),
+ JSON.stringify({
+ name: "foo",
+ version: "0.0.1",
+ dependencies: {
+ baz: "^1.0.0-5",
+ },
+ }),
+ );
+ ({ stdout, stderr, exited } = spawn({
+ cmd: [bunExe(), "install"],
+ cwd: package_dir,
+ stdout: null,
+ stdin: "pipe",
+ stderr: "pipe",
+ env,
+ }));
+ expect(stderr).toBeDefined();
+ err = await new Response(stderr).text();
+ expect(err).toContain("Saved lockfile");
+ expect(stdout).toBeDefined();
+ out = await new Response(stdout).text();
+ expect(out.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\n/)).toEqual([" + baz@1.0.0-8", "", " 1 package installed"]);
+ expect(await exited).toBe(0);
+
+ await rm(join(package_dir, "node_modules"), { recursive: true, force: true });
+ await rm(join(package_dir, "bun.lockb"), { recursive: true, force: true });
+ await writeFile(
+ join(package_dir, "package.json"),
+ JSON.stringify({
+ name: "foo",
+ version: "0.0.1",
+ dependencies: {
+ baz: "^1.0.0-0",
+ },
+ }),
+ );
+ ({ stdout, stderr, exited } = spawn({
+ cmd: [bunExe(), "install"],
+ cwd: package_dir,
+ stdout: null,
+ stdin: "pipe",
+ stderr: "pipe",
+ env,
+ }));
+ expect(stderr).toBeDefined();
+ err = await new Response(stderr).text();
+ expect(err).toContain("Saved lockfile");
+ expect(stdout).toBeDefined();
+ out = await new Response(stdout).text();
+ expect(out.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\n/)).toEqual([" + baz@1.0.0-0", "", " 1 package installed"]);
+ expect(await exited).toBe(0);
+ await access(join(package_dir, "bun.lockb"));
+});
+
it("should handle dependency aliasing", async () => {
const urls: string[] = [];
setHandler(