From 83587ec8d7f254c207714fa1e305e74adf6ecde7 Mon Sep 17 00:00:00 2001 From: Cyril Sobierajewicz Date: Tue, 12 May 2020 11:02:55 +0200 Subject: [PATCH] Remove `yaml-to-dhall` MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The executable isn’t installed anymore with `dhall-json@>1.5.0`. --- package.json | 3 +-- preinstall.js | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/package.json b/package.json index 5d7cb78..e1e3c5c 100644 --- a/package.json +++ b/package.json @@ -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 292b73b..8fdfbfe 100644 --- 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}`; -- 2.41.0