use runfiles to determine more locations instead of relying on the wd

DolceTriade · Jan 10, 2024 · aec2515 · aec2515
1 parent 4ddca8e
commit aec2515
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/blade/components/accordion.rs b/blade/components/accordion.rs
@@ -51,9 +51,7 @@ where
                 if hide.get() { "max-h-0 absolute opacity-0 overflow-hidden" } else { "" },
             )
         }>
-            <div class="p-5 border border-b-0 border-gray-200">
-                {children()}
-            </div>
+            <div class="p-5 border border-b-0 border-gray-200">{children()}</div>
         </div>
     }
 }

diff --git a/blade/main.rs b/blade/main.rs
@@ -52,6 +52,8 @@ cfg_if! {
             // when not using cargo-leptos None must be replaced with Some("Cargo.toml")
             let r = Runfiles::create().expect("Must run using bazel with runfiles");
             let leptos_toml = r.rlocation("_main/blade/leptos.toml");
+            let assets = r.rlocation("_main/blade/static");
+            let pkg = r.rlocation("_main/blade");
             let mut conf = get_configuration(Some(leptos_toml.to_str().unwrap())).await.unwrap();
             conf.leptos_options.site_addr = args.http_host;
             let addr = conf.leptos_options.site_addr;
@@ -74,9 +76,9 @@ cfg_if! {
                 App::new()
                     .route("/api/{tail:.*}", leptos_actix::handle_server_fns_with_context(move|| provide_context(fn_state.clone())))
                     // serve JS/WASM/CSS from `pkg`
-                    .service(Files::new("/pkg", site_root))
+                    .service(Files::new("/pkg", pkg.clone()))
                     // serve other assets from the `assets` directory
-                    .service(Files::new("/assets", format!("{site_root}/static")))
+                    .service(Files::new("/assets", assets.clone()))
                     // serve the favicon from /favicon.ico
                     .service(favicon)
                     .leptos_routes_with_context(

diff --git a/blade/routes/empty.rs b/blade/routes/empty.rs
@@ -34,9 +34,7 @@ pub fn Empty() -> impl IntoView {
                     </g>
                 </svg>
             </div>
-            <p class="font-normal text-3xl text-gray-500">
-                Missing Invocation ID
-            </p>
+            <p class="font-normal text-3xl text-gray-500">Missing Invocation ID</p>
         </div>
     }
 }