summaryrefslogtreecommitdiff
path: root/cli/tools/registry/mod.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-08-16 09:12:52 -0400
committerGitHub <noreply@github.com>2024-08-16 13:12:52 +0000
commit57cd2951f193b02cbd3fb15f0ee14d83107a2855 (patch)
tree129294ae1f462a40bd75de5c88efa7982aed19c5 /cli/tools/registry/mod.rs
parent105d27bc7db5c0d2fd18cb26f41bd3193be74639 (diff)
feat(config/jsr): add license field (#25056)
1. Adds a new "license" field. 1. Adds this field by default when doing `deno init --lib`
Diffstat (limited to 'cli/tools/registry/mod.rs')
-rw-r--r--cli/tools/registry/mod.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/cli/tools/registry/mod.rs b/cli/tools/registry/mod.rs
index 34e803c73..d6e06fb58 100644
--- a/cli/tools/registry/mod.rs
+++ b/cli/tools/registry/mod.rs
@@ -449,6 +449,8 @@ impl PublishPreparer {
let cli_options = self.cli_options.clone();
let source_cache = self.source_cache.clone();
let config_path = config_path.clone();
+ let config_url = deno_json.specifier.clone();
+ let has_license_field = package.license.is_some();
move || {
let root_specifier =
ModuleSpecifier::from_directory_path(&root_dir).unwrap();
@@ -467,7 +469,9 @@ impl PublishPreparer {
&diagnostics_collector,
);
- if !has_license_file(publish_paths.iter().map(|p| &p.specifier)) {
+ if !has_license_field
+ && !has_license_file(publish_paths.iter().map(|p| &p.specifier))
+ {
if let Some(license_path) =
resolve_license_file(&root_dir, cli_options.workspace())
{
@@ -483,7 +487,7 @@ impl PublishPreparer {
});
} else {
diagnostics_collector.push(PublishDiagnostic::MissingLicense {
- expected_path: root_dir.join("LICENSE"),
+ config_specifier: config_url,
});
}
}