Allow projects without rust

ModProg · thedodd · commit a9e495413358 · 2023-03-24T12:50:22.000-05:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -181,3 +181,5 @@ jobs:
         run: ${{ matrix.binPath }} --config=examples/yew/Trunk.toml build
       - name: Build | Examples | yew-tailwindcss
         run: ${{ matrix.binPath }} --config=examples/yew-tailwindcss/Trunk.toml build
+      - name: Build | Examples | no-rust
+        run: ${{ matrix.binPath }} --config=examples/no-rust/Trunk.toml build
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ Subheadings to categorize changes are `added, changed, deprecated, removed, fixe
 - Additional attributes are now passed through script tags (fixes #429)
 - Updated internal http stack to axum v0.6.0.
 - Updated CLI argument parser to clap v0.4.
+- Reduce error to warning when processing a project without Cargo.toml and no `<link rel="rust"/>` (fixes #487)
 
 ### fixed
 - Nested WS proxies - if `backend=ws://localhost:8000/ws` is set, queries for `ws://localhost:8080/ws/entityX` will be linked with `ws://localhost:8000/ws/entityX`
diff --git a/examples/no-rust/Trunk.toml b/examples/no-rust/Trunk.toml
@@ -0,0 +1,3 @@
+[build]
+target = "index.html"
+dist = "dist"
diff --git a/examples/no-rust/index.html b/examples/no-rust/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <title>Trunk | No-Rust</title>
+
+    <link data-trunk rel="scss" href="index.scss"/>
+    <base data-trunk-public-url/>
+</head>
+<body>
+    <h1>Trunk without WASM</h1>
+</body>
+</html>
diff --git a/examples/no-rust/index.scss b/examples/no-rust/index.scss
@@ -0,0 +1,13 @@
+@charset "utf-8";
+
+html {
+    body {
+        font-size: 20pt;
+        color: #111;
+        font-family: sans-serif;
+
+        h1 {
+            text-align: center;
+        }
+    }
+}
diff --git a/src/pipelines/html.rs b/src/pipelines/html.rs
@@ -142,13 +142,17 @@ impl HtmlPipeline {
             r#"only one <link data-trunk rel="rust" data-type="main" .../> may be specified"#
         );
         if rust_app_nodes == 0 {
-            let app = RustApp::new_default(
+            if let Ok(app) = RustApp::new_default(
                 self.cfg.clone(),
                 self.target_html_dir.clone(),
                 self.ignore_chan.clone(),
             )
-            .await?;
-            assets.push(TrunkAsset::RustApp(app));
+            .await
+            {
+                assets.push(TrunkAsset::RustApp(app));
+            } else {
+                tracing::warn!("no rust project found")
+            };
         }
 
         // Spawn all asset pipelines.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[build]`
	`2`	`+target = "index.html"`
	`3`	`+dist = "dist"`