summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/Cargo.toml2
-rw-r--r--cli/args/mod.rs7
-rw-r--r--cli/lsp/language_server.rs3
-rw-r--r--cli/tools/registry/mod.rs2
4 files changed, 11 insertions, 3 deletions
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 1097d8d98..0d71eae1e 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -64,7 +64,7 @@ winres.workspace = true
[dependencies]
deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] }
deno_cache_dir = { workspace = true }
-deno_config = "=0.11.0"
+deno_config = "=0.12.0"
deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
deno_doc = { version = "=0.113.1", features = ["html"] }
deno_emit = "=0.38.2"
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index 9aa819a30..8103f489e 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -759,10 +759,17 @@ impl CliOptions {
pub fn from_flags(flags: Flags) -> Result<Self, AnyError> {
let initial_cwd =
std::env::current_dir().with_context(|| "Failed getting cwd.")?;
+ let additional_config_file_names =
+ if matches!(flags.subcommand, DenoSubcommand::Publish(..)) {
+ Some(vec!["jsr.json", "jsr.jsonc"])
+ } else {
+ None
+ };
let maybe_config_file = ConfigFile::discover(
&flags.config_flag,
flags.config_path_args(&initial_cwd),
&initial_cwd,
+ additional_config_file_names,
)?;
let mut maybe_package_json = None;
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs
index 185cde6f9..45d1eed8a 100644
--- a/cli/lsp/language_server.rs
+++ b/cli/lsp/language_server.rs
@@ -654,7 +654,8 @@ impl Inner {
if let Some(root_uri) = self.config.root_uri() {
let root_path = specifier_to_file_path(root_uri)?;
let mut checked = std::collections::HashSet::new();
- let maybe_config = ConfigFile::discover_from(&root_path, &mut checked)?;
+ let maybe_config =
+ ConfigFile::discover_from(&root_path, &mut checked, None)?;
Ok(maybe_config.map(|c| {
lsp_log!(" Auto-resolved configuration file: \"{}\"", c.specifier);
c
diff --git a/cli/tools/registry/mod.rs b/cli/tools/registry/mod.rs
index ab02bc8d5..52d303ae1 100644
--- a/cli/tools/registry/mod.rs
+++ b/cli/tools/registry/mod.rs
@@ -817,7 +817,7 @@ pub async fn publish(
let cli_options = cli_factory.cli_options();
let Some(config_file) = cli_options.maybe_config_file() else {
bail!(
- "Couldn't find a deno.json or a deno.jsonc configuration file in {}.",
+ "Couldn't find a deno.json, deno.jsonc, jsr.json or jsr.jsonc configuration file in {}.",
directory_path.display()
);
};