From ba0706939d1c3b26121d7e39edf0c1a7a3f3a4da Mon Sep 17 00:00:00 2001 From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> Date: Wed, 1 Mar 2023 16:15:55 -0800 Subject: Revert "Add `-D`, `--dev` flags for bun install (#2240)" This reverts commit ec20fae57f96a835562b154730957ecc4015ba31. --- src/install/install.zig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/install/install.zig b/src/install/install.zig index 9265e6c29..5399a6fd3 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -5300,15 +5300,15 @@ pub const PackageManager = struct { // clap.parseParam("--no-dedupe Disable automatic downgrading of dependencies that would otherwise cause unnecessary duplicate package versions ($BUN_CONFIG_NO_DEDUPLICATE)") catch unreachable, - // Note that zig-clap currently doesn't support multiple short or long names, - // so for npm/yarn compatibility we'll specify both --development and --dev pub const install_params = install_params_ ++ clap.parseParamsComptime( + \\ ... + ); + + pub const add_params = install_params_ ++ clap.parseParamsComptime( \\-d, --development Add dependency to "devDependencies" - \\-D, --dev Add dependency to "devDependencies" (npm/yarn compat) - \\-O, --optional Add dependency to "optionalDependencies" + \\--optional Add dependency to "optionalDependencies" \\ ... "name" or "name@version" of packages to install ); - pub const add_params = install_params; pub const remove_params = install_params_ ++ clap.parseParamsComptime( \\ ... "name" of packages to remove from package.json @@ -5414,7 +5414,7 @@ pub const PackageManager = struct { cli.ignore_scripts = res.args.@"ignore-scripts"; cli.no_summary = res.args.@"no-summary"; - if (comptime @hasField(@TypeOf(res.args), "save")) { + if (comptime @hasDecl(@TypeOf(res.args), "save")) { cli.no_save = true; if (res.args.save) { @@ -5430,10 +5430,10 @@ pub const PackageManager = struct { cli.link_native_bins = res.args.@"link-native-bins"; - if (@hasField(@TypeOf(res.args), "development")) - cli.development = res.args.development or res.args.dev; - if (@hasField(@TypeOf(res.args), "optional")) + if (comptime params.len == add_params.len) { + cli.development = res.args.development; cli.optional = res.args.optional; + } // for (res.args.omit) |omit| { // if (strings.eqlComptime(omit, "dev")) { -- cgit v1.2.3