luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-16 16:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #761 from metosin/bump-deps

Browse source 
bump deps
This commit is contained in:
Joel Kaasinen 2025-10-24 15:45:27 +03:00 committed by GitHub
commit 5ff8ba2e3e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 725 additions and 1505 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CHANGELOG.md
View file

@ -19,6 +19,18 @@ We use [Break Versioning][breakver]. The version numbers follow a `<major>.<mino
* Allow middleware registry to be used when defining middleware in `ring-handler`. See [docs](./doc/ring/middleware_registry.md). [#739](https://github.com/metosin/reitit/pull/739) * Allow middleware registry to be used when defining middleware in `ring-handler`. See [docs](./doc/ring/middleware_registry.md). [#739](https://github.com/metosin/reitit/pull/739)
* Allow passing options (eg. `:malli.transform/add-optional-keys`) to malli's `default-value-transformer`. See [docs](./doc/coercion/malli_coercion.md). [#756](https://github.com/metosin/reitit/pull/756) * Allow passing options (eg. `:malli.transform/add-optional-keys`) to malli's `default-value-transformer`. See [docs](./doc/coercion/malli_coercion.md). [#756](https://github.com/metosin/reitit/pull/756)
* **FIX**: `match-by-name!` returning `nil` instead of throwing an exception for some partial matches [#758](https://github.com/metosin/reitit/issues/758) * **FIX**: `match-by-name!` returning `nil` instead of throwing an exception for some partial matches [#758](https://github.com/metosin/reitit/issues/758)
* Updated dependencies:
```
[com.fasterxml.jackson.core/jackson-core "2.20.0"] is available but we use "2.18.2"
[com.fasterxml.jackson.core/jackson-databind "2.20.0"] is available but we use "2.18.2"
[compojure "1.7.2"] is available but we use "1.7.1"
[fipp "0.6.29"] is available but we use "0.6.27"
[metosin/malli "0.19.2"] is available but we use "0.18.0"
[ring "1.15.3"] is available but we use "1.14.1"
[ring/ring-core "1.15.3"] is available but we use "1.14.1"
[ring/ring-defaults "0.7.0"] is available but we use "0.6.0"
```
## 0.9.1 (2025-05-27) ## 0.9.1 (2025-05-27)

12
doc/development.md
View file

@ -25,6 +25,14 @@ clojure-lsp clean-ns
The documentation lives under `doc` and it is hosted on [cljdoc](https://cljdoc.org). See their The documentation lives under `doc` and it is hosted on [cljdoc](https://cljdoc.org). See their
documentation for [library authors](https://github.com/cljdoc/cljdoc/blob/master/doc/userguide/for-library-authors.adoc) documentation for [library authors](https://github.com/cljdoc/cljdoc/blob/master/doc/userguide/for-library-authors.adoc)
## Updating deps
* `lein ancient upgrade`
* Mention non-dev non-test dep upgrades in CHANGELOG.md
* `npm update --save`
* Make a PR, run CI
## Making a release ## Making a release
We use [Break Versioning][breakver]. Remember our promise: patch-level bumps never include breaking changes! We use [Break Versioning][breakver]. Remember our promise: patch-level bumps never include breaking changes!
@ -36,7 +44,7 @@ We use [Break Versioning][breakver]. Remember our promise: patch-level bumps nev
./scripts/set-version "1.0.0" ./scripts/set-version "1.0.0"
# create a release commit and a tag # create a release commit and a tag
git add -u git add -u
git commit -m "Release 1.0.0" git commit -m "Release 1.0.0"
git tag 1.0.0 git tag 1.0.0
@ -52,5 +60,5 @@ git push
git push --tags git push --tags
``` ```
* Remembor to update the changelog! * Remember to update the changelog!
* Announce the release at least on #reitit in Clojurians. * Announce the release at least on #reitit in Clojurians.

2145
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
package.json
View file

@ -2,13 +2,13 @@
"name": "reitit", "name": "reitit",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@seriousme/openapi-schema-validator": "^2.4.0", "@seriousme/openapi-schema-validator": "^2.7.0",
"karma": "^6.4.4", "karma": "^6.4.4",
"karma-chrome-launcher": "^3.2.0", "karma-chrome-launcher": "^3.2.0",
"karma-cli": "^2.0.0", "karma-cli": "^2.0.0",
"karma-cljs-test": "^0.1.0" "karma-cljs-test": "^0.1.0"
}, },
"dependencies": { "dependencies": {
"shadow-cljs": "^2.28.22" "shadow-cljs": "^3.2.1"
} }
} }

45
project.clj
View file

@ -39,23 +39,23 @@
[metosin/muuntaja "0.6.11"] [metosin/muuntaja "0.6.11"]
[metosin/jsonista "0.3.13"] [metosin/jsonista "0.3.13"]
[metosin/sieppari "0.0.0-alpha13"] [metosin/sieppari "0.0.0-alpha13"]
[metosin/malli "0.18.0"] [metosin/malli "0.19.2"]
;; https://clojureverse.org/t/depending-on-the-right-versions-of-jackson-libraries/5111 ;; https://clojureverse.org/t/depending-on-the-right-versions-of-jackson-libraries/5111
[com.fasterxml.jackson.core/jackson-core "2.18.2"] [com.fasterxml.jackson.core/jackson-core "2.20.0"]
[com.fasterxml.jackson.core/jackson-databind "2.18.2"] [com.fasterxml.jackson.core/jackson-databind "2.20.0"]
[meta-merge "1.0.0"] [meta-merge "1.0.0"]
[fipp "0.6.27" :exclusions [org.clojure/core.rrb-vector]] [fipp "0.6.29" :exclusions [org.clojure/core.rrb-vector]]
;; Deep-diff uses this version, override olders versiom from fipp. ;; Deep-diff uses this version, override olders versiom from fipp.
[org.clojure/core.rrb-vector "0.2.0"] [org.clojure/core.rrb-vector "0.2.0"]
[expound "0.9.0"] [expound "0.9.0"]
[lambdaisland/deep-diff "0.0-47"] [lambdaisland/deep-diff "0.0-47"]
[com.bhauman/spell-spec "0.1.2"] [com.bhauman/spell-spec "0.1.2"]
[mvxcvi/arrangement "2.1.0"] [mvxcvi/arrangement "2.1.0"]
[ring/ring-core "1.14.1"] [ring/ring-core "1.15.3"]
[io.pedestal/pedestal.service "0.6.4"]] [io.pedestal/pedestal.service "0.6.4" :upgrade false]]
:plugins [[jonase/eastwood "1.4.3"] :plugins [[jonase/eastwood "1.4.3"]
;[lein-virgil "0.1.7"] ;[lein-virgil "0.1.7"]
@ -89,8 +89,8 @@
:java-source-paths ["modules/reitit-core/java-src"] :java-source-paths ["modules/reitit-core/java-src"]
:dependencies [[org.clojure/clojure "1.11.4"] :dependencies [[org.clojure/clojure "1.11.4"]
[thheller/shadow-cljs "2.28.22"] [thheller/shadow-cljs "3.2.1"]
[org.clojure/clojurescript "1.11.132"] [org.clojure/clojurescript "1.12.42"]
;; modules dependencies ;; modules dependencies
[metosin/schema-tools "0.13.1"] [metosin/schema-tools "0.13.1"]
@ -98,16 +98,16 @@
[metosin/muuntaja "0.6.11"] [metosin/muuntaja "0.6.11"]
[metosin/sieppari "0.0.0-alpha13"] [metosin/sieppari "0.0.0-alpha13"]
[metosin/jsonista "0.3.13"] [metosin/jsonista "0.3.13"]
[metosin/malli "0.18.0"] [metosin/malli "0.19.2"]
[lambdaisland/deep-diff "0.0-47"] [lambdaisland/deep-diff "0.0-47"]
[meta-merge "1.0.0"] [meta-merge "1.0.0"]
[com.bhauman/spell-spec "0.1.2"] [com.bhauman/spell-spec "0.1.2"]
[expound "0.9.0"] [expound "0.9.0"]
[fipp "0.6.27"] [fipp "0.6.29"]
[orchestra "2021.01.01-1"] [orchestra "2021.01.01-1"]
[ring "1.14.1"] [ring "1.15.3"]
[ikitommi/immutant-web "3.0.0-alpha1"] [ikitommi/immutant-web "3.0.0-alpha1"]
[metosin/ring-http-response "0.9.5"] [metosin/ring-http-response "0.9.5"]
[metosin/ring-swagger-ui "5.20.0"] [metosin/ring-swagger-ui "5.20.0"]
@ -116,16 +116,17 @@
[criterium "0.4.6"] [criterium "0.4.6"]
[org.clojure/test.check "1.1.1"] [org.clojure/test.check "1.1.1"]
[org.clojure/tools.namespace "1.5.0"] [org.clojure/tools.namespace "1.5.0"]
[com.gfredericks/test.chuck "0.2.14"] [com.gfredericks/test.chuck "0.2.15"]
[nubank/matcher-combinators "3.9.1"] [nubank/matcher-combinators "3.9.2"]
[io.pedestal/pedestal.service "0.6.4"] ;; TODO: adapt to breaking changes in pedestal 0.7 and 0.8
[io.pedestal/pedestal.service "0.6.4" :upgrade false]
[org.clojure/core.async "1.7.701"] [org.clojure/core.async "1.8.741"]
[manifold "0.4.3"] [manifold "0.4.3"]
[funcool/promesa "11.0.678"] [funcool/promesa "11.0.678"]
[com.clojure-goes-fast/clj-async-profiler "1.6.1"] [com.clojure-goes-fast/clj-async-profiler "1.6.2"]
[ring-cors "0.1.13"] [ring-cors "0.1.13"]
[com.bhauman/rebel-readline "0.1.5"]]} [com.bhauman/rebel-readline "0.1.5"]]}
@ -134,18 +135,18 @@
"-Xmx4096m" "-Xmx4096m"
"-Dclojure.compiler.direct-linking=true"] "-Dclojure.compiler.direct-linking=true"]
:test-paths ["perf-test/clj"] :test-paths ["perf-test/clj"]
:dependencies [[compojure "1.7.1"] :dependencies [[compojure "1.7.2"]
[ring/ring-defaults "0.6.0"] [ring/ring-defaults "0.7.0"]
[ikitommi/immutant-web "3.0.0-alpha1"] [ikitommi/immutant-web "3.0.0-alpha1"]
[io.pedestal/pedestal.service "0.6.4"] [io.pedestal/pedestal.service "0.6.4" :upgrade false]
[io.pedestal/pedestal.jetty "0.6.4"] [io.pedestal/pedestal.jetty "0.6.4" :upgrade false]
[calfpath "0.8.1"] [calfpath "0.8.1"]
[org.clojure/core.async "1.7.701"] [org.clojure/core.async "1.8.741"]
[manifold "0.4.3"] [manifold "0.4.3"]
[funcool/promesa "11.0.678"] [funcool/promesa "11.0.678"]
[metosin/sieppari] [metosin/sieppari]
[yada "1.2.16"] [yada "1.2.16"]
[aleph "0.8.3"] [aleph "0.9.3"]
[ataraxy "0.4.3"] [ataraxy "0.4.3"]
[bidi "2.1.6"] [bidi "2.1.6"]
[janus "1.3.2"]]} [janus "1.3.2"]]}

12
test/cljc/reitit/openapi_test.clj
View file

@ -901,13 +901,11 @@
:request {:description "body description" :request {:description "body description"
:content {"application/json" {:schema {:x int?, :y int?} :content {"application/json" {:schema {:x int?, :y int?}
:examples {"1+1" {:value {:x 1, :y 1}} :examples {"1+1" {:value {:x 1, :y 1}}
"1+2" {:value {:x 1, :y 2}}} "1+2" {:value {:x 1, :y 2}}}}}}
:openapi {:example {:x 2, :y 2}}}}}
:responses {200 {:description "success" :responses {200 {:description "success"
:content {"application/json" {:schema {:total int?} :content {"application/json" {:schema {:total int?}
:examples {"2" {:value {:total 2}} :examples {"2" {:value {:total 2}}
"3" {:value {:total 3}}} "3" {:value {:total 3}}}}}}}
:openapi {:example {:total 4}}}}}}
:handler (fn [request] :handler (fn [request]
(let [{:keys [x y]} (-> request :parameters :body)] (let [{:keys [x y]} (-> request :parameters :body)]
{:status 200, :body {:total (+ x y)}}))}}]]] {:status 200, :body {:total (+ x y)}}))}}]]]
@ -925,16 +923,14 @@
:required [:x :y], :required [:x :y],
:additionalProperties false}, :additionalProperties false},
:examples {"1+1" {:value {:x 1, :y 1}} :examples {"1+1" {:value {:x 1, :y 1}}
"1+2" {:value {:x 1, :y 2}}}, "1+2" {:value {:x 1, :y 2}}}}}},
:example {:x 2, :y 2}}}},
:responses {200 {:description "success", :responses {200 {:description "success",
:content {"application/json" {:schema {:type "object", :content {"application/json" {:schema {:type "object",
:properties {:total {:type "integer"}}, :properties {:total {:type "integer"}},
:required [:total], :required [:total],
:additionalProperties false}, :additionalProperties false},
:examples {"2" {:value {:total 2}}, :examples {"2" {:value {:total 2}},
"3" {:value {:total 3}}}, "3" {:value {:total 3}}}}}}},
:example {:total 4}}}}},
:summary "plus with body"}}} :summary "plus with body"}}}
(:paths spec))) (:paths spec)))
(is (nil? (validate spec)))) (is (nil? (validate spec))))