Merge 6e05c24ea8 into 5e9b3712de

cli/tools/installer.rs

@@ -115,16 +115,10 @@ exec deno {} "$@"
   Ok(())
 }
 
-fn get_installer_root() -> Result<PathBuf, AnyError> {
+fn get_installer_root() -> Result<PathBuf, io::Error> {
-  if let Some(env_dir) = env::var_os("DENO_INSTALL_ROOT") {
+  if let Ok(env_dir) = env::var("DENO_INSTALL_ROOT") {
     if !env_dir.is_empty() {
-      let env_dir = PathBuf::from(env_dir);
+      return canonicalize_path_maybe_not_exists(&PathBuf::from(env_dir));
-      return canonicalize_path_maybe_not_exists(&env_dir).with_context(|| {
-        format!(
-          "Canonicalizing DENO_INSTALL_ROOT ('{}').",
-          env_dir.display()
-        )
-      });
     }
   }
   // Note: on Windows, the $HOME environment variable may be set by users or by
@@ -593,22 +587,11 @@ async fn resolve_shim_data(
     let copy_path = get_hidden_file_with_ext(&file_path, "deno.json");
     executable_args.push("--config".to_string());
     executable_args.push(copy_path.to_str().unwrap().to_string());
-    let mut config_text = fs::read_to_string(config_path)
+    extra_files.push((
-      .with_context(|| format!("error reading {config_path}"))?;
+      copy_path,
-    // always remove the import map field because when someone specifies `--import-map` we
+      fs::read_to_string(config_path)
-    // don't want that file to be attempted to be loaded and when they don't specify that
+        .with_context(|| format!("error reading {config_path}"))?,
-    // (which is just something we haven't implemented yet)
+    ));
-    if let Some(new_text) = remove_import_map_field_from_text(&config_text) {
-      if flags.import_map_path.is_none() {
-        log::warn!(
-          "{} \"importMap\" field in the specified config file we be ignored. Use the --import-map flag instead.",
-          crate::colors::yellow("Warning"),
-        );
-      }
-      config_text = new_text;
-    }
-
-    extra_files.push((copy_path, config_text));
   } else {
     executable_args.push("--no-config".to_string());
   }
@@ -648,16 +631,6 @@ async fn resolve_shim_data(
   })
 }
 
-fn remove_import_map_field_from_text(config_text: &str) -> Option<String> {
-  let value =
-    jsonc_parser::cst::CstRootNode::parse(config_text, &Default::default())
-      .ok()?;
-  let root_value = value.object_value()?;
-  let import_map_value = root_value.get("importMap")?;
-  import_map_value.remove();
-  Some(value.to_string())
-}
-
 fn get_hidden_file_with_ext(file_path: &Path, ext: &str) -> PathBuf {
   // use a dot file to prevent the file from showing up in some
   // users shell auto-complete since this directory is on the PATH
@@ -1612,17 +1585,4 @@ mod tests {
       assert!(!file_path.exists());
     }
   }
-
-  #[test]
-  fn test_remove_import_map_field_from_text() {
-    assert_eq!(
-      remove_import_map_field_from_text(
-        r#"{
-    "importMap": "./value.json"
-}"#,
-      )
-      .unwrap(),
-      "{}"
-    );
-  }
 }

tests/specs/install/global/config_file_import_map/__test__.jsonc

@@ -1,5 +0,0 @@
-{
-  "tempDir": true,
-  "args": "install -g --root ./folder --config deno.json main.ts --name my-cli",
-  "output": "install.out"
-}

tests/specs/install/global/config_file_import_map/deno.json

@@ -1,3 +0,0 @@
-{
-  "importMap": "./import_map.json"
-}

tests/specs/install/global/config_file_import_map/import_map.json

@@ -1,2 +0,0 @@
-{
-}

tests/specs/install/global/config_file_import_map/install.out

@@ -1,3 +0,0 @@
-Warning "importMap" field in the specified config file we be ignored. Use the --import-map flag instead.
-✅ Successfully installed my-cli
-[WILDCARD]

tests/specs/install/global/config_file_import_map/main.ts

@@ -1 +0,0 @@
-console.log(1);