diff --git a/CHANGELOG.md b/CHANGELOG.md index a14587efbd..a39e1d32b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [0.3.3](https://github.com/arctic-hen7/perseus/compare/v0.3.2...v0.3.3) (2022-02-15) + + +### Bug Fixes + +* fixed actix web beta issues ([2c2e460](https://github.com/arctic-hen7/perseus/commit/2c2e46085e55da8d3610902de7c6e0270f063e41)), closes [#125](https://github.com/arctic-hen7/perseus/issues/125) + ### [0.3.2](https://github.com/arctic-hen7/perseus/compare/v0.3.1...v0.3.2) (2022-01-11) diff --git a/docs/0.3.x/en-US/deploying/docker.md b/docs/0.3.x/en-US/deploying/docker.md index ff4d29cac6..0edb265421 100644 --- a/docs/0.3.x/en-US/deploying/docker.md +++ b/docs/0.3.x/en-US/deploying/docker.md @@ -19,7 +19,7 @@ RUN apt update \ build-essential curl wget # vars -ENV PERSEUS_VERSION=0.3.2 \ +ENV PERSEUS_VERSION=0.3.3 \ PERSEUS_SIZE_OPT_VERSION=0.1.7 \ ESBUILD_VERSION=0.14.7 \ BINARYEN_VERSION=104 @@ -113,7 +113,7 @@ RUN apt update \ build-essential curl wget # vars -ENV PERSEUS_VERSION=0.3.2 \ +ENV PERSEUS_VERSION=0.3.3 \ WEE_ALLOC_VERSION=0.4 \ ESBUILD_VERSION=0.14.7 \ BINARYEN_VERSION=104 diff --git a/docs/next/en-US/deploying/docker.md b/docs/next/en-US/deploying/docker.md index ff4d29cac6..0edb265421 100644 --- a/docs/next/en-US/deploying/docker.md +++ b/docs/next/en-US/deploying/docker.md @@ -19,7 +19,7 @@ RUN apt update \ build-essential curl wget # vars -ENV PERSEUS_VERSION=0.3.2 \ +ENV PERSEUS_VERSION=0.3.3 \ PERSEUS_SIZE_OPT_VERSION=0.1.7 \ ESBUILD_VERSION=0.14.7 \ BINARYEN_VERSION=104 @@ -113,7 +113,7 @@ RUN apt update \ build-essential curl wget # vars -ENV PERSEUS_VERSION=0.3.2 \ +ENV PERSEUS_VERSION=0.3.3 \ WEE_ALLOC_VERSION=0.4 \ ESBUILD_VERSION=0.14.7 \ BINARYEN_VERSION=104 diff --git a/examples/basic/.perseus/Cargo.toml b/examples/basic/.perseus/Cargo.toml index 73abaf633b..4ad8beb172 100644 --- a/examples/basic/.perseus/Cargo.toml +++ b/examples/basic/.perseus/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "perseus-engine" -version = "0.3.2" +version = "0.3.3" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/basic/.perseus/builder/Cargo.toml b/examples/basic/.perseus/builder/Cargo.toml index ec306896df..1cbc43ac9a 100644 --- a/examples/basic/.perseus/builder/Cargo.toml +++ b/examples/basic/.perseus/builder/Cargo.toml @@ -4,7 +4,7 @@ [package] name = "perseus-engine-builder" -version = "0.3.2" +version = "0.3.3" edition = "2018" default-run = "perseus-builder" diff --git a/examples/basic/.perseus/server/Cargo.toml b/examples/basic/.perseus/server/Cargo.toml index eac17858f9..eb4d91d02f 100644 --- a/examples/basic/.perseus/server/Cargo.toml +++ b/examples/basic/.perseus/server/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "perseus-engine-server" -version = "0.3.2" +version = "0.3.3" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -13,7 +13,9 @@ perseus = { path = "../../../../packages/perseus", features = [ "server-side" ] perseus-actix-web = { path = "../../../../packages/perseus-actix-web", optional = true } perseus-warp = { path = "../../../../packages/perseus-warp", optional = true } perseus-engine = { path = "../" } -actix-web = { version = "=4.0.0-beta.15", optional = true } +actix-web = { version = "=4.0.0-rc.3", optional = true } +actix-http = { version = "=3.0.0-rc.2", optional = true } # Without this, Actix can introduce breaking changes in a dependency tree +# actix-router = { version = "=0.5.0-rc.3", optional = true } futures = "0.3" warp = { package = "warp-fix-171", version = "0.3", optional = true } # TODO Choose features here @@ -21,7 +23,7 @@ tokio = { version = "1", optional = true, features = [ "macros", "rt-multi-threa # This binary can use any of the server integrations [features] -integration-actix-web = [ "perseus-actix-web", "actix-web" ] +integration-actix-web = [ "perseus-actix-web", "actix-web", "actix-http" ] integration-warp = [ "perseus-warp", "warp", "tokio" ] default = [ "integration-warp" ] diff --git a/examples/basic/Cargo.toml b/examples/basic/Cargo.toml index 32786af279..8c447d80a2 100644 --- a/examples/basic/Cargo.toml +++ b/examples/basic/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "perseus-example-basic" -version = "0.3.2" +version = "0.3.3" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/basic/Cargo.toml.example b/examples/basic/Cargo.toml.example index 1d40066980..a523430667 100644 --- a/examples/basic/Cargo.toml.example +++ b/examples/basic/Cargo.toml.example @@ -6,7 +6,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -perseus = { version = "0.3.2", features = [ "hydrate" ] } +perseus = { version = "0.3.3", features = [ "hydrate" ] } sycamore = "0.7" serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/examples/fetching/Cargo.toml b/examples/fetching/Cargo.toml index 75f29b2f3f..5acef1f188 100644 --- a/examples/fetching/Cargo.toml +++ b/examples/fetching/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "perseus-example-fetching" -version = "0.3.2" +version = "0.3.3" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/plugins/Cargo.toml b/examples/plugins/Cargo.toml index 6ffa71fe48..a89dfb0d98 100644 --- a/examples/plugins/Cargo.toml +++ b/examples/plugins/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "perseus-example-plugins" -version = "0.3.2-beta.8" +version = "0.3.3-beta.8" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/tiny/Cargo.toml b/examples/tiny/Cargo.toml index 2b15eff79d..c8663bd8c2 100644 --- a/examples/tiny/Cargo.toml +++ b/examples/tiny/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "perseus-example-tiny" -version = "0.3.2" +version = "0.3.3" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/tiny/Cargo.toml.example b/examples/tiny/Cargo.toml.example index ff80c6a20e..39272b7839 100644 --- a/examples/tiny/Cargo.toml.example +++ b/examples/tiny/Cargo.toml.example @@ -6,5 +6,5 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -perseus = { version = "0.3.2", features = [ "hydrate" ] } +perseus = { version = "0.3.3", features = [ "hydrate" ] } sycamore = "0.7" diff --git a/packages/perseus-actix-web/Cargo.toml b/packages/perseus-actix-web/Cargo.toml index 119c210888..2be8c4b365 100644 --- a/packages/perseus-actix-web/Cargo.toml +++ b/packages/perseus-actix-web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "perseus-actix-web" -version = "0.3.2" +version = "0.3.3" edition = "2018" description = "An integration that makes the Perseus frontend framework easy to use with Actix Web." authors = ["arctic_hen7 "] @@ -14,10 +14,11 @@ categories = ["wasm", "web-programming::http-server", "development-tools", "asyn # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -perseus = { path = "../perseus", version = "0.3.2" } -actix-web = "=4.0.0-beta.15" -actix-http = "=3.0.0-beta.16" # Without this, Actix can introduce breaking changes in a dependency tree -actix-files = "=0.6.0-beta.10" +perseus = { path = "../perseus", version = "0.3.3" } +actix-web = "=4.0.0-rc.3" +actix-http = "=3.0.0-rc.2" # Without this, Actix can introduce breaking changes in a dependency tree +# actix-router = "=0.5.0-rc.3" +actix-files = "=0.6.0-beta.16" urlencoding = "2.1" serde = "1" serde_json = "1" diff --git a/packages/perseus-cli/Cargo.toml b/packages/perseus-cli/Cargo.toml index e8c68dcf57..50c978300d 100644 --- a/packages/perseus-cli/Cargo.toml +++ b/packages/perseus-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "perseus-cli" -version = "0.3.2" +version = "0.3.3" edition = "2018" description = "The CLI for the Perseus frontend framework." authors = ["arctic_hen7 "] diff --git a/packages/perseus-macro/Cargo.toml b/packages/perseus-macro/Cargo.toml index 3141e88d58..e70756692b 100644 --- a/packages/perseus-macro/Cargo.toml +++ b/packages/perseus-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "perseus-macro" -version = "0.3.2" +version = "0.3.3" edition = "2018" autotests = false description = "The Perseus macros." diff --git a/packages/perseus-warp/Cargo.toml b/packages/perseus-warp/Cargo.toml index 77d2efd1ae..7be06cf0ad 100644 --- a/packages/perseus-warp/Cargo.toml +++ b/packages/perseus-warp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "perseus-warp" -version = "0.3.2" +version = "0.3.3" edition = "2018" description = "An integration that makes the Perseus framework easy to use with Warp." authors = ["arctic_hen7 "] @@ -14,7 +14,7 @@ categories = ["wasm", "web-programming::http-server", "development-tools", "asyn # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -perseus = { path = "../perseus", version = "0.3.2" } +perseus = { path = "../perseus", version = "0.3.3" } tokio = { version = "1", features = [ "rt-multi-thread" ] } warp = { package = "warp-fix-171", version = "0.3" } # Temporary until Warp #171 is resolved urlencoding = "2.1" diff --git a/packages/perseus/Cargo.toml b/packages/perseus/Cargo.toml index 562f3c8822..aa595a38f6 100644 --- a/packages/perseus/Cargo.toml +++ b/packages/perseus/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "perseus" -version = "0.3.2" +version = "0.3.3" edition = "2018" description = "A lightning-fast frontend web dev platform with full support for SSR and SSG." authors = ["arctic_hen7 "] @@ -16,7 +16,7 @@ categories = ["wasm", "web-programming", "development-tools", "asynchronous", "g [dependencies] sycamore = { version = "^0.7.1", features = ["ssr"] } sycamore-router = "^0.7.1" -perseus-macro = { path = "../perseus-macro", version = "0.3.2" } +perseus-macro = { path = "../perseus-macro", version = "0.3.3" } # TODO review feature flags here web-sys = { version = "0.3", features = ["Headers", "Navigator", "NodeList", "Request", "RequestInit", "RequestMode", "Response", "ReadableStream", "Window"] } wasm-bindgen = { version = "0.2", features = ["serde-serialize"] } diff --git a/packages/perseus/src/html_shell.rs b/packages/perseus/src/html_shell.rs index ce4713cab1..7ef5523222 100644 --- a/packages/perseus/src/html_shell.rs +++ b/packages/perseus/src/html_shell.rs @@ -91,8 +91,7 @@ pub fn interpolate_page_data(html_shell: &str, page_data: &PageData, root_id: &s let html_replacement = format!( // We give the content a specific ID so that it can be deleted if an error page needs to be rendered on the client-side "{}
{}
", - &html_to_replace_double, - &page_data.content + &html_to_replace_double, &page_data.content ); // Now interpolate that HTML into the HTML shell html_with_state diff --git a/packages/perseus/src/server/build_error_page.rs b/packages/perseus/src/server/build_error_page.rs index 6fcc63b47c..677018dfab 100644 --- a/packages/perseus/src/server/build_error_page.rs +++ b/packages/perseus/src/server/build_error_page.rs @@ -43,8 +43,7 @@ pub fn build_error_page( let html_replacement = format!( // We give the content a specific ID so that it can be hydrated properly "{}
{}
", - &html_to_replace_double, - &error_html + &html_to_replace_double, &error_html ); // Now interpolate that HTML into the HTML shell html_with_declaration