🚨 Fix the macro parse problem for stylist-rs.

Related to rust-lang/rust#111888

Author: langyo

Cargo.toml

@@ -2,7 +2,10 @@
 members = [
   "packages/*",
 ]
+resolver = "2"
 
 [profile.release]
 lto = true
 opt-level = 'z'
+codegen-units = 1
+panic = "abort"

Makefile.toml

@@ -81,15 +81,15 @@ cd /home
 exec cargo build --package hikari-router
 
 mkdir /home/res
-cp /home/packages/router/res/favicon.ico /home/dist/res/favicon.ico
-cp /home/packages/router/res/fonts.otf /home/dist/res/fonts.otf
+cp /home/packages/router/res/favicon.ico /home/res/favicon.ico
+cp /home/packages/router/res/logo.png /home/res/logo.png
 
-mv /home/dist/a_bg.wasm /home/dist/res/a.wasm
-mv /home/dist/a.js /home/dist/res/a.js
-cp /home/target/debug/router /home/dist/a
+mv /home/dist/a_bg.wasm /home/res/a.wasm
+mv /home/dist/a.js /home/res/a.js
+cp /home/target/debug/hikari-router /home/a
 
-cd /home/dist
-exec /home/dist/a
+cd /home
+exec /home/a
 '''
 
 [tasks.dev-preload]

packages/router/src/routes/frontend/static_files.rs

@@ -21,6 +21,16 @@ pub async fn route() -> Result<Router> {
             "/a.wasm",
             get_service(ServeFile::new(ROOT_DIR.clone().join("./a.wasm")))
                 .handle_error(handle_static_file_error),
+        )
+        .route_service(
+            "/favicon.ico",
+            get_service(ServeFile::new(ROOT_DIR.clone().join("./favicon.ico")))
+                .handle_error(handle_static_file_error),
+        )
+        .route_service(
+            "/logo.png",
+            get_service(ServeFile::new(ROOT_DIR.clone().join("./logo.png")))
+                .handle_error(handle_static_file_error),
         );
 
     Ok(router)

packages/web/Cargo.toml

@@ -7,10 +7,6 @@ version = "0.1.0"
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[features]
-default = []
-web_env = ["yew/hydration", "stylist/hydration"]
-
 [dependencies]
 anyhow = "^1"
 base64 = "^0.21"
@@ -21,15 +17,15 @@ serde_json = "^1"
 strum = "^0.24"
 strum_macros = "^0.24"
 
-console_log = "^0.2"
+console_log = "^1"
 js-sys = "^0.3"
 log = "^0.4"
 wasm-bindgen = "0.2.87"
 wasm-bindgen-futures = "^0.4"
 wasm-logger = "^0.2"
 
 stylist = {version = "^0.12", features = ["yew_integration", "hydration"]}
-yew = {version = "^0.20", features = ["csr"]}
+yew = {version = "^0.20", features = ["csr", "hydration"]}
 yew-router = "^0.17"
 
 [dependencies.web-sys]

tasks/build.dockerfile

@@ -52,11 +52,11 @@ RUN cargo build --offline --package hikari-router --release
 # Stage 2 for server build, used to integrate the build result of client and generate the final image
 FROM ubuntu:22.10 as stage-server-build2
 
-COPY ./packages/router/res /home/dist/res
-COPY --from=stage-client-build2 /home/dist/a_bg.wasm /home/dist/res/a.wasm
-COPY --from=stage-client-build2 /home/dist/a.js /home/dist/res/a.js
-COPY --from=stage-server-build1 /home/target/release/router /home/dist/a
-ENV ROOT_DIR=/home/dist/res
-WORKDIR /home/dist
+COPY ./packages/router/res /home/res
+COPY --from=stage-client-build2 /home/dist/a_bg.wasm /home/res/a.wasm
+COPY --from=stage-client-build2 /home/dist/a.js /home/res/a.js
+COPY --from=stage-server-build1 /home/target/release/hikari-router /home/a
+ENV ROOT_DIR=/home/res
+WORKDIR /home
 ENTRYPOINT [ "./a" ]
 EXPOSE 80

tasks/dev.dockerfile

@@ -11,7 +11,7 @@ COPY ./Makefile.toml /home/Makefile.toml
 
 VOLUME ["/home/target", "/home/packages"]
 
-ENV ROOT_DIR=/home/dist/res
+ENV ROOT_DIR=/home/res
 WORKDIR /home
 ENTRYPOINT ["cargo", "make", "-p", "docker-inside", "dev-on-container-build"]
 EXPOSE 80