Merge pull request #1194 from DioxusLabs/jk/remove-dioxus-bin

Remove the `dioxus` bin for the `dx` bin

docs/guide/src/en/__unused/advanced-guides/testing.md

@@ -21,7 +21,7 @@ fn runs_in_browser() {
 Then, when you run
 
 ```console
-dioxus test --chrome
+dx test --chrome
 ```
 
 Dioxus will build and test your code using the Chrome browser as a harness.

docs/guide/src/en/fullstack/getting_started.md

@@ -76,7 +76,7 @@ Next, we need to modify our `main.rs` to use either hydrate on the client or ren
 {{#include ../../../examples/hydration.rs}}
 ```
 
-Now, build your client-side bundle with `dioxus build --features web` and run your server with `cargo run --features ssr`. You should see the same page as before, but now you can interact with the buttons!
+Now, build your client-side bundle with `dx build --features web` and run your server with `cargo run --features ssr`. You should see the same page as before, but now you can interact with the buttons!
 
 ## Sycronizing props between the server and client
 
@@ -99,4 +99,4 @@ The only thing we need to change on the client is the props. `dioxus-fullstack`
 {{#include ../../../examples/hydration_props.rs}}
 ```
 
-Now, build your client-side bundle with `dioxus build --features web` and run your server with `cargo run --features ssr`. Navigate to `http://localhost:8080/1` and you should see the counter start at 1. Navigate to `http://localhost:8080/2` and you should see the counter start at 2.
+Now, build your client-side bundle with `dx build --features web` and run your server with `cargo run --features ssr`. Navigate to `http://localhost:8080/1` and you should see the counter start at 1. Navigate to `http://localhost:8080/2` and you should see the counter start at 2.

docs/guide/src/en/fullstack/server_functions.md

@@ -24,7 +24,7 @@ Next, add the server function to your `main.rs`:
 {{#include ../../../examples/server_function.rs}}
 ```
 
-Now, build your client-side bundle with `dioxus build --features web` and run your server with `cargo run --features ssr`. You should see a new button that multiplies the count by 2.
+Now, build your client-side bundle with `dx build --features web` and run your server with `cargo run --features ssr`. You should see a new button that multiplies the count by 2.
 
 ## Conclusion
 

docs/guide/src/en/getting_started/hot_reload.md

@@ -18,7 +18,7 @@ Hot reloading is automatically enabled when using the web renderer on debug buil
 1. Run:
 
 ```bash
-dioxus serve --hot-reload
+dx serve --hot-reload
 ```
 
 2. Change some code within a rsx or render macro

docs/guide/src/en/getting_started/web.md

@@ -59,5 +59,5 @@ Edit your `main.rs`:
 And to serve our app:
 
 ```bash
-dioxus serve
+dx serve
 ```

docs/guide/src/pt-br/getting_started/hot_reload.md

@@ -18,7 +18,7 @@ dioxus = { version = "*", features = ["hot-reload"] }
 1. Execute:
 
 ```
-dioxus serve --hot-reload
+dx serve --hot-reload
 ```
 
 2. alterar algum código dentro de uma macro `rsx`

examples/PWA-example/README.md

@@ -9,8 +9,8 @@ It is also very much usable as a template for your projects, if you're aiming to
 
 Make sure you have Dioxus CLI installed (if you're unsure, run `cargo install dioxus-cli`).
 
-You can run `dioxus serve` in this directory to start the web server locally, or run
-`dioxus build --release` to build the project so you can deploy it on a separate web-server.
+You can run `dx serve` in this directory to start the web server locally, or run
+`dx build --release` to build the project so you can deploy it on a separate web-server.
 
 ## Project Structure
 ```
@@ -41,4 +41,4 @@ For service worker scripting (in JavaScript):
 * [Service worker guide from PWABuilder](https://docs.pwabuilder.com/#/home/sw-intro)
 * [Service worker examples, also from PWABuilder](https://github.com/pwa-builder/pwabuilder-serviceworkers)
 
-If you want to stay as close to 100% Rust as possible, you can try using [wasi-worker](https://github.com/dunnock/wasi-worker) to replace the JS service worker file. The JSON manifest will still be required though.
+If you want to stay as close to 100% Rust as possible, you can try using [wasi-worker](https://github.com/dunnock/wasi-worker) to replace the JS service worker file. The JSON manifest will still be required though.

examples/tailwind/README.md

@@ -122,7 +122,7 @@ npx tailwindcss -i ./input.css -o ./public/tailwind.css --watch
 - Run the following command in the root of the project to start the dioxus dev server:
 
 ```bash
-dioxus serve --hot-reload
+dx serve --hot-reload
 ```
 
 - Open the browser to http://localhost:8080

notes/FAQ.md

@@ -18,7 +18,7 @@ There are plenty Rust Elm-like frameworks in the world - we were not interested
 The `RSX` DSL is _barely_ a DSL. Rustaceans will find the DSL very similar to simply assembling nested structs, but without the syntactical overhead of "Default" everywhere or having to jump through hoops with the builder pattern. Between RSX, HTML, the Raw Factory API, and the NodeBuilder syntax, there's plenty of options to choose from.
 
 ### What are the build times like? Why on earth would I choose Rust instead of JS/TS/Elm?
-Dioxus builds as roughly as fast as a complex WebPack-TypeScript site. Compile times will be slower than an equivalent TypeScript site, but not unbearably slow. The Wasm compiler backend for Rust is very fast. Iterating on small components is basically instant and larger apps takes a few seconds. In practice, the compiler guarantees of Rust balance out the rebuild times.
+dx builds as roughly as fast as a complex WebPack-TypeScript site. Compile times will be slower than an equivalent TypeScript site, but not unbearably slow. The Wasm compiler backend for Rust is very fast. Iterating on small components is basically instant and larger apps takes a few seconds. In practice, the compiler guarantees of Rust balance out the rebuild times.
 
 ### What about Yew/Seed/Sycamore/Dominator/Dodrio/Percy?
 - Yew and Seed use an Elm-like pattern and don't support SSR or any alternate rendering platforms

packages/cli/Cargo.toml

@@ -86,13 +86,6 @@ dioxus-core = { workspace = true, features = ["serialize"] }
 default = []
 plugin = ["mlua"]
 
-# install path dx and dioxus as the same command
-# so, they're not really aliases
-# eventually dx will defer to the right version of dioxus
-[[bin]]
-path = "src/main.rs"
-name = "dioxus"
-
 [[bin]]
 path = "src/main.rs"
 name = "dx"

packages/cli/Dioxus.toml

@@ -4,7 +4,7 @@
 name = "dioxus-cli"
 
 # default platfrom
-# you can also use `dioxus serve/build --platform XXX` to use other platform
+# you can also use `dx serve/build --platform XXX` to use other platform
 # value: web | desktop
 default_platform = "desktop"
 
@@ -42,4 +42,4 @@ script = []
 
 # use binaryen.wasm-opt for output Wasm file
 # binaryen just will trigger in `web` platform
-binaryen = { wasm_opt = true }
+binaryen = { wasm_opt = true }

packages/cli/README.md

@@ -24,7 +24,7 @@ cargo install --path . --debug
 
 ## Get Started
 
-Use `dioxus create project-name` to initialize a new Dioxus project. <br>
+Use `dx create project-name` to initialize a new Dioxus project. <br>
 
 It will be cloned from the [dioxus-template](https://github.com/DioxusLabs/dioxus-template) repository.
 
@@ -33,7 +33,7 @@ It will be cloned from the [dioxus-template](https://github.com/DioxusLabs/dioxu
 Alternatively, you can specify the template path:
 
 ```
-dioxus create hello --template gh:dioxuslabs/dioxus-template
+dx create hello --template gh:dioxuslabs/dioxus-template
 ```
 
 ## Dioxus Config File

packages/cli/docs/src/cmd/README.md

@@ -2,14 +2,14 @@
 
 In this chapter we will introduce all `dioxus-cli` commands.
 
-> You can also use `dioxus --help` to get cli help info.
+> You can also use `dx --help` to get cli help info.
 
 ```
-dioxus 
+dx
 Build, bundle, & ship your Dioxus app
 
 USAGE:
-    dioxus [OPTIONS] <SUBCOMMAND>
+    dx [OPTIONS] <SUBCOMMAND>
 
 OPTIONS:
     -h, --help    Print help information
@@ -23,4 +23,4 @@ SUBCOMMANDS:
     help         Print this message or the help of the given subcommand(s)
     serve        Build, watch & serve the Rust WASM app and all of its assets
     translate    Translate some html file into a Dioxus component
-```
+```

packages/cli/docs/src/cmd/build.md

@@ -1,13 +1,13 @@
 # Build
 
-The `dioxus build` command can help you `pack & build` a dioxus project.
+The `dx build` command can help you `pack & build` a dioxus project.
 
 ```
-dioxus-build 
+dioxus-build
 Build the Rust WASM app and all of its assets
 
 USAGE:
-    dioxus build [OPTIONS]
+    dx build [OPTIONS]
 
 OPTIONS:
         --example <EXAMPLE>      [default: ""]
@@ -19,7 +19,7 @@ OPTIONS:
 You can use this command to build a project:
 
 ```
-dioxus build --release
+dx build --release
 ```
 
 ## Target platform
@@ -28,14 +28,14 @@ Use the `platform` option to choose your target platform:
 
 ```
 # for desktop project
-dioxus build --platform desktop
+dx build --platform desktop
 ```
 
 `platform` currently only supports `desktop` & `web`.
 
 ```
 # for web project
-dioxus build --platform web
+dx build --platform web
 ```
 
 ## Specify workspace bin
@@ -43,7 +43,7 @@ dioxus build --platform web
 You can add the `--bin` option to select which crate you want Dioxus to build:
 
 ```
-dioxus build --bin app
+dx build --bin app
 ```
 
 ## Build Example
@@ -52,5 +52,5 @@ You can use the `example` option to select a example to build:
 
 ```
 # build the `test` example
-dioxus build --exmaple test
-```
+dx build --exmaple test
+```

packages/cli/docs/src/cmd/clean.md

@@ -1,13 +1,13 @@
 # Clean
 
-`dioxus clean` will clear the build artifacts (the out_dir and the cargo cache)
+`dx clean` will clear the build artifacts (the out_dir and the cargo cache)
 
 ```
-dioxus-clean 
+dioxus-clean
 Clean build artifacts
 
 USAGE:
-    dioxus clean [OPTIONS]
+    dx clean [OPTIONS]
 
 OPTIONS:
         --bin   [default: None]
@@ -16,12 +16,12 @@ OPTIONS:
 # Example
 
 ```
-dioxus clean
+dx clean
 ```
 
 # Specify workspace bin
 You can add the `--bin` option to select which crate you want Dioxus to clean artifacts from:
 
 ```
-dioxus clean --bin app
-```
+dx clean --bin app
+```

packages/cli/docs/src/cmd/serve.md

@@ -1,13 +1,13 @@
 # Serve
 
-The `dioxus serve` can start a dev server with hot-reloading
+The `dx serve` can start a dev server with hot-reloading
 
 ```
-dioxus-serve 
+dioxus-serve
 Build, watch & serve the Rust WASM app and all of its assets
 
 USAGE:
-    dioxus serve [OPTIONS]
+    dx serve [OPTIONS]
 
 OPTIONS:
         --example <EXAMPLE>      [default: ""]
@@ -20,7 +20,7 @@ OPTIONS:
 You can use this command to build project and start a dev server:
 
 ```
-dioxus serve
+dx serve
 ```
 
 ## Serve Example
@@ -29,7 +29,7 @@ You can use the `example` option to serve a example:
 
 ```
 # serve the `test` example
-dioxus serve --exmaple test
+dx serve --exmaple test
 ```
 
 ## Specify workspace bin
@@ -37,7 +37,7 @@ dioxus serve --exmaple test
 You can add the `--bin` option to select which crate you want Dioxus to build and serve:
 
 ```
-dioxus serve --bin app
+dx serve --bin app
 ```
 
 ## Open Browser
@@ -45,7 +45,7 @@ dioxus serve --bin app
 You can add the `--open` option to open system default browser when server startup:
 
 ```
-dioxus serve --open
+dx serve --open
 ```
 
 ## RSX Hot Reloading
@@ -53,7 +53,7 @@ dioxus serve --open
 You can add the `--hot-reload` flag to enable [rsx hot reloading](https://dioxuslabs.com/docs/0.3/guide/en/getting_started/hot_reload.html). This will allow you to reload some rsx changes without a full recompile:
 
 ```
-dioxus serve --open
+dx serve --open
 ```
 
 ## Cross Origin Policy
@@ -66,5 +66,5 @@ You can add the `cross-origin-policy` option to change cross-origin header to:
 ```
 
 ```
-dioxus serve --corss-origin-policy
-```
+dx serve --corss-origin-policy
+```

packages/cli/docs/src/cmd/translate.md

@@ -1,13 +1,13 @@
 # Translate
 
-`dioxus translate` can translate some `html` file into a Dioxus compoent
+`dx translate` can translate some `html` file into a Dioxus compoent
 
 ```
-dioxus-translate 
+dioxus-translate
 Translate some source file into a Dioxus component
 
 USAGE:
-    dioxus translate [OPTIONS] [OUTPUT]
+    dx translate [OPTIONS] [OUTPUT]
 
 ARGS:
     <OUTPUT>    Output file, defaults to stdout if not present
@@ -22,7 +22,7 @@ OPTIONS:
 You can use the `file` option to set path to the `html` file to translate:
 
 ```
-dioxus transtale --file ./index.html
+dx transtale --file ./index.html
 ```
 
 ## Output rsx to a file
@@ -30,7 +30,7 @@ dioxus transtale --file ./index.html
 You can pass a file to the traslate command to set the path to write the output of the command to:
 
 ```
-dioxus translate --file ./index.html component.rsx
+dx translate --file ./index.html component.rsx
 ```
 
 ## Output rsx to a file
@@ -38,7 +38,7 @@ dioxus translate --file ./index.html component.rsx
 Setting the `component` option will create a compoent from the HTML:
 
 ```
-dioxus translate --file ./index.html --component
+dx translate --file ./index.html --component
 ```
 
 ## Example
@@ -65,4 +65,4 @@ fn component(cx: Scope) -> Element {
         }
     })
 }
-```
+```

packages/cli/docs/src/configure.md

@@ -29,8 +29,8 @@ General application confiration:
    # default: web
    default_platform = "web"
    ```
-   if you change this to `desktop`, the `dioxus build` will default building a desktop app
-3. ***out_dir*** - The directory to place the build artifacts from `dioxus build` or `dioxus service` into. This is also where the `assets` directory will be copied to
+   if you change this to `desktop`, the `dx build` will default building a desktop app
+3. ***out_dir*** - The directory to place the build artifacts from `dx build` or `dx service` into. This is also where the `assets` directory will be copied to
     ```
     out_dir = "dist"
     ```

packages/cli/docs/src/creating.md

@@ -4,10 +4,10 @@ Once you have the Dioxus CLI tool installed, you can use it to create dioxus pro
 
 ## Initializing a default project
 
-First, run the `dioxus create` command to create a new project ready to be used with Dioxus and the Dioxus CLI:
+First, run the `dx create` command to create a new project ready to be used with Dioxus and the Dioxus CLI:
 
 ```
-dioxus create hello-dioxus
+dx create hello-dioxus
 ```
 
 > It will clone a default template from github template: [DioxusLabs/dioxus-template](https://github.com/DioxusLabs/dioxus-template)
@@ -15,7 +15,7 @@ dioxus create hello-dioxus
 >
 > You can choose to create your project from a different template by passing the `template` argument:
 > ```
-> dioxus init hello-dioxus --template=gh:dioxuslabs/dioxus-template
+> dx init hello-dioxus --template=gh:dioxuslabs/dioxus-template
 > ```
 
 Next, move the current directory into your new project:
@@ -33,7 +33,7 @@ cd hello-dioxus
 Finally, create serve your project with the Dioxus CLI:
 
 ```
-dioxus serve
+dx serve
 ```
 
 By default, the CLI serve your site at: [`http://127.0.0.1:8080/`](http://127.0.0.1:8080/)

packages/cli/docs/src/plugin/README.md

@@ -2,7 +2,7 @@
 
 > For Cli 0.2.0 we will add `plugin-develop` support.
 
-Before the 0.2.0 we use `dioxus tool` to use & install some plugin, but we think that is not good for extend cli program, some people want tailwind support, some people want sass support, we can't add all this thing in to the cli source code and we don't have time to maintain a lot of tools that user request, so maybe user make plugin by themself is a good choice.
+Before the 0.2.0 we use `dx tool` to use & install some plugin, but we think that is not good for extend cli program, some people want tailwind support, some people want sass support, we can't add all this thing in to the cli source code and we don't have time to maintain a lot of tools that user request, so maybe user make plugin by themself is a good choice.
 
 ### Why Lua ?
 
@@ -76,4 +76,4 @@ end
 manager.serve.interval = 1000
 
 return manager
-```
+```

packages/cli/src/assets/dioxus.toml

@@ -4,7 +4,7 @@
 name = "{{project-name}}"
 
 # default platfrom
-# you can also use `dioxus serve/build --platform XXX` to use other platform
+# you can also use `dx serve/build --platform XXX` to use other platform
 # value: web | desktop
 default_platform = "{{default-platform}}"
 

packages/cli/src/builder.rs

@@ -161,7 +161,7 @@ pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
             }
         } else {
             log::warn!(
-                "Binaryen tool not found, you can use `dioxus tool add binaryen` to install it."
+                "Binaryen tool not found, you can use `dx tool add binaryen` to install it."
             );
         }
     }
@@ -200,7 +200,7 @@ pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
             }
         } else {
             log::warn!(
-                "Tailwind tool not found, you can use `dioxus tool add tailwindcss` to install it."
+                "Tailwind tool not found, you can use `dx tool add tailwindcss` to install it."
             );
         }
     }

packages/cli/src/cli/plugin.rs

@@ -31,7 +31,7 @@ impl Plugin {
                 }
             }
             Plugin::Add { name: _ } => {
-                log::info!("You can use `dioxus plugin app-path` to get Installation position");
+                log::info!("You can use `dx plugin app-path` to get Installation position");
             }
         }
         Ok(())

packages/fullstack/examples/axum-auth/src/main.rs

@@ -1,7 +1,7 @@
 //! Run with:
 //!
 //! ```sh
-//! dioxus build --features web
+//! dx build --features web
 //! cargo run --features ssr
 //! ```
 

packages/fullstack/examples/axum-hello-world/src/main.rs

@@ -1,7 +1,7 @@
 //! Run with:
 //!
 //! ```sh
-//! dioxus build --features web
+//! dx build --features web
 //! cargo run --features ssr
 //! ```
 

packages/fullstack/examples/axum-router/src/main.rs

@@ -1,7 +1,7 @@
 //! Run with:
 //!
 //! ```sh
-//! dioxus build --features web
+//! dx build --features web
 //! cargo run --features ssr
 //! ```
 

packages/fullstack/examples/salvo-hello-world/src/main.rs

@@ -1,7 +1,7 @@
 //! Run with:
 //!
 //! ```sh
-//! dioxus build --features web
+//! dx build --features web
 //! cargo run --features ssr
 //! ```
 

packages/fullstack/examples/static-hydrated/src/main.rs

@@ -1,7 +1,7 @@
 //! Run with:
 //!
 //! ```sh
-//! dioxus build --features web
+//! dx build --features web
 //! cargo run --features ssr
 //! ```
 

packages/fullstack/examples/warp-hello-world/src/main.rs

@@ -1,7 +1,7 @@
 //! Run with:
 //!
 //! ```sh
-//! dioxus build --features web
+//! dx build --features web
 //! cargo run --features ssr
 //! ```
 

playwright-tests/fullstack/src/main.rs

@@ -20,7 +20,7 @@ fn main() {
     {
         // Start hot reloading
         hot_reload_init!(dioxus_hot_reload::Config::new().with_rebuild_callback(|| {
-            execute::shell("dioxus build --features web")
+            execute::shell("dx build --features web")
                 .spawn()
                 .unwrap()
                 .wait()