Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Upgrade dependencies and use more permissive ntex version #2

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 20.x
cache: npm

- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.17.1-alpine AS builder
FROM node:20.10.0-alpine AS builder

RUN apk add git

Expand All @@ -23,10 +23,10 @@ COPY --chown=node ./.git ./.git

RUN npm run build

FROM nginx:1.23.2-alpine
FROM nginx:1.25.3-alpine3.18-slim

WORKDIR /etc/nginx/conf.d

COPY --from=0 /home/node/app/build /home/node/app
COPY --from=builder /home/node/app/build /home/node/app

COPY ./server.nginx ./default.conf
4 changes: 2 additions & 2 deletions docs/url-dispatch.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ and:
/{foo}/bar/baz
```

A _variable part_ (replacement marker) is specified in the form _{identifier}_, where this means "accept any characters up to the next slash character and use this as the name in the `HttpRequest.match_info()` object".
A _variable part_ (replacement marker) is specified in the form _\{identifier\}_, where this means "accept any characters up to the next slash character and use this as the name in the `HttpRequest.match_info()` object".

A replacement marker in a pattern matches the regular expression `[^{}/]+`.

Expand Down Expand Up @@ -170,7 +170,7 @@ Suppose that you want to organize paths to endpoints used to view "Users". Such

- /users
- /users/show
- /users/show/{id}
- /users/show/\{id\}

A scoped layout of these paths would appear as follows

Expand Down
2 changes: 1 addition & 1 deletion docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports = {
},
prism: {
// dracula is closest to docs.rs, where keywords are highlighted
theme: require('prism-react-renderer/themes/okaidia'),
theme: require('prism-react-renderer').themes.okaidia,
additionalLanguages: ['rust', 'toml'],
defaultLanguage: 'rust'
}
Expand Down
2 changes: 1 addition & 1 deletion examples/application/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ edition = "2018"
workspace = "../"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
2 changes: 1 addition & 1 deletion examples/async-handlers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ version = "2.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
futures = "0.3.1"
bytes = "0.5"
2 changes: 1 addition & 1 deletion examples/databases/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
diesel = { version = "2", features = ["sqlite", "r2d2"] }
serde = { version = "1", features = ["derive"] }
uuid = { version = "1", features = ["v4"] }
2 changes: 1 addition & 1 deletion examples/either/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
2 changes: 1 addition & 1 deletion examples/errors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
derive_more = "0.99"
env_logger = "0.7"
log = "0.4"
2 changes: 1 addition & 1 deletion examples/extractors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
serde = "1.0"
serde_json = "1.0"
2 changes: 1 addition & 1 deletion examples/flexible-responders/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
serde = "1.0"
2 changes: 1 addition & 1 deletion examples/getting-started/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ edition = "2018"
workspace = "../"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
2 changes: 1 addition & 1 deletion examples/http2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio", "openssl"] }
ntex = { version = "0.7", features = ["tokio", "openssl"] }
openssl = { version = "0.10", features = ["v110", "vendored"] }
2 changes: 1 addition & 1 deletion examples/main-example/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
2 changes: 1 addition & 1 deletion examples/middleware/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio", "cookie"] }
ntex = { version = "0.7", features = ["tokio", "cookie"] }
ntex-session = { version = "0.3.0" }
futures-util = { version = "0.3.7", default-features = false, features = ["std"] }
env_logger = "0.10.0"
2 changes: 1 addition & 1 deletion examples/powerful-extractors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
serde = "1.0"
2 changes: 1 addition & 1 deletion examples/request-handlers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
2 changes: 1 addition & 1 deletion examples/request-routing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
2 changes: 1 addition & 1 deletion examples/requests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ edition = "2018"
[dependencies]
serde = "1.0"
serde_json = "1.0"
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
futures = "0.3.1"
ntex-multipart = "0.3.0"
2 changes: 1 addition & 1 deletion examples/responses/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio", "compress"] }
ntex = { version = "0.7", features = ["tokio", "compress"] }
serde = "1.0"
futures = "0.3.1"
bytes = "0.5"
2 changes: 1 addition & 1 deletion examples/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ workspace = "../"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio", "openssl"] }
ntex = { version = "0.7", features = ["tokio", "openssl"] }
futures = "0.3"
openssl = { version = "0.10", features = ["vendored"] }
tokio = { version = "1.16.1", features = ["full"] }
2 changes: 1 addition & 1 deletion examples/static-files/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
ntex-files = "0.3.0"
mime = "0.3"
2 changes: 1 addition & 1 deletion examples/testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2018"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
futures = "0.3"
futures-util = "0.3"
bytes = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion examples/url-dispatch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
workspace = "../"

[dependencies]
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
futures = "0.3.1"
openssl = "0.10"
serde = "1.0"
2 changes: 1 addition & 1 deletion examples/websockets/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ edition = "2018"

[dependencies]
futures = "0.3.27"
ntex = { version = "0.7.2", features = ["tokio"] }
ntex = { version = "0.7", features = ["tokio"] }
Loading