From 9c964b789d74dadc1219d611c84913743eb7d09c Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Mon, 16 Sep 2024 12:37:23 -0500 Subject: [PATCH] don't re-export launch in the prelude --- example-projects/ecommerce-site/src/main.rs | 2 +- example-projects/file-explorer/src/main.rs | 2 +- example-projects/fullstack-hackernews/src/main.rs | 2 +- example-projects/wifi-scanner/src/main.rs | 2 +- examples/all_events.rs | 2 +- examples/backgrounded_futures.rs | 2 +- examples/calculator.rs | 2 +- examples/calculator_mutable.rs | 2 +- examples/clock.rs | 2 +- examples/control_focus.rs | 2 +- examples/counters.rs | 2 +- examples/crm.rs | 2 +- examples/custom_assets.rs | 2 +- examples/custom_html.rs | 2 +- examples/custom_menu.rs | 4 ++-- examples/disabled.rs | 2 +- examples/dog_app.rs | 2 +- examples/dynamic_asset.rs | 2 +- examples/errors.rs | 2 +- examples/eval.rs | 2 +- examples/file_upload.rs | 2 +- examples/flat_router.rs | 2 +- examples/form.rs | 2 +- examples/fullstack-desktop/src/main.rs | 2 +- examples/fullstack-hello-world/src/main.rs | 2 +- examples/fullstack-router/src/main.rs | 2 +- examples/fullstack-streaming/src/main.rs | 2 +- examples/future.rs | 2 +- examples/generic_component.rs | 2 +- examples/global.rs | 2 +- examples/hash_fragment_state.rs | 2 +- examples/hello_world.rs | 8 ++++---- examples/hydration.rs | 4 ++-- examples/image_generator_openai.rs | 2 +- examples/link.rs | 2 +- examples/login_form.rs | 2 +- examples/memo_chain.rs | 2 +- examples/meta.rs | 2 +- examples/mobile_demo/src/lib.rs | 2 +- examples/multiwindow.rs | 2 +- examples/nested_listeners.rs | 2 +- examples/optional_props.rs | 2 +- examples/overlay.rs | 2 +- examples/popup.rs | 2 +- examples/pwa/src/main.rs | 2 +- examples/query_segment_search.rs | 2 +- examples/read_size.rs | 2 +- examples/readme.rs | 2 +- examples/reducer.rs | 2 +- examples/resize.rs | 2 +- examples/router.rs | 2 +- examples/router_resource.rs | 2 +- examples/rsx_usage.rs | 2 +- examples/scroll_to_top.rs | 2 +- examples/shortcut.rs | 2 +- examples/shorthand.rs | 2 +- examples/signals.rs | 2 +- examples/simple_list.rs | 2 +- examples/simple_router.rs | 4 ++-- examples/ssg-github-pages/src/main.rs | 2 +- examples/ssg-router/src/main.rs | 2 +- examples/ssg-simple/src/main.rs | 2 +- examples/streams.rs | 2 +- examples/suspense.rs | 2 +- examples/svg.rs | 2 +- examples/tailwind/src/main.rs | 2 +- examples/title.rs | 2 +- examples/todomvc.rs | 2 +- examples/video_stream.rs | 2 +- examples/weather_app.rs | 2 +- examples/web_component.rs | 2 +- examples/window_event.rs | 2 +- examples/window_focus.rs | 2 +- examples/window_zoom.rs | 2 +- examples/xss_safety.rs | 2 +- packages/autofmt/tests/samples/many_exprs.rsx | 2 +- packages/autofmt/tests/wrong/multiexpr-many.rsx | 2 +- packages/autofmt/tests/wrong/multiexpr-many.wrong.rsx | 2 +- packages/core-macro/src/component.rs | 2 +- packages/desktop/README.md | 2 +- packages/desktop/headless_tests/utils.rs | 2 +- packages/desktop/src/desktop_context.rs | 2 +- packages/desktop/src/readme.md | 2 +- packages/dioxus-lib/README.md | 6 +++--- packages/dioxus/README.md | 6 +++--- packages/dioxus/build.rs | 8 ++++---- packages/dioxus/src/launch.rs | 2 +- packages/dioxus/src/lib.rs | 6 +----- packages/extension/.vscode/launch.json | 2 +- packages/fullstack/README.md | 2 +- packages/fullstack/src/axum_adapter.rs | 2 +- packages/fullstack/src/launch.rs | 2 +- packages/fullstack/src/server_context.rs | 6 +++--- packages/playwright-tests/fullstack/src/main.rs | 2 +- packages/playwright-tests/nested-suspense/src/main.rs | 2 +- packages/playwright-tests/static-generation/src/main.rs | 2 +- packages/playwright-tests/suspense-carousel/src/main.rs | 2 +- packages/playwright-tests/web/src/main.rs | 2 +- packages/router/examples/simple_routes.rs | 2 +- packages/rsx/tests/valid/combo.new.rsx | 2 +- packages/rsx/tests/valid/combo.old.rsx | 2 +- packages/signals/examples/context.rs | 2 +- packages/signals/examples/dependencies.rs | 2 +- packages/signals/examples/map_signal.rs | 2 +- packages/signals/examples/read_only_degrade.rs | 2 +- packages/signals/examples/selector.rs | 2 +- packages/signals/examples/send.rs | 2 +- packages/signals/examples/split_subscriptions.rs | 2 +- packages/static-generation/README.md | 2 +- 109 files changed, 124 insertions(+), 128 deletions(-) diff --git a/example-projects/ecommerce-site/src/main.rs b/example-projects/ecommerce-site/src/main.rs index 7323055d02..985915a3f9 100644 --- a/example-projects/ecommerce-site/src/main.rs +++ b/example-projects/ecommerce-site/src/main.rs @@ -15,7 +15,7 @@ mod components { mod api; fn main() { - launch(|| { + dioxus::launch(|| { rsx! { head::Link { rel: "stylesheet", diff --git a/example-projects/file-explorer/src/main.rs b/example-projects/file-explorer/src/main.rs index d2c585092e..25f483017c 100644 --- a/example-projects/file-explorer/src/main.rs +++ b/example-projects/file-explorer/src/main.rs @@ -12,7 +12,7 @@ use dioxus::desktop::{Config, WindowBuilder}; use dioxus::prelude::*; fn main() { - LaunchBuilder::desktop() + dioxus::LaunchBuilder::desktop() .with_cfg(Config::new().with_window(WindowBuilder::new().with_resizable(true))) .launch(app) } diff --git a/example-projects/fullstack-hackernews/src/main.rs b/example-projects/fullstack-hackernews/src/main.rs index 62bf9d8f7b..e3960c7e57 100644 --- a/example-projects/fullstack-hackernews/src/main.rs +++ b/example-projects/fullstack-hackernews/src/main.rs @@ -17,7 +17,7 @@ fn main() { #[cfg(feature = "server")] tracing_subscriber::fmt::init(); - launch(|| rsx! { Router:: {} }); + dioxus::launch(|| rsx! { Router:: {} }); } #[derive(Clone, Routable)] diff --git a/example-projects/wifi-scanner/src/main.rs b/example-projects/wifi-scanner/src/main.rs index 57cf8bb24f..3b27234b3e 100644 --- a/example-projects/wifi-scanner/src/main.rs +++ b/example-projects/wifi-scanner/src/main.rs @@ -2,7 +2,7 @@ use dioxus::prelude::*; use wifiscanner::Wifi; fn main() { - launch(app) + dioxus::launch(app) } fn perform_scan() -> Status { diff --git a/examples/all_events.rs b/examples/all_events.rs index 2a04ee2bb3..df4dcfa739 100644 --- a/examples/all_events.rs +++ b/examples/all_events.rs @@ -9,7 +9,7 @@ use std::{collections::VecDeque, fmt::Debug, rc::Rc}; const STYLE: &str = asset!("./examples/assets/events.css"); fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/backgrounded_futures.rs b/examples/backgrounded_futures.rs index 4cafad439e..16708e638f 100644 --- a/examples/backgrounded_futures.rs +++ b/examples/backgrounded_futures.rs @@ -11,7 +11,7 @@ use async_std::task::sleep; use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/calculator.rs b/examples/calculator.rs index 9bf2a04618..d130feffcb 100644 --- a/examples/calculator.rs +++ b/examples/calculator.rs @@ -15,7 +15,7 @@ use dioxus::prelude::*; const STYLE: &str = asset!("./examples/assets/calculator.css"); fn main() { - LaunchBuilder::desktop() + dioxus::LaunchBuilder::desktop() .with_cfg(desktop!({ use dioxus::desktop::{Config, LogicalSize, WindowBuilder}; Config::new().with_window( diff --git a/examples/calculator_mutable.rs b/examples/calculator_mutable.rs index 2f933ebbea..54f69b5163 100644 --- a/examples/calculator_mutable.rs +++ b/examples/calculator_mutable.rs @@ -13,7 +13,7 @@ use dioxus::html::MouseEvent; use dioxus::prelude::*; fn main() { - LaunchBuilder::desktop() + dioxus::LaunchBuilder::desktop() .with_cfg( Config::new().with_window( WindowBuilder::new() diff --git a/examples/clock.rs b/examples/clock.rs index dc168a5ec2..f53398d4c4 100644 --- a/examples/clock.rs +++ b/examples/clock.rs @@ -8,7 +8,7 @@ use web_time::Instant; const STYLE: &str = asset!("./examples/assets/clock.css"); fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/control_focus.rs b/examples/control_focus.rs index c69293c56d..20ec58aba2 100644 --- a/examples/control_focus.rs +++ b/examples/control_focus.rs @@ -11,7 +11,7 @@ use dioxus::prelude::*; const STYLE: &str = asset!("./examples/assets/roulette.css"); fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/counters.rs b/examples/counters.rs index f2d8c4203c..c99da8ee7b 100644 --- a/examples/counters.rs +++ b/examples/counters.rs @@ -5,7 +5,7 @@ use dioxus::prelude::*; const STYLE: &str = asset!("./examples/assets/counter.css"); fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/crm.rs b/examples/crm.rs index 21f07466cd..0dddde01ff 100644 --- a/examples/crm.rs +++ b/examples/crm.rs @@ -12,7 +12,7 @@ use dioxus::prelude::*; fn main() { - LaunchBuilder::new() + dioxus::LaunchBuilder::new() .with_cfg(desktop!({ use dioxus::desktop::{LogicalSize, WindowBuilder}; dioxus::desktop::Config::default() diff --git a/examples/custom_assets.rs b/examples/custom_assets.rs index 6c927d21a4..fb5709f437 100644 --- a/examples/custom_assets.rs +++ b/examples/custom_assets.rs @@ -14,7 +14,7 @@ static ASSET_PATH: &str = "examples/assets/logo.png"; static ASSET_PATH: &str = asset!("examples/assets/logo.png".format(ImageType::Avif)); fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/custom_html.rs b/examples/custom_html.rs index dbbe334f05..e876169dfc 100644 --- a/examples/custom_html.rs +++ b/examples/custom_html.rs @@ -4,7 +4,7 @@ use dioxus::prelude::*; fn main() { - LaunchBuilder::new() + dioxus::LaunchBuilder::new() .with_cfg( dioxus::desktop::Config::new().with_custom_index( r#" diff --git a/examples/custom_menu.rs b/examples/custom_menu.rs index f78f33c884..9dbc655aa6 100644 --- a/examples/custom_menu.rs +++ b/examples/custom_menu.rs @@ -27,8 +27,8 @@ fn main() { // Create a desktop config that overrides the default menu with the custom menu let config = dioxus::desktop::Config::new().with_menu(menu); - // Launch the app with the custom menu - LaunchBuilder::new().with_cfg(config).launch(app) + //dioxus::launch the app with the custom menu + dioxus::LaunchBuilder::new().with_cfg(config).launch(app) } fn app() -> Element { diff --git a/examples/disabled.rs b/examples/disabled.rs index 6aaa70b9d4..1e95f85f9a 100644 --- a/examples/disabled.rs +++ b/examples/disabled.rs @@ -5,7 +5,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/dog_app.rs b/examples/dog_app.rs index 1c53c8731f..0004d0f2c6 100644 --- a/examples/dog_app.rs +++ b/examples/dog_app.rs @@ -11,7 +11,7 @@ use dioxus::prelude::*; use std::collections::HashMap; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/dynamic_asset.rs b/examples/dynamic_asset.rs index 0ab59be478..1bad6ccd9d 100644 --- a/examples/dynamic_asset.rs +++ b/examples/dynamic_asset.rs @@ -10,7 +10,7 @@ use dioxus::prelude::*; const STYLE: &str = asset!("./examples/assets/custom_assets.css"); fn main() { - LaunchBuilder::desktop().launch(app); + dioxus::LaunchBuilder::desktop().launch(app); } fn app() -> Element { diff --git a/examples/errors.rs b/examples/errors.rs index 4727cb5e03..aab69656a8 100644 --- a/examples/errors.rs +++ b/examples/errors.rs @@ -11,7 +11,7 @@ use dioxus::prelude::*; fn main() { - launch(|| rsx! { Router:: {} }); + dioxus::launch(|| rsx! { Router:: {} }); } /// You can use an ErrorBoundary to catch errors in children and display a warning diff --git a/examples/eval.rs b/examples/eval.rs index 9cfd15e941..449a2a0b4d 100644 --- a/examples/eval.rs +++ b/examples/eval.rs @@ -7,7 +7,7 @@ use async_std::task::sleep; use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/file_upload.rs b/examples/file_upload.rs index 9fb74072bb..95668296cd 100644 --- a/examples/file_upload.rs +++ b/examples/file_upload.rs @@ -11,7 +11,7 @@ use dioxus::{html::HasFileData, prelude::dioxus_elements::FileEngine}; const STYLE: &str = asset!("./examples/assets/file_upload.css"); fn main() { - launch(app); + dioxus::launch(app); } struct UploadedFile { diff --git a/examples/flat_router.rs b/examples/flat_router.rs index 79a9d2a3f2..362631cf3a 100644 --- a/examples/flat_router.rs +++ b/examples/flat_router.rs @@ -12,7 +12,7 @@ use dioxus::prelude::*; const STYLE: &str = asset!("./examples/assets/flat_router.css"); fn main() { - launch(|| { + dioxus::launch(|| { rsx! { head::Link { rel: "stylesheet", href: STYLE } Router:: {} diff --git a/examples/form.rs b/examples/form.rs index 91b09ecd34..3806b96d89 100644 --- a/examples/form.rs +++ b/examples/form.rs @@ -7,7 +7,7 @@ use dioxus::prelude::*; use std::collections::HashMap; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/fullstack-desktop/src/main.rs b/examples/fullstack-desktop/src/main.rs index 0e39cc69d7..c2a1e2b0b8 100644 --- a/examples/fullstack-desktop/src/main.rs +++ b/examples/fullstack-desktop/src/main.rs @@ -5,7 +5,7 @@ fn main() { // Set the url of the server where server functions are hosted. #[cfg(not(feature = "server"))] dioxus::fullstack::prelude::server_fn::client::set_server_url("http://127.0.0.1:8080"); - launch(app); + dioxus::launch(app); } pub fn app() -> Element { diff --git a/examples/fullstack-hello-world/src/main.rs b/examples/fullstack-hello-world/src/main.rs index 513791fa4c..a3e6960f12 100644 --- a/examples/fullstack-hello-world/src/main.rs +++ b/examples/fullstack-hello-world/src/main.rs @@ -50,5 +50,5 @@ fn main() { #[cfg(feature = "server")] tracing_subscriber::fmt::init(); - launch(app); + dioxus::launch(app); } diff --git a/examples/fullstack-router/src/main.rs b/examples/fullstack-router/src/main.rs index 2240291b26..b88df874aa 100644 --- a/examples/fullstack-router/src/main.rs +++ b/examples/fullstack-router/src/main.rs @@ -7,7 +7,7 @@ use dioxus::prelude::*; fn main() { - LaunchBuilder::fullstack() + dioxus::LaunchBuilder::fullstack() .with_cfg(server_only!(ServeConfig::builder().incremental( IncrementalRendererConfig::default() .invalidate_after(std::time::Duration::from_secs(120)), diff --git a/examples/fullstack-streaming/src/main.rs b/examples/fullstack-streaming/src/main.rs index fc6e82c020..8e4f28d99b 100644 --- a/examples/fullstack-streaming/src/main.rs +++ b/examples/fullstack-streaming/src/main.rs @@ -37,5 +37,5 @@ pub async fn test_stream() -> Result { } fn main() { - launch(app) + dioxus::launch(app) } diff --git a/examples/future.rs b/examples/future.rs index f4ddc10468..1fdf1b07f0 100644 --- a/examples/future.rs +++ b/examples/future.rs @@ -7,7 +7,7 @@ use async_std::task::sleep; use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/generic_component.rs b/examples/generic_component.rs index 6af34e542b..5f75fe939d 100644 --- a/examples/generic_component.rs +++ b/examples/generic_component.rs @@ -7,7 +7,7 @@ use dioxus::prelude::*; use std::fmt::Display; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/global.rs b/examples/global.rs index 0a08485b02..411a02fb8f 100644 --- a/examples/global.rs +++ b/examples/global.rs @@ -13,7 +13,7 @@ static COUNT: GlobalSignal = Signal::global(|| 0); static DOUBLED_COUNT: GlobalMemo = Memo::global(|| COUNT() * 2); fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/hash_fragment_state.rs b/examples/hash_fragment_state.rs index ed77c8c46e..5f5f7f400a 100644 --- a/examples/hash_fragment_state.rs +++ b/examples/hash_fragment_state.rs @@ -19,7 +19,7 @@ use dioxus::prelude::*; use serde::{Deserialize, Serialize}; fn main() { - launch(|| { + dioxus::launch(|| { rsx! { Router:: {} } diff --git a/examples/hello_world.rs b/examples/hello_world.rs index ee33c22309..2475d16d3c 100644 --- a/examples/hello_world.rs +++ b/examples/hello_world.rs @@ -2,17 +2,17 @@ //! //! In this example we: //! - import a number of important items from the prelude (launch, Element, rsx, div, etc.) -//! - define a main function that calls the launch function with our app function +//! - define a main function that calls thedioxus::launch function with our app function //! - define an app function that returns a div element with the text "Hello, world!" //! //! The `launch` function is the entry point for all Dioxus apps. It takes a function that returns an Element. This function -//! calls "launch" on the currently-configured renderer you have. So if the `web` feature is enabled, it will launch a web -//! app, and if the `desktop` feature is enabled, it will launch a desktop app. +//! calls "launch" on the currently-configured renderer you have. So if the `web` feature is enabled, it willdioxus::launch a web +//! app, and if the `desktop` feature is enabled, it willdioxus::launch a desktop app. use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/hydration.rs b/examples/hydration.rs index 1e7de2706f..8c1bfa4f14 100644 --- a/examples/hydration.rs +++ b/examples/hydration.rs @@ -13,12 +13,12 @@ use dioxus::desktop::Config; use dioxus::prelude::*; fn main() { - LaunchBuilder::desktop() + dioxus::LaunchBuilder::desktop() .with_cfg(Config::new().with_prerendered({ // We build the dom a first time, then pre-render it to HTML let pre_rendered_dom = VirtualDom::prebuilt(app); - // We then launch the app with the pre-rendered HTML + // We thendioxus::launch the app with the pre-rendered HTML dioxus_ssr::pre_render(&pre_rendered_dom) })) .launch(app) diff --git a/examples/image_generator_openai.rs b/examples/image_generator_openai.rs index 474c46de90..d7963b8535 100644 --- a/examples/image_generator_openai.rs +++ b/examples/image_generator_openai.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use serde_json::{json, Error}; fn main() { - launch(app) + dioxus::launch(app) } fn app() -> Element { diff --git a/examples/link.rs b/examples/link.rs index ff29b65626..70640f41a6 100644 --- a/examples/link.rs +++ b/examples/link.rs @@ -11,7 +11,7 @@ use dioxus::prelude::*; const STYLE: &str = asset!("./examples/assets/links.css"); fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/login_form.rs b/examples/login_form.rs index 39e874cc99..81083f18a4 100644 --- a/examples/login_form.rs +++ b/examples/login_form.rs @@ -9,7 +9,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/memo_chain.rs b/examples/memo_chain.rs index 205fe87693..d144dfec61 100644 --- a/examples/memo_chain.rs +++ b/examples/memo_chain.rs @@ -6,7 +6,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/meta.rs b/examples/meta.rs index fae916258f..63332e73c7 100644 --- a/examples/meta.rs +++ b/examples/meta.rs @@ -4,7 +4,7 @@ use dioxus::prelude::*; fn main() { tracing_subscriber::fmt::init(); - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/mobile_demo/src/lib.rs b/examples/mobile_demo/src/lib.rs index 6fc142d9a3..01da129603 100644 --- a/examples/mobile_demo/src/lib.rs +++ b/examples/mobile_demo/src/lib.rs @@ -50,7 +50,7 @@ pub fn main() -> Result<()> { // Right now we're going through dioxus-desktop but we'd like to go through dioxus-mobile // That will seed the index.html with some fixes that prevent the page from scrolling/zooming etc - LaunchBuilder::mobile() + dioxus::LaunchBuilder::mobile() .with_cfg( // Note that we have to disable the viewport goofiness of the browser. // Dioxus_mobile should do this for us diff --git a/examples/multiwindow.rs b/examples/multiwindow.rs index c071e25d2d..32e116c590 100644 --- a/examples/multiwindow.rs +++ b/examples/multiwindow.rs @@ -7,7 +7,7 @@ use dioxus::prelude::*; fn main() { - LaunchBuilder::desktop().launch(app); + dioxus::LaunchBuilder::desktop().launch(app); } fn app() -> Element { diff --git a/examples/nested_listeners.rs b/examples/nested_listeners.rs index 33cf3d4043..edb9acd2bf 100644 --- a/examples/nested_listeners.rs +++ b/examples/nested_listeners.rs @@ -7,7 +7,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/optional_props.rs b/examples/optional_props.rs index ad54ed33cd..7491853c95 100644 --- a/examples/optional_props.rs +++ b/examples/optional_props.rs @@ -6,7 +6,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/overlay.rs b/examples/overlay.rs index e4e2e80592..6dddd90aca 100644 --- a/examples/overlay.rs +++ b/examples/overlay.rs @@ -11,7 +11,7 @@ use dioxus::desktop::{ use dioxus::prelude::*; fn main() { - LaunchBuilder::desktop().with_cfg(make_config()).launch(app); + dioxus::LaunchBuilder::desktop().with_cfg(make_config()).launch(app); } fn app() -> Element { diff --git a/examples/popup.rs b/examples/popup.rs index d391ceb21d..8faf5bde1c 100644 --- a/examples/popup.rs +++ b/examples/popup.rs @@ -5,7 +5,7 @@ use dioxus::prelude::*; use std::rc::Rc; fn main() { - LaunchBuilder::desktop().launch(app); + dioxus::LaunchBuilder::desktop().launch(app); } fn app() -> Element { diff --git a/examples/pwa/src/main.rs b/examples/pwa/src/main.rs index 3e4d5b2361..124c705e2c 100644 --- a/examples/pwa/src/main.rs +++ b/examples/pwa/src/main.rs @@ -5,7 +5,7 @@ fn main() { wasm_logger::init(wasm_logger::Config::default()); console_error_panic_hook::set_once(); - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/query_segment_search.rs b/examples/query_segment_search.rs index 018f475e45..e1a6c79991 100644 --- a/examples/query_segment_search.rs +++ b/examples/query_segment_search.rs @@ -14,7 +14,7 @@ use dioxus::prelude::*; fn main() { - launch(|| { + dioxus::launch(|| { rsx! { Router:: {} } diff --git a/examples/read_size.rs b/examples/read_size.rs index 1965597cfa..44bf51c88b 100644 --- a/examples/read_size.rs +++ b/examples/read_size.rs @@ -9,7 +9,7 @@ use std::rc::Rc; use dioxus::{html::geometry::euclid::Rect, prelude::*}; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/readme.rs b/examples/readme.rs index 8f412a749d..9b52c2b6be 100644 --- a/examples/readme.rs +++ b/examples/readme.rs @@ -8,7 +8,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/reducer.rs b/examples/reducer.rs index 7c434e5858..cde6ee2346 100644 --- a/examples/reducer.rs +++ b/examples/reducer.rs @@ -10,7 +10,7 @@ use dioxus::prelude::*; const STYLE: &str = asset!("./examples/assets/radio.css"); fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/resize.rs b/examples/resize.rs index eace774a0b..452b703385 100644 --- a/examples/resize.rs +++ b/examples/resize.rs @@ -8,7 +8,7 @@ use dioxus::prelude::*; use dioxus_elements::geometry::euclid::Size2D; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/router.rs b/examples/router.rs index 13197f57e2..c68ca736df 100644 --- a/examples/router.rs +++ b/examples/router.rs @@ -11,7 +11,7 @@ use dioxus::prelude::*; const STYLE: &str = asset!("./examples/assets/router.css"); fn main() { - launch(|| { + dioxus::launch(|| { rsx! { head::Link { rel: "stylesheet", href: STYLE } Router:: {} diff --git a/examples/router_resource.rs b/examples/router_resource.rs index de69f0e40b..7517ae7056 100644 --- a/examples/router_resource.rs +++ b/examples/router_resource.rs @@ -15,7 +15,7 @@ enum Route { } fn main() { - launch(App); + dioxus::launch(App); } #[component] diff --git a/examples/rsx_usage.rs b/examples/rsx_usage.rs index 3bffe8c700..3ed5cd1405 100644 --- a/examples/rsx_usage.rs +++ b/examples/rsx_usage.rs @@ -39,7 +39,7 @@ //! - Allow top-level fragments fn main() { - launch(app) + dioxus::launch(app) } use core::{fmt, str::FromStr}; diff --git a/examples/scroll_to_top.rs b/examples/scroll_to_top.rs index 9f4f85955e..09d966108b 100644 --- a/examples/scroll_to_top.rs +++ b/examples/scroll_to_top.rs @@ -8,7 +8,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/shortcut.rs b/examples/shortcut.rs index 8e3ad5b35a..fa4b67f60e 100644 --- a/examples/shortcut.rs +++ b/examples/shortcut.rs @@ -9,7 +9,7 @@ use dioxus::desktop::use_global_shortcut; use dioxus::prelude::*; fn main() { - LaunchBuilder::desktop().launch(app); + dioxus::LaunchBuilder::desktop().launch(app); } fn app() -> Element { diff --git a/examples/shorthand.rs b/examples/shorthand.rs index 33905d5710..4699e083a6 100644 --- a/examples/shorthand.rs +++ b/examples/shorthand.rs @@ -3,7 +3,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/signals.rs b/examples/signals.rs index 26db9685c1..0278a3ce82 100644 --- a/examples/signals.rs +++ b/examples/signals.rs @@ -10,7 +10,7 @@ use async_std::task::sleep; use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/simple_list.rs b/examples/simple_list.rs index 3c1b9d71a1..ace5a1ae02 100644 --- a/examples/simple_list.rs +++ b/examples/simple_list.rs @@ -5,7 +5,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/simple_router.rs b/examples/simple_router.rs index e674f2f30e..51ab165d47 100644 --- a/examples/simple_router.rs +++ b/examples/simple_router.rs @@ -3,9 +3,9 @@ use dioxus::prelude::*; fn main() { - // Launch the router, using our `Route` component as the generic type + //dioxus::launch the router, using our `Route` component as the generic type // This will automatically boot the app to "/" unless otherwise specified - launch(|| rsx! { Router:: {} }); + dioxus::launch(|| rsx! { Router:: {} }); } /// By default, the Routable derive will use the name of the variant as the route diff --git a/examples/ssg-github-pages/src/main.rs b/examples/ssg-github-pages/src/main.rs index ba80f9983b..bef15f8804 100644 --- a/examples/ssg-github-pages/src/main.rs +++ b/examples/ssg-github-pages/src/main.rs @@ -6,7 +6,7 @@ use dioxus::prelude::*; // Generate all routes and output them to the static path fn main() { - LaunchBuilder::new() + dioxus::LaunchBuilder::new() .with_cfg(dioxus::static_site_generation::Config::new().github_pages()) .launch(|| { rsx! { diff --git a/examples/ssg-router/src/main.rs b/examples/ssg-router/src/main.rs index 2d43a264cb..75e404cd00 100644 --- a/examples/ssg-router/src/main.rs +++ b/examples/ssg-router/src/main.rs @@ -5,7 +5,7 @@ use dioxus::prelude::*; // Generate all routes and output them to the static path fn main() { - launch(|| { + dioxus::launch(|| { rsx! { Router:: {} } diff --git a/examples/ssg-simple/src/main.rs b/examples/ssg-simple/src/main.rs index b7816277c3..f644ec2714 100644 --- a/examples/ssg-simple/src/main.rs +++ b/examples/ssg-simple/src/main.rs @@ -3,7 +3,7 @@ use dioxus::prelude::*; // Generate all routes and output them to the static path fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/streams.rs b/examples/streams.rs index 6155cb35f9..cd477454ca 100644 --- a/examples/streams.rs +++ b/examples/streams.rs @@ -5,7 +5,7 @@ use dioxus::prelude::*; use futures_util::{future, stream, Stream, StreamExt}; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/suspense.rs b/examples/suspense.rs index 014bb3276a..70a490da22 100644 --- a/examples/suspense.rs +++ b/examples/suspense.rs @@ -15,7 +15,7 @@ use dioxus::desktop::{Config, LogicalSize, WindowBuilder}; use dioxus::prelude::*; fn main() { - LaunchBuilder::new() + dioxus::LaunchBuilder::new() .with_cfg(desktop! { Config::new().with_window( WindowBuilder::new() diff --git a/examples/svg.rs b/examples/svg.rs index d4c23d1ddb..49957c8f03 100644 --- a/examples/svg.rs +++ b/examples/svg.rs @@ -10,7 +10,7 @@ use dioxus::prelude::*; use rand::{thread_rng, Rng}; fn main() { - launch(|| { + dioxus::launch(|| { rsx! { div { user_select: "none", webkit_user_select: "none", margin_left: "10%", margin_right: "10%", h1 { "Click die to generate a new value" } diff --git a/examples/tailwind/src/main.rs b/examples/tailwind/src/main.rs index 70ce484c38..019acc43a4 100644 --- a/examples/tailwind/src/main.rs +++ b/examples/tailwind/src/main.rs @@ -5,7 +5,7 @@ use dioxus::prelude::*; const _STYLE: &str = asset!("public/tailwind.css"); fn main() { - launch(app); + dioxus::launch(app); } pub fn app() -> Element { diff --git a/examples/title.rs b/examples/title.rs index ebe258963c..9befb349e1 100644 --- a/examples/title.rs +++ b/examples/title.rs @@ -4,7 +4,7 @@ use dioxus::prelude::*; fn main() { tracing_subscriber::fmt::init(); - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/todomvc.rs b/examples/todomvc.rs index ea2e528a12..f15ea4aa21 100644 --- a/examples/todomvc.rs +++ b/examples/todomvc.rs @@ -6,7 +6,7 @@ use std::collections::HashMap; const STYLE: &str = asset!("./examples/assets/todomvc.css"); fn main() { - launch(app); + dioxus::launch(app); } #[derive(PartialEq, Eq, Clone, Copy)] diff --git a/examples/video_stream.rs b/examples/video_stream.rs index 215a746d28..0f9c6d95ac 100644 --- a/examples/video_stream.rs +++ b/examples/video_stream.rs @@ -16,7 +16,7 @@ fn main() { // For the sake of this example, we will download the video file if it doesn't exist ensure_video_is_loaded(); - LaunchBuilder::desktop().launch(app); + dioxus::LaunchBuilder::desktop().launch(app); } fn app() -> Element { diff --git a/examples/weather_app.rs b/examples/weather_app.rs index 395fd81f19..3b5a3a0508 100644 --- a/examples/weather_app.rs +++ b/examples/weather_app.rs @@ -4,7 +4,7 @@ use dioxus::prelude::*; use serde::{Deserialize, Serialize}; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/web_component.rs b/examples/web_component.rs index df0515397b..84dab8170f 100644 --- a/examples/web_component.rs +++ b/examples/web_component.rs @@ -7,7 +7,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/examples/window_event.rs b/examples/window_event.rs index cb91d2a5b2..84a75e3f06 100644 --- a/examples/window_event.rs +++ b/examples/window_event.rs @@ -13,7 +13,7 @@ use dioxus::desktop::{window, Config, WindowBuilder}; use dioxus::prelude::*; fn main() { - LaunchBuilder::desktop() + dioxus::LaunchBuilder::desktop() .with_cfg( Config::new().with_window( WindowBuilder::new() diff --git a/examples/window_focus.rs b/examples/window_focus.rs index 447544077b..e8e951a2ec 100644 --- a/examples/window_focus.rs +++ b/examples/window_focus.rs @@ -12,7 +12,7 @@ use dioxus::desktop::{Config, WindowCloseBehaviour}; use dioxus::prelude::*; fn main() { - LaunchBuilder::desktop() + dioxus::LaunchBuilder::desktop() .with_cfg(Config::new().with_close_behaviour(WindowCloseBehaviour::CloseWindow)) .launch(app) } diff --git a/examples/window_zoom.rs b/examples/window_zoom.rs index 9104a88131..1493a66a7c 100644 --- a/examples/window_zoom.rs +++ b/examples/window_zoom.rs @@ -5,7 +5,7 @@ use dioxus::prelude::*; fn main() { - LaunchBuilder::desktop().launch(app); + dioxus::LaunchBuilder::desktop().launch(app); } fn app() -> Element { diff --git a/examples/xss_safety.rs b/examples/xss_safety.rs index cb8d414dd7..fadfc904f8 100644 --- a/examples/xss_safety.rs +++ b/examples/xss_safety.rs @@ -5,7 +5,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/packages/autofmt/tests/samples/many_exprs.rsx b/packages/autofmt/tests/samples/many_exprs.rsx index a0432822bc..c13d4cdbe4 100644 --- a/packages/autofmt/tests/samples/many_exprs.rsx +++ b/packages/autofmt/tests/samples/many_exprs.rsx @@ -8,7 +8,7 @@ use std::{ use tokio::time::sleep; fn main() { - LaunchBuilder::desktop().launch(app); + dioxus::LaunchBuilder::desktop().launch(app); } struct WindowPreferences { diff --git a/packages/autofmt/tests/wrong/multiexpr-many.rsx b/packages/autofmt/tests/wrong/multiexpr-many.rsx index 383edfebfa..560f9d2840 100644 --- a/packages/autofmt/tests/wrong/multiexpr-many.rsx +++ b/packages/autofmt/tests/wrong/multiexpr-many.rsx @@ -8,7 +8,7 @@ use std::{ use tokio::time::sleep; fn main() { - LaunchBuilder::desktop().launch(app); + dioxus::LaunchBuilder::desktop().launch(app); } struct WindowPreferences { diff --git a/packages/autofmt/tests/wrong/multiexpr-many.wrong.rsx b/packages/autofmt/tests/wrong/multiexpr-many.wrong.rsx index 66f87ee382..2f541ad750 100644 --- a/packages/autofmt/tests/wrong/multiexpr-many.wrong.rsx +++ b/packages/autofmt/tests/wrong/multiexpr-many.wrong.rsx @@ -8,7 +8,7 @@ use std::{ use tokio::time::sleep; fn main() { - LaunchBuilder::desktop().launch(app); + dioxus::LaunchBuilder::desktop().launch(app); } struct WindowPreferences { diff --git a/packages/core-macro/src/component.rs b/packages/core-macro/src/component.rs index fb8cf0c204..e4cb7dee55 100644 --- a/packages/core-macro/src/component.rs +++ b/packages/core-macro/src/component.rs @@ -36,7 +36,7 @@ impl ToTokens for ComponentBody { // If there's no props declared, we simply omit the props argument // This is basically so you can annotate the App component with #[component] and still be compatible with the - // launch signatures that take fn() -> Element + //dioxus::launch signatures that take fn() -> Element let props_struct = match self.item_fn.sig.inputs.is_empty() { // No props declared, so we don't need to generate a props struct true => quote! {}, diff --git a/packages/desktop/README.md b/packages/desktop/README.md index ca07c3628a..87ef10d826 100644 --- a/packages/desktop/README.md +++ b/packages/desktop/README.md @@ -29,7 +29,7 @@ This requires that webview is installed on the target system. WebView is install ## Features -- Simple, one-line launch for desktop apps +- Simple, one-linedioxus::launch for desktop apps - Dioxus VirtualDom running on a native thread - Full HTML/CSS support via `wry` and `tao` - Exposed `window` and `Proxy` types from tao for direct window manipulation diff --git a/packages/desktop/headless_tests/utils.rs b/packages/desktop/headless_tests/utils.rs index 1f15cdd536..1fc1b38584 100644 --- a/packages/desktop/headless_tests/utils.rs +++ b/packages/desktop/headless_tests/utils.rs @@ -17,7 +17,7 @@ pub fn check_app_exits(app: fn() -> Element) { } }); - LaunchBuilder::desktop() + dioxus::LaunchBuilder::desktop() .with_cfg(Config::new().with_window(WindowBuilder::new().with_visible(false))) .launch(app); diff --git a/packages/desktop/src/desktop_context.rs b/packages/desktop/src/desktop_context.rs index 415f4b73a1..603ff2d5d0 100644 --- a/packages/desktop/src/desktop_context.rs +++ b/packages/desktop/src/desktop_context.rs @@ -164,7 +164,7 @@ impl DesktopService { } } - /// launch print modal + ///dioxus::launch print modal pub fn print(&self) { if let Err(e) = self.webview.print() { tracing::warn!("Open print modal failed: {e}"); diff --git a/packages/desktop/src/readme.md b/packages/desktop/src/readme.md index 1764d279a8..ef9892e432 100644 --- a/packages/desktop/src/readme.md +++ b/packages/desktop/src/readme.md @@ -43,7 +43,7 @@ fn app() -> Element { } ``` -To configure the webview, menubar, and other important desktop-specific features, checkout out some of the launch configuration in the [API reference](https://docs.rs/dioxus-desktop/). +To configure the webview, menubar, and other important desktop-specific features, checkout out some of thedioxus::launch configuration in the [API reference](https://docs.rs/dioxus-desktop/). ## Future Steps diff --git a/packages/dioxus-lib/README.md b/packages/dioxus-lib/README.md index 7aaff46f13..934d3546cd 100644 --- a/packages/dioxus-lib/README.md +++ b/packages/dioxus-lib/README.md @@ -38,13 +38,13 @@ Remember: Dioxus is a library for declaring interactive user interfaces—it is All Dioxus apps are built by composing functions that return an `Element`. -To launch an app, we use the `launch` method and use features in `Cargo.toml` to specify which renderer we want to use. In the launch function, we pass the app's root `Component`. +Todioxus::launch an app, we use the `launch` method and use features in `Cargo.toml` to specify which renderer we want to use. In thedioxus::launch function, we pass the app's root `Component`. ```rust, no_run use dioxus::prelude::*; fn main() { - launch(App); + dioxus::launch(App); } // The #[component] attribute streamlines component creation. @@ -239,7 +239,7 @@ Using components, templates, and hooks, we can build a simple app. use dioxus::prelude::*; fn main() { - launch(App); + dioxus::launch(App); } #[component] diff --git a/packages/dioxus/README.md b/packages/dioxus/README.md index a841353c09..1dfba6c72b 100644 --- a/packages/dioxus/README.md +++ b/packages/dioxus/README.md @@ -36,13 +36,13 @@ Remember: Dioxus is a library for declaring interactive user interfaces—it is All Dioxus apps are built by composing functions that start with a capital letter and return an `Element`. -To launch an app, we use the `launch` method and use features in `Cargo.toml` to specify which renderer we want to use. In the launch function, we pass the app's root `Component`. +Todioxus::launch an app, we use the `launch` method and use features in `Cargo.toml` to specify which renderer we want to use. In thedioxus::launch function, we pass the app's root `Component`. ```rust, no_run use dioxus::prelude::*; fn main() { - launch(App); + dioxus::launch(App); } // The #[component] attribute streamlines component creation. @@ -184,7 +184,7 @@ Using components, rsx, and hooks, we can build a simple app. use dioxus::prelude::*; fn main() { - launch(App); + dioxus::launch(App); } #[component] diff --git a/packages/dioxus/build.rs b/packages/dioxus/build.rs index 48ffdf467a..9d68231721 100644 --- a/packages/dioxus/build.rs +++ b/packages/dioxus/build.rs @@ -1,5 +1,5 @@ fn main() { - // Warn the user if they enabled the launch feature without any renderers + // Warn the user if they enabled thedioxus::launch feature without any renderers if feature_enabled("launch") { if feature_enabled("third-party-renderer") { return; @@ -16,7 +16,7 @@ fn main() { .iter() .any(|renderer| feature_enabled(renderer)); if !server_fullstack_enabled && !client_renderer_selected { - println!("cargo:warning=You have enabled the launch and fullstack features, but have not enabled any renderers. The application will not be able to launch. Try enabling one of the following renderers: {} for the server or one of the following renderers: {} for the client.", fullstack_renderers.join(", "), client_renderers.join(", ")); + println!("cargo:warning=You have enabled thedioxus::launch and fullstack features, but have not enabled any renderers. The application will not be able todioxus::launch. Try enabling one of the following renderers: {} for the server or one of the following renderers: {} for the client.", fullstack_renderers.join(", "), client_renderers.join(", ")); } } @@ -25,12 +25,12 @@ fn main() { .iter() .any(|renderer| feature_enabled(renderer)); if !server_selected { - println!("cargo:warning=You have enabled the launch and liveview features, but have not enabled any liveview renderers. The application will not be able to launch. Try enabling one of the following renderers: {}", liveview_renderers.join(", ")); + println!("cargo:warning=You have enabled thedioxus::launch and liveview features, but have not enabled any liveview renderers. The application will not be able todioxus::launch. Try enabling one of the following renderers: {}", liveview_renderers.join(", ")); } } if !client_renderer_selected { - println!("cargo:warning=You have enabled the launch feature, but have not enabled any client renderers. The application will not be able to launch. Try enabling one of the following renderers: {}, fullstack or liveview", client_renderers.join(", ")); + println!("cargo:warning=You have enabled thedioxus::launch feature, but have not enabled any client renderers. The application will not be able todioxus::launch. Try enabling one of the following renderers: {}, fullstack or liveview", client_renderers.join(", ")); } } diff --git a/packages/dioxus/src/launch.rs b/packages/dioxus/src/launch.rs index 7037342088..28d94d95e3 100644 --- a/packages/dioxus/src/launch.rs +++ b/packages/dioxus/src/launch.rs @@ -149,7 +149,7 @@ impl LaunchBuilder { /// /// LaunchBuilder::custom(my_custom_launcher).launch(app); /// ``` - pub fn custom(launch_fn: LaunchFn) -> LaunchBuilder { + pub fn custom(launch_fn: LaunchFn) -> LaunchBuilder { LaunchBuilder { launch_fn, contexts: vec![], diff --git a/packages/dioxus/src/lib.rs b/packages/dioxus/src/lib.rs index f1231745d5..b4a56dd766 100644 --- a/packages/dioxus/src/lib.rs +++ b/packages/dioxus/src/lib.rs @@ -34,8 +34,7 @@ mod launch; #[cfg(feature = "launch")] #[cfg_attr(docsrs, doc(cfg(feature = "launch")))] -#[allow(deprecated)] -pub use launch::launch; +pub use crate::launch::*; #[cfg(feature = "hooks")] #[cfg_attr(docsrs, doc(cfg(feature = "hooks")))] @@ -60,9 +59,6 @@ pub use dioxus_html as html; pub use dioxus_core_macro as core_macro; pub mod prelude { - #[cfg(feature = "launch")] - #[cfg_attr(docsrs, doc(cfg(feature = "launch")))] - pub use crate::launch::*; #[cfg(feature = "hooks")] #[cfg_attr(docsrs, doc(cfg(feature = "hooks")))] diff --git a/packages/extension/.vscode/launch.json b/packages/extension/.vscode/launch.json index fd57822dfb..b412206eb0 100644 --- a/packages/extension/.vscode/launch.json +++ b/packages/extension/.vscode/launch.json @@ -1,4 +1,4 @@ -// A launch configuration that compiles the extension and then opens it inside a new window +// Adioxus::launch configuration that compiles the extension and then opens it inside a new window // Use IntelliSense to learn about possible attributes. // Hover to view descriptions of existing attributes. // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 diff --git a/packages/fullstack/README.md b/packages/fullstack/README.md index 764bdbdedd..cc85e25894 100644 --- a/packages/fullstack/README.md +++ b/packages/fullstack/README.md @@ -37,7 +37,7 @@ Full stack Dioxus in under 30 lines of code use dioxus::prelude::*; fn main() { - launch(App); + dioxus::launch(App); } #[component] diff --git a/packages/fullstack/src/axum_adapter.rs b/packages/fullstack/src/axum_adapter.rs index 368f09cacc..d4c7924882 100644 --- a/packages/fullstack/src/axum_adapter.rs +++ b/packages/fullstack/src/axum_adapter.rs @@ -8,7 +8,7 @@ //! fn main() { //! #[cfg(feature = "web")] //! // Hydrate the application on the client -//! launch(app); +//! dioxus::launch(app); //! #[cfg(feature = "server")] //! { //! tokio::runtime::Runtime::new() diff --git a/packages/fullstack/src/launch.rs b/packages/fullstack/src/launch.rs index 909aeb1af6..c8e0e0b194 100644 --- a/packages/fullstack/src/launch.rs +++ b/packages/fullstack/src/launch.rs @@ -64,7 +64,7 @@ pub fn launch( #[allow(unused_mut)] mut contexts: Vec< Box Box + Send + Sync>, >, - platform_config: Config, + platform_config: dioxus_web::Config, ) { let contexts = Arc::new(contexts); let mut factory = virtual_dom_factory(root, contexts); diff --git a/packages/fullstack/src/server_context.rs b/packages/fullstack/src/server_context.rs index 63b2556f01..8975e25b54 100644 --- a/packages/fullstack/src/server_context.rs +++ b/packages/fullstack/src/server_context.rs @@ -232,14 +232,14 @@ impl std::fmt::Display for NotFoundInServerContext { impl std::error::Error for NotFoundInServerContext {} -/// Extract a value from the server context provided through the launch builder context or [`DioxusServerContext::insert`] +/// Extract a value from the server context provided through thedioxus::launch builder context or [`DioxusServerContext::insert`] /// /// Example: /// ```rust, no_run /// use dioxus::prelude::*; /// -/// LaunchBuilder::new() -/// // You can provide context to your whole app (including server functions) with the `with_context` method on the launch builder +///dioxus::LaunchBuilder::new() +/// // You can provide context to your whole app (including server functions) with the `with_context` method on thedioxus::launch builder /// .with_context(server_only! { /// 1234567890u32 /// }) diff --git a/packages/playwright-tests/fullstack/src/main.rs b/packages/playwright-tests/fullstack/src/main.rs index 59edd973ec..a580a3fc75 100644 --- a/packages/playwright-tests/fullstack/src/main.rs +++ b/packages/playwright-tests/fullstack/src/main.rs @@ -8,7 +8,7 @@ use dioxus::{prelude::*, CapturedError}; fn main() { - LaunchBuilder::fullstack().launch(app); + dioxus::LaunchBuilder::fullstack().launch(app); } fn app() -> Element { diff --git a/packages/playwright-tests/nested-suspense/src/main.rs b/packages/playwright-tests/nested-suspense/src/main.rs index c8e275ff96..9287cbc093 100644 --- a/packages/playwright-tests/nested-suspense/src/main.rs +++ b/packages/playwright-tests/nested-suspense/src/main.rs @@ -12,7 +12,7 @@ use dioxus::prelude::*; use serde::{Deserialize, Serialize}; fn main() { - LaunchBuilder::fullstack().launch(app); + dioxus::LaunchBuilder::fullstack().launch(app); } fn app() -> Element { diff --git a/packages/playwright-tests/static-generation/src/main.rs b/packages/playwright-tests/static-generation/src/main.rs index 06a98c2219..6a701a3e03 100644 --- a/packages/playwright-tests/static-generation/src/main.rs +++ b/packages/playwright-tests/static-generation/src/main.rs @@ -8,7 +8,7 @@ use dioxus::prelude::*; fn main() { - LaunchBuilder::static_generation().launch(app); + dioxus::LaunchBuilder::static_generation().launch(app); } fn app() -> Element { diff --git a/packages/playwright-tests/suspense-carousel/src/main.rs b/packages/playwright-tests/suspense-carousel/src/main.rs index 6d304ba88a..1c03cbe7b3 100644 --- a/packages/playwright-tests/suspense-carousel/src/main.rs +++ b/packages/playwright-tests/suspense-carousel/src/main.rs @@ -107,5 +107,5 @@ fn NestedSuspendedComponent(id: i32) -> Element { } fn main() { - launch(app); + dioxus::launch(app); } diff --git a/packages/playwright-tests/web/src/main.rs b/packages/playwright-tests/web/src/main.rs index 126f729e4c..951aa47ba2 100644 --- a/packages/playwright-tests/web/src/main.rs +++ b/packages/playwright-tests/web/src/main.rs @@ -77,5 +77,5 @@ fn main() { .set_max_level(tracing::Level::TRACE) .build(), ); - launch(app); + dioxus::launch(app); } diff --git a/packages/router/examples/simple_routes.rs b/packages/router/examples/simple_routes.rs index 3ee695dee6..2083d4635e 100644 --- a/packages/router/examples/simple_routes.rs +++ b/packages/router/examples/simple_routes.rs @@ -44,7 +44,7 @@ async fn main() { #[cfg(not(feature = "liveview"))] fn main() { - launch(app) + dioxus::launch(app) } fn app() -> Element { diff --git a/packages/rsx/tests/valid/combo.new.rsx b/packages/rsx/tests/valid/combo.new.rsx index 08a0c49b15..08f05294c8 100644 --- a/packages/rsx/tests/valid/combo.new.rsx +++ b/packages/rsx/tests/valid/combo.new.rsx @@ -64,5 +64,5 @@ fn main() { // .set_max_level(tracing::Level::TRACE) // .build(), // ); - launch(app); + dioxus::launch(app); } diff --git a/packages/rsx/tests/valid/combo.old.rsx b/packages/rsx/tests/valid/combo.old.rsx index d08ca4e87b..d0914ed21b 100644 --- a/packages/rsx/tests/valid/combo.old.rsx +++ b/packages/rsx/tests/valid/combo.old.rsx @@ -53,5 +53,5 @@ fn main() { // .set_max_level(tracing::Level::TRACE) // .build(), // ); - launch(app); + dioxus::launch(app); } diff --git a/packages/signals/examples/context.rs b/packages/signals/examples/context.rs index 1e22423d0e..e769a3ea8e 100644 --- a/packages/signals/examples/context.rs +++ b/packages/signals/examples/context.rs @@ -3,7 +3,7 @@ use dioxus::prelude::*; fn main() { - launch(app) + dioxus::launch(app) } // Because signal is never read in this component, this component will not rerun when the signal changes diff --git a/packages/signals/examples/dependencies.rs b/packages/signals/examples/dependencies.rs index 70319da403..81fce00a10 100644 --- a/packages/signals/examples/dependencies.rs +++ b/packages/signals/examples/dependencies.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/packages/signals/examples/map_signal.rs b/packages/signals/examples/map_signal.rs index 71d882638f..f8a5cd681c 100644 --- a/packages/signals/examples/map_signal.rs +++ b/packages/signals/examples/map_signal.rs @@ -3,7 +3,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/packages/signals/examples/read_only_degrade.rs b/packages/signals/examples/read_only_degrade.rs index a69101beca..c3e2e61749 100644 --- a/packages/signals/examples/read_only_degrade.rs +++ b/packages/signals/examples/read_only_degrade.rs @@ -4,7 +4,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/packages/signals/examples/selector.rs b/packages/signals/examples/selector.rs index c9f578ddb1..14493ad586 100644 --- a/packages/signals/examples/selector.rs +++ b/packages/signals/examples/selector.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; fn main() { - launch(app) + dioxus::launch(app) } fn app() -> Element { diff --git a/packages/signals/examples/send.rs b/packages/signals/examples/send.rs index 5d9c5e51f0..d8727a02c9 100644 --- a/packages/signals/examples/send.rs +++ b/packages/signals/examples/send.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; fn main() { - launch(app); + dioxus::launch(app); } fn app() -> Element { diff --git a/packages/signals/examples/split_subscriptions.rs b/packages/signals/examples/split_subscriptions.rs index da02ba34f7..401a012839 100644 --- a/packages/signals/examples/split_subscriptions.rs +++ b/packages/signals/examples/split_subscriptions.rs @@ -4,7 +4,7 @@ use dioxus::prelude::*; use dioxus_signals::Signal; fn main() { - launch(app); + dioxus::launch(app); } #[derive(Clone, Copy, Default)] diff --git a/packages/static-generation/README.md b/packages/static-generation/README.md index b09e5f08cb..b62a5dcc48 100644 --- a/packages/static-generation/README.md +++ b/packages/static-generation/README.md @@ -37,7 +37,7 @@ Full stack Dioxus in under 30 lines of code use dioxus::prelude::*; fn main() { - launch(App); + dioxus::launch(App); } #[component]