From 334e7e6f22342e302fa3a02b68c9d149f3449222 Mon Sep 17 00:00:00 2001 From: Teague Lasser <58143782+kraemahz@users.noreply.github.com> Date: Thu, 4 Jan 2024 16:41:05 -0800 Subject: [PATCH 1/2] Updated packages and comments referencing old CLI location (#1786) --- examples/tailwind/README.md | 2 +- packages/cli/src/assets/autoreload.js | 4 ++-- packages/hot-reload/README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/tailwind/README.md b/examples/tailwind/README.md index 552ab402f..95d01f408 100644 --- a/examples/tailwind/README.md +++ b/examples/tailwind/README.md @@ -7,7 +7,7 @@ This example shows how an app might be styled with TailwindCSS. 1. Install the Dioxus CLI: ```bash -cargo install --git https://github.com/DioxusLabs/cli +cargo install dioxus-cli ``` 2. Install npm: https://docs.npmjs.com/downloading-and-installing-node-js-and-npm diff --git a/packages/cli/src/assets/autoreload.js b/packages/cli/src/assets/autoreload.js index fffb3e26c..cc8fef166 100644 --- a/packages/cli/src/assets/autoreload.js +++ b/packages/cli/src/assets/autoreload.js @@ -1,5 +1,5 @@ // Dioxus-CLI -// https://github.com/DioxusLabs/cli +// https://github.com/DioxusLabs/dioxus/tree/master/packages/cli (function () { var protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'; @@ -22,4 +22,4 @@ } }; ws.onclose = reload_upon_connect; -})() \ No newline at end of file +})() diff --git a/packages/hot-reload/README.md b/packages/hot-reload/README.md index d7418d4b1..d2428e9e9 100644 --- a/packages/hot-reload/README.md +++ b/packages/hot-reload/README.md @@ -68,7 +68,7 @@ rsx! { ## Usage -> This crate implements hot reloading for native compilation targets not WASM. For hot relaoding with the web renderer, see the [dioxus-cli](https://github.com/DioxusLabs/cli) project. +> This crate implements hot reloading for native compilation targets not WASM. For hot relaoding with the web renderer, see the [dioxus-cli](https://github.com/DioxusLabs/dioxus/tree/master/packages/cli) project. Add this to the top of your main function on any renderer that supports hot reloading to start the hot reloading server: From bb8341241d085c57e9e6d1c4a85ae24fb912504d Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Thu, 4 Jan 2024 19:57:02 -0600 Subject: [PATCH 2/2] bump sledgehammer --- packages/interpreter/Cargo.toml | 2 +- packages/interpreter/src/sledgehammer_bindings.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/interpreter/Cargo.toml b/packages/interpreter/Cargo.toml index bac04d496..63113872d 100644 --- a/packages/interpreter/Cargo.toml +++ b/packages/interpreter/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["dom", "ui", "gui", "react", "wasm"] wasm-bindgen = { workspace = true, optional = true } js-sys = { version = "0.3.56", optional = true } web-sys = { version = "0.3.56", optional = true, features = ["Element", "Node"] } -sledgehammer_bindgen = { versio = "0.3.0", default-features = false, optional = true } +sledgehammer_bindgen = { versio = "0.3.1", default-features = false, optional = true } sledgehammer_utils = { version = "0.2", optional = true } serde = { version = "1.0", features = ["derive"], optional = true } diff --git a/packages/interpreter/src/sledgehammer_bindings.rs b/packages/interpreter/src/sledgehammer_bindings.rs index a42824e15..23831f3e6 100644 --- a/packages/interpreter/src/sledgehammer_bindings.rs +++ b/packages/interpreter/src/sledgehammer_bindings.rs @@ -11,7 +11,7 @@ pub const SLEDGEHAMMER_JS: &str = GENERATED_JS; #[cfg(feature = "web")] #[bindgen(module)] mod js { - const JS_FILE: &str = "./packages/interpreter/src/common.js"; + const JS_FILE: &str = "./src/common.js"; const JS: &str = r#" class ListenerMap { constructor(root) { @@ -260,8 +260,8 @@ pub mod binary_protocol { #[bindgen] mod protocol_js { - const JS_FILE: &str = "./packages/interpreter/src/interpreter.js"; - const JS_FILE: &str = "./packages/interpreter/src/common.js"; + const JS_FILE: &str = "./src/interpreter.js"; + const JS_FILE: &str = "./src/common.js"; fn mount_to_root() { "{AppendChildren(root, stack.length-1);}"