Skip to content
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
18 changes: 18 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# 1.0.0

This release brings support for OCaml 5.5 and marks the completed transition to the camlworks organization and, with it, more active maintenance. 1.0.0 does not mean that Dream is feature complete or bug free, only that we use semantic versioning from now on. Stay tuned for more regular releases in the future!

Additions and improvements:
- Require an initialization call for `Dream.memory_sessions`. Fix `Dream.memory_sessions` when combined with `Dream.scope` (@boechat107, #385)
- Shut down server on SIGTERM/SIGINT even when running in docker (@yawaramin, #406)
- Clean up socket file before binding to it if started as Unix socket server (@yawaramin, #407)
- Add `post_connect` option to `sql_pool` (@gahr, #422)
- Suppress EML template detection inside OCaml comments (@MavenRain, #431)

Miscellaneous:
- Move project to new camlworks organization (#417)
- Update dependencies and support OCaml 5.5 (@lthms, @bensmrs, #381, #415, #434, #439)
- Support latest Mirage version (@boechat107, @hannesm, #383, #393, #395)
- Improve documentation (@aantron, @sabine, @yawaramin, @funwithcthulhu, @blendux, #372, #391, #403, #404, #423, #433)
- Improve examples (@asymmetric, @mostafatouny, @yotamN, @yawaramin, #366, #370, #379, #380, #386, #405)
- CI fixes (#416, #418, #435)
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2021-2024, Anton Bachin
Copyright (c) 2021-2026, Anton Bachin

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
9 changes: 4 additions & 5 deletions docs/web/postprocess/index.ml
Original file line number Diff line number Diff line change
Expand Up @@ -1906,7 +1906,7 @@ let invalidate_session_expected = {|<div class="spec value" id="val-invalidate_s
|}

let memory_sessions_expected = {|<div class="spec value" id="val-memory_sessions">
<a href="#val-memory_sessions" class="anchor"></a><code><span><span class="keyword">val</span> memory_sessions : <span>?lifetime:float <span class="arrow">-&gt;</span></span> <a href="#type-middleware">middleware</a></span></code>
<a href="#val-memory_sessions" class="anchor"></a><code><span><span class="keyword">val</span> memory_sessions : <span>?lifetime:float <span class="arrow">-&gt;</span></span> <span>unit <span class="arrow">-&gt;</span></span> <a href="#type-middleware">middleware</a></span></code>
</div>
|}

Expand Down Expand Up @@ -1951,8 +1951,7 @@ let graphiql_expected = {|<div class="spec value" id="val-graphiql">
|}

let sql_pool_expected = {|<div class="spec value" id="val-sql_pool">
<a href="#val-sql_pool" class="anchor"></a><code><span><span class="keyword">val</span> sql_pool : <span>?size:int <span class="arrow">-&gt;</span></span>
<span>?post_connect:<span>(<span><span>(<span class="keyword">module</span> <span class="xref-unresolved">Caqti_lwt</span>.CONNECTION)</span> <span class="arrow">-&gt;</span></span> <span><span><span>(unit,&nbsp;<span class="xref-unresolved">Caqti_error</span>.t)</span> <span class="xref-unresolved">Stdlib</span>.result</span> <a href="#type-promise">promise</a></span>)</span> <span class="arrow">-&gt;</span></span> <span>string <span class="arrow">-&gt;</span></span> <a href="#type-middleware">middleware</a></span></code>
<a href="#val-sql_pool" class="anchor"></a><code><span><span class="keyword">val</span> sql_pool : <span>?size:int <span class="arrow">-&gt;</span></span> <span>?post_connect:<span>(<span><span class="xref-unresolved">Caqti_lwt</span>.connection <span class="arrow">-&gt;</span></span> <span>unit <a href="#type-promise">promise</a></span>)</span> <span class="arrow">-&gt;</span></span> <span>string <span class="arrow">-&gt;</span></span> <a href="#type-middleware">middleware</a></span></code>
</div>
|}

Expand Down Expand Up @@ -2383,7 +2382,7 @@ let pretty_print_signatures soup =
"#val-all_session_fields" all_session_fields_expected ["string"; "list"];
link_stdlib_type
"#val-invalidate_session" invalidate_session_expected ["unit"];
link_stdlib_type "#val-memory_sessions" memory_sessions_expected ["float"];
link_stdlib_type "#val-memory_sessions" memory_sessions_expected ["float"; "unit"];
link_stdlib_type "#val-cookie_sessions" cookie_sessions_expected ["float"];
link_stdlib_type "#val-sql_sessions" sql_sessions_expected ["float"];
link_stdlib_type "#val-session_id" session_id_expected ["string"];
Expand All @@ -2405,7 +2404,7 @@ let pretty_print_signatures soup =
multiline "#val-graphql" graphql_expected graphql_replacement;
link_stdlib_type "#val-graphiql" graphiql_expected ["string"];

link_stdlib_type "#val-sql_pool" sql_pool_expected ["int"; "string"];
link_stdlib_type "#val-sql_pool" sql_pool_expected ["int"; "string"; "unit"];
multiline "#val-sql" sql_expected sql_replacement;

replace "#val-log" log_expected log_replacement;
Expand Down
2 changes: 1 addition & 1 deletion docs/web/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h6>Tidy Web framework for OCaml and ReasonML</h6>
</div>

<ul>
<li><code>1.0.0~alpha7</code></li>
<li><code>1.0.0</code></li>
<li><code>opam install dream</code></li>
<li><a target="_blank" rel="noreferrer noopener" href="https://github.com/camlworks/dream">GitHub</a></li>
<li><a target="_blank" rel="noreferrer noopener" href="https://github.com/camlworks/dream/edit/master/src/dream.mli">Edit these docs</a></li>
Expand Down
2 changes: 1 addition & 1 deletion docs/web/web.opam
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
opam-version: "2.0"

synopsis: "Dream docs"
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: ["Sebastian Willenbrink <sebastian.willenbrink@mailbox.org>" "Yawar Amin <yawar.amin@gmail.com>" "Anton Bachin <antonbachin@yahoo.com>"]
depends: [
"lambdasoup"
"odoc" {= "2.0.2"}
Expand Down
4 changes: 2 additions & 2 deletions dream-httpaf.opam
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ bug-reports: "https://github.com/camlworks/dream/issues"
dev-repo: "git+https://github.com/camlworks/dream.git"

author: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: ["Sebastian Willenbrink <sebastian.willenbrink@mailbox.org>" "Yawar Amin <yawar.amin@gmail.com>" "Anton Bachin <antonbachin@yahoo.com>"]

depends: [
"dream-pure"
"dream-pure" {= version}
"dune" {>= "2.7.0"} # --instrument-with.
"gluten"
"gluten-lwt-unix"
Expand Down
8 changes: 4 additions & 4 deletions dream-mirage.opam
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ bug-reports: "https://github.com/camlworks/dream/issues"
dev-repo: "git+https://github.com/camlworks/dream.git"

author: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: ["Sebastian Willenbrink <sebastian.willenbrink@mailbox.org>" "Yawar Amin <yawar.amin@gmail.com>" "Anton Bachin <antonbachin@yahoo.com>"]

depends: [
"bigarray-compat"
"bigstringaf"
"digestif" {>= "1.0.0"}
"dream"
"dream-httpaf"
"dream-pure"
"dream" {= version}
"dream-httpaf" {= version}
"dream-pure" {= version}
"dune" {>= "2.7.0"}
"duration"
"emile" {>= "1.1"}
Expand Down
2 changes: 1 addition & 1 deletion dream-pure.opam
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ bug-reports: "https://github.com/camlworks/dream/issues"
dev-repo: "git+https://github.com/camlworks/dream.git"

author: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: ["Sebastian Willenbrink <sebastian.willenbrink@mailbox.org>" "Yawar Amin <yawar.amin@gmail.com>" "Anton Bachin <antonbachin@yahoo.com>"]

depends: [
"base64" {>= "3.1.0"} # Base64.encode_string.
Expand Down
6 changes: 3 additions & 3 deletions dream.opam
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ bug-reports: "https://github.com/camlworks/dream/issues"
dev-repo: "git+https://github.com/camlworks/dream.git"

author: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: ["Sebastian Willenbrink <sebastian.willenbrink@mailbox.org>" "Yawar Amin <yawar.amin@gmail.com>" "Anton Bachin <antonbachin@yahoo.com>"]

depends: [
"base-unix"
Expand All @@ -55,8 +55,8 @@ depends: [
("conf-libev" {os != "win32"} | "ocaml" {os = "win32"})
"cstruct" {>= "6.0.0"}
"digestif" {>= "0.7"} # to_raw_string.
"dream-httpaf" {>= "1.0.0~alpha4"}
"dream-pure" {>= "1.0.0~alpha2"}
"dream-httpaf" {= version}
"dream-pure" {= version}
"dune" {>= "2.7.0"} # --instrument-with.
"fmt" {>= "0.8.7"} # `Italic.
"graphql_parser"
Expand Down
1 change: 1 addition & 0 deletions dune-project
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
(lang dune 2.7)
(name dream)
2 changes: 1 addition & 1 deletion example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ if something is missing!

# Roadmap

These examples will be trickled in during the alpha releases.
These examples will be trickled in during future releases.

Ideas:

Expand Down
2 changes: 1 addition & 1 deletion example/g-upload/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ This example uses
[`Dream.multipart`](https://camlworks.github.io/dream/#val-multipart) (named
after `Content-Type: multipart/form-data`).
[`Dream.multipart`](https://camlworks.github.io/dream/#val-multipart) receives
entire files into strings. Size limits will be added in one of the early alphas.
entire files into strings. Size limits will be added in a future release.
However, this is only good for rare, small uploads, such as user avatars, or for
prototyping.

Expand Down
2 changes: 1 addition & 1 deletion example/r-graphql/esy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"@opam/reason": "^3.8.0",
"ocaml": "^4.14.0"
Expand Down
2 changes: 1 addition & 1 deletion example/r-hello/esy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"@opam/reason": "^3.8.0",
"ocaml": "^4.14.0"
Expand Down
2 changes: 1 addition & 1 deletion example/r-html_of_jsx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ To get this, we depend on package `html_of_jsx` in

<pre><code>{
"dependencies": {
"@opam/dream": "1.0.0~alpha4",
"@opam/dream": "1.0.0",
"@opam/dune": "^2.0",
"@opam/reason": "^3.8.0",
<b>"@opam/html_of_jsx": "*",</b>
Expand Down
2 changes: 1 addition & 1 deletion example/r-html_of_jsx/esy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"@opam/reason": "^3.8.0",
"@opam/html_of_jsx": "0.0.4",
Expand Down
2 changes: 1 addition & 1 deletion example/r-template-files/esy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"ocaml": "^4.14.0"
},
Expand Down
2 changes: 1 addition & 1 deletion example/r-template-logic/esy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"@opam/reason": "^3.8.0",
"ocaml": "^4.14.0"
Expand Down
2 changes: 1 addition & 1 deletion example/r-template-stream/esy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"@opam/reason": "^3.8.0",
"ocaml": "^4.14.0"
Expand Down
2 changes: 1 addition & 1 deletion example/r-template/esy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"@opam/reason": "^3.8.0",
"ocaml": "^4.14.0"
Expand Down
2 changes: 1 addition & 1 deletion example/r-tyxml/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ To get this, we depend on package `tyxml-jsx` in

<pre><code>{
"dependencies": {
"@opam/dream": "1.0.0~alpha4",
"@opam/dream": "1.0.0",
"@opam/dune": "^2.0",
"@opam/reason": "^3.8.0",
"@opam/tyxml": "*",
Expand Down
2 changes: 1 addition & 1 deletion example/r-tyxml/esy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"@opam/reason": "^3.8.0",
"@opam/tyxml": "*",
Expand Down
2 changes: 1 addition & 1 deletion example/w-esy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ and looks like this:
```json
{
"dependencies": {
"@opam/dream": "1.0.0~alpha4",
"@opam/dream": "1.0.0",
"@opam/dune": "^2.0",
"ocaml": "4.12.x"
},
Expand Down
2 changes: 1 addition & 1 deletion example/w-esy/esy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"ocaml": "^4.14.0"
},
Expand Down
2 changes: 1 addition & 1 deletion example/w-fullstack-rescript/esy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"ocaml": "^4.14.0"
},
Expand Down
2 changes: 1 addition & 1 deletion example/z-docker-esy/esy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"ocaml": "^4.14.0"
},
Expand Down
2 changes: 1 addition & 1 deletion example/z-fly/esy.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"ocaml": "^4.14.0"
},
Expand Down
2 changes: 1 addition & 1 deletion example/z-heroku/esy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha5",
"@opam/dream": "1.0.0",
"@opam/dune": "^3.0",
"ocaml": "^4.14.x"
},
Expand Down
Loading