diff --git a/esy.lock/index.json b/esy.lock/index.json index bc347ccef..639eff872 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,25 +1,21 @@ { - "checksum": "af496c194d032a30efd3d34a64f0ac0d", - "root": "revery@link-dev:./package.json", + "checksum": "19b9840c553f8c6d0b9138ef0a9ed175", + "root": "revery@link:./package.json", "node": { - "revery@link-dev:./package.json": { - "id": "revery@link-dev:./package.json", + "revery@link:./package.json": { + "id": "revery@link:./package.json", "name": "revery", - "version": "link-dev:./package.json", - "source": { - "type": "link-dev", - "path": ".", - "manifest": "package.json" - }, + "version": "link:./package.json", + "source": { "type": "link", "path": ".", "manifest": "package.json" }, "overrides": [], "dependencies": [ "reperf@1.4.0@d41d8cd9", "rebez@github:jchavarri/rebez#46cbc183@d41d8cd9", "reason-glfw@3.2.1024@d41d8cd9", "reason-gl-matrix@0.9.9304@d41d8cd9", - "reason-fontkit@2.4.0@d41d8cd9", "ocaml@4.7.1004@d41d8cd9", + "reason-fontkit@2.4.1@d41d8cd9", "ocaml@4.7.1004@d41d8cd9", "flex@1.2.2@d41d8cd9", "@reason-native/console@0.0.3@d41d8cd9", - "@opam/lwt_ppx@opam:1.2.2@946c5ba2", "@opam/lwt@opam:4.2.0@3edaca61", + "@opam/lwt_ppx@opam:1.2.2@946c5ba2", "@opam/lwt@opam:4.2.1@c1888ec9", "@opam/js_of_ocaml-lwt@opam:3.3.0@ff746e31", "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#db257ce@d41d8cd9", "@opam/js_of_ocaml@github:ocsigen/js_of_ocaml:js_of_ocaml.opam#db257ce@d41d8cd9", @@ -64,7 +60,7 @@ "overrides": [], "dependencies": [ "refmterr@3.1.10@d41d8cd9", "ocaml@4.7.1004@d41d8cd9", - "@opam/lwt_ppx@opam:1.2.2@946c5ba2", "@opam/lwt@opam:4.2.0@3edaca61", + "@opam/lwt_ppx@opam:1.2.2@946c5ba2", "@opam/lwt@opam:4.2.1@c1888ec9", "@opam/lambda-term@opam:1.13@a3d28a27", "@opam/js_of_ocaml-lwt@opam:3.3.0@ff746e31", "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#db257ce@d41d8cd9", @@ -86,7 +82,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/re@opam:1.8.0@7baac1a7", + "ocaml@4.7.1004@d41d8cd9", "@opam/re@opam:1.9.0@7f4a36a5", "@opam/dune@opam:1.7.3@72aad784", "@esy-ocaml/reason@3.4.0@d41d8cd9" ], "devDependencies": [] @@ -122,7 +118,7 @@ "refmterr@3.1.10@d41d8cd9", "reason-gl-matrix@0.9.9304@d41d8cd9", "ocaml@4.7.1004@d41d8cd9", "esy-glfw@3.2.1009@d41d8cd9", "esy-cmake@0.3.5@d41d8cd9", "@opam/lwt_ppx@opam:1.2.2@946c5ba2", - "@opam/lwt@opam:4.2.0@3edaca61", + "@opam/lwt@opam:4.2.1@c1888ec9", "@opam/js_of_ocaml-lwt@opam:3.3.0@ff746e31", "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#db257ce@d41d8cd9", "@opam/js_of_ocaml@github:ocsigen/js_of_ocaml:js_of_ocaml.opam#db257ce@d41d8cd9", @@ -149,14 +145,14 @@ ], "devDependencies": [] }, - "reason-fontkit@2.4.0@d41d8cd9": { - "id": "reason-fontkit@2.4.0@d41d8cd9", + "reason-fontkit@2.4.1@d41d8cd9": { + "id": "reason-fontkit@2.4.1@d41d8cd9", "name": "reason-fontkit", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/reason-fontkit/-/reason-fontkit-2.4.0.tgz#sha1:aefa0f0c8f4840293ac39a14e7377f94052b7e5b" + "archive:https://registry.npmjs.org/reason-fontkit/-/reason-fontkit-2.4.1.tgz#sha1:696911e73dea0ebbd90be4b3207671362794b2c8" ] }, "overrides": [], @@ -433,12 +429,12 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.8.0@7baac1a7", + "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@7f4a36a5", "@opam/dune@opam:1.7.3@72aad784", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.8.0@7baac1a7" + "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@7f4a36a5" ] }, "@opam/topkg@opam:1.0.0@61f4ccf9": { @@ -536,27 +532,26 @@ ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] }, - "@opam/re@opam:1.8.0@7baac1a7": { - "id": "@opam/re@opam:1.8.0@7baac1a7", + "@opam/re@opam:1.9.0@7f4a36a5": { + "id": "@opam/re@opam:1.9.0@7f4a36a5", "name": "@opam/re", - "version": "opam:1.8.0", + "version": "opam:1.9.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/76/765f6f8d3e6ab200866e719ed7e5178d#md5:765f6f8d3e6ab200866e719ed7e5178d", - "archive:https://github.com/ocaml/ocaml-re/releases/download/1.8.0/re-1.8.0.tbz#md5:765f6f8d3e6ab200866e719ed7e5178d" + "archive:https://opam.ocaml.org/cache/md5/bd/bddaed4f386a22cace7850c9c7dac296#md5:bddaed4f386a22cace7850c9c7dac296", + "archive:https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz#md5:bddaed4f386a22cace7850c9c7dac296" ], "opam": { "name": "re", - "version": "1.8.0", - "path": "esy.lock/opam/re.1.8.0" + "version": "1.9.0", + "path": "esy.lock/opam/re.1.9.0" } }, "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/jbuilder@opam:transition@58bdfe0a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:1.7.3@72aad784", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/seq@opam:base@d8d7de1d" @@ -589,8 +584,8 @@ "ocaml@4.7.1004@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff" ] }, - "@opam/ppx_tools_versioned@opam:5.2.1@95275a75": { - "id": "@opam/ppx_tools_versioned@opam:5.2.1@95275a75", + "@opam/ppx_tools_versioned@opam:5.2.1@1eeea765": { + "id": "@opam/ppx_tools_versioned@opam:5.2.1@1eeea765", "name": "@opam/ppx_tools_versioned", "version": "opam:5.2.1", "source": { @@ -617,25 +612,25 @@ "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71" ] }, - "@opam/ppx_derivers@opam:1.0@78655ff8": { - "id": "@opam/ppx_derivers@opam:1.0@78655ff8", + "@opam/ppx_derivers@opam:1.2.1@0b458500": { + "id": "@opam/ppx_derivers@opam:1.2.1@0b458500", "name": "@opam/ppx_derivers", - "version": "opam:1.0", + "version": "opam:1.2.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/4d/4ddce8f43fdb9b0ef0ab6a7cbfebc3e3#md5:4ddce8f43fdb9b0ef0ab6a7cbfebc3e3", - "archive:https://github.com/ocaml-ppx/ppx_derivers/archive/1.0.tar.gz#md5:4ddce8f43fdb9b0ef0ab6a7cbfebc3e3" + "archive:https://opam.ocaml.org/cache/md5/5d/5dc2bf130c1db3c731fe0fffc5648b41#md5:5dc2bf130c1db3c731fe0fffc5648b41", + "archive:https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz#md5:5dc2bf130c1db3c731fe0fffc5648b41" ], "opam": { "name": "ppx_derivers", - "version": "1.0", - "path": "esy.lock/opam/ppx_derivers.1.0" + "version": "1.2.1", + "path": "esy.lock/opam/ppx_derivers.1.2.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/jbuilder@opam:transition@58bdfe0a", + "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.7.3@72aad784", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] @@ -742,28 +737,28 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e", - "@opam/ppx_derivers@opam:1.0@78655ff8", + "@opam/ppx_derivers@opam:1.2.1@0b458500", "@opam/dune@opam:1.7.3@72aad784", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e", - "@opam/ppx_derivers@opam:1.0@78655ff8" + "@opam/ppx_derivers@opam:1.2.1@0b458500" ] }, - "@opam/mmap@opam:1.0.2@00138a87": { - "id": "@opam/mmap@opam:1.0.2@00138a87", + "@opam/mmap@opam:1.1.0@6f2a1426": { + "id": "@opam/mmap@opam:1.1.0@6f2a1426", "name": "@opam/mmap", - "version": "opam:1.0.2", + "version": "opam:1.1.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/78/7880d4d74b37664f9bb0906ae1cadf6b#md5:7880d4d74b37664f9bb0906ae1cadf6b", - "archive:https://github.com/mirage/mmap/releases/download/v1.0.2/mmap-v1.0.2.tbz#md5:7880d4d74b37664f9bb0906ae1cadf6b" + "archive:https://opam.ocaml.org/cache/md5/8c/8c5d5fbc537296dc525867535fb878ba#md5:8c5d5fbc537296dc525867535fb878ba", + "archive:https://github.com/mirage/mmap/releases/download/v1.1.0/mmap-v1.1.0.tbz#md5:8c5d5fbc537296dc525867535fb878ba" ], "opam": { "name": "mmap", - "version": "1.0.2", - "path": "esy.lock/opam/mmap.1.0.2" + "version": "1.1.0", + "path": "esy.lock/opam/mmap.1.1.0" } }, "overrides": [], @@ -871,12 +866,12 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/lwt@opam:4.2.0@3edaca61", "@opam/dune@opam:1.7.3@72aad784", + "@opam/lwt@opam:4.2.1@c1888ec9", "@opam/dune@opam:1.7.3@72aad784", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/lwt@opam:4.2.0@3edaca61" + "@opam/lwt@opam:4.2.1@c1888ec9" ] }, "@opam/lwt_ppx@opam:1.2.2@946c5ba2": { @@ -898,16 +893,16 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", - "@opam/ppx_tools_versioned@opam:5.2.1@95275a75", + "@opam/ppx_tools_versioned@opam:5.2.1@1eeea765", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71", - "@opam/lwt@opam:4.2.0@3edaca61", "@opam/dune@opam:1.7.3@72aad784", + "@opam/lwt@opam:4.2.1@c1888ec9", "@opam/dune@opam:1.7.3@72aad784", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", - "@opam/ppx_tools_versioned@opam:5.2.1@95275a75", + "@opam/ppx_tools_versioned@opam:5.2.1@1eeea765", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71", - "@opam/lwt@opam:4.2.0@3edaca61" + "@opam/lwt@opam:4.2.1@c1888ec9" ] }, "@opam/lwt_log@opam:1.1.0@72575e04": { @@ -928,34 +923,34 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/lwt@opam:4.2.0@3edaca61", + "ocaml@4.7.1004@d41d8cd9", "@opam/lwt@opam:4.2.1@c1888ec9", "@opam/jbuilder@opam:transition@58bdfe0a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/lwt@opam:4.2.0@3edaca61" + "ocaml@4.7.1004@d41d8cd9", "@opam/lwt@opam:4.2.1@c1888ec9" ] }, - "@opam/lwt@opam:4.2.0@3edaca61": { - "id": "@opam/lwt@opam:4.2.0@3edaca61", + "@opam/lwt@opam:4.2.1@c1888ec9": { + "id": "@opam/lwt@opam:4.2.1@c1888ec9", "name": "@opam/lwt", - "version": "opam:4.2.0", + "version": "opam:4.2.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/2c/2ce7827948adc611319f9449e4519070#md5:2ce7827948adc611319f9449e4519070", - "archive:https://github.com/ocsigen/lwt/archive/4.2.0.tar.gz#md5:2ce7827948adc611319f9449e4519070" + "archive:https://opam.ocaml.org/cache/md5/9d/9d648386ca0a9978eb9487de36b781cc#md5:9d648386ca0a9978eb9487de36b781cc", + "archive:https://github.com/ocsigen/lwt/archive/4.2.1.tar.gz#md5:9d648386ca0a9978eb9487de36b781cc" ], "opam": { "name": "lwt", - "version": "4.2.0", - "path": "esy.lock/opam/lwt.4.2.0" + "version": "4.2.1", + "path": "esy.lock/opam/lwt.4.2.1" } }, "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/result@opam:1.3@bee8bf2e", "@opam/mmap@opam:1.0.2@00138a87", + "@opam/result@opam:1.3@bee8bf2e", "@opam/mmap@opam:1.1.0@6f2a1426", "@opam/dune@opam:1.7.3@72aad784", "@opam/cppo@opam:1.6.5@bec3dbd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", @@ -963,7 +958,7 @@ ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/result@opam:1.3@bee8bf2e", "@opam/mmap@opam:1.0.2@00138a87" + "@opam/result@opam:1.3@bee8bf2e", "@opam/mmap@opam:1.1.0@6f2a1426" ] }, "@opam/lambda-term@opam:1.13@a3d28a27": { @@ -992,7 +987,7 @@ "ocaml@4.7.1004@d41d8cd9", "@opam/zed@opam:1.6@004ea65e", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt_react@opam:1.1.2@2d73ee34", - "@opam/lwt_log@opam:1.1.0@72575e04", "@opam/lwt@opam:4.2.0@3edaca61", + "@opam/lwt_log@opam:1.1.0@72575e04", "@opam/lwt@opam:4.2.1@c1888ec9", "@opam/jbuilder@opam:transition@58bdfe0a", "@opam/camomile@opam:1.0.1@4a2e8bdd", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1001,7 +996,7 @@ "ocaml@4.7.1004@d41d8cd9", "@opam/zed@opam:1.6@004ea65e", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt_react@opam:1.1.2@2d73ee34", - "@opam/lwt_log@opam:1.1.0@72575e04", "@opam/lwt@opam:4.2.0@3edaca61", + "@opam/lwt_log@opam:1.1.0@72575e04", "@opam/lwt@opam:4.2.1@c1888ec9", "@opam/camomile@opam:1.0.1@4a2e8bdd" ] }, @@ -1024,14 +1019,14 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", - "@opam/ppx_tools_versioned@opam:5.2.1@95275a75", + "@opam/ppx_tools_versioned@opam:5.2.1@1eeea765", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71", "@opam/js_of_ocaml@github:ocsigen/js_of_ocaml:js_of_ocaml.opam#db257ce@d41d8cd9", "@opam/dune@opam:1.7.3@72aad784", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", - "@opam/ppx_tools_versioned@opam:5.2.1@95275a75", + "@opam/ppx_tools_versioned@opam:5.2.1@1eeea765", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71", "@opam/js_of_ocaml@github:ocsigen/js_of_ocaml:js_of_ocaml.opam#db257ce@d41d8cd9" ] @@ -1055,13 +1050,13 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/lwt_log@opam:1.1.0@72575e04", - "@opam/lwt@opam:4.2.0@3edaca61", + "@opam/lwt@opam:4.2.1@c1888ec9", "@opam/js_of_ocaml-ppx@opam:3.3.0@6d90d7d2", "@opam/js_of_ocaml@github:ocsigen/js_of_ocaml:js_of_ocaml.opam#db257ce@d41d8cd9", "@opam/dune@opam:1.7.3@72aad784", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/lwt@opam:4.2.0@3edaca61", + "ocaml@4.7.1004@d41d8cd9", "@opam/lwt@opam:4.2.1@c1888ec9", "@opam/js_of_ocaml-ppx@opam:3.3.0@6d90d7d2", "@opam/js_of_ocaml@github:ocsigen/js_of_ocaml:js_of_ocaml.opam#db257ce@d41d8cd9" ] @@ -1104,14 +1099,14 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", - "@opam/ppx_tools_versioned@opam:5.2.1@95275a75", + "@opam/ppx_tools_versioned@opam:5.2.1@1eeea765", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71", "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#db257ce@d41d8cd9", "@opam/dune@opam:1.7.3@72aad784", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", - "@opam/ppx_tools_versioned@opam:5.2.1@95275a75", + "@opam/ppx_tools_versioned@opam:5.2.1@1eeea765", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71", "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#db257ce@d41d8cd9" ] diff --git a/esy.lock/opam/lwt.4.2.0/opam b/esy.lock/opam/lwt.4.2.1/opam similarity index 88% rename from esy.lock/opam/lwt.4.2.0/opam rename to esy.lock/opam/lwt.4.2.1/opam index 57fcf6f0b..0b30db90b 100644 --- a/esy.lock/opam/lwt.4.2.0/opam +++ b/esy.lock/opam/lwt.4.2.1/opam @@ -21,7 +21,7 @@ dev-repo: "git+https://github.com/ocsigen/lwt.git" depends: [ "cppo" {build & >= "1.1.0"} "dune" {build} - "mmap" + "mmap" # mmap is needed as long as Lwt supports OCaml < 4.06.0. "ocaml" {>= "4.02.0"} "result" # result is needed as long as Lwt supports OCaml 4.02. "seq" # seq is needed as long as Lwt supports OCaml < 4.07.0. @@ -53,6 +53,6 @@ a single thread by default. This reduces the need for locks or other synchronization primitives. Code can be run in parallel on an opt-in basis." url { - src: "https://github.com/ocsigen/lwt/archive/4.2.0.tar.gz" - checksum: "md5=2ce7827948adc611319f9449e4519070" + src: "https://github.com/ocsigen/lwt/archive/4.2.1.tar.gz" + checksum: "md5=9d648386ca0a9978eb9487de36b781cc" } diff --git a/esy.lock/opam/mmap.1.0.2/opam b/esy.lock/opam/mmap.1.1.0/opam similarity index 73% rename from esy.lock/opam/mmap.1.0.2/opam rename to esy.lock/opam/mmap.1.1.0/opam index 0384e3599..0b515b453 100644 --- a/esy.lock/opam/mmap.1.0.2/opam +++ b/esy.lock/opam/mmap.1.1.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" maintainer: "jeremie@dimino.org" -authors: ["Jérémie Dimino "] +authors: ["Jérémie Dimino " "Anton Bachin" ] homepage: "https://github.com/mirage/mmap" bug-reports: "https://github.com/mirage/mmap/issues" doc: "https://mirage.github.io/mmap/" @@ -19,6 +19,6 @@ This project provides a Mmap.map_file functions for mapping files in memory. """ url { src: - "https://github.com/mirage/mmap/releases/download/v1.0.2/mmap-v1.0.2.tbz" - checksum: "md5=7880d4d74b37664f9bb0906ae1cadf6b" + "https://github.com/mirage/mmap/releases/download/v1.1.0/mmap-v1.1.0.tbz" + checksum: "md5=8c5d5fbc537296dc525867535fb878ba" } diff --git a/esy.lock/opam/ppx_derivers.1.0/opam b/esy.lock/opam/ppx_derivers.1.2.1/opam similarity index 73% rename from esy.lock/opam/ppx_derivers.1.0/opam rename to esy.lock/opam/ppx_derivers.1.2.1/opam index ac3aad973..19e8b0f90 100644 --- a/esy.lock/opam/ppx_derivers.1.0/opam +++ b/esy.lock/opam/ppx_derivers.1.2.1/opam @@ -6,11 +6,11 @@ homepage: "https://github.com/ocaml-ppx/ppx_derivers" bug-reports: "https://github.com/ocaml-ppx/ppx_derivers/issues" dev-repo: "git://github.com/ocaml-ppx/ppx_derivers.git" build: [ - ["jbuilder" "build" "-p" name "-j" jobs] + ["dune" "build" "-p" name "-j" jobs] ] depends: [ "ocaml" - "jbuilder" {build & >= "1.0+beta7"} + "dune" {build} ] synopsis: "Shared [@@deriving] plugin registry" description: """ @@ -18,6 +18,6 @@ Ppx_derivers is a tiny package whose sole purpose is to allow ppx_deriving and ppx_type_conv to inter-operate gracefully when linked as part of the same ocaml-migrate-parsetree driver.""" url { - src: "https://github.com/ocaml-ppx/ppx_derivers/archive/1.0.tar.gz" - checksum: "md5=4ddce8f43fdb9b0ef0ab6a7cbfebc3e3" + src: "https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz" + checksum: "md5=5dc2bf130c1db3c731fe0fffc5648b41" } diff --git a/esy.lock/opam/ppx_tools_versioned.5.2.1/opam b/esy.lock/opam/ppx_tools_versioned.5.2.1/opam index 0dd92b360..cbf8f4fe8 100644 --- a/esy.lock/opam/ppx_tools_versioned.5.2.1/opam +++ b/esy.lock/opam/ppx_tools_versioned.5.2.1/opam @@ -17,7 +17,7 @@ build: [ depends: [ "ocaml" {>= "4.02.0"} "jbuilder" {build & >= "1.0+beta17"} - "ocaml-migrate-parsetree" {>= "1.0.10"} + "ocaml-migrate-parsetree" {>= "1.0.10" & < "1.3.0"} ] synopsis: "A variant of ppx_tools based on ocaml-migrate-parsetree" url { diff --git a/esy.lock/opam/re.1.8.0/opam b/esy.lock/opam/re.1.9.0/opam similarity index 70% rename from esy.lock/opam/re.1.8.0/opam rename to esy.lock/opam/re.1.9.0/opam index 77b3fe224..28b376f90 100644 --- a/esy.lock/opam/re.1.8.0/opam +++ b/esy.lock/opam/re.1.9.0/opam @@ -1,4 +1,5 @@ opam-version: "2.0" + maintainer: "rudi.grinberg@gmail.com" authors: [ "Jerome Vouillon" @@ -11,17 +12,20 @@ license: "LGPL-2.0 with OCaml linking exception" homepage: "https://github.com/ocaml/ocaml-re" bug-reports: "https://github.com/ocaml/ocaml-re/issues" dev-repo: "git+https://github.com/ocaml/ocaml-re.git" + build: [ - ["jbuilder" "subst" "-n" name] {pinned} - ["jbuilder" "build" "-p" name "-j" jobs] - ["jbuilder" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] + depends: [ - "ocaml" {>= "4.02.3"} - "jbuilder" {build & >= "1.0+beta10"} + "ocaml" {>= "4.02"} + "dune" {build} "ounit" {with-test} "seq" ] + synopsis: "RE is a regular expression library for OCaml" description: """ Pure OCaml regular expressions with: @@ -29,9 +33,10 @@ Pure OCaml regular expressions with: * Posix extended regular expressions (module Re.Posix) * Emacs-style regular expressions (module Re.Emacs) * Shell-style file globbing (module Re.Glob) -* Compatibility layer for OCaml's built-in Str module (module Re.Str)""" +* Compatibility layer for OCaml's built-in Str module (module Re.Str) +""" url { src: - "https://github.com/ocaml/ocaml-re/releases/download/1.8.0/re-1.8.0.tbz" - checksum: "md5=765f6f8d3e6ab200866e719ed7e5178d" + "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz" + checksum: "md5=bddaed4f386a22cace7850c9c7dac296" } diff --git a/src/Core/TextWrapping.re b/src/Core/TextWrapping.re index fdbec0247..8fc3cdfd5 100644 --- a/src/Core/TextWrapping.re +++ b/src/Core/TextWrapping.re @@ -61,13 +61,17 @@ let wrapText = (~text, ~measureWidth, ~maxWidth, ~wrapHere) => { if (width >= maxWidth) { let (line, lineWidth) = subAndMeasure(acc.beginIndex, acc.endIndex); - let (lastLine, lastLineWidth) = - subAndMeasure(acc.endIndex + 2, index); + if (acc.endIndex + 2 > index) { + {...acc, lines: [line, ...acc.lines], currMaxWidth: lineWidth}; + } else { + let (lastLine, lastLineWidth) = + subAndMeasure(acc.endIndex + 2, index); - let currMaxWidth = - max(lastLineWidth, max(acc.currMaxWidth, lineWidth)); + let currMaxWidth = + max(lastLineWidth, max(acc.currMaxWidth, lineWidth)); - {...acc, lines: [lastLine, line, ...acc.lines], currMaxWidth}; + {...acc, lines: [lastLine, line, ...acc.lines], currMaxWidth}; + }; } else { let (line, lineWidth) = subAndMeasure(acc.beginIndex, index); diff --git a/test/Core/TextWrappingTests.re b/test/Core/TextWrappingTests.re new file mode 100644 index 000000000..1597043cf --- /dev/null +++ b/test/Core/TextWrappingTests.re @@ -0,0 +1,16 @@ +open Rejest; + +open Revery_Core; + +test("TextWrapping", () => + test("doesn't crash when supplied with text that is too wide", () => { + let measureWidth = _ => 14; + let wrapHere = TextWrapping.isWhitespaceWrapPoint; + let text = "W"; + let maxWidth = 12; + let (text, width) = + TextWrapping.wrapText(~text, ~measureWidth, ~maxWidth, ~wrapHere); + expect(text).toEqual(["W"]); + expect(width).toEqual(14); + }) +);