add autoreload to trunk serve

triggered by an injected websocket script
enabled with --autoreload (default false)

CHANGELOG.md

@@ -6,6 +6,7 @@ Subheadings to categorize changes are `added, changed, deprecated, removed, fixe
 
 ## Unreleased
 - Added an example application for using Trunk with a vanilla (no frameworks) Rust application.
+- Added `--autoreload` flag to `trunk serve` that automatically reloads the web frontend on a new build finishing (default `false`).
 
 ## 0.11.0
 ### added

Cargo.toml

@@ -20,7 +20,7 @@ ansi_term = "0.12.1"
 anyhow = "1"
 async-process = "1"
 async-std = { version = "1.9", default-features = false, features = ["attributes", "std", "unstable"] }
-async-tungstenite = { version = "0.10.0", default-features = false, features = ["async-std-runtime"] }
+async-tungstenite = { version = "0.13.0", default-features = false, features = ["async-std-runtime"] }
 cargo_metadata = "0.12"
 console = "0.14"
 dunce = "1"
@@ -40,10 +40,11 @@ structopt = "0.3"
 structopt-derive = "0.4"
 surf = "2"
 tide = { version = "0.16.0", default-features = false, features = ["h1-server", "sessions", "unstable"] }
-tide-websockets = "0.3.0"
+tide-websockets = "0.4.0"
 toml = "0.5"
 tracing = "0.1.25"
 tracing-subscriber = "0.2.16"
+kuchiki = "0.8.1"
 
 [dev-dependencies]
 insta = "0.16.1"

src/autoreload.js

@@ -0,0 +1,9 @@
+(function () {
+    var ws = new WebSocket('ws://' + window.location.host);
+    ws.onmessage = (ev) => {
+        const msg = JSON.parse(ev.data);
+        if (msg.reload) {
+            window.location.reload();
+        }
+    };
+})()

src/cmd/watch.rs

@@ -20,7 +20,7 @@ impl Watch {
     #[tracing::instrument(level = "trace", skip(self, config))]
     pub async fn run(self, config: Option<PathBuf>) -> Result<()> {
         let cfg = ConfigOpts::rtc_watch(self.build, self.watch, config)?;
-        let mut system = WatchSystem::new(cfg).await?;
+        let mut system = WatchSystem::new(cfg, None).await?;
         system.build().await;
         system.run().await;
         Ok(())

src/config/models.rs

@@ -61,6 +61,10 @@ pub struct ConfigOptsServe {
     #[structopt(long = "proxy-ws")]
     #[serde(default)]
     pub proxy_ws: bool,
+    /// Whether to auto-reload the web page when a build completes.
+    #[structopt(long)]
+    #[serde(default)]
+    pub autoreload: bool,
 }
 
 /// Config options for the serve system.
@@ -169,10 +173,7 @@ impl ConfigOpts {
     }
 
     fn cli_opts_layer_watch(cli: ConfigOptsWatch, cfg_base: Self) -> Self {
-        let opts = ConfigOptsWatch {
-            watch: cli.watch,
-            ignore: cli.ignore,
-        };
+        let opts = ConfigOptsWatch { watch: cli.watch, ignore: cli.ignore };
         let cfg = ConfigOpts {
             build: None,
             watch: Some(opts),
@@ -190,6 +191,7 @@ impl ConfigOpts {
             proxy_backend: cli.proxy_backend,
             proxy_rewrite: cli.proxy_rewrite,
             proxy_ws: cli.proxy_ws,
+            autoreload: cli.autoreload,
         };
         let cfg = ConfigOpts {
             build: None,
@@ -202,10 +204,7 @@ impl ConfigOpts {
     }
 
     fn cli_opts_layer_clean(cli: ConfigOptsClean, cfg_base: Self) -> Self {
-        let opts = ConfigOptsClean {
-            dist: cli.dist,
-            cargo: cli.cargo,
-        };
+        let opts = ConfigOptsClean { dist: cli.dist, cargo: cli.cargo };
         let cfg = ConfigOpts {
             build: None,
             watch: None,