trunk-rs · Its-Just-Nans · Feb 17, 2025 · Feb 17, 2025 · Feb 17, 2025
diff --git a/examples/workplace/Cargo.lock b/examples/workplace/Cargo.lock
diff --git a/examples/workplace/Cargo.toml b/examples/workplace/Cargo.toml
@@ -0,0 +1,10 @@
+[workspace]
+resolver = "2"
+members = ["simple-example", "not-default-example"]
+default-members = ["simple-example"]
+
+[workspace.package]
+edition = "2021"
+license = "MIT OR Apache-2.0"
+rust-version = "1.76"
+version = "0.27.2"
diff --git a/examples/workplace/not-default-example/Cargo.toml b/examples/workplace/not-default-example/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "not-default-example"
+version = "0.1.0"
+authors = ["Jens Reimann <[email protected]>"]
+edition = "2021"
+
+[dependencies]
+web-sys = { version = "0.3", features = [
+    "console",
+    "Document",
+    "HtmlElement",
+    "Node",
+    "Text",
+    "Window",
+] }
diff --git a/examples/workplace/not-default-example/index.html b/examples/workplace/not-default-example/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <title>Trunk | No-Rust</title>
+
+        <base data-trunk-public-url />
+    </head>
+    <body>
+        <h1>Trunk without WASM in workspace (not default target)</h1>
+    </body>
+</html>
diff --git a/examples/workplace/not-default-example/src/main.rs b/examples/workplace/not-default-example/src/main.rs
@@ -0,0 +1,15 @@
+use web_sys::window;
+
+fn start_app() {
+    let document = window()
+        .and_then(|win| win.document())
+        .expect("Could not access document");
+    let body = document.body().expect("Could not access document.body");
+    let text_node = document.create_text_node("Hello, world from Vanilla Rust!");
+    body.append_child(text_node.as_ref())
+        .expect("Failed to append text");
+}
+
+fn main() {
+    start_app();
+}
diff --git a/examples/workplace/simple-example/Cargo.toml b/examples/workplace/simple-example/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "simple-example"
+version = "0.1.0"
+authors = ["Jens Reimann <[email protected]>"]
+edition = "2021"
+
+[dependencies]
+web-sys = { version = "0.3", features = [
+    "console",
+    "Document",
+    "HtmlElement",
+    "Node",
+    "Text",
+    "Window",
+] }
diff --git a/examples/workplace/simple-example/index.html b/examples/workplace/simple-example/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <title>Trunk | No-Rust</title>
+
+        <base data-trunk-public-url />
+    </head>
+    <body>
+        <h1>Trunk without WASM in workspace</h1>
+    </body>
+</html>
diff --git a/examples/workplace/simple-example/src/main.rs b/examples/workplace/simple-example/src/main.rs
@@ -0,0 +1,15 @@
+use web_sys::window;
+
+fn start_app() {
+    let document = window()
+        .and_then(|win| win.document())
+        .expect("Could not access document");
+    let body = document.body().expect("Could not access document.body");
+    let text_node = document.create_text_node("Hello, world from Vanilla Rust!");
+    body.append_child(text_node.as_ref())
+        .expect("Failed to append text");
+}
+
+fn main() {
+    start_app();
+}
diff --git a/site/content/configuration.md b/site/content/configuration.md
@@ -8,7 +8,9 @@ Trunk supports a layered config system. At the base, a config file can encapsula
 
 # Trunk.toml
 
