Skip to content

Commit

Permalink
chore: merged actix web fixes and verion update
Browse files Browse the repository at this point in the history
  • Loading branch information
arctic-hen7 committed Feb 16, 2022
2 parents 5cb23c7 + 19af771 commit 5e2601d
Show file tree
Hide file tree
Showing 17 changed files with 34 additions and 25 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
4 changes: 2 additions & 2 deletions docs/0.3.0-0.3.2/en-US/deploying/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/next/en-US/reference/deploying/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/comprehensive/tiny/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/comprehensive/tiny/Cargo.toml.example
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion examples/core/basic/.perseus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/core/basic/.perseus/builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[package]
name = "perseus-engine-builder"
version = "0.3.2"
version = "0.3.3"
edition = "2018"
default-run = "perseus-builder"

Expand Down
7 changes: 4 additions & 3 deletions examples/core/basic/.perseus/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -13,8 +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-rc.2", optional = true }
actix-http = { version = "=3.0.0-rc.1", optional = true } # We need this to prevent breaking changes in the dependency tree
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
Expand Down
2 changes: 1 addition & 1 deletion examples/core/basic/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/core/basic/Cargo.toml.example
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion examples/core/plugins/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "perseus-example-plugins"
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
Expand Down
2 changes: 1 addition & 1 deletion examples/demos/fetching/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 5 additions & 4 deletions packages/perseus-actix-web/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <arctic_hen7@pm.me>"]
Expand All @@ -14,9 +14,10 @@ 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-rc.2"
actix-http = "=3.0.0-rc.1" # Without this, Actix can introduce breaking changes in a dependency tree
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"
Expand Down
2 changes: 1 addition & 1 deletion packages/perseus-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <arctic_hen7@pm.me>"]
Expand Down
2 changes: 1 addition & 1 deletion packages/perseus-macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "perseus-macro"
version = "0.3.2"
version = "0.3.3"
edition = "2018"
autotests = false
description = "The Perseus macros."
Expand Down
4 changes: 2 additions & 2 deletions packages/perseus-warp/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <arctic_hen7@pm.me>"]
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/perseus/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <arctic_hen7@pm.me>"]
Expand All @@ -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"] }
Expand Down

0 comments on commit 5e2601d

Please sign in to comment.