Skip to content

Commit 7462e6a

Browse files
committed
Merge branch 'main' into develop
2 parents 3ad8501 + 2e35961 commit 7462e6a

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
path: ~/.cargo/bin/cargo-release
2626
key: ${{ runner.os }}-cargo-release
2727

28-
- run: cargo install cargo-release
28+
- run: cargo install cargo-release --locked
2929
if: steps.cargo_release_cache.outputs.cache-hit != 'true'
3030

3131
- name: cargo login

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/hyperapp.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,12 +538,17 @@ where
538538

539539
pub fn setup_server(
540540
ui_config: Option<&HttpBindingConfig>,
541+
ui_path: Option<String>,
541542
endpoints: &[Binding],
542543
) -> http::server::HttpServer {
543544
let mut server = http::server::HttpServer::new(5);
544545

545546
if let Some(ui) = ui_config {
546-
if let Err(e) = server.serve_ui("ui", vec!["/"], ui.clone()) {
547+
if let Err(e) = server.serve_ui(
548+
&ui_path.unwrap_or_else(|| "ui".to_string()),
549+
vec!["/"],
550+
ui.clone(),
551+
) {
547552
panic!("failed to serve UI: {e}. Make sure that a ui folder is in /pkg");
548553
}
549554
}

0 commit comments

Comments
 (0)