-Trunk supports an optional `Trunk.toml` config file. An example config file is included [in the Trunk repo](https://github.com/trunk-rs/trunk/blob/main/Trunk.toml), and shows all available config options along with their default values. By default, Trunk will look for a `Trunk.toml` config file in the current working directory. Trunk supports the global `--config` option to specify an alternative location for the file.
+Trunk supports an optional `Trunk.toml` config file. An example config file is included [in the Trunk repo](https://github.com/trunk-rs/trunk/blob/main/Trunk.toml), and shows all available config options along with their default values. By default, Trunk will look for a `Trunk.toml` config file in the current working directory.
+
+Trunk supports the global `--config` option to specify an alternative location for the file. But also detects the configuration file in a workspace. If the current directory is a workspace, Trunk will look for a `Trunk.toml` file in the [workspace default-members](https://doc.rust-lang.org/cargo/reference/workspaces.html#the-default-members-field). Or you can specify the workspace member with the `--workspace <name>` option.
 
 Note that any relative paths declared in a `Trunk.toml` file will be treated as being relative to the `Trunk.toml` file itself.
 

diff --git a/src/config/models/mod.rs b/src/config/models/mod.rs
@@ -29,8 +29,8 @@ mod test;
 use anyhow::{bail, Context, Result};
 use schemars::JsonSchema;
 use serde::Deserialize;
-use source::Source;
-use std::path::PathBuf;
+use source::{workspace::WorkspaceConfig, Source};
+use std::path::{Path, PathBuf};
 use tracing::log;
 
 /// Common configuration model functionality
@@ -114,6 +114,60 @@ impl ConfigModel for Configuration {
     }
 }
 
+/// Return the configuration path from the workspace, if available.
+pub async fn load_workspace_config(
+    current_path: &Path,
+    workspace_name: Option<String>,
+) -> Result<Option<PathBuf>> {
+    let cargo_toml = current_path.join("Cargo.toml");
+    if cargo_toml.exists() {
+        if let Ok(workspace) = WorkspaceConfig::new(&cargo_toml).await {
+            match workspace_name {
+                Some(name) => {
+                    if let Some(workspace) = workspace.get_workspace_by_name(&name) {
+                        // get the parent directory of the workspace
+                        let workspace = match workspace.parent() {
+                            Some(parent) => parent,
+                            None => {
+                                return Err(anyhow::format_err!(
+                                    "unable to get parent directory of workspace '{}'",
+                                    workspace.display()
+                                ));
+                            }
+                        };
+                        return Ok(Some(workspace.to_path_buf()));
+                    }
+                    return Err(anyhow::format_err!(
+                        "workspace '{}' not found in {}",
+                        name,
+                        cargo_toml.display()
+                    ));
+                }
+                None => {
+                    if let Some(workspace) = workspace.get_default_workspace() {
+                        // get the parent directory of the workspace
+                        let workspace = match workspace.parent() {
+                            Some(parent) => parent,
+                            None => {
+                                return Err(anyhow::format_err!(
+                                    "unable to get parent directory of workspace '{}'",
+                                    workspace.display()
+                                ));
+                            }
+                        };
+                        return Ok(Some(workspace.to_path_buf()));
+                    }
+                    return Err(anyhow::format_err!(
+                        "default workspace not found in {}",
+                        cargo_toml.display()
+                    ));
+                }
+            }
+        }
+    }
+    Ok(None)
+}
+
 /// Locate and load the configuration, given an optional file or directory. Falling back to the
 /// current directory.
 pub async fn load(path: Option<PathBuf>) -> Result<(Configuration, PathBuf)> {

diff --git a/src/config/models/source/mod.rs b/src/config/models/source/mod.rs
@@ -1,4 +1,5 @@
 mod cargo;
+pub mod workspace;
 
 use crate::config::{models::ConfigModel, Configuration};
 use anyhow::bail;

diff --git a/src/config/models/source/workspace.rs b/src/config/models/source/workspace.rs
@@ -0,0 +1,56 @@
+#![deny(missing_docs, clippy::all)]
+
+use anyhow::{Context, Result};
+use cargo_metadata::{Metadata, MetadataCommand};
+use serde::{Deserialize, Serialize};
+use std::path::Path;
+use std::path::PathBuf;
+use tokio::task::spawn_blocking;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct WorkspaceConfig {
+    pub metadata: Metadata,
+}
+
+impl WorkspaceConfig {
+    pub async fn new(manifest: &Path) -> Result<Self> {
+        let mut cmd = MetadataCommand::new();
+        cmd.manifest_path(dunce::simplified(manifest));
+        let metadata = spawn_blocking(move || cmd.exec())
+            .await
+            .context("error awaiting spawned cargo metadata task")?
+            .context("error getting cargo metadata")?;
+        Ok(Self { metadata })
+    }
+
+    pub fn get_default_workspace(self) -> Option<PathBuf> {
+        if let Some(default_member) = self.metadata.workspace_default_members.first() {
+            if let Some(found) = self
+                .metadata
+                .packages
+                .into_iter()
+                .find(|p| p.id == *default_member)
+            {
+                return Some(found.manifest_path.clone().into());
+            }
+        }
+        None
+    }
+
+    pub fn get_workspace_by_name(self, name: &str) -> Option<PathBuf> {
+        // we search for the package in the workspace packages list
+        if let Some(one_package) = self.metadata.packages.iter().find(|m| m.name == name) {
+            // we check if the package is present in the workspace members list
+            if self
+                .metadata
+                .workspace_members
+                .into_iter()
+                .any(|p| p == one_package.id)
+            {
+                // we return the manifest path of the package
+                return Some(one_package.manifest_path.clone().into());
+            }
+        }
+        None
+    }
+}