Skip to content

Commit 1d123e0

Browse files
committed
add with-dev-setup group
1 parent 73c5aed commit 1d123e0

File tree

17 files changed

+29
-20
lines changed

17 files changed

+29
-20
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ jobs:
273273
274274
- name: Install OPAM dependencies
275275
if: steps.cache-opam-env.outputs.cache-hit != 'true'
276-
run: opam install . --deps-only
276+
run: opam install . --deps-only --with-dev-setup
277277

278278
- name: Cache OPAM environment
279279
if: steps.cache-opam-env.outputs.cache-hit != 'true'

.ocamlformat-ignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
jscom/js_parser/**
2+
jscomp/ml/cmt_format.ml
3+
jscomp/ml/pprintast.ml
4+
jscomp/core/js_name_of_module_id.ml
5+
jscomp/core/js_pass_debug.ml
6+
jscomp/core/lam_util.ml
7+
jscomp/core/lam_compile_main.ml
8+
jscomp/ext/bs_hash_stubs.ml
9+
jscomp/ext/ext_string.ml
10+
jscomp/ext/ext_string.mli
11+
jscomp/ext/ext_sys.ml
12+
jscomp/ext/hash.cppo.ml
13+
jscomp/ext/hash_set.cppo.ml
14+
jscomp/ext/map.cppo.ml
15+
jscomp/ext/ordered_hash_map.cppo.ml
16+
jscomp/ext/set.cppo.ml
17+
jscomp/ext/vec.cppo.ml

CONTRIBUTING.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Happy hacking!
1717
- [NodeJS v18](https://nodejs.org/)
1818
- C compiler toolchain (usually installed with `xcode` on Mac)
1919
- Rust toolchain (required to build rewatch; follow the instructions at https://www.rust-lang.org/tools/install)
20-
- `opam` (OCaml Package Manager)
20+
- `opam` (OCaml Package Manager) v2.2.0
2121
- VSCode (+ [OCaml Platform Extension](https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform))
2222

2323
## Cloning the Git Repo
@@ -45,10 +45,7 @@ opam init
4545
opam switch create 5.2.0 # can also create local switch with opam switch create
4646

4747
# Install dev dependencies from OPAM
48-
opam install . --deps-only
49-
50-
# For IDE support, install the OCaml language server
51-
opam install ocaml-lsp-server
48+
opam install . --deps-only --with-dev-setup -y
5249
```
5350

5451
## npm install

dune-project

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@
2121
(ocaml
2222
(>= 4.10))
2323
(ocamlformat
24-
(= 0.26.2))
24+
(and
25+
:with-dev-setup
26+
(= 0.26.2)))
27+
(ocaml-lsp-server
28+
(and
29+
:with-dev-setup
30+
(= 1.18.0~5.2preview)))
2531
(cppo
2632
(= 1.6.9))
2733
(js_of_ocaml

jscomp/bsb/.ocamlformat

Lines changed: 0 additions & 1 deletion
This file was deleted.

jscomp/bsb_exe/.ocamlformat

Lines changed: 0 additions & 1 deletion
This file was deleted.

jscomp/bsb_helper/.ocamlformat

Lines changed: 0 additions & 1 deletion
This file was deleted.

jscomp/bsb_helper_exe/.ocamlformat

Lines changed: 0 additions & 1 deletion
This file was deleted.

jscomp/bsc/.ocamlformat

Lines changed: 0 additions & 1 deletion
This file was deleted.

jscomp/cmij/.ocamlformat

Lines changed: 0 additions & 1 deletion
This file was deleted.

jscomp/core/.ocamlformat

Lines changed: 0 additions & 1 deletion
This file was deleted.

jscomp/depends/.ocamlformat

Lines changed: 0 additions & 1 deletion
This file was deleted.

jscomp/ext/.ocamlformat

Lines changed: 0 additions & 1 deletion
This file was deleted.

jscomp/jsoo/.ocamlformat

Lines changed: 0 additions & 1 deletion
This file was deleted.

jscomp/ml/.ocamlformat

Lines changed: 0 additions & 1 deletion
This file was deleted.

jscomp/ounit_tests/.ocamlformat

Lines changed: 0 additions & 1 deletion
This file was deleted.

rescript.opam

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ homepage: "https://github.com/rescript-lang/rescript-compiler"
88
bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
99
depends: [
1010
"ocaml" {>= "4.10"}
11-
"ocamlformat" {= "0.26.2"}
11+
"ocamlformat" {with-dev-setup & = "0.26.2"}
12+
"ocaml-lsp-server" {with-dev-setup & = "1.18.0~5.2preview"}
1213
"cppo" {= "1.6.9"}
1314
"js_of_ocaml" {= "5.8.1"}
1415
"ounit2" {= "2.2.7"}

0 commit comments

Comments
 (0)