Skip to content

Commit 41e5f0b

Browse files
authored
playground: melange 4.0.1-52 + newer reason, reason-react (#187)
1 parent a365521 commit 41e5f0b

File tree

11 files changed

+16
-23
lines changed

11 files changed

+16
-23
lines changed

.github/workflows/deploy-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
cache: yarn
2020
- uses: ocaml/setup-ocaml@v2
2121
with:
22-
ocaml-compiler: 5.1.1
22+
ocaml-compiler: 5.2.0
2323
dune-cache: false # can cause trouble when generating melange docs in step below: https://github.com/ocaml/dune/issues/7720
2424
- name: Install all deps
2525
run: make install

.github/workflows/publish-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
cache: yarn
1818
- uses: ocaml/setup-ocaml@v2
1919
with:
20-
ocaml-compiler: 5.1.1
20+
ocaml-compiler: 5.2.0
2121
dune-cache: false # can cause trouble when generating melange docs in step below: https://github.com/ocaml/dune/issues/7720
2222
- name: Install all deps
2323
run: make install

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ help: ## Print this help message
1313

1414
.PHONY: create-switch
1515
create-switch: ## Create opam switch
16-
opam switch create . 5.1.1 -y --deps-only
16+
opam switch create . 5.2.0 -y --deps-only
1717

1818
.PHONY: init
1919
init: create-switch install ## Configure everything to develop this repository in local

docs/build-system.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ First of all, create an opam switch, as shown in the [package management
6565
section](package-management.md):
6666

6767
```bash
68-
opam switch create . 5.1.1 --deps-only
68+
opam switch create . 5.2.0 --deps-only
6969
```
7070

7171
Install the latest versions of Dune and Melange in the switch:

docs/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ For Visual Studio Code, install the [OCaml Platform Visual Studio Code
4949
extension](https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform)
5050
from the Visual Studio Marketplace. When you load an OCaml source file for the
5151
first time, you may be prompted to select the toolchain to use. Select the
52-
version of OCaml you are using from the list, such as 5.1.1. Further
52+
version of OCaml you are using from the list, such as 5.2.0. Further
5353
instructions for configuration can be found in the [extension
5454
repository](https://github.com/ocamllabs/vscode-ocaml-platform#setting-up-the-extension-for-your-project).
5555

docs/how-to-guides.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ switch](https://opam.ocaml.org/blog/opam-local-switches/) to start working on
6060
our library:
6161

6262
```bash
63-
opam switch create . 5.1.1 -y --deps-only
63+
opam switch create . 5.2.0 -y --deps-only
6464
```
6565

6666
Once this step is done, we can call `dune` from the library folder, but first we
@@ -451,7 +451,7 @@ opam update
451451
Now, update the version of the OCaml compiler in the local switch to 5.1:
452452

453453
```bash
454-
opam install --update-invariant ocaml-base-compiler.5.1.1
454+
opam install --update-invariant ocaml-base-compiler.5.2.0
455455
```
456456

457457
Finally, we can upgrade all packages to get Melange v2 and the latest version of

docs/melange-for-x-developers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ architectures are not included in the pre-built binaries.
581581
### OCaml compiler version
582582

583583
ReScript is compatible with the 4.06 version of the OCaml compiler, while
584-
Melange is compatible with the version 5.1.1 (as of Dec 2023).
584+
Melange is compatible with the version 5.2.0 (as of Sep 2024).
585585

586586
### Editor integration
587587

docs/package-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ in the project folder.
158158
If it does not exist, we can create it with:
159159

160160
```text
161-
opam switch create . 5.1.1 --deps-only
161+
opam switch create . 5.2.0 --deps-only
162162
```
163163

164164
If it exists, we can install the dependencies of the project with:

documentation-site.opam

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ depends: [
2727
]
2828
dev-repo: "git+https://github.com/melange-re/melange-re.github.io.git"
2929
pin-depends: [
30-
[ "melange.dev" "git+https://github.com/melange-re/melange.git#3a953fa32ed26449e5e8304c12d6ba18a4f08438" ]
31-
[ "melange-playground.dev" "git+https://github.com/melange-re/melange.git#3a953fa32ed26449e5e8304c12d6ba18a4f08438" ]
32-
[ "reason-react.dev" "git+https://github.com/reasonml/reason-react.git#4ee2eda353628090eda95e0b8dabe4e2be50f954" ]
33-
[ "reason-react-ppx.dev" "git+https://github.com/reasonml/reason-react.git#4ee2eda353628090eda95e0b8dabe4e2be50f954" ]
30+
[ "melange.dev" "git+https://github.com/melange-re/melange.git#4.0.1-52" ]
31+
[ "melange-playground.dev" "git+https://github.com/melange-re/melange.git#4.0.1-52" ]
3432
[ "cmarkit.dev" "git+https://github.com/dbuenzli/cmarkit.git#f37c8ea86fd0be8dba7a8babcee3682e0e047d91" ]
3533
]
3634
build: [

playground/dune

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
(:standard -open Ocamlformat_stdlib))
2828
(libraries js_of_ocaml ocamlformat-lib))
2929

30-
(install
31-
(package documentation-site)
32-
(section bin)
33-
(files format.bc.js))
34-
3530
(rule
3631
(alias playground-assets)
3732
(deps

playground/src/app.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import "./App.css";
22
import "../../_build/default/playground/reason-react-cmijs";
33
import "../../_opam/bin/mel_playground.bc";
44
import "../../_opam/bin/melange-cmijs";
5-
import "../../_opam/bin/format.bc.js";
5+
import "../../_build/default/playground/format.bc.js";
66

77
import * as React from "react";
88
import Editor, { useMonaco } from "@monaco-editor/react";
@@ -137,19 +137,19 @@ function Sidebar({ onExampleClick }) {
137137
<div className="Versions">
138138
<span className="Version">
139139
<span className="Text-xs">{"Melange"}</span>
140-
<span className="Text-xs Number">{"4.0.0-51"}</span>
140+
<span className="Text-xs Number">{"4.0.0-52"}</span>
141141
</span>
142142
<span className="Version">
143143
<span className="Text-xs">{"OCaml"}</span>
144-
<span className="Text-xs Number">{"5.1.1"}</span>
144+
<span className="Text-xs Number">{"5.2.0"}</span>
145145
</span>
146146
<span className="Version">
147147
<span className="Text-xs">{"Reason"}</span>
148-
<span className="Text-xs Number">{"3.10.0"}</span>
148+
<span className="Text-xs Number">{"3.12.0"}</span>
149149
</span>
150150
<span className="Version">
151151
<span className="Text-xs">{"ReasonReact"}</span>
152-
<span className="Text-xs Number">{"dev"}</span>
152+
<span className="Text-xs Number">{"0.15.0"}</span>
153153
</span>
154154
</div>
155155
</div>) : null}

0 commit comments

Comments
 (0)