Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Upgrade dependencies #66

Merged
merged 3 commits into from
Mar 9, 2021
Merged

Upgrade dependencies #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
daaf34a
Upgrade esy
ryb73 Mar 9, 2021
fd77ade
Upgrade esy dependencies
ryb73 Mar 9, 2021
51f76dc
Undo esy upgrade; seems to cause problems on CI
ryb73 Mar 9, 2021
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"bs-platform": "6 || 7 || 8"
},
"devDependencies": {
"@glennsl/bs-jest": "0.5.1",
"@glennsl/bs-jest": "^0.5.1",
"bs-platform": "8",
"esy": "0.5.8",
"esy": "^0.5.8",
"jest": "^25.1.0"
}
}
2 changes: 1 addition & 1 deletion ppx_src/esy.lock/.gitattributes
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

270 changes: 157 additions & 113 deletions ppx_src/esy.lock/index.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ppx_src/esy.lock/opam/conf-m4.1/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions ppx_src/esy.lock/opam/cppo.1.6.6/opam → ppx_src/esy.lock/opam/cppo.1.6.7/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions ppx_src/esy.lock/opam/dune.1.11.3/opam → ppx_src/esy.lock/opam/dune.1.11.4/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions ppx_src/esy.lock/opam/fix.20201120/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ppx_src/esy.lock/opam/menhir.20190626/opam → ppx_src/esy.lock/opam/menhir.20190924/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions ppx_src/esy.lock/opam/merlin-extend.0.5/opam → ppx_src/esy.lock/opam/merlin-extend.0.6/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions ...k/opam/ocaml-migrate-parsetree.1.4.0/opam → ...k/opam/ocaml-migrate-parsetree.1.8.0/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ppx_src/esy.lock/opam/ocamlbuild.0.14.0/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion ppx_src/esy.lock/opam/ocamlfind.1.8.1/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ppx_src/esy.lock/opam/ppx_derivers.1.2.1/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions ....lock/opam/ppx_tools_versioned.5.2.3/opam → ....lock/opam/ppx_tools_versioned.5.4.0/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ppx_src/esy.lock/opam/result.1.4/opam → ppx_src/esy.lock/opam/result.1.5/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions ppx_src/esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 0 additions & 14 deletions ppx_src/esy.lock/overrides/opam__s__dune_opam__c__1.11.3_opam_override/package.json
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions ppx_src/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
},
"devDependencies": {
"@esy-ocaml/reason": "^3.5.0",
"@opam/dune": "^1.11.0",
"@opam/ppx_tools_versioned": "5.2.3",
"ocaml": "~4.6.0"
"@opam/dune": "~1.11.0",
"@opam/ppx_tools_versioned": "^5.2.3",
"ocaml": "~4.6.1001"
}
}
}
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@
resolved "https://registry.yarnpkg.com/@esy-ocaml/esy-opam/-/esy-opam-0.0.15.tgz#97656c8e5774cf84692a680319784cb833cc5b70"
integrity sha512-s3gEaDMCSJwxxz+vjVYAVYWOMqJC+lIckT20A9sB2nYLQ8qGkkm8nIHd7LvgCFPUGxmETOy0etGMLA+K6v6WZw==

"@glennsl/bs-jest@0.5.1":
"@glennsl/bs-jest@^0.5.1":
version "0.5.1"
resolved "https://registry.yarnpkg.com/@glennsl/bs-jest/-/bs-jest-0.5.1.tgz#2e16ad94268fc1e5ba0af978c141db1684556a55"
integrity sha512-+yhWn6uxFt+k61xcWz/xnLC3ticZR5m2d2++a7vXIq2qxiktegBc3ZD/5nvKU8ciFnsHEOoyIzBzoZH2oRGdkw==
Expand Down Expand Up @@ -1224,7 +1224,7 @@ esy-solve-cudf@^0.1.10:
resolved "https://registry.yarnpkg.com/esy-solve-cudf/-/esy-solve-cudf-0.1.10.tgz#2cd48af78183ae8f06c035a398beb65673c2d77d"
integrity sha512-/MrZOBH0wuJndvZN8pl+S3Mg3zJaK70PH9ZZwqDeJHulghEWROEZxpmenNiS9pqAaxyUVhTZJBt2/vL9jKCJbg==

esy@0.5.8:
esy@^0.5.8:
version "0.5.8"
resolved "https://registry.yarnpkg.com/esy/-/esy-0.5.8.tgz#09698649cdd0310836ca278b827860aadc3140eb"
integrity sha512-LT5d/uAoIoAsaGg133y0U/8DkCgoldu2TO66qQG5Iq/kI1zjbMCDpwcp3yrhQSro0uS6+bYeuVupqrboPcYKyQ==
Expand Down