Merge pull request #4 from cyrilfretlink/remove-yaml-to-dhall

Remove `yaml-to-dhall`

diff --git a/package-lock.json b/package-lock.json
index 2769f8a6aed214180aa8d18b090e3700208c24f3..946bfcfe5b1e937ab55f2adf05e6fd3802011464 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "dhall-json",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

diff --git a/package.json b/package.json
index 5d7cb78c3b9052669c097ee85ef0ea58055f2e75..488e9b57b28ee656ff4f9308688588da31131196 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dhall-json",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "description": "NPM package for `dhall-json`, based on https://github.com/justinwoo/npm-psc-package-bin-simple.",
   "os": [
     "darwin",
@@ -16,8 +16,7 @@
   "bin": {
     "dhall-to-json": "bin/dhall-to-json.exe",
     "dhall-to-yaml": "bin/dhall-to-yaml.exe",
-    "json-to-dhall": "bin/json-to-dhall.exe",
-    "yaml-to-dhall": "bin/yaml-to-dhall.exe"
+    "json-to-dhall": "bin/json-to-dhall.exe"
   },
   "scripts": {
     "preinstall": "node ./preinstall.js"

diff --git a/preinstall.js b/preinstall.js
index 292b73b961ff8d518baac93cfd48de5f6e11e2c9..8fdfbfe4c92fec147c7692ed843fefe8acce0f71 100644 (file)
--- a/preinstall.js
+++ b/preinstall.js
@@ -62,15 +62,10 @@ const dhallJsonVersion = readVersion("dhall-json");
 
 const isLesserThan = (version, upperBound) =>
   semver.valid(version) && semver.lt(version, upperBound);
-const isGreaterThan = (version, lowerBound) =>
-  semver.valid(version) && semver.gt(version, lowerBound);
 
 if (isLesserThan(dhallJsonVersion, "1.2.8")) {
   throw new Error(`This release of the \`${pkg.name}\` npm package installs \`json-to-dhall\`, which isn’t provided by \`dhall-json@<1.2.8\`.`);
 }
-if (isLesserThan(dhallJsonVersion, "1.3.0") || isGreaterThan(dhallJsonVersion, "1.5.0")) {
-  throw new Error(`This release of the \`${pkg.name}\` npm package installs \`yaml-to-dhall\`, which isn’t provided by \`dhall-json@<1.3.0 >1.5.0\`.`);
-}
 
 const release = `https://github.com/dhall-lang/dhall-haskell/releases/download/${dhallVersion}/dhall-json-${dhallJsonVersion}`;