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.rs2
-rw-r--r--cli/lsp/config.rs2
-rw-r--r--cli/npm/managed/mod.rs2
-rw-r--r--cli/resolver.rs23
-rw-r--r--cli/schemas/config-file.v1.json7
-rw-r--r--cli/standalone/mod.rs5
-rw-r--r--cli/tools/lint/rules/no_sloppy_imports.rs28
-rw-r--r--cli/tools/registry/unfurl.rs5
9 files changed, 53 insertions, 23 deletions
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index acda2292c..920f0d795 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -65,7 +65,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 = { version = "=0.29.0", features = ["workspace", "sync"] }
+deno_config = { version = "=0.30.0", features = ["workspace", "sync"] }
deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
deno_doc = { version = "0.146.0", features = ["html", "syntect"] }
deno_emit = "=0.44.0"
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index 68cf916b2..056dcb2af 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -1085,7 +1085,7 @@ impl CliOptions {
};
Ok(
self
- .start_dir
+ .workspace()
.create_resolver(
CreateResolverOptions {
pkg_json_dep_resolution,
diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs
index 1d6601933..e32303baa 100644
--- a/cli/lsp/config.rs
+++ b/cli/lsp/config.rs
@@ -1491,7 +1491,7 @@ impl ConfigData {
}
};
let resolver = deno_core::unsync::spawn({
- let workspace = member_dir.clone();
+ let workspace = member_dir.workspace.clone();
let file_fetcher = file_fetcher.cloned();
async move {
workspace
diff --git a/cli/npm/managed/mod.rs b/cli/npm/managed/mod.rs
index 1561d3969..8f82ddea2 100644
--- a/cli/npm/managed/mod.rs
+++ b/cli/npm/managed/mod.rs
@@ -324,7 +324,7 @@ impl ManagedCliNpmResolver {
Ok(path)
}
- /// Resolves the package nv from the provided specifier.
+ /// Resolves the package id from the provided specifier.
pub fn resolve_pkg_id_from_specifier(
&self,
specifier: &ModuleSpecifier,
diff --git a/cli/resolver.rs b/cli/resolver.rs
index b72fcd322..a62828b6e 100644
--- a/cli/resolver.rs
+++ b/cli/resolver.rs
@@ -5,6 +5,7 @@ use dashmap::DashMap;
use dashmap::DashSet;
use deno_ast::MediaType;
use deno_config::workspace::MappedResolution;
+use deno_config::workspace::MappedResolutionDiagnostic;
use deno_config::workspace::MappedResolutionError;
use deno_config::workspace::WorkspaceResolver;
use deno_core::anyhow::anyhow;
@@ -21,6 +22,7 @@ use deno_graph::NpmLoadError;
use deno_graph::NpmResolvePkgReqsResult;
use deno_npm::resolution::NpmResolutionError;
use deno_package_json::PackageJsonDepValue;
+use deno_runtime::colors;
use deno_runtime::deno_fs;
use deno_runtime::deno_fs::FileSystem;
use deno_runtime::deno_node::is_builtin_node_module;
@@ -434,6 +436,7 @@ pub struct CliGraphResolver {
maybe_vendor_specifier: Option<ModuleSpecifier>,
found_package_json_dep_flag: AtomicFlag,
bare_node_builtins_enabled: bool,
+ warned_pkgs: DashSet<PackageReq>,
}
pub struct CliGraphResolverOptions<'a> {
@@ -469,6 +472,7 @@ impl CliGraphResolver {
.and_then(|v| ModuleSpecifier::from_directory_path(v).ok()),
found_package_json_dep_flag: Default::default(),
bare_node_builtins_enabled: options.bare_node_builtins_enabled,
+ warned_pkgs: Default::default(),
}
}
@@ -541,8 +545,23 @@ impl Resolver for CliGraphResolver {
});
let result = match result {
Ok(resolution) => match resolution {
- MappedResolution::Normal(specifier)
- | MappedResolution::ImportMap(specifier) => {
+ MappedResolution::Normal {
+ specifier,
+ maybe_diagnostic,
+ }
+ | MappedResolution::ImportMap {
+ specifier,
+ maybe_diagnostic,
+ } => {
+ if let Some(diagnostic) = maybe_diagnostic {
+ match &*diagnostic {
+ MappedResolutionDiagnostic::ConstraintNotMatchedLocalVersion { reference, .. } => {
+ if self.warned_pkgs.insert(reference.req().clone()) {
+ log::warn!("{} {}\n at {}", colors::yellow("Warning"), diagnostic, referrer_range);
+ }
+ }
+ }
+ }
// do sloppy imports resolution if enabled
if let Some(sloppy_imports_resolver) = &self.sloppy_imports_resolver {
Ok(
diff --git a/cli/schemas/config-file.v1.json b/cli/schemas/config-file.v1.json
index e74df9f2f..adfe3b0c2 100644
--- a/cli/schemas/config-file.v1.json
+++ b/cli/schemas/config-file.v1.json
@@ -608,6 +608,13 @@
}
]
},
+ "patch": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "description": "UNSTABLE: List of relative paths to folders containing JSR packages to use local versions of."
+ },
"workspace": {
"oneOf": [
{
diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs
index 020561ece..68e133476 100644
--- a/cli/standalone/mod.rs
+++ b/cli/standalone/mod.rs
@@ -227,8 +227,8 @@ impl ModuleLoader for EmbeddedModuleLoader {
)
}
},
- Ok(MappedResolution::Normal(specifier))
- | Ok(MappedResolution::ImportMap(specifier)) => {
+ Ok(MappedResolution::Normal { specifier, .. })
+ | Ok(MappedResolution::ImportMap { specifier, .. }) => {
if let Ok(reference) =
NpmPackageReqReference::from_specifier(&specifier)
{
@@ -622,6 +622,7 @@ pub async fn run(
.jsr_pkgs
.iter()
.map(|pkg| ResolverWorkspaceJsrPackage {
+ is_patch: false, // only used for enhancing the diagnostic, which isn't shown in deno compile
base: root_dir_url.join(&pkg.relative_base).unwrap(),
name: pkg.name.clone(),
version: pkg.version.clone(),
diff --git a/cli/tools/lint/rules/no_sloppy_imports.rs b/cli/tools/lint/rules/no_sloppy_imports.rs
index 1ae792e08..4180be5be 100644
--- a/cli/tools/lint/rules/no_sloppy_imports.rs
+++ b/cli/tools/lint/rules/no_sloppy_imports.rs
@@ -189,20 +189,22 @@ impl<'a> deno_graph::source::Resolver for SloppyImportCaptureResolver<'a> {
.map_err(|err| ResolveError::Other(err.into()))?;
match resolution {
- deno_config::workspace::MappedResolution::Normal(specifier)
- | deno_config::workspace::MappedResolution::ImportMap(specifier) => {
- match self.sloppy_imports_resolver.resolve(&specifier, mode) {
- Some(res) => {
- self
- .captures
- .borrow_mut()
- .entry(referrer_range.clone())
- .or_insert_with(|| res.clone());
- Ok(res.into_specifier())
- }
- None => Ok(specifier),
- }
+ deno_config::workspace::MappedResolution::Normal {
+ specifier, ..
}
+ | deno_config::workspace::MappedResolution::ImportMap {
+ specifier, ..
+ } => match self.sloppy_imports_resolver.resolve(&specifier, mode) {
+ Some(res) => {
+ self
+ .captures
+ .borrow_mut()
+ .entry(referrer_range.clone())
+ .or_insert_with(|| res.clone());
+ Ok(res.into_specifier())
+ }
+ None => Ok(specifier),
+ },
deno_config::workspace::MappedResolution::WorkspaceJsrPackage {
..
}
diff --git a/cli/tools/registry/unfurl.rs b/cli/tools/registry/unfurl.rs
index 489c9a1be..2babedb36 100644
--- a/cli/tools/registry/unfurl.rs
+++ b/cli/tools/registry/unfurl.rs
@@ -73,8 +73,8 @@ impl SpecifierUnfurler {
self.workspace_resolver.resolve(specifier, referrer)
{
match resolved {
- MappedResolution::Normal(specifier)
- | MappedResolution::ImportMap(specifier) => Some(specifier),
+ MappedResolution::Normal { specifier, .. }
+ | MappedResolution::ImportMap { specifier, .. } => Some(specifier),
MappedResolution::WorkspaceJsrPackage { pkg_req_ref, .. } => {
Some(ModuleSpecifier::parse(&pkg_req_ref.to_string()).unwrap())
}
@@ -443,6 +443,7 @@ mod tests {
Arc::new(ModuleSpecifier::from_directory_path(&cwd).unwrap()),
Some(import_map),
vec![ResolverWorkspaceJsrPackage {
+ is_patch: false,
base: ModuleSpecifier::from_directory_path(cwd.join("jsr-package"))
.unwrap(),
name: "@denotest/example".to_string(),
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 10:13:21 +0000