Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into compiler-options-fr…
Browse files Browse the repository at this point in the history
…om-workspace-member
  • Loading branch information
nayeemrmn committed Dec 7, 2024
2 parents 0d588fb + bf8ca43 commit 8e4caf2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "deno_config"
description = "Config file implementation for the Deno CLI"
version = "0.39.3"
version = "0.40.0"
edition = "2021"
authors = ["the Deno authors"]
license = "MIT"
Expand Down
8 changes: 4 additions & 4 deletions src/deno_json/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ pub struct PatchConfigParseError(#[source] serde_json::Error);

#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
pub struct TaskDefinition {
pub command: String,
pub command: Option<String>,
#[serde(default)]
pub dependencies: Vec<String>,
#[serde(default)]
Expand All @@ -462,7 +462,7 @@ pub struct TaskDefinition {
impl From<&str> for TaskDefinition {
fn from(value: &str) -> Self {
Self {
command: value.to_string(),
command: Some(value.to_string()),
dependencies: vec![],
description: None,
}
Expand Down Expand Up @@ -499,7 +499,7 @@ impl TaskDefinition {
{
let task_def = match value {
serde_json::Value::String(command) => TaskDefinition {
command,
command: Some(command),
dependencies: Vec::new(),
description: None,
},
Expand Down Expand Up @@ -1734,7 +1734,7 @@ mod tests {
tasks_config["client"],
TaskDefinition {
description: Some("Build client project".to_string()),
command: "deno run -A client.js".to_string(),
command: Some("deno run -A client.js".to_string()),
dependencies: vec!["build".to_string()]
}
);
Expand Down

0 comments on commit 8e4caf2

Please sign in to comment.