Skip to content

Commit

Permalink
playground: melange 4.0.1-52 + newer reason, reason-react (#187)
Browse files Browse the repository at this point in the history
  • Loading branch information
jchavarri authored Sep 9, 2024
1 parent a365521 commit 41e5f0b
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
cache: yarn
- uses: ocaml/setup-ocaml@v2
with:
ocaml-compiler: 5.1.1
ocaml-compiler: 5.2.0
dune-cache: false # can cause trouble when generating melange docs in step below: https://github.com/ocaml/dune/issues/7720
- name: Install all deps
run: make install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
cache: yarn
- uses: ocaml/setup-ocaml@v2
with:
ocaml-compiler: 5.1.1
ocaml-compiler: 5.2.0
dune-cache: false # can cause trouble when generating melange docs in step below: https://github.com/ocaml/dune/issues/7720
- name: Install all deps
run: make install
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ help: ## Print this help message

.PHONY: create-switch
create-switch: ## Create opam switch
opam switch create . 5.1.1 -y --deps-only
opam switch create . 5.2.0 -y --deps-only

.PHONY: init
init: create-switch install ## Configure everything to develop this repository in local
Expand Down
2 changes: 1 addition & 1 deletion docs/build-system.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ First of all, create an opam switch, as shown in the [package management
section](package-management.md):

```bash
opam switch create . 5.1.1 --deps-only
opam switch create . 5.2.0 --deps-only
```

Install the latest versions of Dune and Melange in the switch:
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ For Visual Studio Code, install the [OCaml Platform Visual Studio Code
extension](https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform)
from the Visual Studio Marketplace. When you load an OCaml source file for the
first time, you may be prompted to select the toolchain to use. Select the
version of OCaml you are using from the list, such as 5.1.1. Further
version of OCaml you are using from the list, such as 5.2.0. Further
instructions for configuration can be found in the [extension
repository](https://github.com/ocamllabs/vscode-ocaml-platform#setting-up-the-extension-for-your-project).

Expand Down
4 changes: 2 additions & 2 deletions docs/how-to-guides.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ switch](https://opam.ocaml.org/blog/opam-local-switches/) to start working on
our library:

```bash
opam switch create . 5.1.1 -y --deps-only
opam switch create . 5.2.0 -y --deps-only
```

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

```bash
opam install --update-invariant ocaml-base-compiler.5.1.1
opam install --update-invariant ocaml-base-compiler.5.2.0
```

Finally, we can upgrade all packages to get Melange v2 and the latest version of
Expand Down
2 changes: 1 addition & 1 deletion docs/melange-for-x-developers.md
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ architectures are not included in the pre-built binaries.
### OCaml compiler version

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

### Editor integration

Expand Down
2 changes: 1 addition & 1 deletion docs/package-management.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ in the project folder.
If it does not exist, we can create it with:

```text
opam switch create . 5.1.1 --deps-only
opam switch create . 5.2.0 --deps-only
```

If it exists, we can install the dependencies of the project with:
Expand Down
6 changes: 2 additions & 4 deletions documentation-site.opam
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ depends: [
]
dev-repo: "git+https://github.com/melange-re/melange-re.github.io.git"
pin-depends: [
[ "melange.dev" "git+https://github.com/melange-re/melange.git#3a953fa32ed26449e5e8304c12d6ba18a4f08438" ]
[ "melange-playground.dev" "git+https://github.com/melange-re/melange.git#3a953fa32ed26449e5e8304c12d6ba18a4f08438" ]
[ "reason-react.dev" "git+https://github.com/reasonml/reason-react.git#4ee2eda353628090eda95e0b8dabe4e2be50f954" ]
[ "reason-react-ppx.dev" "git+https://github.com/reasonml/reason-react.git#4ee2eda353628090eda95e0b8dabe4e2be50f954" ]
[ "melange.dev" "git+https://github.com/melange-re/melange.git#4.0.1-52" ]
[ "melange-playground.dev" "git+https://github.com/melange-re/melange.git#4.0.1-52" ]
[ "cmarkit.dev" "git+https://github.com/dbuenzli/cmarkit.git#f37c8ea86fd0be8dba7a8babcee3682e0e047d91" ]
]
build: [
Expand Down
5 changes: 0 additions & 5 deletions playground/dune
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@
(:standard -open Ocamlformat_stdlib))
(libraries js_of_ocaml ocamlformat-lib))

(install
(package documentation-site)
(section bin)
(files format.bc.js))

(rule
(alias playground-assets)
(deps
Expand Down
10 changes: 5 additions & 5 deletions playground/src/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import "./App.css";
import "../../_build/default/playground/reason-react-cmijs";
import "../../_opam/bin/mel_playground.bc";
import "../../_opam/bin/melange-cmijs";
import "../../_opam/bin/format.bc.js";
import "../../_build/default/playground/format.bc.js";

import * as React from "react";
import Editor, { useMonaco } from "@monaco-editor/react";
Expand Down Expand Up @@ -137,19 +137,19 @@ function Sidebar({ onExampleClick }) {
<div className="Versions">
<span className="Version">
<span className="Text-xs">{"Melange"}</span>
<span className="Text-xs Number">{"4.0.0-51"}</span>
<span className="Text-xs Number">{"4.0.0-52"}</span>
</span>
<span className="Version">
<span className="Text-xs">{"OCaml"}</span>
<span className="Text-xs Number">{"5.1.1"}</span>
<span className="Text-xs Number">{"5.2.0"}</span>
</span>
<span className="Version">
<span className="Text-xs">{"Reason"}</span>
<span className="Text-xs Number">{"3.10.0"}</span>
<span className="Text-xs Number">{"3.12.0"}</span>
</span>
<span className="Version">
<span className="Text-xs">{"ReasonReact"}</span>
<span className="Text-xs Number">{"dev"}</span>
<span className="Text-xs Number">{"0.15.0"}</span>
</span>
</div>
</div>) : null}
Expand Down

0 comments on commit 41e5f0b

Please sign in to comment.