From 99af4c2e779dd5bee783a179d81612722e70fa64 Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Mon, 2 Mar 2020 11:39:49 +0800 Subject: [PATCH 1/6] fixing bsc.exe location and -bs-no-builtin-ppx flag --- src/analyze/BuildSystem.re | 18 +++++++++++++++++- src/analyze/Packages.re | 18 ++++-------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/analyze/BuildSystem.re b/src/analyze/BuildSystem.re index 7722a24c..0de59532 100644 --- a/src/analyze/BuildSystem.re +++ b/src/analyze/BuildSystem.re @@ -85,6 +85,19 @@ let namespacedName = (buildSystem, namespace, name) => switch buildSystem { open Infix; +let nodePlatform = + switch (Sys.os_type) { + | "Unix" => switch (input_line (Unix.open_process_in ("uname -s"))) { + | "Darwin" => "darwin" + | "Linux" => "linux" + | "FreeBSD" => "freebsd" + | s => invalid_arg (s ++ ": unsupported os_type") + } + | "Win32" => "win32" + | s => invalid_arg (s ++ ": unsupported os_type") + }; + + let getBsPlatformDir = rootPath => { let result = ModuleResolution.resolveNodeModulePath( @@ -319,7 +332,10 @@ let getCompiler = (rootPath, buildSystem) => { | BsbNative(_, Js) | Bsb(_) => let%try_wrap bsPlatformDir = getBsPlatformDir(rootPath); - bsPlatformDir /+ "lib" /+ "bsc.exe" + switch(Files.ifExists(bsPlatformDir /+ "lib" /+ "bsc.exe")){ + | Some (x) => x + | None => bsPlatformDir /+ nodePlatform /+ "bsc.exe" + } | BsbNative(_, Native) => let%try_wrap bsPlatformDir = getBsPlatformDir(rootPath); bsPlatformDir /+ "vendor" /+ "ocaml" /+ "ocamlopt.opt" diff --git a/src/analyze/Packages.re b/src/analyze/Packages.re index ab4f4b6a..f25c17e0 100644 --- a/src/analyze/Packages.re +++ b/src/analyze/Packages.re @@ -51,22 +51,12 @@ let newBsPackage = (~overrideBuildSystem=?, ~reportDiagnostics, state, rootPath) let%try bsPlatform = BuildSystem.getBsPlatformDir(rootPath); - let nodePlatform = - switch (Sys.os_type) { - | "Unix" => switch (input_line (Unix.open_process_in ("uname -s"))) { - | "Darwin" => "darwin" - | "Linux" => "linux" - | "FreeBSD" => "freebsd" - | s => invalid_arg (s ++ ": unsupported os_type") - } - | "Win32" => "win32" - | s => invalid_arg (s ++ ": unsupported os_type") - }; + let bsb = switch (Files.ifExists(bsPlatform /+ "lib" /+ "bsb.exe")){ | Some (x) => x | None => - switch (Files.ifExists(bsPlatform /+ nodePlatform /+ "bsb.exe")){ + switch (Files.ifExists(bsPlatform /+ BuildSystem.nodePlatform /+ "bsb.exe")){ | Some (x) => x | None => failwith ("can not locate bsb.exe in " ++ bsPlatform) } @@ -189,7 +179,7 @@ let newBsPackage = (~overrideBuildSystem=?, ~reportDiagnostics, state, rootPath) }; let flags = switch buildSystem { - | Bsb(_) | BsbNative(_, Js) => { + | Bsb(version) | BsbNative(version, Js) => { let jsPackageMode = { let specs = config |> Json.get("package-specs"); @@ -212,7 +202,7 @@ let newBsPackage = (~overrideBuildSystem=?, ~reportDiagnostics, state, rootPath) | _ => flags; }; /* flags */ - ["-bs-no-builtin-ppx-ml", ...flags]; + [ version > "7.1" ? "-bs-no-builtin-ppx" : "-bs-no-builtin-ppx-ml", ...flags]; } | _ => flags }; From 6338bb1424d8edd86fe9f98f229afaf21c597dfa Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Mon, 2 Mar 2020 11:53:17 +0800 Subject: [PATCH 2/6] try to test again latest version --- examples/bs-3.1.5/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/bs-3.1.5/package.json b/examples/bs-3.1.5/package.json index 4b6594e0..f6ea980f 100644 --- a/examples/bs-3.1.5/package.json +++ b/examples/bs-3.1.5/package.json @@ -20,6 +20,6 @@ "reason-react": ">=0.4.0" }, "devDependencies": { - "bs-platform": "3.1.5" + "bs-platform": "7.2.0" } } From 479bbeba1a7cecb110a2935a936ffcb0dafdfc8e Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Mon, 2 Mar 2020 12:45:05 +0800 Subject: [PATCH 3/6] Fix refmt location and parsing ocaml-version --- src/analyze/BuildSystem.re | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/analyze/BuildSystem.re b/src/analyze/BuildSystem.re index 0de59532..3f0b2672 100644 --- a/src/analyze/BuildSystem.re +++ b/src/analyze/BuildSystem.re @@ -146,9 +146,9 @@ let getCompilerVersion = executable => { let (output, success) = Commands.execSync(cmd); success ? switch output { | [line] when Str.string_match(Str.regexp_string("BuckleScript "), line, 0) => - switch (Str.split(Str.regexp_string("(Using OCaml"), String.trim(line))) { + switch (Str.split(Str.regexp("( *Using OCaml:?"), String.trim(line))) { | [_, version] => parseOCamlVersion(version) - | _ => Error("Cannot detect OCaml version from BuckleScript version string: " ++ line) + | xs => Error("Cannot detect OCaml version from BuckleScript version string: " ++ line ++ "[" ++ String.concat(" ;", xs) ++ "]") } | [line] => parseOCamlVersion(line) | _ => Error("Unable to determine compiler version (ran " ++ cmd ++ "). Output: " ++ String.concat("\n", output)) @@ -350,19 +350,28 @@ let getCompiler = (rootPath, buildSystem) => { }; let getRefmt = (rootPath, buildSystem) => { + let bsRefmt = (bsPlatformDir) => + switch (Files.ifExists(bsPlatformDir/+"lib"/+"refmt.exe")){ + | Some (x) => x + | None => + switch(Files.ifExists(bsPlatformDir /+ nodePlatform /+ "refmt.exe")){ + | Some (x) => x + | None => bsPlatformDir /+ "lib" /+ "refmt3.exe" + } + } switch (buildSystem) { | BsbNative("3.2.0", _) => let%try_wrap bsPlatformDir = getBsPlatformDir(rootPath); - bsPlatformDir /+ "lib" /+ "refmt.exe" + bsRefmt(bsPlatformDir) | Bsb(version) when version > "2.2.0" => let%try_wrap bsPlatformDir = getBsPlatformDir(rootPath); - bsPlatformDir /+ "lib" /+ "refmt.exe" + bsRefmt(bsPlatformDir) | BsbNative(version, _) when version >= "4.0.6" => let%try_wrap bsPlatformDir = getBsPlatformDir(rootPath); - bsPlatformDir /+ "lib" /+ "refmt.exe" + bsRefmt(bsPlatformDir) | Bsb(_) | BsbNative(_, _) => let%try_wrap bsPlatformDir = getBsPlatformDir(rootPath); - bsPlatformDir /+ "lib" /+ "refmt3.exe" + bsRefmt(bsPlatformDir) | Dune(Esy(_)) => getExecutableInEsyPath("refmt",~pwd=rootPath) | Dune(Opam(switchPrefix)) => Ok(switchPrefix /+ "bin" /+ "refmt") From 5d7a11c86d65bb23421e32883b45ab0079d3154c Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Mon, 2 Mar 2020 12:54:45 +0800 Subject: [PATCH 4/6] snapshot changes --- examples/bs-3.1.5/src/Component1.bs.js | 42 +++++++------- examples/bs-3.1.5/src/Component2.bs.js | 77 +++++++++++++------------- examples/bs-3.1.5/src/Index.bs.js | 6 +- 3 files changed, 62 insertions(+), 63 deletions(-) diff --git a/examples/bs-3.1.5/src/Component1.bs.js b/examples/bs-3.1.5/src/Component1.bs.js index 3da3352f..fa9dd109 100644 --- a/examples/bs-3.1.5/src/Component1.bs.js +++ b/examples/bs-3.1.5/src/Component1.bs.js @@ -1,4 +1,4 @@ -// Generated by BUCKLESCRIPT VERSION 3.1.5, PLEASE EDIT WITH CARE +// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE 'use strict'; var Curry = require("bs-platform/lib/js/curry.js"); @@ -7,33 +7,33 @@ var ReasonReact = require("reason-react/src/ReasonReact.js"); var component = ReasonReact.statelessComponent("Page"); -function handleClick(_, _$1) { +function handleClick(_event, _self) { console.log("clicked!"); return /* () */0; } -function make(message, _) { - return /* record */[ - /* debugName */component[/* debugName */0], - /* reactClassInternal */component[/* reactClassInternal */1], - /* handedOffState */component[/* handedOffState */2], - /* willReceiveProps */component[/* willReceiveProps */3], - /* didMount */component[/* didMount */4], - /* didUpdate */component[/* didUpdate */5], - /* willUnmount */component[/* willUnmount */6], - /* willUpdate */component[/* willUpdate */7], - /* shouldUpdate */component[/* shouldUpdate */8], - /* render */(function (self) { +function make(message, _children) { + return { + debugName: component.debugName, + reactClassInternal: component.reactClassInternal, + handedOffState: component.handedOffState, + willReceiveProps: component.willReceiveProps, + didMount: component.didMount, + didUpdate: component.didUpdate, + willUnmount: component.willUnmount, + willUpdate: component.willUpdate, + shouldUpdate: component.shouldUpdate, + render: (function (self) { return React.createElement("div", { - onClick: Curry._1(self[/* handle */0], handleClick) + onClick: Curry._1(self.handle, handleClick) }, message); }), - /* initialState */component[/* initialState */10], - /* retainedProps */component[/* retainedProps */11], - /* reducer */component[/* reducer */12], - /* subscriptions */component[/* subscriptions */13], - /* jsElementWrapped */component[/* jsElementWrapped */14] - ]; + initialState: component.initialState, + retainedProps: component.retainedProps, + reducer: component.reducer, + subscriptions: component.subscriptions, + jsElementWrapped: component.jsElementWrapped + }; } exports.component = component; diff --git a/examples/bs-3.1.5/src/Component2.bs.js b/examples/bs-3.1.5/src/Component2.bs.js index 3f2a1339..734ab637 100644 --- a/examples/bs-3.1.5/src/Component2.bs.js +++ b/examples/bs-3.1.5/src/Component2.bs.js @@ -1,4 +1,4 @@ -// Generated by BUCKLESCRIPT VERSION 3.1.5, PLEASE EDIT WITH CARE +// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE 'use strict'; var Block = require("bs-platform/lib/js/block.js"); @@ -6,59 +6,58 @@ var Curry = require("bs-platform/lib/js/curry.js"); var React = require("react"); var ReasonReact = require("reason-react/src/ReasonReact.js"); -function z() { +function z(param) { return 2; } var component = ReasonReact.reducerComponent("Example"); -function make(greeting, _) { - return /* record */[ - /* debugName */component[/* debugName */0], - /* reactClassInternal */component[/* reactClassInternal */1], - /* handedOffState */component[/* handedOffState */2], - /* willReceiveProps */component[/* willReceiveProps */3], - /* didMount */component[/* didMount */4], - /* didUpdate */component[/* didUpdate */5], - /* willUnmount */component[/* willUnmount */6], - /* willUpdate */component[/* willUpdate */7], - /* shouldUpdate */component[/* shouldUpdate */8], - /* render */(function (self) { - var message = "You've clicked this " + (String(self[/* state */1][/* count */0]) + " times(s)"); - var match = self[/* state */1][/* show */1]; +function make(greeting, _children) { + return { + debugName: component.debugName, + reactClassInternal: component.reactClassInternal, + handedOffState: component.handedOffState, + willReceiveProps: component.willReceiveProps, + didMount: component.didMount, + didUpdate: component.didUpdate, + willUnmount: component.willUnmount, + willUpdate: component.willUpdate, + shouldUpdate: component.shouldUpdate, + render: (function (self) { + var message = "You've clicked this " + (String(self.state.count) + " times(s)"); return React.createElement("div", undefined, React.createElement("button", { - onClick: (function () { - return Curry._1(self[/* send */3], /* Click */0); + onClick: (function (_event) { + return Curry._1(self.send, /* Click */0); }) }, message), React.createElement("button", { - onClick: (function () { - return Curry._1(self[/* send */3], /* Toggle */1); + onClick: (function (_event) { + return Curry._1(self.send, /* Toggle */1); }) - }, "Toggle greeting"), match ? greeting : null); + }, "Toggle greeting"), self.state.show ? greeting : null); }), - /* initialState */(function () { - return /* record */[ - /* count */0, - /* show */true - ]; + initialState: (function (param) { + return { + count: 0, + show: true + }; }), - /* retainedProps */component[/* retainedProps */11], - /* reducer */(function (action, state) { + retainedProps: component.retainedProps, + reducer: (function (action, state) { if (action) { - return /* Update */Block.__(0, [/* record */[ - /* count */state[/* count */0], - /* show */!state[/* show */1] - ]]); + return /* Update */Block.__(0, [{ + count: state.count, + show: !state.show + }]); } else { - return /* Update */Block.__(0, [/* record */[ - /* count */state[/* count */0] + 1 | 0, - /* show */state[/* show */1] - ]]); + return /* Update */Block.__(0, [{ + count: state.count + 1 | 0, + show: state.show + }]); } }), - /* subscriptions */component[/* subscriptions */13], - /* jsElementWrapped */component[/* jsElementWrapped */14] - ]; + subscriptions: component.subscriptions, + jsElementWrapped: component.jsElementWrapped + }; } var x = 10; diff --git a/examples/bs-3.1.5/src/Index.bs.js b/examples/bs-3.1.5/src/Index.bs.js index a6411107..75dc5028 100644 --- a/examples/bs-3.1.5/src/Index.bs.js +++ b/examples/bs-3.1.5/src/Index.bs.js @@ -1,4 +1,4 @@ -// Generated by BUCKLESCRIPT VERSION 3.1.5, PLEASE EDIT WITH CARE +// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE 'use strict'; var ReactDOMRe = require("reason-react/src/ReactDOMRe.js"); @@ -6,8 +6,8 @@ var ReasonReact = require("reason-react/src/ReasonReact.js"); var Component1$ReactTemplate = require("./Component1.bs.js"); var Component2$ReactTemplate = require("./Component2.bs.js"); -ReactDOMRe.renderToElementWithId(ReasonReact.element(/* None */0, /* None */0, Component1$ReactTemplate.make("Hello!", /* array */[])), "index1"); +ReactDOMRe.renderToElementWithId(ReasonReact.element(undefined, undefined, Component1$ReactTemplate.make("Hello!", [])), "index1"); -ReactDOMRe.renderToElementWithId(ReasonReact.element(/* None */0, /* None */0, Component2$ReactTemplate.make("Hello!", /* array */[])), "index2"); +ReactDOMRe.renderToElementWithId(ReasonReact.element(undefined, undefined, Component2$ReactTemplate.make("Hello!", [])), "index2"); /* Not a pure module */ From 08db7688e31ee7a028ad334af2144c3d52f66bd3 Mon Sep 17 00:00:00 2001 From: Jared Forsyth Date: Mon, 2 Mar 2020 19:24:52 -0700 Subject: [PATCH 5/6] add new bs-7.2 example test --- .vscode/launch.json | 12 ++ examples/bs-3.1.5/package.json | 2 +- examples/bs-3.1.5/src/Component1.bs.js | 42 ++--- examples/bs-3.1.5/src/Component2.bs.js | 77 +++++---- examples/bs-3.1.5/src/Index.bs.js | 6 +- examples/bs-7.2/.vscode/settings.json | 3 + examples/bs-7.2/bsconfig.json | 24 +++ examples/bs-7.2/package-lock.json | 163 ++++++++++++++++++ examples/bs-7.2/package.json | 25 +++ examples/bs-7.2/src/Component1.bs.js | 42 +++++ examples/bs-7.2/src/Component1.re | 24 +++ examples/bs-7.2/src/Component2.bs.js | 69 ++++++++ examples/bs-7.2/src/Component2.re | 47 +++++ examples/bs-7.2/src/Index.bs.js | 13 ++ examples/bs-7.2/src/Index.re | 3 + examples/bs-7.2/src/index.html | 15 ++ src/analyze_example_tests/ExamplesTests.re | 1 + .../AnalyzeFixtureTests.re | 1 + 18 files changed, 506 insertions(+), 63 deletions(-) create mode 100644 examples/bs-7.2/.vscode/settings.json create mode 100644 examples/bs-7.2/bsconfig.json create mode 100644 examples/bs-7.2/package-lock.json create mode 100644 examples/bs-7.2/package.json create mode 100644 examples/bs-7.2/src/Component1.bs.js create mode 100644 examples/bs-7.2/src/Component1.re create mode 100644 examples/bs-7.2/src/Component2.bs.js create mode 100644 examples/bs-7.2/src/Component2.re create mode 100644 examples/bs-7.2/src/Index.bs.js create mode 100644 examples/bs-7.2/src/Index.re create mode 100644 examples/bs-7.2/src/index.html diff --git a/.vscode/launch.json b/.vscode/launch.json index 48628144..97d815a2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -74,6 +74,18 @@ "stopOnEntry": false, "sourceMaps": false, }, + { + "name": "BS 7.2", + "type": "extensionHost", + "request": "launch", + "runtimeExecutable": "${execPath}", + "args": [ + "--extensionDevelopmentPath=${workspaceRoot}/editor-extensions/vscode", + "${workspaceRoot}/examples/bs-7.2" + ], + "stopOnEntry": false, + "sourceMaps": false, + }, { "name": "Workspace", "type": "extensionHost", diff --git a/examples/bs-3.1.5/package.json b/examples/bs-3.1.5/package.json index f6ea980f..4b6594e0 100644 --- a/examples/bs-3.1.5/package.json +++ b/examples/bs-3.1.5/package.json @@ -20,6 +20,6 @@ "reason-react": ">=0.4.0" }, "devDependencies": { - "bs-platform": "7.2.0" + "bs-platform": "3.1.5" } } diff --git a/examples/bs-3.1.5/src/Component1.bs.js b/examples/bs-3.1.5/src/Component1.bs.js index fa9dd109..3da3352f 100644 --- a/examples/bs-3.1.5/src/Component1.bs.js +++ b/examples/bs-3.1.5/src/Component1.bs.js @@ -1,4 +1,4 @@ -// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE +// Generated by BUCKLESCRIPT VERSION 3.1.5, PLEASE EDIT WITH CARE 'use strict'; var Curry = require("bs-platform/lib/js/curry.js"); @@ -7,33 +7,33 @@ var ReasonReact = require("reason-react/src/ReasonReact.js"); var component = ReasonReact.statelessComponent("Page"); -function handleClick(_event, _self) { +function handleClick(_, _$1) { console.log("clicked!"); return /* () */0; } -function make(message, _children) { - return { - debugName: component.debugName, - reactClassInternal: component.reactClassInternal, - handedOffState: component.handedOffState, - willReceiveProps: component.willReceiveProps, - didMount: component.didMount, - didUpdate: component.didUpdate, - willUnmount: component.willUnmount, - willUpdate: component.willUpdate, - shouldUpdate: component.shouldUpdate, - render: (function (self) { +function make(message, _) { + return /* record */[ + /* debugName */component[/* debugName */0], + /* reactClassInternal */component[/* reactClassInternal */1], + /* handedOffState */component[/* handedOffState */2], + /* willReceiveProps */component[/* willReceiveProps */3], + /* didMount */component[/* didMount */4], + /* didUpdate */component[/* didUpdate */5], + /* willUnmount */component[/* willUnmount */6], + /* willUpdate */component[/* willUpdate */7], + /* shouldUpdate */component[/* shouldUpdate */8], + /* render */(function (self) { return React.createElement("div", { - onClick: Curry._1(self.handle, handleClick) + onClick: Curry._1(self[/* handle */0], handleClick) }, message); }), - initialState: component.initialState, - retainedProps: component.retainedProps, - reducer: component.reducer, - subscriptions: component.subscriptions, - jsElementWrapped: component.jsElementWrapped - }; + /* initialState */component[/* initialState */10], + /* retainedProps */component[/* retainedProps */11], + /* reducer */component[/* reducer */12], + /* subscriptions */component[/* subscriptions */13], + /* jsElementWrapped */component[/* jsElementWrapped */14] + ]; } exports.component = component; diff --git a/examples/bs-3.1.5/src/Component2.bs.js b/examples/bs-3.1.5/src/Component2.bs.js index 734ab637..3f2a1339 100644 --- a/examples/bs-3.1.5/src/Component2.bs.js +++ b/examples/bs-3.1.5/src/Component2.bs.js @@ -1,4 +1,4 @@ -// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE +// Generated by BUCKLESCRIPT VERSION 3.1.5, PLEASE EDIT WITH CARE 'use strict'; var Block = require("bs-platform/lib/js/block.js"); @@ -6,58 +6,59 @@ var Curry = require("bs-platform/lib/js/curry.js"); var React = require("react"); var ReasonReact = require("reason-react/src/ReasonReact.js"); -function z(param) { +function z() { return 2; } var component = ReasonReact.reducerComponent("Example"); -function make(greeting, _children) { - return { - debugName: component.debugName, - reactClassInternal: component.reactClassInternal, - handedOffState: component.handedOffState, - willReceiveProps: component.willReceiveProps, - didMount: component.didMount, - didUpdate: component.didUpdate, - willUnmount: component.willUnmount, - willUpdate: component.willUpdate, - shouldUpdate: component.shouldUpdate, - render: (function (self) { - var message = "You've clicked this " + (String(self.state.count) + " times(s)"); +function make(greeting, _) { + return /* record */[ + /* debugName */component[/* debugName */0], + /* reactClassInternal */component[/* reactClassInternal */1], + /* handedOffState */component[/* handedOffState */2], + /* willReceiveProps */component[/* willReceiveProps */3], + /* didMount */component[/* didMount */4], + /* didUpdate */component[/* didUpdate */5], + /* willUnmount */component[/* willUnmount */6], + /* willUpdate */component[/* willUpdate */7], + /* shouldUpdate */component[/* shouldUpdate */8], + /* render */(function (self) { + var message = "You've clicked this " + (String(self[/* state */1][/* count */0]) + " times(s)"); + var match = self[/* state */1][/* show */1]; return React.createElement("div", undefined, React.createElement("button", { - onClick: (function (_event) { - return Curry._1(self.send, /* Click */0); + onClick: (function () { + return Curry._1(self[/* send */3], /* Click */0); }) }, message), React.createElement("button", { - onClick: (function (_event) { - return Curry._1(self.send, /* Toggle */1); + onClick: (function () { + return Curry._1(self[/* send */3], /* Toggle */1); }) - }, "Toggle greeting"), self.state.show ? greeting : null); + }, "Toggle greeting"), match ? greeting : null); }), - initialState: (function (param) { - return { - count: 0, - show: true - }; + /* initialState */(function () { + return /* record */[ + /* count */0, + /* show */true + ]; }), - retainedProps: component.retainedProps, - reducer: (function (action, state) { + /* retainedProps */component[/* retainedProps */11], + /* reducer */(function (action, state) { if (action) { - return /* Update */Block.__(0, [{ - count: state.count, - show: !state.show - }]); + return /* Update */Block.__(0, [/* record */[ + /* count */state[/* count */0], + /* show */!state[/* show */1] + ]]); } else { - return /* Update */Block.__(0, [{ - count: state.count + 1 | 0, - show: state.show - }]); + return /* Update */Block.__(0, [/* record */[ + /* count */state[/* count */0] + 1 | 0, + /* show */state[/* show */1] + ]]); } }), - subscriptions: component.subscriptions, - jsElementWrapped: component.jsElementWrapped - }; + /* subscriptions */component[/* subscriptions */13], + /* jsElementWrapped */component[/* jsElementWrapped */14] + ]; } var x = 10; diff --git a/examples/bs-3.1.5/src/Index.bs.js b/examples/bs-3.1.5/src/Index.bs.js index 75dc5028..a6411107 100644 --- a/examples/bs-3.1.5/src/Index.bs.js +++ b/examples/bs-3.1.5/src/Index.bs.js @@ -1,4 +1,4 @@ -// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE +// Generated by BUCKLESCRIPT VERSION 3.1.5, PLEASE EDIT WITH CARE 'use strict'; var ReactDOMRe = require("reason-react/src/ReactDOMRe.js"); @@ -6,8 +6,8 @@ var ReasonReact = require("reason-react/src/ReasonReact.js"); var Component1$ReactTemplate = require("./Component1.bs.js"); var Component2$ReactTemplate = require("./Component2.bs.js"); -ReactDOMRe.renderToElementWithId(ReasonReact.element(undefined, undefined, Component1$ReactTemplate.make("Hello!", [])), "index1"); +ReactDOMRe.renderToElementWithId(ReasonReact.element(/* None */0, /* None */0, Component1$ReactTemplate.make("Hello!", /* array */[])), "index1"); -ReactDOMRe.renderToElementWithId(ReasonReact.element(undefined, undefined, Component2$ReactTemplate.make("Hello!", [])), "index2"); +ReactDOMRe.renderToElementWithId(ReasonReact.element(/* None */0, /* None */0, Component2$ReactTemplate.make("Hello!", /* array */[])), "index2"); /* Not a pure module */ diff --git a/examples/bs-7.2/.vscode/settings.json b/examples/bs-7.2/.vscode/settings.json new file mode 100644 index 00000000..858c6422 --- /dev/null +++ b/examples/bs-7.2/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "reason_language_server.location": "../../lib/bs/native/bin.native" +} \ No newline at end of file diff --git a/examples/bs-7.2/bsconfig.json b/examples/bs-7.2/bsconfig.json new file mode 100644 index 00000000..4b7305cc --- /dev/null +++ b/examples/bs-7.2/bsconfig.json @@ -0,0 +1,24 @@ +/* This is the BuckleScript configuration file. Note that this is a comment; + BuckleScript comes with a JSON parser that supports comments and trailing + comma. If this screws with your editor highlighting, please tell us by filing + an issue! */ +{ + "name": "react-template", + "reason": { + "react-jsx": 2 + }, + "sources": { + "dir" : "src", + "subdirs" : true + }, + "package-specs": [{ + "module": "commonjs", + "in-source": true + }], + "suffix": ".bs.js", + "namespace": true, + "bs-dependencies": [ + "reason-react" + ], + "refmt": 3 +} diff --git a/examples/bs-7.2/package-lock.json b/examples/bs-7.2/package-lock.json new file mode 100644 index 00000000..fe294e7f --- /dev/null +++ b/examples/bs-7.2/package-lock.json @@ -0,0 +1,163 @@ +{ + "name": "react-template", + "version": "0.1.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, + "bs-platform": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-3.1.5.tgz", + "integrity": "sha1-+zTuRwK8kWOEjVU3CWxPMeuu7UA=", + "dev": true + }, + "core-js": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" + }, + "encoding": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "requires": { + "iconv-lite": "~0.4.13" + } + }, + "fbjs": { + "version": "0.8.17", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", + "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", + "requires": { + "core-js": "^1.0.0", + "isomorphic-fetch": "^2.1.1", + "loose-envify": "^1.0.0", + "object-assign": "^4.1.0", + "promise": "^7.1.1", + "setimmediate": "^1.0.5", + "ua-parser-js": "^0.7.18" + } + }, + "iconv-lite": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", + "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "isomorphic-fetch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", + "requires": { + "node-fetch": "^1.0.1", + "whatwg-fetch": ">=0.10.0" + } + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" + }, + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "requires": { + "js-tokens": "^3.0.0" + } + }, + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { + "encoding": "^0.1.11", + "is-stream": "^1.0.1" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "requires": { + "asap": "~2.0.3" + } + }, + "prop-types": { + "version": "15.6.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", + "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==", + "requires": { + "loose-envify": "^1.3.1", + "object-assign": "^4.1.1" + } + }, + "react": { + "version": "16.4.1", + "resolved": "https://registry.npmjs.org/react/-/react-16.4.1.tgz", + "integrity": "sha512-3GEs0giKp6E0Oh/Y9ZC60CmYgUPnp7voH9fbjWsvXtYFb4EWtgQub0ADSq0sJR0BbHc4FThLLtzlcFaFXIorwg==", + "requires": { + "fbjs": "^0.8.16", + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.0" + } + }, + "react-dom": { + "version": "16.4.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.4.1.tgz", + "integrity": "sha512-1Gin+wghF/7gl4Cqcvr1DxFX2Osz7ugxSwl6gBqCMpdrxHjIFUS7GYxrFftZ9Ln44FHw0JxCFD9YtZsrbR5/4A==", + "requires": { + "fbjs": "^0.8.16", + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.0" + } + }, + "reason-react": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/reason-react/-/reason-react-0.4.2.tgz", + "integrity": "sha512-30SNLbpW8Ay0fB2nXb0H38ruv8I+WmznmnGze9C96+l3yEWa7/GccwwnenVLnye0t3o0j9Q9pC2E78oCw8tdDg==", + "requires": { + "react": ">=15.0.0 || >=16.0.0", + "react-dom": ">=15.0.0 || >=16.0.0" + } + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + }, + "ua-parser-js": { + "version": "0.7.18", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz", + "integrity": "sha512-LtzwHlVHwFGTptfNSgezHp7WUlwiqb0gA9AALRbKaERfxwJoiX0A73QbTToxteIAuIaFshhgIZfqK8s7clqgnA==" + }, + "whatwg-fetch": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", + "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==" + } + } +} diff --git a/examples/bs-7.2/package.json b/examples/bs-7.2/package.json new file mode 100644 index 00000000..f6ea980f --- /dev/null +++ b/examples/bs-7.2/package.json @@ -0,0 +1,25 @@ +{ + "name": "react-template", + "version": "0.1.0", + "scripts": { + "build": "bsb -make-world", + "start": "bsb -make-world -w", + "clean": "bsb -clean-world", + "test": "echo \"Error: no test specified\" && exit 1", + "webpack": "webpack -w", + "webpack:production": "NODE_ENV=production webpack" + }, + "keywords": [ + "BuckleScript" + ], + "author": "", + "license": "MIT", + "dependencies": { + "react": "^16.2.0", + "react-dom": "^16.2.0", + "reason-react": ">=0.4.0" + }, + "devDependencies": { + "bs-platform": "7.2.0" + } +} diff --git a/examples/bs-7.2/src/Component1.bs.js b/examples/bs-7.2/src/Component1.bs.js new file mode 100644 index 00000000..fa9dd109 --- /dev/null +++ b/examples/bs-7.2/src/Component1.bs.js @@ -0,0 +1,42 @@ +// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE +'use strict'; + +var Curry = require("bs-platform/lib/js/curry.js"); +var React = require("react"); +var ReasonReact = require("reason-react/src/ReasonReact.js"); + +var component = ReasonReact.statelessComponent("Page"); + +function handleClick(_event, _self) { + console.log("clicked!"); + return /* () */0; +} + +function make(message, _children) { + return { + debugName: component.debugName, + reactClassInternal: component.reactClassInternal, + handedOffState: component.handedOffState, + willReceiveProps: component.willReceiveProps, + didMount: component.didMount, + didUpdate: component.didUpdate, + willUnmount: component.willUnmount, + willUpdate: component.willUpdate, + shouldUpdate: component.shouldUpdate, + render: (function (self) { + return React.createElement("div", { + onClick: Curry._1(self.handle, handleClick) + }, message); + }), + initialState: component.initialState, + retainedProps: component.retainedProps, + reducer: component.reducer, + subscriptions: component.subscriptions, + jsElementWrapped: component.jsElementWrapped + }; +} + +exports.component = component; +exports.handleClick = handleClick; +exports.make = make; +/* component Not a pure module */ diff --git a/examples/bs-7.2/src/Component1.re b/examples/bs-7.2/src/Component1.re new file mode 100644 index 00000000..8692c337 --- /dev/null +++ b/examples/bs-7.2/src/Component1.re @@ -0,0 +1,24 @@ +/* This is the basic component. */ +let component = ReasonReact.statelessComponent("Page"); + +/* Your familiar handleClick from ReactJS. This mandatorily takes the payload, + then the `self` record, which contains state (none here), `handle`, `reduce` + and other utilities */ +let handleClick = (_event, _self) => Js.log("clicked!"); +/* let x = () => */ + +/* `make` is the function that mandatorily takes `children` (if you want to use + `JSX). `message` is a named argument, which simulates ReactJS props. Usage: + + `` + + Which desugars to + + `ReasonReact.element(Page.make(~message="hello", [||]))` */ +let make = (~message, _children) => { + ...component, + render: self => +
+ (ReasonReact.string(message)) +
, +}; \ No newline at end of file diff --git a/examples/bs-7.2/src/Component2.bs.js b/examples/bs-7.2/src/Component2.bs.js new file mode 100644 index 00000000..734ab637 --- /dev/null +++ b/examples/bs-7.2/src/Component2.bs.js @@ -0,0 +1,69 @@ +// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE +'use strict'; + +var Block = require("bs-platform/lib/js/block.js"); +var Curry = require("bs-platform/lib/js/curry.js"); +var React = require("react"); +var ReasonReact = require("reason-react/src/ReasonReact.js"); + +function z(param) { + return 2; +} + +var component = ReasonReact.reducerComponent("Example"); + +function make(greeting, _children) { + return { + debugName: component.debugName, + reactClassInternal: component.reactClassInternal, + handedOffState: component.handedOffState, + willReceiveProps: component.willReceiveProps, + didMount: component.didMount, + didUpdate: component.didUpdate, + willUnmount: component.willUnmount, + willUpdate: component.willUpdate, + shouldUpdate: component.shouldUpdate, + render: (function (self) { + var message = "You've clicked this " + (String(self.state.count) + " times(s)"); + return React.createElement("div", undefined, React.createElement("button", { + onClick: (function (_event) { + return Curry._1(self.send, /* Click */0); + }) + }, message), React.createElement("button", { + onClick: (function (_event) { + return Curry._1(self.send, /* Toggle */1); + }) + }, "Toggle greeting"), self.state.show ? greeting : null); + }), + initialState: (function (param) { + return { + count: 0, + show: true + }; + }), + retainedProps: component.retainedProps, + reducer: (function (action, state) { + if (action) { + return /* Update */Block.__(0, [{ + count: state.count, + show: !state.show + }]); + } else { + return /* Update */Block.__(0, [{ + count: state.count + 1 | 0, + show: state.show + }]); + } + }), + subscriptions: component.subscriptions, + jsElementWrapped: component.jsElementWrapped + }; +} + +var x = 10; + +exports.x = x; +exports.z = z; +exports.component = component; +exports.make = make; +/* component Not a pure module */ diff --git a/examples/bs-7.2/src/Component2.re b/examples/bs-7.2/src/Component2.re new file mode 100644 index 00000000..a57ddc8c --- /dev/null +++ b/examples/bs-7.2/src/Component2.re @@ -0,0 +1,47 @@ +/* State declaration */ +type state = { + count: int, + show: bool, +}; + +let x = 10; +let z = () => 2; + +/* Action declaration */ +type action = + | Click + | Toggle; + +/* Component template declaration. + Needs to be **after** state and action declarations! */ +let component = ReasonReact.reducerComponent("Example"); + +/* greeting and children are props. `children` isn't used, therefore ignored. + We ignore it by prepending it with an underscore */ +let make = (~greeting, _children) => { + /* spread the other default fields of component here and override a few */ + ...component, + + initialState: () => {count: 0, show: true}, + + /* State transitions */ + reducer: (action, state) => + switch (action) { + | Click => ReasonReact.Update({...state, count: state.count + 1}) + | Toggle => ReasonReact.Update({...state, show: ! state.show}) + }, + + render: self => { + let message = + "You've clicked this " ++ string_of_int(self.state.count) ++ " times(s)"; +
+ + + (self.state.show ? ReasonReact.string(greeting) : ReasonReact.null) +
; + }, +}; diff --git a/examples/bs-7.2/src/Index.bs.js b/examples/bs-7.2/src/Index.bs.js new file mode 100644 index 00000000..75dc5028 --- /dev/null +++ b/examples/bs-7.2/src/Index.bs.js @@ -0,0 +1,13 @@ +// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE +'use strict'; + +var ReactDOMRe = require("reason-react/src/ReactDOMRe.js"); +var ReasonReact = require("reason-react/src/ReasonReact.js"); +var Component1$ReactTemplate = require("./Component1.bs.js"); +var Component2$ReactTemplate = require("./Component2.bs.js"); + +ReactDOMRe.renderToElementWithId(ReasonReact.element(undefined, undefined, Component1$ReactTemplate.make("Hello!", [])), "index1"); + +ReactDOMRe.renderToElementWithId(ReasonReact.element(undefined, undefined, Component2$ReactTemplate.make("Hello!", [])), "index2"); + +/* Not a pure module */ diff --git a/examples/bs-7.2/src/Index.re b/examples/bs-7.2/src/Index.re new file mode 100644 index 00000000..9ef72411 --- /dev/null +++ b/examples/bs-7.2/src/Index.re @@ -0,0 +1,3 @@ +ReactDOMRe.renderToElementWithId(, "index1"); + +ReactDOMRe.renderToElementWithId(, "index2"); \ No newline at end of file diff --git a/examples/bs-7.2/src/index.html b/examples/bs-7.2/src/index.html new file mode 100644 index 00000000..aaec6743 --- /dev/null +++ b/examples/bs-7.2/src/index.html @@ -0,0 +1,15 @@ + + + + + ReasonReact Examples + + + Component 1: +
+ Component 2: +
+ + + + diff --git a/src/analyze_example_tests/ExamplesTests.re b/src/analyze_example_tests/ExamplesTests.re index a0f88772..626fe366 100644 --- a/src/analyze_example_tests/ExamplesTests.re +++ b/src/analyze_example_tests/ExamplesTests.re @@ -64,6 +64,7 @@ let projects = (Sys.os_type == "Unix" ? esyProjects : []) @ [ ("example-react", ["src", "__tests__"], "npm install"), ("name_with_underscore", ["src"], "npm install"), ("bs-3.1.5", ["src"], "npm install"), + ("bs-7.2", ["src"], "npm install"), ]; // let main = (baseDir, _verbose, args) => { diff --git a/src/analyze_fixture_tests/AnalyzeFixtureTests.re b/src/analyze_fixture_tests/AnalyzeFixtureTests.re index 832fea1b..0d609801 100644 --- a/src/analyze_fixture_tests/AnalyzeFixtureTests.re +++ b/src/analyze_fixture_tests/AnalyzeFixtureTests.re @@ -38,6 +38,7 @@ let (/+) = Filename.concat; let projectDirs = [ ("examples" /+ "bs-3.1.5", "npm i"), + ("examples" /+ "bs-7.2", "npm i"), ("examples" /+ "dune", "esy"), ("examples" /+ "example-react", "npm i"), (".", "esy"), From bf3f33ad25bdaa06d090959b6bc37d3d80bda063 Mon Sep 17 00:00:00 2001 From: Jared Forsyth Date: Mon, 2 Mar 2020 19:30:03 -0700 Subject: [PATCH 6/6] lockfile updates --- esy.lock/.gitattributes | 2 +- esy.lock/index.json | 601 ++++++++---------- esy.lock/opam/atd.2.0.0/opam | 34 - esy.lock/opam/atdgen-runtime.2.0.0/opam | 29 - esy.lock/opam/atdgen.2.0.0/opam | 44 -- .../opam/{base.v0.13.0 => base.v0.13.1}/opam | 6 +- esy.lock/opam/biniou.1.2.1/opam | 45 -- esy.lock/opam/dune-configurator.1.0.0/opam | 9 - esy.lock/opam/dune-configurator.2.3.1/opam | 43 ++ esy.lock/opam/dune-private-libs.2.3.1/opam | 42 ++ .../opam/{dune.1.11.4 => dune.2.3.1}/opam | 35 +- esy.lock/opam/easy-format.1.3.2/opam | 46 -- esy.lock/opam/jbuilder.transition/opam | 18 - .../opam/{junit.2.0.1 => junit.2.0.2}/opam | 9 +- esy.lock/opam/menhir.20190924/opam | 29 - esy.lock/opam/menhir.20200211/opam | 27 + esy.lock/opam/menhirLib.20200211/opam | 25 + esy.lock/opam/menhirSdk.20200211/opam | 25 + .../opam | 6 +- .../{ppxlib.0.10.0 => ppxlib.0.12.0}/opam | 8 +- esy.lock/opam/{result.1.4 => result.1.5}/opam | 4 +- esy.lock/opam/stringext.1.6.0/opam | 32 + esy.lock/opam/uri.3.1.0/opam | 35 + esy.lock/opam/yojson.1.7.0/opam | 38 -- examples/bs-7.2/package-lock.json | 6 +- examples/example-react/package-lock.json | 46 +- 26 files changed, 569 insertions(+), 675 deletions(-) delete mode 100644 esy.lock/opam/atd.2.0.0/opam delete mode 100644 esy.lock/opam/atdgen-runtime.2.0.0/opam delete mode 100644 esy.lock/opam/atdgen.2.0.0/opam rename esy.lock/opam/{base.v0.13.0 => base.v0.13.1}/opam (86%) delete mode 100644 esy.lock/opam/biniou.1.2.1/opam delete mode 100644 esy.lock/opam/dune-configurator.1.0.0/opam create mode 100644 esy.lock/opam/dune-configurator.2.3.1/opam create mode 100644 esy.lock/opam/dune-private-libs.2.3.1/opam rename esy.lock/opam/{dune.1.11.4 => dune.2.3.1}/opam (56%) delete mode 100644 esy.lock/opam/easy-format.1.3.2/opam delete mode 100644 esy.lock/opam/jbuilder.transition/opam rename esy.lock/opam/{junit.2.0.1 => junit.2.0.2}/opam (73%) delete mode 100644 esy.lock/opam/menhir.20190924/opam create mode 100644 esy.lock/opam/menhir.20200211/opam create mode 100644 esy.lock/opam/menhirLib.20200211/opam create mode 100644 esy.lock/opam/menhirSdk.20200211/opam rename esy.lock/opam/{ocaml-migrate-parsetree.1.5.0 => ocaml-migrate-parsetree.1.6.0}/opam (79%) rename esy.lock/opam/{ppxlib.0.10.0 => ppxlib.0.12.0}/opam (80%) rename esy.lock/opam/{result.1.4 => result.1.5}/opam (83%) create mode 100644 esy.lock/opam/stringext.1.6.0/opam create mode 100644 esy.lock/opam/uri.3.1.0/opam delete mode 100644 esy.lock/opam/yojson.1.7.0/opam diff --git a/esy.lock/.gitattributes b/esy.lock/.gitattributes index 25366aee..e0b4e26c 100644 --- a/esy.lock/.gitattributes +++ b/esy.lock/.gitattributes @@ -1,3 +1,3 @@ # Set eol to LF so files aren't converted to CRLF-eol on Windows. -* text eol=lf +* text eol=lf linguist-generated diff --git a/esy.lock/index.json b/esy.lock/index.json index 9b141cd8..cbff6296 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "382d9c0d7c8d337566e561eb27a5d3de", + "checksum": "f566254bb91be0a33189550ffce4126e", "root": "reason-language-server@link-dev:./package.json", "node": { "rex-json@1.4.0@d41d8cd9": { @@ -16,26 +16,6 @@ "dependencies": [], "devDependencies": [] }, - "refmterr@3.2.2@d41d8cd9": { - "id": "refmterr@3.2.2@d41d8cd9", - "name": "refmterr", - "version": "3.2.2", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/refmterr/-/refmterr-3.2.2.tgz#sha1:b7d6c5df6a37633ec82d339dc609b1867e54e55e" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.2.2@d41d8cd9", - "@reason-native/console@0.1.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:1.11.4@a7ccb7ae", - "@opam/atdgen@opam:2.0.0@46af0360", - "@esy-ocaml/reason@3.5.2@d41d8cd9" - ], - "devDependencies": [] - }, "reason-language-server@link-dev:./package.json": { "id": "reason-language-server@link-dev:./package.json", "name": "reason-language-server", @@ -48,14 +28,15 @@ "overrides": [], "dependencies": [ "rex-json@1.4.0@d41d8cd9", "ocaml@4.8.1000@d41d8cd9", - "@reason-native/rely@3.1.0@d41d8cd9", - "@reason-native/pastel@0.2.2@d41d8cd9", + "@reason-native/rely@3.2.1@d41d8cd9", + "@reason-native/pastel@0.2.3@d41d8cd9", + "@opam/uri@opam:3.1.0@d38ac0ae", "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/reason@opam:3.5.2@f689c2cb", - "@opam/ppxlib@opam:0.10.0@011ee889", + "@opam/ppxlib@opam:0.12.0@fcf5cabc", "@opam/ppx_tools_versioned@opam:5.2.3@4994ec80", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", - "@opam/dune@opam:1.11.4@a7ccb7ae", + "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", + "@opam/dune@opam:2.3.1@b10b59bf", "@opam/ANSITerminal@opam:0.8.1@531211e6" ], "devDependencies": [] @@ -74,40 +55,40 @@ "dependencies": [], "devDependencies": [] }, - "@reason-native/rely@3.1.0@d41d8cd9": { - "id": "@reason-native/rely@3.1.0@d41d8cd9", + "@reason-native/rely@3.2.1@d41d8cd9": { + "id": "@reason-native/rely@3.2.1@d41d8cd9", "name": "@reason-native/rely", - "version": "3.1.0", + "version": "3.2.1", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@reason-native/rely/-/rely-3.1.0.tgz#sha1:4f59906dc7c18ba86c998e44d6463b6be866dfc6" + "archive:https://registry.npmjs.org/@reason-native/rely/-/rely-3.2.1.tgz#sha1:7945ac6a51773a97b8f8cfd97d2855ac7ac4ecb2" ] }, "overrides": [], "dependencies": [ - "refmterr@3.2.2@d41d8cd9", "ocaml@4.8.1000@d41d8cd9", - "@reason-native/pastel@0.2.2@d41d8cd9", + "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.2.3@d41d8cd9", "@reason-native/file-context-printer@0.0.3@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/junit@opam:2.0.1@1b4d302c", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/reason@3.5.2@d41d8cd9" + "@reason-native/cli@0.0.1-alpha@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/junit@opam:2.0.2@0b7bd730", + "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [] }, - "@reason-native/pastel@0.2.2@d41d8cd9": { - "id": "@reason-native/pastel@0.2.2@d41d8cd9", + "@reason-native/pastel@0.2.3@d41d8cd9": { + "id": "@reason-native/pastel@0.2.3@d41d8cd9", "name": "@reason-native/pastel", - "version": "0.2.2", + "version": "0.2.3", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@reason-native/pastel/-/pastel-0.2.2.tgz#sha1:a1f7fe266223aaf7915a71f5c8b9ee58e065c62a" + "archive:https://registry.npmjs.org/@reason-native/pastel/-/pastel-0.2.3.tgz#sha1:5c5d420c09874584ce15a38695c5dfd0f0ff5dfa" ] }, "overrides": [], "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/reason@3.5.2@d41d8cd9" + "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [] }, @@ -123,57 +104,30 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.2.2@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.2.3@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [] }, - "@reason-native/console@0.1.0@d41d8cd9": { - "id": "@reason-native/console@0.1.0@d41d8cd9", - "name": "@reason-native/console", - "version": "0.1.0", + "@reason-native/cli@0.0.1-alpha@d41d8cd9": { + "id": "@reason-native/cli@0.0.1-alpha@d41d8cd9", + "name": "@reason-native/cli", + "version": "0.0.1-alpha", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@reason-native/console/-/console-0.1.0.tgz#sha1:3b56f0e9e1be8464329793df29020aa90e71c22c" + "archive:https://registry.npmjs.org/@reason-native/cli/-/cli-0.0.1-alpha.tgz#sha1:0b911053fa7cc661eac10ead50d6ea6cc1fcd94d" ] }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.2.3@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [] }, - "@opam/yojson@opam:1.7.0@7056d985": { - "id": "@opam/yojson@opam:1.7.0@7056d985", - "name": "@opam/yojson", - "version": "opam:1.7.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/b8/b89d39ca3f8c532abe5f547ad3b8f84d#md5:b89d39ca3f8c532abe5f547ad3b8f84d", - "archive:https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz#md5:b89d39ca3f8c532abe5f547ad3b8f84d" - ], - "opam": { - "name": "yojson", - "version": "1.7.0", - "path": "esy.lock/opam/yojson.1.7.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@opam/cppo@opam:1.6.6@f4f83858", - "@opam/biniou@opam:1.2.1@d7570399", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@opam/biniou@opam:1.2.1@d7570399" - ] - }, "@opam/uutf@opam:1.0.2@4440868f": { "id": "@opam/uutf@opam:1.0.2@4440868f", "name": "@opam/uutf", @@ -202,6 +156,33 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, + "@opam/uri@opam:3.1.0@d38ac0ae": { + "id": "@opam/uri@opam:3.1.0@d38ac0ae", + "name": "@opam/uri", + "version": "opam:3.1.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/c4/c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43#sha256:c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43", + "archive:https://github.com/mirage/ocaml-uri/releases/download/v3.1.0/uri-v3.1.0.tbz#sha256:c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43" + ], + "opam": { + "name": "uri", + "version": "3.1.0", + "path": "esy.lock/opam/uri.3.1.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/stringext@opam:1.6.0@104bc94b", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.3.1@b10b59bf", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/stringext@opam:1.6.0@104bc94b", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.3.1@b10b59bf" + ] + }, "@opam/uchar@opam:0.0.2@c8218eea": { "id": "@opam/uchar@opam:0.0.2@c8218eea", "name": "@opam/uchar", @@ -245,12 +226,12 @@ "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:1.11.4@a7ccb7ae" + "@opam/dune@opam:2.3.1@b10b59bf" ] }, "@opam/topkg@opam:1.0.1@a42c631e": { @@ -279,6 +260,33 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" ] }, + "@opam/stringext@opam:1.6.0@104bc94b": { + "id": "@opam/stringext@opam:1.6.0@104bc94b", + "name": "@opam/stringext", + "version": "opam:1.6.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/db/db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea#sha256:db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea", + "archive:https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz#sha256:db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" + ], + "opam": { + "name": "stringext", + "version": "1.6.0", + "path": "esy.lock/opam/stringext.1.6.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", + "@opam/base-bytes@opam:base@19d0c2ff", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", + "@opam/base-bytes@opam:base@19d0c2ff" + ] + }, "@opam/stdlib-shims@opam:0.1.0@d957c903": { "id": "@opam/stdlib-shims@opam:0.1.0@d957c903", "name": "@opam/stdlib-shims", @@ -297,11 +305,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" ] }, "@opam/stdio@opam:v0.13.0@eb59d879": { @@ -322,13 +330,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", - "@opam/base@opam:v0.13.0@93f21415", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", + "@opam/base@opam:v0.13.1@7d937ed0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", - "@opam/base@opam:v0.13.0@93f21415" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", + "@opam/base@opam:v0.13.1@7d937ed0" ] }, "@opam/sexplib0@opam:v0.13.0@3f54c2be": { @@ -349,11 +357,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -375,29 +383,29 @@ ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, - "@opam/result@opam:1.4@dc720aef": { - "id": "@opam/result@opam:1.4@dc720aef", + "@opam/result@opam:1.5@6b753c82": { + "id": "@opam/result@opam:1.5@6b753c82", "name": "@opam/result", - "version": "opam:1.4", + "version": "opam:1.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/d3/d3162dbc501a2af65c8c71e0866541da#md5:d3162dbc501a2af65c8c71e0866541da", - "archive:https://github.com/janestreet/result/archive/1.4.tar.gz#md5:d3162dbc501a2af65c8c71e0866541da" + "archive:https://opam.ocaml.org/cache/md5/1b/1b82dec78849680b49ae9a8a365b831b#md5:1b82dec78849680b49ae9a8a365b831b", + "archive:https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz#md5:1b82dec78849680b49ae9a8a365b831b" ], "opam": { "name": "result", - "version": "1.4", - "path": "esy.lock/opam/result.1.4" + "version": "1.5", + "path": "esy.lock/opam/result.1.5" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" ] }, "@opam/reason@opam:3.5.2@f689c2cb": { @@ -418,19 +426,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", + "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", "@opam/merlin-extend@opam:0.5@a5dd7d4b", - "@opam/menhir@opam:20190924@004407ff", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/menhir@opam:20200211@90483d81", + "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", "@opam/merlin-extend@opam:0.5@a5dd7d4b", - "@opam/menhir@opam:20190924@004407ff", - "@opam/dune@opam:1.11.4@a7ccb7ae" + "@opam/menhir@opam:20200211@90483d81", + "@opam/dune@opam:2.3.1@b10b59bf" ] }, "@opam/re@opam:1.9.0@d4d5e13d": { @@ -452,11 +460,11 @@ "overrides": [], "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:1.11.4@a7ccb7ae" + "@opam/dune@opam:2.3.1@b10b59bf" ] }, "@opam/ptime@opam:0.8.5@0051d642": { @@ -478,47 +486,46 @@ "overrides": [], "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", - "@opam/result@opam:1.4@dc720aef", + "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef" + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82" ] }, - "@opam/ppxlib@opam:0.10.0@011ee889": { - "id": "@opam/ppxlib@opam:0.10.0@011ee889", + "@opam/ppxlib@opam:0.12.0@fcf5cabc": { + "id": "@opam/ppxlib@opam:0.12.0@fcf5cabc", "name": "@opam/ppxlib", - "version": "opam:0.10.0", + "version": "opam:0.12.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/58/588e85c759688742ae0bd2cb1a53f0f555a76d8810ad9a9dbb026a076a0c10af#sha256:588e85c759688742ae0bd2cb1a53f0f555a76d8810ad9a9dbb026a076a0c10af", - "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.10.0/ppxlib-0.10.0.tbz#sha256:588e85c759688742ae0bd2cb1a53f0f555a76d8810ad9a9dbb026a076a0c10af" + "archive:https://opam.ocaml.org/cache/sha256/6b/6b562c9b3b9350777318729921f890850b385c469db60769aafd9371998a2c42#sha256:6b562c9b3b9350777318729921f890850b385c469db60769aafd9371998a2c42", + "archive:https://github.com/ocaml-ppx/ppxlib/archive/0.12.0.tar.gz#sha256:6b562c9b3b9350777318729921f890850b385c469db60769aafd9371998a2c42" ], "opam": { "name": "ppxlib", - "version": "0.10.0", - "path": "esy.lock/opam/ppxlib.0.10.0" + "version": "0.12.0", + "path": "esy.lock/opam/ppxlib.0.12.0" } }, "overrides": [], "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/stdio@opam:v0.13.0@eb59d879", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", + "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d", - "@opam/dune@opam:1.11.4@a7ccb7ae", - "@opam/base@opam:v0.13.0@93f21415", + "@opam/dune@opam:2.3.1@b10b59bf", "@opam/base@opam:v0.13.1@7d937ed0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/stdio@opam:v0.13.0@eb59d879", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", + "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@opam/base@opam:v0.13.0@93f21415" + "@opam/dune@opam:2.3.1@b10b59bf", "@opam/base@opam:v0.13.1@7d937ed0" ] }, "@opam/ppx_tools_versioned@opam:5.2.3@4994ec80": { @@ -540,13 +547,13 @@ "overrides": [], "dependencies": [ "ocaml@4.8.1000@d41d8cd9", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", + "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", - "@opam/dune@opam:1.11.4@a7ccb7ae" + "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", + "@opam/dune@opam:2.3.1@b10b59bf" ] }, "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { @@ -567,11 +574,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" ] }, "@opam/ocamlfind@opam:1.8.1@ff07b0f9": { @@ -630,32 +637,32 @@ ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc": { - "id": "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", + "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7": { + "id": "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", "name": "@opam/ocaml-migrate-parsetree", - "version": "opam:1.5.0", + "version": "opam:1.6.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/7f/7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0#sha256:7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0", - "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.5.0/ocaml-migrate-parsetree-v1.5.0.tbz#sha256:7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0" + "archive:https://opam.ocaml.org/cache/sha256/9b/9b018e7d25114ce17fc0b82b7cd7c927b84ebb6b043aa987fa7731c2484de33f#sha256:9b018e7d25114ce17fc0b82b7cd7c927b84ebb6b043aa987fa7731c2484de33f", + "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.6.0/ocaml-migrate-parsetree-v1.6.0.tbz#sha256:9b018e7d25114ce17fc0b82b7cd7c927b84ebb6b043aa987fa7731c2484de33f" ], "opam": { "name": "ocaml-migrate-parsetree", - "version": "1.5.0", - "path": "esy.lock/opam/ocaml-migrate-parsetree.1.5.0" + "version": "1.6.0", + "path": "esy.lock/opam/ocaml-migrate-parsetree.1.6.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:1.11.4@a7ccb7ae" + "@opam/dune@opam:2.3.1@b10b59bf" ] }, "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d": { @@ -676,11 +683,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" ] }, "@opam/merlin-extend@opam:0.5@a5dd7d4b": { @@ -701,143 +708,182 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" ] }, - "@opam/menhir@opam:20190924@004407ff": { - "id": "@opam/menhir@opam:20190924@004407ff", - "name": "@opam/menhir", - "version": "opam:20190924", + "@opam/menhirSdk@opam:20200211@1b43927c": { + "id": "@opam/menhirSdk@opam:20200211@1b43927c", + "name": "@opam/menhirSdk", + "version": "opam:20200211", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/67/677f1997fb73177d5a00fa1b8d61c3ef#md5:677f1997fb73177d5a00fa1b8d61c3ef", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20190924/archive.tar.gz#md5:677f1997fb73177d5a00fa1b8d61c3ef" + "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" ], "opam": { - "name": "menhir", - "version": "20190924", - "path": "esy.lock/opam/menhir.20190924" + "name": "menhirSdk", + "version": "20200211", + "path": "esy.lock/opam/menhirSdk.20200211" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" + ] }, - "@opam/junit@opam:2.0.1@1b4d302c": { - "id": "@opam/junit@opam:2.0.1@1b4d302c", - "name": "@opam/junit", - "version": "opam:2.0.1", + "@opam/menhirLib@opam:20200211@99279102": { + "id": "@opam/menhirLib@opam:20200211@99279102", + "name": "@opam/menhirLib", + "version": "opam:20200211", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/40/40224fb3d4f5e47dc5ff4605587d383b#md5:40224fb3d4f5e47dc5ff4605587d383b", - "archive:https://github.com/Khady/ocaml-junit/releases/download/2.0.1/junit-2.0.1.tbz#md5:40224fb3d4f5e47dc5ff4605587d383b" + "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" ], "opam": { - "name": "junit", - "version": "2.0.1", - "path": "esy.lock/opam/junit.2.0.1" + "name": "menhirLib", + "version": "20200211", + "path": "esy.lock/opam/menhirLib.20200211" } }, "overrides": [], "dependencies": [ - "@opam/tyxml@opam:4.3.0@c1da25f1", "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/tyxml@opam:4.3.0@c1da25f1", "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" ] }, - "@opam/jbuilder@opam:transition@20522f05": { - "id": "@opam/jbuilder@opam:transition@20522f05", - "name": "@opam/jbuilder", - "version": "opam:transition", + "@opam/menhir@opam:20200211@90483d81": { + "id": "@opam/menhir@opam:20200211@90483d81", + "name": "@opam/menhir", + "version": "opam:20200211", "source": { "type": "install", - "source": [ "no-source:" ], + "source": [ + "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + ], "opam": { - "name": "jbuilder", - "version": "transition", - "path": "esy.lock/opam/jbuilder.transition" + "name": "menhir", + "version": "20200211", + "path": "esy.lock/opam/menhir.20200211" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@1b43927c", + "@opam/menhirLib@opam:20200211@99279102", + "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@1b43927c", + "@opam/menhirLib@opam:20200211@99279102", + "@opam/dune@opam:2.3.1@b10b59bf" ] }, - "@opam/easy-format@opam:1.3.2@0484b3c4": { - "id": "@opam/easy-format@opam:1.3.2@0484b3c4", - "name": "@opam/easy-format", - "version": "opam:1.3.2", + "@opam/junit@opam:2.0.2@0b7bd730": { + "id": "@opam/junit@opam:2.0.2@0b7bd730", + "name": "@opam/junit", + "version": "opam:2.0.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/34/3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926#sha256:3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926", - "archive:https://github.com/mjambon/easy-format/releases/download/1.3.2/easy-format-1.3.2.tbz#sha256:3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926" + "archive:https://opam.ocaml.org/cache/sha256/fd/fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01#sha256:fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01", + "archive:https://github.com/Khady/ocaml-junit/releases/download/2.0.2/junit-2.0.2.tbz#sha256:fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01" ], "opam": { - "name": "easy-format", - "version": "1.3.2", - "path": "esy.lock/opam/easy-format.1.3.2" + "name": "junit", + "version": "2.0.2", + "path": "esy.lock/opam/junit.2.0.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "@opam/tyxml@opam:4.3.0@c1da25f1", "@opam/ptime@opam:0.8.5@0051d642", + "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "@opam/tyxml@opam:4.3.0@c1da25f1", "@opam/ptime@opam:0.8.5@0051d642", + "@opam/dune@opam:2.3.1@b10b59bf" + ] + }, + "@opam/dune-private-libs@opam:2.3.1@6390fc3e": { + "id": "@opam/dune-private-libs@opam:2.3.1@6390fc3e", + "name": "@opam/dune-private-libs", + "version": "opam:2.3.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/b2/b2b3dd9cdfd34ef8c4583ea8c52c3503c2395bf94c264af19d6450547e12f5cb#sha256:b2b3dd9cdfd34ef8c4583ea8c52c3503c2395bf94c264af19d6450547e12f5cb", + "archive:https://github.com/ocaml/dune/releases/download/2.3.1/dune-2.3.1.tbz#sha256:b2b3dd9cdfd34ef8c4583ea8c52c3503c2395bf94c264af19d6450547e12f5cb" + ], + "opam": { + "name": "dune-private-libs", + "version": "2.3.1", + "path": "esy.lock/opam/dune-private-libs.2.3.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" ] }, - "@opam/dune-configurator@opam:1.0.0@4873acd8": { - "id": "@opam/dune-configurator@opam:1.0.0@4873acd8", + "@opam/dune-configurator@opam:2.3.1@f275cf9a": { + "id": "@opam/dune-configurator@opam:2.3.1@f275cf9a", "name": "@opam/dune-configurator", - "version": "opam:1.0.0", + "version": "opam:2.3.1", "source": { "type": "install", - "source": [ "no-source:" ], + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/b2/b2b3dd9cdfd34ef8c4583ea8c52c3503c2395bf94c264af19d6450547e12f5cb#sha256:b2b3dd9cdfd34ef8c4583ea8c52c3503c2395bf94c264af19d6450547e12f5cb", + "archive:https://github.com/ocaml/dune/releases/download/2.3.1/dune-2.3.1.tbz#sha256:b2b3dd9cdfd34ef8c4583ea8c52c3503c2395bf94c264af19d6450547e12f5cb" + ], "opam": { "name": "dune-configurator", - "version": "1.0.0", - "path": "esy.lock/opam/dune-configurator.1.0.0" + "version": "2.3.1", + "path": "esy.lock/opam/dune-configurator.2.3.1" } }, "overrides": [], "dependencies": [ - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-private-libs@opam:2.3.1@6390fc3e", + "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "@opam/dune@opam:1.11.4@a7ccb7ae" ] + "devDependencies": [ + "@opam/dune-private-libs@opam:2.3.1@6390fc3e", + "@opam/dune@opam:2.3.1@b10b59bf" + ] }, - "@opam/dune@opam:1.11.4@a7ccb7ae": { - "id": "@opam/dune@opam:1.11.4@a7ccb7ae", + "@opam/dune@opam:2.3.1@b10b59bf": { + "id": "@opam/dune@opam:2.3.1@b10b59bf", "name": "@opam/dune", - "version": "opam:1.11.4", + "version": "opam:2.3.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/77/77cb5f483221b266ded2b85fc84173ae0089a25134a086be922e82c131456ce6#sha256:77cb5f483221b266ded2b85fc84173ae0089a25134a086be922e82c131456ce6", - "archive:https://github.com/ocaml/dune/releases/download/1.11.4/dune-build-info-1.11.4.tbz#sha256:77cb5f483221b266ded2b85fc84173ae0089a25134a086be922e82c131456ce6" + "archive:https://opam.ocaml.org/cache/sha256/b2/b2b3dd9cdfd34ef8c4583ea8c52c3503c2395bf94c264af19d6450547e12f5cb#sha256:b2b3dd9cdfd34ef8c4583ea8c52c3503c2395bf94c264af19d6450547e12f5cb", + "archive:https://github.com/ocaml/dune/releases/download/2.3.1/dune-2.3.1.tbz#sha256:b2b3dd9cdfd34ef8c4583ea8c52c3503c2395bf94c264af19d6450547e12f5cb" ], "opam": { "name": "dune", - "version": "1.11.4", - "path": "esy.lock/opam/dune.1.11.4" + "version": "2.3.1", + "path": "esy.lock/opam/dune.2.3.1" } }, "overrides": [], @@ -869,12 +915,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -895,32 +941,6 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/biniou@opam:1.2.1@d7570399": { - "id": "@opam/biniou@opam:1.2.1@d7570399", - "name": "@opam/biniou", - "version": "opam:1.2.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/35/35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335#sha256:35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335", - "archive:https://github.com/mjambon/biniou/releases/download/1.2.1/biniou-1.2.1.tbz#sha256:35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335" - ], - "opam": { - "name": "biniou", - "version": "1.2.1", - "path": "esy.lock/opam/biniou.1.2.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.4@a7ccb7ae" - ] - }, "@opam/base-unix@opam:base@87d0b2eb": { "id": "@opam/base-unix@opam:base@87d0b2eb", "name": "@opam/base-unix", @@ -977,121 +997,32 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9" ] }, - "@opam/base@opam:v0.13.0@93f21415": { - "id": "@opam/base@opam:v0.13.0@93f21415", + "@opam/base@opam:v0.13.1@7d937ed0": { + "id": "@opam/base@opam:v0.13.1@7d937ed0", "name": "@opam/base", - "version": "opam:v0.13.0", + "version": "opam:v0.13.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/52/527289dbc2c7de748f965d3caae450cb#md5:527289dbc2c7de748f965d3caae450cb", - "archive:https://ocaml.janestreet.com/ocaml-core/v0.13/files/base-v0.13.0.tar.gz#md5:527289dbc2c7de748f965d3caae450cb" + "archive:https://opam.ocaml.org/cache/md5/29/296457416f9a8b75e6edfc3b1140e384#md5:296457416f9a8b75e6edfc3b1140e384", + "archive:https://github.com/janestreet/base/archive/v0.13.1.tar.gz#md5:296457416f9a8b75e6edfc3b1140e384" ], "opam": { "name": "base", - "version": "v0.13.0", - "path": "esy.lock/opam/base.v0.13.0" + "version": "v0.13.1", + "path": "esy.lock/opam/base.v0.13.1" } }, "overrides": [], "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be", - "@opam/dune-configurator@opam:1.0.0@4873acd8", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-configurator@opam:2.3.1@f275cf9a", + "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be", - "@opam/dune-configurator@opam:1.0.0@4873acd8", - "@opam/dune@opam:1.11.4@a7ccb7ae" - ] - }, - "@opam/atdgen-runtime@opam:2.0.0@60f6faab": { - "id": "@opam/atdgen-runtime@opam:2.0.0@60f6faab", - "name": "@opam/atdgen-runtime", - "version": "opam:2.0.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/14/14e47609397c524ea0eae7c3f14f7ccf#md5:14e47609397c524ea0eae7c3f14f7ccf", - "archive:https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz#md5:14e47609397c524ea0eae7c3f14f7ccf" - ], - "opam": { - "name": "atdgen-runtime", - "version": "2.0.0", - "path": "esy.lock/opam/atdgen-runtime.2.0.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@20522f05", - "@opam/biniou@opam:1.2.1@d7570399", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@20522f05", - "@opam/biniou@opam:1.2.1@d7570399" - ] - }, - "@opam/atdgen@opam:2.0.0@46af0360": { - "id": "@opam/atdgen@opam:2.0.0@46af0360", - "name": "@opam/atdgen", - "version": "opam:2.0.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/14/14e47609397c524ea0eae7c3f14f7ccf#md5:14e47609397c524ea0eae7c3f14f7ccf", - "archive:https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz#md5:14e47609397c524ea0eae7c3f14f7ccf" - ], - "opam": { - "name": "atdgen", - "version": "2.0.0", - "path": "esy.lock/opam/atdgen.2.0.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@20522f05", - "@opam/biniou@opam:1.2.1@d7570399", - "@opam/atdgen-runtime@opam:2.0.0@60f6faab", - "@opam/atd@opam:2.0.0@e0ddd12f", "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@20522f05", - "@opam/biniou@opam:1.2.1@d7570399", - "@opam/atdgen-runtime@opam:2.0.0@60f6faab", - "@opam/atd@opam:2.0.0@e0ddd12f" - ] - }, - "@opam/atd@opam:2.0.0@e0ddd12f": { - "id": "@opam/atd@opam:2.0.0@e0ddd12f", - "name": "@opam/atd", - "version": "opam:2.0.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/14/14e47609397c524ea0eae7c3f14f7ccf#md5:14e47609397c524ea0eae7c3f14f7ccf", - "archive:https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz#md5:14e47609397c524ea0eae7c3f14f7ccf" - ], - "opam": { - "name": "atd", - "version": "2.0.0", - "path": "esy.lock/opam/atd.2.0.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/menhir@opam:20190924@004407ff", - "@opam/jbuilder@opam:transition@20522f05", - "@opam/easy-format@opam:1.3.2@0484b3c4", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/jbuilder@opam:transition@20522f05", - "@opam/easy-format@opam:1.3.2@0484b3c4" + "@opam/dune-configurator@opam:2.3.1@f275cf9a", + "@opam/dune@opam:2.3.1@b10b59bf" ] }, "@opam/ANSITerminal@opam:0.8.1@531211e6": { @@ -1112,13 +1043,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -1149,12 +1080,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", + "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", "@opam/merlin-extend@opam:0.5@a5dd7d4b", - "@opam/menhir@opam:20190924@004407ff", - "@opam/dune@opam:1.11.4@a7ccb7ae" + "@opam/menhir@opam:20200211@90483d81", + "@opam/dune@opam:2.3.1@b10b59bf" ], "devDependencies": [] } diff --git a/esy.lock/opam/atd.2.0.0/opam b/esy.lock/opam/atd.2.0.0/opam deleted file mode 100644 index 2808354c..00000000 --- a/esy.lock/opam/atd.2.0.0/opam +++ /dev/null @@ -1,34 +0,0 @@ -opam-version: "2.0" -maintainer: "martin@mjambon.com" -authors: ["Martin Jambon"] - -homepage: "https://github.com/mjambon/atd" -bug-reports: "https://github.com/mjambon/atd/issues" -dev-repo: "git://github.com/mjambon/atd.git" - -build: [ - ["jbuilder" "subst" "-p" name] {pinned} - ["jbuilder" "build" "-p" name "-j" jobs] -] - -# Restore when https://github.com/mjambon/atd/issues/121 is resolved. -# build-test: [ -# ["jbuilder" "runtest" "-p" name] -# ] - -depends: [ - "ocaml" {>= "4.03.0"} - "jbuilder" - "menhir" {build} - "easy-format" -] -synopsis: "Parser for the ATD data format description language" -description: """ -ATD is the OCaml library providing a parser for the ATD language and -various utilities. ATD stands for Adjustable Type Definitions in -reference to its main property of supporting annotations that allow a -good fit with a variety of data formats.""" -url { - src: "https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz" - checksum: "md5=14e47609397c524ea0eae7c3f14f7ccf" -} diff --git a/esy.lock/opam/atdgen-runtime.2.0.0/opam b/esy.lock/opam/atdgen-runtime.2.0.0/opam deleted file mode 100644 index 7236d930..00000000 --- a/esy.lock/opam/atdgen-runtime.2.0.0/opam +++ /dev/null @@ -1,29 +0,0 @@ -opam-version: "2.0" -maintainer: "martin@mjambon.com" -authors: ["Martin Jambon"] - -homepage: "https://github.com/mjambon/atd" -bug-reports: "https://github.com/mjambon/atd/issues" -dev-repo: "git://github.com/mjambon/atd.git" - -build: [ - ["jbuilder" "subst" "-p" name] {pinned} - ["jbuilder" "build" "-p" name "-j" jobs] -] - -# Restore when https://github.com/mjambon/atd/issues/121 is resolved. -# build-test: [ -# ["jbuilder" "runtest" "-p" name] -# ] - -depends: [ - "ocaml" {>= "4.02.3"} - "jbuilder" - "biniou" {>= "1.0.6"} - "yojson" {>= "1.2.1"} -] -synopsis: "Runtime library for code generated by atdgen." -url { - src: "https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz" - checksum: "md5=14e47609397c524ea0eae7c3f14f7ccf" -} diff --git a/esy.lock/opam/atdgen.2.0.0/opam b/esy.lock/opam/atdgen.2.0.0/opam deleted file mode 100644 index d71d304e..00000000 --- a/esy.lock/opam/atdgen.2.0.0/opam +++ /dev/null @@ -1,44 +0,0 @@ -opam-version: "2.0" -maintainer: "martin@mjambon.com" -authors: ["Martin Jambon"] - -homepage: "https://github.com/mjambon/atd" -bug-reports: "https://github.com/mjambon/atd/issues" -dev-repo: "git://github.com/mjambon/atd.git" - -build: [ - ["jbuilder" "subst" "-p" name] {pinned} - ["jbuilder" "build" "-p" name "-j" jobs] -] - -# Restore when https://github.com/mjambon/atd/issues/121 is resolved. -# build-test: [ -# ["jbuilder" "runtest" "-p" name] -# ] - -depends: [ - "ocaml" {>= "4.03.0"} - "jbuilder" - "atd" {>= "2.0.0"} - "atdgen-runtime" {>= "2.0.0"} - "biniou" {>= "1.0.6"} - "yojson" {>= "1.2.1"} -] -synopsis: - "Generates efficient JSON serializers, deserializers and validators" -description: """ -Atdgen is a command-line program that takes as input type definitions in the -ATD syntax and produces OCaml code suitable for data serialization and -deserialization. - -Two data formats are currently supported, these are biniou and JSON. -Atdgen-biniou and Atdgen-json will refer to Atdgen used in one context or the -other. - -Atdgen was designed with efficiency and durability in mind. Software authors -are encouraged to use Atdgen directly and to write tools that may reuse part of -Atdgen’s source code.""" -url { - src: "https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz" - checksum: "md5=14e47609397c524ea0eae7c3f14f7ccf" -} diff --git a/esy.lock/opam/base.v0.13.0/opam b/esy.lock/opam/base.v0.13.1/opam similarity index 86% rename from esy.lock/opam/base.v0.13.0/opam rename to esy.lock/opam/base.v0.13.1/opam index 3756d1e6..e3c61b28 100644 --- a/esy.lock/opam/base.v0.13.0/opam +++ b/esy.lock/opam/base.v0.13.1/opam @@ -10,7 +10,7 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.04.2" & < "4.10.0"} + "ocaml" {>= "4.04.2"} "sexplib0" {>= "v0.13" & < "v0.14"} "dune" {>= "1.5.1"} "dune-configurator" @@ -31,6 +31,6 @@ provided by companion libraries such as stdio: https://github.com/janestreet/stdio " url { - src: "https://ocaml.janestreet.com/ocaml-core/v0.13/files/base-v0.13.0.tar.gz" - checksum: "md5=527289dbc2c7de748f965d3caae450cb" + src: "https://github.com/janestreet/base/archive/v0.13.1.tar.gz" + checksum: "md5=296457416f9a8b75e6edfc3b1140e384" } diff --git a/esy.lock/opam/biniou.1.2.1/opam b/esy.lock/opam/biniou.1.2.1/opam deleted file mode 100644 index b706b425..00000000 --- a/esy.lock/opam/biniou.1.2.1/opam +++ /dev/null @@ -1,45 +0,0 @@ -opam-version: "2.0" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} - ["dune" "build" "-p" name "@doc"] {with-doc} -] -maintainer: ["martin@mjambon.com"] -authors: ["Martin Jambon"] -bug-reports: "https://github.com/mjambon/biniou/issues" -homepage: "https://github.com/mjambon/biniou" -doc: "https://mjambon.github.io/biniou/" -license: "BSD-3-Clause" -dev-repo: "git+https://github.com/mjambon/biniou.git" -synopsis: - "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve" -description: """ - -Biniou (pronounced "be new") is a binary data format designed for speed, safety, -ease of use and backward compatibility as protocols evolve. Biniou is vastly -equivalent to JSON in terms of functionality but allows implementations several -times faster (4 times faster than yojson), with 25-35% space savings. - -Biniou data can be decoded into human-readable form without knowledge of type -definitions except for field and variant names which are represented by 31-bit -hashes. A program named bdump is provided for routine visualization of biniou -data files. - -The program atdgen is used to derive OCaml-Biniou serializers and deserializers -from type definitions. - -Biniou format specification: mjambon.github.io/atdgen-doc/biniou-format.txt""" -depends: [ - "easy-format" - "dune" {>= "1.10"} - "ocaml" {>= "4.02.3"} -] -url { - src: - "https://github.com/mjambon/biniou/releases/download/1.2.1/biniou-1.2.1.tbz" - checksum: [ - "sha256=35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335" - "sha512=82670cc77bf3e869ee26e5fbe5a5affa45a22bc8b6c4bd7e85473912780e0111baca59b34a2c14feae3543ce6e239d7fddaeab24b686a65bfe642cdb91d27ebf" - ] -} diff --git a/esy.lock/opam/dune-configurator.1.0.0/opam b/esy.lock/opam/dune-configurator.1.0.0/opam deleted file mode 100644 index 6e2b712e..00000000 --- a/esy.lock/opam/dune-configurator.1.0.0/opam +++ /dev/null @@ -1,9 +0,0 @@ -opam-version: "2.0" -authors: ["Jérémie Dimino"] -homepage: "https://github.com/ocaml/dune" -bug-reports: "https://github.com/ocaml/dune/issues" -maintainer: "Jérémie Dimino" -description: """ -dune.configurator library distributed with Dune 1.x -""" -depends: ["dune" {<"2.0.0"}] diff --git a/esy.lock/opam/dune-configurator.2.3.1/opam b/esy.lock/opam/dune-configurator.2.3.1/opam new file mode 100644 index 00000000..fe4119de --- /dev/null +++ b/esy.lock/opam/dune-configurator.2.3.1/opam @@ -0,0 +1,43 @@ +opam-version: "2.0" +synopsis: "Helper library for gathering system configuration" +description: """ +dune-configurator is a small library that helps writing OCaml scripts that +test features available on the system, in order to generate config.h +files for instance. +Among other things, dune-configurator allows one to: +- test if a C program compiles +- query pkg-config +- import #define from OCaml header files +- generate config.h file +""" +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" +depends: [ + "dune" {>= "2.3"} + "dune-private-libs" {= version} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: "https://github.com/ocaml/dune/releases/download/2.3.1/dune-2.3.1.tbz" + checksum: [ + "sha256=b2b3dd9cdfd34ef8c4583ea8c52c3503c2395bf94c264af19d6450547e12f5cb" + "sha512=023fe4ddf743b8de24de0d7d2e6d5d0f85e459c5044aa4ba3de02cf63113d54d79004cc8ea8f7a958b324e9cbeef0845ec6a0f65454bc6a2e635e8944d28a0f9" + ] +} diff --git a/esy.lock/opam/dune-private-libs.2.3.1/opam b/esy.lock/opam/dune-private-libs.2.3.1/opam new file mode 100644 index 00000000..caac6d74 --- /dev/null +++ b/esy.lock/opam/dune-private-libs.2.3.1/opam @@ -0,0 +1,42 @@ +opam-version: "2.0" +synopsis: "Private libraries of Dune" +description: """ +!!!!!!!!!!!!!!!!!!!!!! +!!!!! DO NOT USE !!!!! +!!!!!!!!!!!!!!!!!!!!!! + +This package contains code that is shared between various dune-xxx +packages. However, it is not meant for public consumption and provides +no stability guarantee. +""" +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" +depends: [ + "dune" {>= "2.3"} + "ocaml" {>= "4.07"} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: "https://github.com/ocaml/dune/releases/download/2.3.1/dune-2.3.1.tbz" + checksum: [ + "sha256=b2b3dd9cdfd34ef8c4583ea8c52c3503c2395bf94c264af19d6450547e12f5cb" + "sha512=023fe4ddf743b8de24de0d7d2e6d5d0f85e459c5044aa4ba3de02cf63113d54d79004cc8ea8f7a958b324e9cbeef0845ec6a0f65454bc6a2e635e8944d28a0f9" + ] +} diff --git a/esy.lock/opam/dune.1.11.4/opam b/esy.lock/opam/dune.2.3.1/opam similarity index 56% rename from esy.lock/opam/dune.1.11.4/opam rename to esy.lock/opam/dune.2.3.1/opam index 19e25117..5155cbad 100644 --- a/esy.lock/opam/dune.1.11.4/opam +++ b/esy.lock/opam/dune.2.3.1/opam @@ -1,14 +1,14 @@ opam-version: "2.0" -synopsis: "Fast, portable and opinionated build system" +synopsis: "Fast, portable, and opinionated build system" description: """ dune is a build system that was designed to simplify the release of Jane Street packages. It reads metadata from "dune" files following a very simple s-expression syntax. -dune is fast, it has very low-overhead and support parallel builds on -all platforms. It has no system dependencies, all you need to build -dune and packages using dune is OCaml. You don't need or make or bash +dune is fast, has very low-overhead, and supports parallel builds on +all platforms. It has no system dependencies; all you need to build +dune or packages using dune is OCaml. You don't need make or bash as long as the packages themselves don't use bash explicitly. dune supports multi-package development by simply dropping multiple @@ -25,29 +25,30 @@ license: "MIT" homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "ocaml" {>= "4.02"} - "base-unix" - "base-threads" -] conflicts: [ - "jbuilder" {!= "transition"} + "dune-configurator" {< "2.3.0"} "odoc" {< "1.3.0"} "dune-release" {< "1.3.0"} + "jbuilder" {= "transition"} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} - ["ocaml" "bootstrap.ml"] - ["./boot.exe" "--release" "--subst"] {pinned} - ["./boot.exe" "--release" "-j" jobs] + ["ocaml" "bootstrap.ml" "-j" jobs] + ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] +] +depends: [ + # Please keep the lower bound in sync with .travis.yml, dune-project + # and min_ocaml_version in bootstrap.ml + ("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary")) + "base-unix" + "base-threads" ] url { - src: - "https://github.com/ocaml/dune/releases/download/1.11.4/dune-build-info-1.11.4.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.3.1/dune-2.3.1.tbz" checksum: [ - "sha256=77cb5f483221b266ded2b85fc84173ae0089a25134a086be922e82c131456ce6" - "sha512=02f00fd872aa49b832fc8c1e928409f23c79ddf84a53009a58875f222cca36fbb92c905e12c539caec9cbad723f195a8aa24218382dca35a903b3f52b11f06f2" + "sha256=b2b3dd9cdfd34ef8c4583ea8c52c3503c2395bf94c264af19d6450547e12f5cb" + "sha512=023fe4ddf743b8de24de0d7d2e6d5d0f85e459c5044aa4ba3de02cf63113d54d79004cc8ea8f7a958b324e9cbeef0845ec6a0f65454bc6a2e635e8944d28a0f9" ] } diff --git a/esy.lock/opam/easy-format.1.3.2/opam b/esy.lock/opam/easy-format.1.3.2/opam deleted file mode 100644 index 138d0fb2..00000000 --- a/esy.lock/opam/easy-format.1.3.2/opam +++ /dev/null @@ -1,46 +0,0 @@ -opam-version: "2.0" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} - ["dune" "build" "-p" name "@doc"] {with-doc} -] -maintainer: ["martin@mjambon.com" "rudi.grinberg@gmail.com"] -authors: ["Martin Jambon"] -bug-reports: "https://github.com/mjambon/easy-format/issues" -homepage: "https://github.com/mjambon/easy-format" -doc: "https://mjambon.github.io/easy-format/" -license: "BSD-3-Clause" -dev-repo: "git+https://github.com/mjambon/easy-format.git" -synopsis: - "High-level and functional interface to the Format module of the OCaml standard library" -description: """ - -This module offers a high-level and functional interface to the Format module of -the OCaml standard library. It is a pretty-printing facility, i.e. it takes as -input some code represented as a tree and formats this code into the most -visually satisfying result, breaking and indenting lines of code where -appropriate. - -Input data must be first modelled and converted into a tree using 3 kinds of -nodes: - -* atoms -* lists -* labelled nodes - -Atoms represent any text that is guaranteed to be printed as-is. Lists can model -any sequence of items such as arrays of data or lists of definitions that are -labelled with something like "int main", "let x =" or "x:".""" -depends: [ - "dune" {>= "1.10"} - "ocaml" {>= "4.02.3"} -] -url { - src: - "https://github.com/mjambon/easy-format/releases/download/1.3.2/easy-format-1.3.2.tbz" - checksum: [ - "sha256=3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926" - "sha512=e39377a2ff020ceb9ac29e8515a89d9bdbc91dfcfa871c4e3baafa56753fac2896768e5d9822a050dc1e2ade43c8967afb69391a386c0a8ecd4e1f774e236135" - ] -} diff --git a/esy.lock/opam/jbuilder.transition/opam b/esy.lock/opam/jbuilder.transition/opam deleted file mode 100644 index 9280c3ff..00000000 --- a/esy.lock/opam/jbuilder.transition/opam +++ /dev/null @@ -1,18 +0,0 @@ -opam-version: "2.0" -maintainer: "opensource@janestreet.com" -authors: ["Jane Street Group, LLC "] -homepage: "https://github.com/ocaml/dune" -bug-reports: "https://github.com/ocaml/dune/issues" -dev-repo: "git+https://github.com/ocaml/dune.git" -license: "MIT" -depends: [ - "ocaml" - "dune" {< "2.0"} -] -post-messages: [ - "Jbuilder has been renamed and the jbuilder package is now a transition \ - package. Use the dune package instead." -] -synopsis: - "This is a transition package, jbuilder is now named dune. Use the dune" -description: "package instead." diff --git a/esy.lock/opam/junit.2.0.1/opam b/esy.lock/opam/junit.2.0.2/opam similarity index 73% rename from esy.lock/opam/junit.2.0.1/opam rename to esy.lock/opam/junit.2.0.2/opam index 77132993..874cf38f 100644 --- a/esy.lock/opam/junit.2.0.1/opam +++ b/esy.lock/opam/junit.2.0.2/opam @@ -3,7 +3,7 @@ maintainer: "Louis Roché " authors: "Louis Roché " homepage: "https://github.com/Khady/ocaml-junit" bug-reports: "https://github.com/Khady/ocaml-junit/issues" -license: "LGPL-3.0-or-later with OCaml-LGPL-linking-exception" +license: "LGPLv3+ with OCaml linking exception" dev-repo: "git+https://github.com/Khady/ocaml-junit.git" doc: "https://khady.github.io/ocaml-junit/" tags: ["junit" "jenkins"] @@ -24,6 +24,9 @@ synopsis: "JUnit XML reports generation library" description: "JUnit XML reports generation library" url { src: - "https://github.com/Khady/ocaml-junit/releases/download/2.0.1/junit-2.0.1.tbz" - checksum: "md5=40224fb3d4f5e47dc5ff4605587d383b" + "https://github.com/Khady/ocaml-junit/releases/download/2.0.2/junit-2.0.2.tbz" + checksum: [ + "sha256=fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01" + "sha512=5a9fa803c4861748bb8482fc51197420bf3cc3b9540989a489c4ffb65fdd02386aaa60437eae29182209dae0903b0e537c095249e19d395a451b8e8214f15f03" + ] } diff --git a/esy.lock/opam/menhir.20190924/opam b/esy.lock/opam/menhir.20190924/opam deleted file mode 100644 index 348967a7..00000000 --- a/esy.lock/opam/menhir.20190924/opam +++ /dev/null @@ -1,29 +0,0 @@ -opam-version: "2.0" -maintainer: "francois.pottier@inria.fr" -authors: [ - "François Pottier " - "Yann Régis-Gianas " -] -homepage: "http://gitlab.inria.fr/fpottier/menhir" -dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" -bug-reports: "menhir@inria.fr" -build: [ - [make "-f" "Makefile" "PREFIX=%{prefix}%" "USE_OCAMLFIND=true" "docdir=%{doc}%/menhir" "libdir=%{lib}%/menhir" "mandir=%{man}%/man1"] -] -install: [ - [make "-f" "Makefile" "install" "PREFIX=%{prefix}%" "docdir=%{doc}%/menhir" "libdir=%{lib}%/menhir" "mandir=%{man}%/man1"] -] -depends: [ - "ocaml" {>= "4.02"} - "ocamlfind" {build} - "ocamlbuild" {build} -] -synopsis: "An LR(1) parser generator" -url { - src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20190924/archive.tar.gz" - checksum: [ - "md5=677f1997fb73177d5a00fa1b8d61c3ef" - "sha512=ea8a9a6d773529cf6ac05e4c6c4532770fbb8e574c9b646efcefe90d9f24544741e3e8cfd94c8afea0447e34059a8c79c2829b46764ce3a3d6dcb3e7f75980fc" - ] -} diff --git a/esy.lock/opam/menhir.20200211/opam b/esy.lock/opam/menhir.20200211/opam new file mode 100644 index 00000000..f1f18fcf --- /dev/null +++ b/esy.lock/opam/menhir.20200211/opam @@ -0,0 +1,27 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.02.3"} + "dune" {>= "2.2.0"} + "menhirLib" {= version} + "menhirSdk" {= version} +] +synopsis: "An LR(1) parser generator" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + checksum: [ + "md5=01577e5f15380c35bdaa8fd818204560" + "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + ] +} diff --git a/esy.lock/opam/menhirLib.20200211/opam b/esy.lock/opam/menhirLib.20200211/opam new file mode 100644 index 00000000..28d3e426 --- /dev/null +++ b/esy.lock/opam/menhirLib.20200211/opam @@ -0,0 +1,25 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.02.3"} + "dune" {>= "2.0.0"} +] +synopsis: "Runtime support library for parsers generated by Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + checksum: [ + "md5=01577e5f15380c35bdaa8fd818204560" + "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + ] +} diff --git a/esy.lock/opam/menhirSdk.20200211/opam b/esy.lock/opam/menhirSdk.20200211/opam new file mode 100644 index 00000000..524045ea --- /dev/null +++ b/esy.lock/opam/menhirSdk.20200211/opam @@ -0,0 +1,25 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.02.3"} + "dune" {>= "2.0.0"} +] +synopsis: "Compile-time library for auxiliary tools related to Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + checksum: [ + "md5=01577e5f15380c35bdaa8fd818204560" + "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + ] +} diff --git a/esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam b/esy.lock/opam/ocaml-migrate-parsetree.1.6.0/opam similarity index 79% rename from esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam rename to esy.lock/opam/ocaml-migrate-parsetree.1.6.0/opam index aa41104d..2437975a 100644 --- a/esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam +++ b/esy.lock/opam/ocaml-migrate-parsetree.1.6.0/opam @@ -29,9 +29,9 @@ rewriters independent of a compiler version. """ url { src: - "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.5.0/ocaml-migrate-parsetree-v1.5.0.tbz" + "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.6.0/ocaml-migrate-parsetree-v1.6.0.tbz" checksum: [ - "sha256=7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0" - "sha512=87fdccafae83b0437f1ccd4f3cfbc49e699bc0804596480e0df88510ba33410f31d48c7f677fe72800ed3f442a3a586d82d86aee1d12a964f79892833847b16a" + "sha256=9b018e7d25114ce17fc0b82b7cd7c927b84ebb6b043aa987fa7731c2484de33f" + "sha512=e03a5fe44ecf43683c764a7285a65bfa80639c09badf422661723bc3483d6d799c47c1ead34c2caa289a37e1b4b46d809c8cc56537d5c76e6004849d2d8a305f" ] } diff --git a/esy.lock/opam/ppxlib.0.10.0/opam b/esy.lock/opam/ppxlib.0.12.0/opam similarity index 80% rename from esy.lock/opam/ppxlib.0.10.0/opam rename to esy.lock/opam/ppxlib.0.12.0/opam index 034ba807..6a41efce 100644 --- a/esy.lock/opam/ppxlib.0.10.0/opam +++ b/esy.lock/opam/ppxlib.0.12.0/opam @@ -14,7 +14,7 @@ run-test: [ ["dune" "runtest" "-p" name "-j" jobs] { ocaml:version >= "4.06" & ocaml:version < "4.08" } ] depends: [ - "ocaml" {>= "4.04.1" & < "4.10.0"} + "ocaml" {>= "4.04.1" & < "4.11.0"} "base" {>= "v0.11.0"} "dune" {>= "1.11"} "ocaml-compiler-libs" {>= "v0.11.0"} @@ -38,9 +38,9 @@ A comprehensive toolbox for ppx development. It features: """ url { src: - "https://github.com/ocaml-ppx/ppxlib/releases/download/0.10.0/ppxlib-0.10.0.tbz" + "https://github.com/ocaml-ppx/ppxlib/archive/0.12.0.tar.gz" checksum: [ - "sha256=588e85c759688742ae0bd2cb1a53f0f555a76d8810ad9a9dbb026a076a0c10af" - "sha512=8e3e9399b260e16fb537cdd58706875933ecbf28e3bcddc1bf3e607a33307eb2191a7d3c315e8e4b51ec6f548779a0fad118826f709de65dddd3b2510f3e4bcc" + "sha256=6b562c9b3b9350777318729921f890850b385c469db60769aafd9371998a2c42" + "sha512=2372a7a53d857389978e617c95183289547d53caa5e83a7d867cab347b114b719667bd09eaf2e2334085ef92691a99b42871f6410ffb2977b0b8724014c80a70" ] } diff --git a/esy.lock/opam/result.1.4/opam b/esy.lock/opam/result.1.5/opam similarity index 83% rename from esy.lock/opam/result.1.4/opam rename to esy.lock/opam/result.1.5/opam index b44aeead..671af042 100644 --- a/esy.lock/opam/result.1.4/opam +++ b/esy.lock/opam/result.1.5/opam @@ -17,6 +17,6 @@ while staying compatible with older version of OCaml should use the Result module defined in this library.""" url { src: - "https://github.com/janestreet/result/archive/1.4.tar.gz" - checksum: "md5=d3162dbc501a2af65c8c71e0866541da" + "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz" + checksum: "md5=1b82dec78849680b49ae9a8a365b831b" } diff --git a/esy.lock/opam/stringext.1.6.0/opam b/esy.lock/opam/stringext.1.6.0/opam new file mode 100644 index 00000000..5242fe31 --- /dev/null +++ b/esy.lock/opam/stringext.1.6.0/opam @@ -0,0 +1,32 @@ +opam-version: "2.0" +maintainer: "rudi.grinberg@gmail.com" +authors: "Rudi Grinberg" +license: "MIT" +homepage: "https://github.com/rgrinberg/stringext" +bug-reports: "https://github.com/rgrinberg/stringext/issues" +depends: [ + "ocaml" {>= "4.02.3"} + "dune" {>= "1.0"} + "ounit" {with-test} + "qtest" {with-test & >= "2.2"} + "base-bytes" +] +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +dev-repo: "git+https://github.com/rgrinberg/stringext.git" +synopsis: "Extra string functions for OCaml" +description: """ +Extra string functions for OCaml. Mainly splitting. All functions are in the +Stringext module. +""" +url { + src: + "https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz" + checksum: [ + "sha256=db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" + "sha512=d8ebe40f42b598a9bd99f1ef4b00ba93458385a4accd121af66a0bf3b3f8d7135f576740adf1a43081dd409977c2219fd4bdbb5b3d1308890d301d553ed49900" + ] +} diff --git a/esy.lock/opam/uri.3.1.0/opam b/esy.lock/opam/uri.3.1.0/opam new file mode 100644 index 00000000..73cce662 --- /dev/null +++ b/esy.lock/opam/uri.3.1.0/opam @@ -0,0 +1,35 @@ +opam-version: "2.0" +maintainer: "anil@recoil.org" +authors: ["Anil Madhavapeddy" "David Sheets" "Rudi Grinberg"] +license: "ISC" +tags: ["url" "uri" "org:mirage" "org:xapi-project"] +homepage: "https://github.com/mirage/ocaml-uri" +bug-reports: "https://github.com/mirage/ocaml-uri/issues" +dev-repo: "git+https://github.com/mirage/ocaml-uri.git" +doc: "https://mirage.github.io/ocaml-uri/" +synopsis: "An RFC3986 URI/URL parsing library" +description: """ +This is an OCaml implementation of the [RFC3986](http://tools.ietf.org/html/rfc3986) specification +for parsing URI or URLs. +""" +depends: [ + "ocaml" {>= "4.04.0"} + "dune" {>= "1.2.0"} + "ounit" {with-test & >= "1.0.2"} + "ppx_sexp_conv" {with-test & >= "v0.9.0"} + "re" {>= "1.9.0"} + "stringext" {>= "1.4.0"} +] +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +url { + src: + "https://github.com/mirage/ocaml-uri/releases/download/v3.1.0/uri-v3.1.0.tbz" + checksum: [ + "sha256=c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43" + "sha512=c015576bb077fd243022bcd8804e628d23a253dcd8bbdda8dc2a57e86cfeb9fd629087ec7d7e23dc71dd7cd137450ca2c5ecf8fb7d184ec9d1d4e41f6f83ee38" + ] +} diff --git a/esy.lock/opam/yojson.1.7.0/opam b/esy.lock/opam/yojson.1.7.0/opam deleted file mode 100644 index ffef0682..00000000 --- a/esy.lock/opam/yojson.1.7.0/opam +++ /dev/null @@ -1,38 +0,0 @@ -opam-version: "2.0" -maintainer: "martin@mjambon.com" -authors: ["Martin Jambon"] -homepage: "https://github.com/ocaml-community/yojson" -bug-reports: "https://github.com/ocaml-community/yojson/issues" -dev-repo: "git+https://github.com/ocaml-community/yojson.git" -doc: "https://ocaml-community.github.io/yojson/" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -run-test: [["dune" "runtest" "-p" name "-j" jobs]] -depends: [ - "ocaml" {>= "4.02.3"} - "dune" - "cppo" {build} - "easy-format" - "biniou" {>= "1.2.0"} - "alcotest" {with-test & >= "0.8.5"} -] -synopsis: - "Yojson is an optimized parsing and printing library for the JSON format" -description: """ -Yojson is an optimized parsing and printing library for the JSON format. - -It addresses a few shortcomings of json-wheel including 2x speedup, -polymorphic variants and optional syntax for tuples and variants. - -ydump is a pretty-printing command-line program provided with the -yojson package. - -The program atdgen can be used to derive OCaml-JSON serializers and -deserializers from type definitions.""" -url { - src: - "https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz" - checksum: "md5=b89d39ca3f8c532abe5f547ad3b8f84d" -} diff --git a/examples/bs-7.2/package-lock.json b/examples/bs-7.2/package-lock.json index fe294e7f..137b6fa8 100644 --- a/examples/bs-7.2/package-lock.json +++ b/examples/bs-7.2/package-lock.json @@ -10,9 +10,9 @@ "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, "bs-platform": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-3.1.5.tgz", - "integrity": "sha1-+zTuRwK8kWOEjVU3CWxPMeuu7UA=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-7.2.0.tgz", + "integrity": "sha512-mgwsJ3C1nthhasoR1L3H/7+v7zuCybxI8rTrxl4aOJZfrEZSU2a3E7QTEFfB4gHpOJUvmC1/LkwQNlTTrHautg==", "dev": true }, "core-js": { diff --git a/examples/example-react/package-lock.json b/examples/example-react/package-lock.json index c338583d..14c18e78 100644 --- a/examples/example-react/package-lock.json +++ b/examples/example-react/package-lock.json @@ -307,6 +307,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -318,6 +319,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -3357,7 +3359,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -3378,12 +3381,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3398,17 +3403,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3525,7 +3533,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3537,6 +3546,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3551,6 +3561,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3558,12 +3569,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -3582,6 +3595,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3662,7 +3676,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3674,6 +3689,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3759,7 +3775,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -3795,6 +3812,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3814,6 +3832,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3857,12 +3876,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -6636,7 +6657,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.3.1",