aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Nathan Hammond <github.com@nathanhammond.com> 2023-09-14 13:32:03 +0800
committerGravatar GitHub <noreply@github.com> 2023-09-13 22:32:03 -0700
commit8ae9aeea6becd8e34c45885943cfe3643beb68c9 (patch)
treece92b57eb5a9089b1bf31264d03d31d7abe49367 /src
parent4ebed280dc5532b93c1e28ad0b33a7a315ab3b65 (diff)
downloadbun-8ae9aeea6becd8e34c45885943cfe3643beb68c9.tar.gz
bun-8ae9aeea6becd8e34c45885943cfe3643beb68c9.tar.zst
bun-8ae9aeea6becd8e34c45885943cfe3643beb68c9.zip
Remove the ability to configure lockfile. (#5335)
Diffstat (limited to 'src')
-rw-r--r--src/bunfig.zig12
-rw-r--r--src/install/install.zig33
2 files changed, 2 insertions, 43 deletions
diff --git a/src/bunfig.zig b/src/bunfig.zig
index 76f33cb82..02825d2b5 100644
--- a/src/bunfig.zig
+++ b/src/bunfig.zig
@@ -392,18 +392,6 @@ pub const Bunfig = struct {
install.save_lockfile = value;
}
}
-
- if (lockfile_expr.get("path")) |lockfile| {
- if (lockfile.asString(allocator)) |value| {
- install.lockfile_path = value;
- }
- }
-
- if (lockfile_expr.get("savePath")) |lockfile| {
- if (lockfile.asString(allocator)) |value| {
- install.save_lockfile_path = value;
- }
- }
}
if (_bun.get("optional")) |optional| {
diff --git a/src/install/install.zig b/src/install/install.zig
index bcf33cb53..1e55d7807 100644
--- a/src/install/install.zig
+++ b/src/install/install.zig
@@ -4332,7 +4332,6 @@ pub const PackageManager = struct {
bin_path: stringZ = "node_modules/.bin",
lockfile_path: stringZ = Lockfile.default_filename,
- save_lockfile_path: stringZ = Lockfile.default_filename,
did_override_default_scope: bool = false,
scope: Npm.Registry.Scope = undefined,
@@ -4481,8 +4480,6 @@ pub const PackageManager = struct {
cli_: ?CommandLineArguments,
bun_install_: ?*Api.BunInstall,
) !void {
- this.save_lockfile_path = this.lockfile_path;
-
var base = Api.NpmRegistry{
.url = "",
.username = "",
@@ -4570,19 +4567,6 @@ pub const PackageManager = struct {
this.local_package_features.optional_dependencies = save;
}
- if (bun_install.lockfile_path) |save| {
- if (save.len > 0) {
- this.lockfile_path = try allocator.dupeZ(u8, save);
- this.save_lockfile_path = this.lockfile_path;
- }
- }
-
- if (bun_install.save_lockfile_path) |save| {
- if (save.len > 0) {
- this.save_lockfile_path = try allocator.dupeZ(u8, save);
- }
- }
-
this.explicit_global_directory = bun_install.global_dir orelse this.explicit_global_directory;
}
@@ -4663,14 +4647,6 @@ pub const PackageManager = struct {
if (cli.token.len > 0) {
this.scope.token = cli.token;
}
-
- if (cli.lockfile.len > 0) {
- this.lockfile_path = try allocator.dupeZ(u8, cli.lockfile);
- }
- }
-
- if (env.map.get("BUN_CONFIG_LOCKFILE_SAVE_PATH")) |save_lockfile_path| {
- this.save_lockfile_path = try allocator.dupeZ(u8, save_lockfile_path);
}
if (env.map.get("BUN_CONFIG_YARN_LOCKFILE") != null) {
@@ -5765,7 +5741,6 @@ pub const PackageManager = struct {
clap.parseParam("--no-save Don't save a lockfile") catch unreachable,
clap.parseParam("--save Save to package.json") catch unreachable,
clap.parseParam("--dry-run Don't install anything") catch unreachable,
- clap.parseParam("--lockfile <PATH> Store & load a lockfile at a specific filepath") catch unreachable,
clap.parseParam("--frozen-lockfile Disallow changes to lockfile") catch unreachable,
clap.parseParam("-f, --force Always request the latest versions from the registry & reinstall all dependencies") catch unreachable,
clap.parseParam("--cache-dir <PATH> Store & load cached data from a specific directory path") catch unreachable,
@@ -5955,10 +5930,6 @@ pub const PackageManager = struct {
// }
// }
- if (args.option("--lockfile")) |lockfile| {
- cli.lockfile = lockfile;
- }
-
if (args.option("--cwd")) |cwd_| {
var buf: [bun.MAX_PATH_BYTES]u8 = undefined;
var buf2: [bun.MAX_PATH_BYTES]u8 = undefined;
@@ -7756,7 +7727,7 @@ pub const PackageManager = struct {
save: {
if (manager.lockfile.isEmpty()) {
if (!manager.options.dry_run) {
- std.fs.cwd().deleteFileZ(manager.options.save_lockfile_path) catch |err| brk: {
+ std.fs.cwd().deleteFileZ(manager.options.lockfile_path) catch |err| brk: {
// we don't care
if (err == error.FileNotFound) {
if (had_any_diffs) break :save;
@@ -7784,7 +7755,7 @@ pub const PackageManager = struct {
manager.progress.refresh();
}
- manager.lockfile.saveToDisk(manager.options.save_lockfile_path);
+ manager.lockfile.saveToDisk(manager.options.lockfile_path);
if (comptime log_level.showProgress()) {
node.end();
manager.progress.refresh();