summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/args/flags.rs10
-rw-r--r--cli/args/mod.rs8
-rw-r--r--cli/tests/integration/publish_tests.rs4
-rw-r--r--cli/tests/integration/run_tests.rs6
4 files changed, 5 insertions, 23 deletions
diff --git a/cli/args/flags.rs b/cli/args/flags.rs
index 738bf9948..97cfbcaff 100644
--- a/cli/args/flags.rs
+++ b/cli/args/flags.rs
@@ -902,7 +902,6 @@ pub fn flags_from_vec(args: Vec<String>) -> clap::error::Result<Flags> {
matches.get_flag("unstable-bare-node-builtins");
flags.unstable_byonm = matches.get_flag("unstable-byonm");
flags.unstable_sloppy_imports = matches.get_flag("unstable-sloppy-imports");
- flags.unstable_workspaces = matches.get_flag("unstable-workspaces");
if matches.get_flag("quiet") {
flags.log_level = Some(Level::Error);
@@ -1030,15 +1029,6 @@ fn clap_root() -> Command {
.value_parser(FalseyValueParser::new())
.action(ArgAction::SetTrue)
.global(true),
- )
- .arg(
- Arg::new("unstable-workspaces")
- .long("unstable-workspaces")
- .help("Enable unstable 'workspaces' feature")
- .env("DENO_UNSTABLE_WORKSPACES")
- .value_parser(FalseyValueParser::new())
- .action(ArgAction::SetTrue)
- .global(true),
);
for (flag_name, help, _) in crate::UNSTABLE_GRANULAR_FLAGS {
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index 23723d916..ae48aae50 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -707,14 +707,6 @@ impl CliOptions {
None
};
- // TODO(bartlomieju): remove in v1.39 or v1.40.
- if let Some(wsconfig) = &maybe_workspace_config {
- if !wsconfig.members.is_empty() && !flags.unstable_workspaces {
- eprintln!("Use of unstable 'workspaces' feature. The --unstable-workspaces flags must be provided.");
- std::process::exit(70);
- }
- }
-
if let Some(env_file_name) = &flags.env_file {
if (from_filename(env_file_name)).is_err() {
bail!("Unable to load '{env_file_name}' environment variable file")
diff --git a/cli/tests/integration/publish_tests.rs b/cli/tests/integration/publish_tests.rs
index c0d00f09f..a28736fac 100644
--- a/cli/tests/integration/publish_tests.rs
+++ b/cli/tests/integration/publish_tests.rs
@@ -72,7 +72,7 @@ itest!(successful {
});
itest!(workspace_all {
- args: "publish --unstable-workspaces --token 'sadfasdf'",
+ args: "publish --token 'sadfasdf'",
output: "publish/workspace.out",
cwd: Some("publish/workspace"),
copy_temp_dir: Some("publish/workspace"),
@@ -82,7 +82,7 @@ itest!(workspace_all {
});
itest!(workspace_individual {
- args: "publish --unstable-workspaces --token 'sadfasdf'",
+ args: "publish --token 'sadfasdf'",
output: "publish/workspace_individual.out",
cwd: Some("publish/workspace/bar"),
copy_temp_dir: Some("publish/workspace"),
diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs
index 999dc1177..38408c0f9 100644
--- a/cli/tests/integration/run_tests.rs
+++ b/cli/tests/integration/run_tests.rs
@@ -4804,7 +4804,7 @@ itest!(explicit_resource_management {
});
itest!(workspaces_basic {
- args: "run -L debug -A --unstable-workspaces main.ts",
+ args: "run -L debug -A main.ts",
output: "run/workspaces/basic/main.out",
cwd: Some("run/workspaces/basic/"),
copy_temp_dir: Some("run/workspaces/basic/"),
@@ -4813,7 +4813,7 @@ itest!(workspaces_basic {
});
itest!(workspaces_member_outside_root_dir {
- args: "run -A --unstable-workspaces main.ts",
+ args: "run -A main.ts",
output: "run/workspaces/member_outside_root_dir/main.out",
cwd: Some("run/workspaces/member_outside_root_dir/"),
copy_temp_dir: Some("run/workspaces/member_outside_root_dir/"),
@@ -4823,7 +4823,7 @@ itest!(workspaces_member_outside_root_dir {
});
itest!(workspaces_nested_member {
- args: "run -A --unstable-workspaces main.ts",
+ args: "run -A main.ts",
output: "run/workspaces/nested_member/main.out",
cwd: Some("run/workspaces/nested_member/"),
copy_temp_dir: Some("run/workspaces/nested_member/"),