Add watch mode, get rid of Makefile

briskml · Feb 26, 2019 · c304be2 · c304be2
1 parent 802a5b5
commit c304be2
Show file tree

Hide file tree

Showing 44 changed files with 417 additions and 1,171 deletions.
diff --git a/core/esy.json b/core/esy.json
@@ -8,7 +8,7 @@
  "dependencies": {
  "@esy-ocaml/reason": ">=3.4.0",
  "@opam/color": "^0.2.0",
- "@opam/dune": "^1.6.2",
+ "@opam/dune": "^1.7.2",
  "flex": "^1.2.2",
  "ocaml": "~4.7.1000"
  }

diff --git a/esy.json b/esy.json
@@ -17,14 +17,11 @@
  },
  "devDependencies": {
  "@opam/merlin": "^3.2.2",
- "@opam/merlin-lsp": "*",
  "ocaml": "~4.7.1000"
  },
  "resolutions": {
  "@brisk/core": "link-dev:./core",
  "@brisk/macos": "link-dev:./renderer-macos",
- "@opam/dune": "ocaml/dune:dune.opam#01b46a3",
- "@opam/merlin-lsp": "ocaml/merlin:merlin-lsp.opam#3e34bb5",
- "brisk-reconciler": "briskml/brisk-reconciler#be325c50b0509d3744048d9c77ebe94c52c52596"
+ "brisk-reconciler": "briskml/brisk-reconciler#be325c5"
  }
 }
diff --git a/esy.lock/index.json b/esy.lock/index.json
diff --git a/esy.lock/opam/base-bytes.base/opam b/esy.lock/opam/base-bytes.base/opam
diff --git a/esy.lock/opam/cppo_ocamlbuild.1.6.0/opam b/esy.lock/opam/cppo_ocamlbuild.1.6.0/opam
diff --git a/esy.lock/opam/dune.1.7.2/opam b/esy.lock/opam/dune.1.7.2/opam
diff --git a/esy.lock/opam/ocamlbuild.0.12.0/opam → esy.lock/opam/ocamlbuild.0.14.0/opam b/esy.lock/opam/ocamlbuild.0.12.0/opam → esy.lock/opam/ocamlbuild.0.14.0/opam
diff --git a/esy.lock/opam/ppx_deriving.4.2.1/opam b/esy.lock/opam/ppx_deriving.4.2.1/opam
diff --git a/esy.lock/opam/ppx_deriving_yojson.3.3/opam b/esy.lock/opam/ppx_deriving_yojson.3.3/opam
diff --git a/esy.lock/opam/ppx_tools.5.1+4.06.0/opam b/esy.lock/opam/ppx_tools.5.1+4.06.0/opam
diff --git a/esy.lock/opam/ppxfind.1.2/opam b/esy.lock/opam/ppxfind.1.2/opam
diff --git a/esy.lock/opam/stringext.1.5.0/opam b/esy.lock/opam/stringext.1.5.0/opam
diff --git a/...nts-macos/esy.lock/opam/yojson.1.5.0/opam → esy.lock/opam/yojson.1.7.0/opam b/...nts-macos/esy.lock/opam/yojson.1.5.0/opam → esy.lock/opam/yojson.1.7.0/opam
diff --git a/esy.lock/overrides/6c89142d38eb01103de07762eae6858d/package.json b/esy.lock/overrides/6c89142d38eb01103de07762eae6858d/package.json
diff --git a/esy.lock/overrides/opam__s__dune_opam__c__1.7.2_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__1.7.2_opam_override/package.json
diff --git a/...am_override/files/ocamlbuild-0.12.0.patch → ...am_override/files/ocamlbuild-0.14.0.patch b/...am_override/files/ocamlbuild-0.12.0.patch → ...am_override/files/ocamlbuild-0.14.0.patch
diff --git a/...pam__c__0.12.0_opam_override/package.json → ...pam__c__0.14.0_opam_override/package.json b/...pam__c__0.12.0_opam_override/package.json → ...pam__c__0.14.0_opam_override/package.json