Support building and serving examples

CHANGELOG.md

@@ -9,6 +9,7 @@ Subheadings to categorize changes are `added, changed, deprecated, removed, fixe
 - Added `data-target-path` to `copy-dir`.
 - Allow processing `<script>` tags with the asset pipeline.
 - Added `data-loader-shim` to workers to create shim script.
+- Added `--example` command line option to `trunk build`, `serve` and `watch`.
 ### changed
 - Updated gloo-worker example to use gloo-worker crate v2.1.
 - Our website (trunkrs.dev) now only updates on new releases.

src/config/models.rs

@@ -40,6 +40,9 @@ pub struct ConfigOptsBuild {
     /// [default: ""]
     #[arg(long)]
     pub features: Option<String>,
+    /// Whether to build an example.
+    #[clap(long)]
+    pub example: Option<String>,
     /// Whether to include hash values in the output file names [default: true]
     #[arg(long)]
     pub filehash: Option<bool>,
@@ -283,21 +286,8 @@ impl ConfigOpts {
     }
 
     fn cli_opts_layer_build(cli: ConfigOptsBuild, cfg_base: Self) -> Self {
-        let opts = ConfigOptsBuild {
-            target: cli.target,
-            release: cli.release,
-            dist: cli.dist,
-            public_url: cli.public_url,
-            no_default_features: cli.no_default_features,
-            all_features: cli.all_features,
-            features: cli.features,
-            filehash: cli.filehash,
-            pattern_script: cli.pattern_script,
-            pattern_preload: cli.pattern_preload,
-            pattern_params: cli.pattern_params,
-        };
         let cfg_build = ConfigOpts {
-            build: Some(opts),
+            build: Some(cli),
             watch: None,
             serve: None,
             clean: None,

src/config/rt.rs

@@ -43,6 +43,8 @@ pub struct RtcBuild {
     pub staging_dist: PathBuf,
     /// The configuration of the features passed to cargo.
     pub cargo_features: Features,
+    /// If set, the example passed to cargo.
+    pub cargo_example: Option<String>,
     /// Configuration for automatic application download.
     pub tools: ConfigOptsTools,
     /// Build process hooks.
@@ -125,6 +127,7 @@ impl RtcBuild {
             staging_dist,
             final_dist,
             cargo_features,
+            cargo_example: opts.example,
             tools,
             hooks,
             inject_autoloader,

src/pipelines/rust.rs

@@ -38,6 +38,8 @@ pub struct RustApp {
     /// An optional binary name which will cause cargo & wasm-bindgen to process only the target
     /// binary.
     bin: Option<String>,
+    /// An optional example to build.
+    example: Option<String>,
     /// An option to instruct wasm-bindgen to preserve debug info in the final WASM output, even
     /// for `--release` mode.
     keep_debug: bool,
@@ -161,13 +163,16 @@ impl RustApp {
             }
         };
 
+        let example = cfg.cargo_example.clone();
+
         Ok(Self {
             id,
             cfg,
             cargo_features,
             manifest,
             ignore_chan,
             bin,
+            example,
             keep_debug,
             typescript,
             no_demangle,
@@ -196,6 +201,7 @@ impl RustApp {
             manifest,
             ignore_chan,
             bin: None,
+            example: None,
             keep_debug: false,
             typescript: false,
             no_demangle: false,
@@ -240,6 +246,10 @@ impl RustApp {
             args.push("--bin");
             args.push(bin);
         }
+        if let Some(example) = &self.example {
+            args.push("--example");
+            args.push(example);
+        }
 
         match &self.cargo_features {
             Features::All => args.push("--all-features"),