diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/install/dependency.zig | 13 | ||||
| -rw-r--r-- | src/install/install.zig | 10 |
2 files changed, 6 insertions, 17 deletions
diff --git a/src/install/dependency.zig b/src/install/dependency.zig index 315c22894..2cc3d4177 100644 --- a/src/install/dependency.zig +++ b/src/install/dependency.zig @@ -318,8 +318,8 @@ pub const Version = struct { } pub fn infer(dependency: string) Tag { - // empty string means >= 0.0.0 - if (dependency.len == 0) return .npm; + // empty string means `latest` + if (dependency.len == 0) return .dist_tag; switch (dependency[0]) { // =1 // >1.2 @@ -670,10 +670,6 @@ pub fn parseWithTag( } tag_to_use = sliced.sub(dependency[i + 1 ..]).value(); - if (tag_to_use.isEmpty()) { - tag_to_use = String.from("latest"); - } - break :brk dependency["npm:".len..i]; }).value() else @@ -682,15 +678,12 @@ pub fn parseWithTag( // name should never be empty if (Environment.allow_assert) std.debug.assert(!actual.isEmpty()); - // tag should never be empty - if (Environment.allow_assert) std.debug.assert(!tag_to_use.isEmpty()); - return .{ .literal = sliced.value(), .value = .{ .dist_tag = .{ .name = actual, - .tag = tag_to_use, + .tag = if (tag_to_use.isEmpty()) String.from("latest") else tag_to_use, }, }, .tag = .dist_tag, diff --git a/src/install/install.zig b/src/install/install.zig index d23c1d757..a411d2098 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -4414,7 +4414,7 @@ pub const PackageManager = struct { for (updates) |*update| { if (update.e_string) |e_string| { e_string.data = switch (update.resolution.tag) { - .npm => if (update.version.tag == .npm and update.version.value.npm.version.input.len == 0) + .npm => if (update.version.tag == .dist_tag and update.version.literal.isEmpty()) std.fmt.allocPrint(allocator, "^{}", .{ update.resolution.value.npm.version.fmt(update.version_buf), }) catch unreachable @@ -6530,12 +6530,8 @@ pub const PackageManager = struct { ) else Lockfile.LoadFromDiskResult{ .not_found = {} }; - var root = Lockfile.Package{}; - var maybe_root: Lockfile.Package = undefined; - var needs_new_lockfile = load_lockfile_result != .ok or (load_lockfile_result.ok.buffers.dependencies.items.len == 0 and manager.package_json_updates.len > 0); - // this defaults to false // but we force allowing updates to the lockfile when you do bun add var had_any_diffs = false; @@ -6596,7 +6592,7 @@ pub const PackageManager = struct { var lockfile: Lockfile = undefined; try lockfile.initEmpty(ctx.allocator); - maybe_root = Lockfile.Package{}; + var maybe_root = Lockfile.Package{}; try Lockfile.Package.parseMain( &lockfile, @@ -6706,7 +6702,7 @@ pub const PackageManager = struct { } if (needs_new_lockfile) { - root = Lockfile.Package{}; + root = .{}; try manager.lockfile.initEmpty(ctx.allocator); if (manager.options.enable.frozen_lockfile) { |