Skip to content

Commit

Permalink
rebase with latest package.json
Browse files Browse the repository at this point in the history
  • Loading branch information
Yunxing Dai committed Sep 30, 2016
1 parent 3ff86ba commit c747c23
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,6 @@ endif
git commit -m "Version $(version)"
git tag -a $(version) -m "Version $(version)."
git push "[email protected]:facebook/Reason.git" $(version)
npm publish --access public

.PHONY: release
23 changes: 14 additions & 9 deletions package.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,30 @@
},
"name": "reason",
"dependencies": {
"merlin": "https://github.com/npm-opam/merlin",
"re": "https://github.com/npm-opam/re",
"ocamlfind": "https://github.com/npm-opam/ocamlfind",
"BetterErrors": "https://github.com/npm-opam/BetterErrors",
"ocaml": "https://github.com/npm-opam/ocaml.git#npm-4.02.3",
"@opam-alpha/merlin": "^ 2.5.0",
"@opam-alpha/re": "^ 1.5.0",
"@opam-alpha/ocamlfind": "*",
"@opam-alpha/BetterErrors": ">= 0.0.1",
"@opam-alpha/easy-format": "^ 1.2.0",
"@opam-alpha/merlin-extend": "^ 0.3.0",
"@opam-alpha/menhir": ">= 20160303.0.0",
"@opam-alpha/ocaml": "= 4.02.3",
"dependency-env": "https://github.com/npm-ml/dependency-env.git",
"substs": "https://github.com/yunxing/substs.git",
"easy-format": "https://github.com/npm-opam/easy-format",
"merlin-extend": "https://github.com/npm-opam/merlin-extend",
"opam-installer-bin": "https://github.com/yunxing/opam-installer-bin.git",
"nopam": "https://github.com/yunxing/nopam.git",
"utop-bin": "https://github.com/reasonml/utop-bin",
"menhir": "https://github.com/npm-opam/menhir"
"utop-bin": "https://github.com/reasonml/utop-bin"

},
"scripts": {
"editor": "eval $(dependencyEnv) && eval $EDITOR",
"postinstall": "eval $(dependencyEnv) && nopam && substs pkg/META.in && make compile_error && ocaml pkg/build.ml native=true native-dynlink=true utop=${utop_installed:-false} && (opam-installer --prefix=$opam_prefix || true)",
"clean": "eval $(dependencyEnv) && nopam && make clean",
"env": "eval $(dependencyEnv) && env",
"formatTest": "eval $(dependencyEnv) && cd formatTest; ./test.sh",
"whereisrefmt": "eval $(dependencyEnv) && which refmt"
},
"engines" : {
"npm" : ">=3.10.0"
}
}

0 comments on commit c747c23

Please sign in to comment.