diff --git a/Cargo.lock b/Cargo.lock index 4c7ebc101..2e7cb7871 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3605,7 +3605,7 @@ dependencies = [ "tokio", "tracing", "warnings", - "wasm-split", + "wasm-splitter", ] [[package]] @@ -4027,7 +4027,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "wasm-split", + "wasm-splitter", "web-time", "wgpu 0.19.4", ] @@ -15886,14 +15886,6 @@ dependencies = [ "cxx-build", ] -[[package]] -name = "wasm-split" -version = "0.7.0-alpha.0" -dependencies = [ - "async-once-cell", - "wasm-split-macro", -] - [[package]] name = "wasm-split-cli" version = "0.7.0-alpha.0" @@ -15940,6 +15932,14 @@ dependencies = [ "syn 2.0.101", ] +[[package]] +name = "wasm-splitter" +version = "0.7.0-alpha.0" +dependencies = [ + "async-once-cell", + "wasm-split-macro", +] + [[package]] name = "wasm-streams" version = "0.4.2" diff --git a/Cargo.toml b/Cargo.toml index 2dcc531d3..cefad3abc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -186,7 +186,7 @@ manganis-core = { path = "packages/manganis/manganis-core", version = "0.7.0-alp manganis-macro = { path = "packages/manganis/manganis-macro", version = "0.7.0-alpha.0" } # wasm-split -wasm-split = { path = "packages/wasm-split/wasm-split", version = "0.7.0-alpha.0" } +wasm-splitter = { path = "packages/wasm-split/wasm-split", version = "0.7.0-alpha.0" } wasm-split-macro = { path = "packages/wasm-split/wasm-split-macro", version = "0.7.0-alpha.0" } wasm-split-cli = { path = "packages/wasm-split/wasm-split-cli", version = "0.7.0-alpha.0" } wasm-split-harness = { path = "packages/playwright-tests/wasm-split-harness", version = "0.7.0-alpha.0" } @@ -409,7 +409,7 @@ base64 = { workspace = true, optional = true } http-range = { version = "0.1.5", optional = true } wgpu = { version = "0.19", optional = true } ouroboros = { version = "*", optional = true } -wasm-split = { workspace = true } +wasm-splitter = { workspace = true, package = "wasm-split" } [dev-dependencies] dioxus = { workspace = true, features = ["router"] } diff --git a/packages/dioxus/Cargo.toml b/packages/dioxus/Cargo.toml index 2204a5e21..cf1992a5f 100644 --- a/packages/dioxus/Cargo.toml +++ b/packages/dioxus/Cargo.toml @@ -33,7 +33,7 @@ dioxus_server_macro = { workspace = true, optional = true } manganis = { workspace = true, features = ["dioxus"], optional = true } dioxus-logger = { workspace = true, optional = true } warnings = { workspace = true, optional = true } -wasm-split = { workspace = true, optional = true } +wasm-splitter = { workspace = true, package = "wasm-split", optional = true } subsecond = { workspace = true } serde = { workspace = true, optional = true } @@ -70,7 +70,7 @@ logger = ["dep:dioxus-logger"] cli-config = ["dep:dioxus-cli-config"] warnings = ["dep:warnings"] wasm-split = [ - "dep:wasm-split", + "dep:wasm-splitter", "dioxus-config-macros/wasm-split", ] # note: to turn on the router splitter, you need to manually enable wasm-split on the router diff --git a/packages/dioxus/src/lib.rs b/packages/dioxus/src/lib.rs index ff4795169..31a441306 100644 --- a/packages/dioxus/src/lib.rs +++ b/packages/dioxus/src/lib.rs @@ -76,7 +76,7 @@ pub use dioxus_cli_config as cli_config; #[cfg(feature = "wasm-split")] #[cfg_attr(docsrs, doc(cfg(feature = "wasm-split")))] -pub use wasm_split; +pub use wasm_splitter as wasm_split; pub use subsecond; @@ -144,7 +144,7 @@ pub mod prelude { #[cfg(feature = "wasm-split")] #[cfg_attr(docsrs, doc(cfg(feature = "wasm-split")))] - pub use wasm_split; + pub use wasm_splitter as wasm_split; } #[cfg(feature = "web")] diff --git a/packages/wasm-split/wasm-split/Cargo.toml b/packages/wasm-split/wasm-split/Cargo.toml index 61dedb53c..3d0a23991 100644 --- a/packages/wasm-split/wasm-split/Cargo.toml +++ b/packages/wasm-split/wasm-split/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "wasm-split" +name = "wasm-splitter" version = { workspace = true } edition = "2021" authors = ["Jonathan Kelley"]