Coerce cli version with semver to allow for prerelease tags (#4291)

flow-typed · Mar 30, 2022 · 4fbc8d7 · 4fbc8d7
1 parent f01f996
commit 4fbc8d7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/cli/src/lib/cacheRepoUtils.js b/cli/src/lib/cacheRepoUtils.js
@@ -141,7 +141,12 @@ export async function verifyCLIVersion(): Promise<void> {
   const thisCLIPkgJsonPath = path.join(__dirname, '..', '..', 'package.json');
   const thisCLIPkgJson = await fs.readJson(thisCLIPkgJsonPath);
   const thisCLIVersion = thisCLIPkgJson.version;
-  if (!semver.satisfies(thisCLIVersion, compatibleCLIRange)) {
+  if (
+    !semver.satisfies(
+      semver.coerce(thisCLIVersion) ?? thisCLIVersion,
+      compatibleCLIRange,
+    )
+  ) {
     throw new Error(
       `Please upgrade your flow-typed CLI! This CLI is version ` +
         `${thisCLIVersion}, but the latest flow-typed definitions are only ` +

diff --git a/cli/src/lib/libDefs.js b/cli/src/lib/libDefs.js
@@ -419,7 +419,12 @@ async function verifyCLIVersion(defsDirPath) {
   }
   const minCLIVersion = metadata.compatibleCLIRange;
   const thisCLIVersion = require('../../package.json').version;
-  if (!semver.satisfies(thisCLIVersion, minCLIVersion)) {
+  if (
+    !semver.satisfies(
+      semver.coerce(thisCLIVersion) ?? thisCLIVersion,
+      minCLIVersion,
+    )
+  ) {
     throw new Error(
       `Please upgrade your CLI version! This CLI is version ` +
         `${thisCLIVersion}, but the latest flow-typed definitions are only ` +