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

* chore: Upgrade dependencies and use more permissive ntex version
ntex-rs · Dec 10, 2023 · 360c4ad · 360c4ad
1 parent 507765c
commit 360c4ad
Show file tree

Hide file tree

Showing 29 changed files with 8,481 additions and 15,180 deletions.
diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 20.x
           cache: npm
 
       - name: Install dependencies

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.17.1-alpine AS builder
+FROM node:20.10.0-alpine AS builder
 
 RUN apk add git
 
@@ -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
diff --git a/docs/url-dispatch.md b/docs/url-dispatch.md
@@ -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 `[^{}/]+`.
 
@@ -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
 

diff --git a/docusaurus.config.js b/docusaurus.config.js
@@ -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'
     }

diff --git a/examples/application/Cargo.toml b/examples/application/Cargo.toml
@@ -5,4 +5,4 @@ edition = "2018"
 workspace = "../"
 
 [dependencies]
-ntex = { version = "0.7.2", features = ["tokio"] }
+ntex = { version = "0.7", features = ["tokio"] }
diff --git a/examples/async-handlers/Cargo.toml b/examples/async-handlers/Cargo.toml
@@ -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"
diff --git a/examples/databases/Cargo.toml b/examples/databases/Cargo.toml
@@ -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"] }
diff --git a/examples/either/Cargo.toml b/examples/either/Cargo.toml
@@ -4,4 +4,4 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "0.7.2", features = ["tokio"] }
+ntex = { version = "0.7", features = ["tokio"] }
diff --git a/examples/errors/Cargo.toml b/examples/errors/Cargo.toml
@@ -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"
diff --git a/examples/extractors/Cargo.toml b/examples/extractors/Cargo.toml
@@ -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"
diff --git a/examples/flexible-responders/Cargo.toml b/examples/flexible-responders/Cargo.toml
@@ -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"
diff --git a/examples/getting-started/Cargo.toml b/examples/getting-started/Cargo.toml
@@ -5,4 +5,4 @@ edition = "2018"
 workspace = "../"
 
 [dependencies]
-ntex = { version = "0.7.2", features = ["tokio"] }
+ntex = { version = "0.7", features = ["tokio"] }
diff --git a/examples/http2/Cargo.toml b/examples/http2/Cargo.toml
@@ -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"] }
diff --git a/examples/main-example/Cargo.toml b/examples/main-example/Cargo.toml
@@ -4,4 +4,4 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "0.7.2", features = ["tokio"] }
+ntex = { version = "0.7", features = ["tokio"] }
diff --git a/examples/middleware/Cargo.toml b/examples/middleware/Cargo.toml
@@ -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"
diff --git a/examples/powerful-extractors/Cargo.toml b/examples/powerful-extractors/Cargo.toml
@@ -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"
diff --git a/examples/request-handlers/Cargo.toml b/examples/request-handlers/Cargo.toml
@@ -4,4 +4,4 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "0.7.2", features = ["tokio"] }
+ntex = { version = "0.7", features = ["tokio"] }
diff --git a/examples/request-routing/Cargo.toml b/examples/request-routing/Cargo.toml
@@ -4,4 +4,4 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "0.7.2", features = ["tokio"] }
+ntex = { version = "0.7", features = ["tokio"] }
diff --git a/examples/requests/Cargo.toml b/examples/requests/Cargo.toml
@@ -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"
diff --git a/examples/responses/Cargo.toml b/examples/responses/Cargo.toml
@@ -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"
diff --git a/examples/server/Cargo.toml b/examples/server/Cargo.toml
@@ -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"] }
diff --git a/examples/static-files/Cargo.toml b/examples/static-files/Cargo.toml
@@ -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"
diff --git a/examples/testing/Cargo.toml b/examples/testing/Cargo.toml
@@ -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"

diff --git a/examples/url-dispatch/Cargo.toml b/examples/url-dispatch/Cargo.toml
@@ -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"
diff --git a/examples/websockets/Cargo.toml b/examples/websockets/Cargo.toml
@@ -5,4 +5,4 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.27"
-ntex = { version = "0.7.2", features = ["tokio"] }
+ntex = { version = "0.7", features = ["tokio"] }