refactor: remove DENO_FUTURE (#25314)

3 files changed, 12 insertions, 14 deletions

diff --git a/cli/tools/registry/pm.rs b/cli/tools/registry/pm.rs
index 87a5ea69a..4a36b459a 100644
--- a/cli/tools/registry/pm.rs
+++ b/cli/tools/registry/pm.rs
@@ -140,10 +140,10 @@ impl DenoOrPackageJson {
         ),
         factory,
       )),
-      (None, Some(package_json)) if options.enable_future_features() => {
+      (None, Some(package_json)) => {
         Ok((DenoOrPackageJson::Npm(package_json.clone(), None), factory))
       }
-      (None, Some(_) | None) => {
+      (None, None) => {
         std::fs::write(options.initial_cwd().join("deno.json"), "{}\n")
           .context("Failed to create deno.json file")?;
         drop(factory); // drop to prevent use
diff --git a/cli/tools/run/mod.rs b/cli/tools/run/mod.rs
index 9d1d5e78b..bdafdae88 100644
--- a/cli/tools/run/mod.rs
+++ b/cli/tools/run/mod.rs
@@ -3,6 +3,7 @@
 use std::io::Read;
 use std::sync::Arc;
 
+use deno_config::deno_json::NodeModulesDirMode;
 use deno_core::error::AnyError;
 use deno_runtime::deno_permissions::Permissions;
 use deno_runtime::deno_permissions::PermissionsContainer;
@@ -194,11 +195,8 @@ pub async fn eval_command(
 pub async fn maybe_npm_install(factory: &CliFactory) -> Result<(), AnyError> {
   // ensure an "npm install" is done if the user has explicitly
   // opted into using a managed node_modules directory
-  if factory
-    .cli_options()?
-    .node_modules_mode()?
-    .map(|m| m.uses_node_modules_dir())
-    .unwrap_or(false)
+  if factory.cli_options()?.node_modules_dir()?
+    == Some(NodeModulesDirMode::Auto)
   {
     if let Some(npm_resolver) = factory.npm_resolver().await?.as_managed() {
       npm_resolver.ensure_top_level_package_json_install().await?;
diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs
index d21d17529..3de08f1d0 100644
--- a/cli/tools/vendor/mod.rs
+++ b/cli/tools/vendor/mod.rs
@@ -89,7 +89,7 @@ pub async fn vendor(
   let npm_package_count = graph.npm_packages.len();
   let try_add_node_modules_dir = npm_package_count > 0
     && cli_options
-      .node_modules_mode()?
+      .node_modules_dir()?
       .map(|m| m.uses_node_modules_dir())
       .unwrap_or(true);
 
@@ -344,7 +344,7 @@ fn update_config_text(
       let insert_position = obj.range.end - 1;
       text_changes.push(TextChange {
         range: insert_position..insert_position,
-        new_text: r#""nodeModulesDir": true"#.to_string(),
+        new_text: r#""nodeModulesDir": "auto""#.to_string(),
       });
       should_format = true;
       modified_result.added_node_modules_dir = true;
@@ -454,7 +454,7 @@ mod internal_test {
     assert_eq!(
       result.new_text.unwrap(),
       r#"{
-  "nodeModulesDir": true,
+  "nodeModulesDir": "auto",
   "importMap": "./vendor/import_map.json"
 }
 "#
@@ -467,7 +467,7 @@ mod internal_test {
     assert_eq!(
       result.new_text.unwrap(),
       r#"{
-  "nodeModulesDir": true
+  "nodeModulesDir": "auto"
 }
 "#
     );
@@ -546,10 +546,10 @@ mod internal_test {
 
   #[test]
   fn no_update_node_modules_dir() {
-    // will not update if this is already set (even if it's false)
+    // will not update if this is already set (even if it's "none")
     let result = update_config_text(
       r#"{
-  "nodeModulesDir": false
+  "nodeModulesDir": "none"
 }
 "#,
       &Default::default(),
@@ -563,7 +563,7 @@ mod internal_test {
 
     let result = update_config_text(
       r#"{
-  "nodeModulesDir": true
+  "nodeModulesDir": "auto"
 }
 "#,
       &Default::default(),