fix: release action

Author: LeoBorai

.github/workflows/release.yml

@@ -30,8 +30,20 @@ jobs:
         with:
           targets: wasm32-unknown-unknown
 
+      - name: Setup Cargo Binstall
+        uses: cargo-bins/cargo-binstall@main
+
+      - name: Install Rust Binaries
+        run: |
+          cargo binstall -y --force cargo-edit
+          cargo binstall -y --force leptosfmt
+          cargo binstall -y --force trunk
+
+      - name: Build (debug)
+        run: make build
+
       - name: publish crate
-        run: cargo publish -p http-server --dry-run
+        run: cargo publish -p http-server --dry-run --allow-dirty
 
   release:
     name: Create Release
@@ -78,7 +90,7 @@ jobs:
           CRATES_IO_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}
 
       - name: Publish crate
-        run: cargo publish -p http-server
+        run: cargo publish -p http-server --allow-dirty
 
       - name: Create Release
         id: create_release

.gitignore

@@ -6,6 +6,8 @@
 #######################
 /target
 /tmp
+/src/http-server/ui/*
+!/src/http-server/ui/.gitkeep
 
 # Compiled source #
 ###################

Makefile

@@ -2,7 +2,12 @@
 
 default: release
 
-release: ui-build
+build:
+	make -C ./src/file-explorer-ui dist
+	make -C ./src/http-server build
+
+release:
+	make -C ./src/file-explorer-ui release
 	make -C ./src/http-server release
 
 run:

src/file-explorer-ui/Makefile

@@ -11,7 +11,7 @@ dist:
 
 fmt:
 	@leptosfmt --version >/dev/null 2>&1 || (echo "Error: leptosfmt is required."; exit 1)
-	leptosfmt ./src/**/*.rs
+	@leptosfmt ./src/**/*.rs
 
 release:
 	trunk build --release --locked --config ./Trunk.toml

src/file-explorer-ui/Trunk.toml

@@ -1,6 +1,7 @@
 [build]
 # The index HTML file to drive the bundling process.
 target = "./public/index.html"
+dist = "../http-server/ui"
 
 [watch]
 # Paths to watch. The `build.target`'s parent folder is watched by default.

src/http-server/Cargo.toml

@@ -1,16 +1,19 @@
 [package]
 name = "http-server"
 version = "0.8.9"
-authors = ["Esteban Borai <estebanborai@gmail.com>"]
+authors = ["Leo Borai <estebanborai@gmail.com>"]
 edition = "2021"
 description = "Simple and configurable command-line HTTP server"
 repository = "https://github.com/http-server-rs/http-server"
 categories = ["web-programming", "web-programming::http-server"]
 keywords = ["configurable", "http", "server", "serve", "static"]
 license = "MIT OR Apache-2.0"
-readme = "README.md"
+readme = "../../README.md"
+include = ["/ui", "/src/"]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[[bin]]
+name = "http-server"
+path = "src/main.rs"
 
 [dependencies]
 anyhow = { workspace = true }

src/http-server/Makefile

@@ -3,6 +3,9 @@
 default:
 	cargo r -- start
 
+build:
+	cargo b
+
 release:
 	cargo b --release
 

src/http-server/src/handler/file_explorer/mod.rs

@@ -22,7 +22,7 @@ use self::proto::BreadcrumbItem;
 use self::utils::{decode_uri, encode_uri, PERCENT_ENCODE_SET};
 
 #[derive(Embed)]
-#[folder = "../file-explorer-ui/dist"]
+#[folder = "./ui"]
 struct FileExplorerAssets;
 
 pub struct FileExplorer {