fix: validate using semver.coerce() (#3477)

Close #3475
electron-userland · Nov 15, 2018 · a46f79a · a46f79a
1 parent 9422251
commit a46f79a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/packages/app-builder-lib/src/electron/electronVersion.ts b/packages/app-builder-lib/src/electron/electronVersion.ts
@@ -3,10 +3,10 @@ import { httpExecutor } from "builder-util/out/nodeHttpExecutor"
 import { readJson } from "fs-extra-p"
 import { Lazy } from "lazy-val"
 import * as path from "path"
+import * as semver from "semver"
 import { orNullIfFileNotExist } from "read-config-file"
 import { Configuration } from "../configuration"
 import { getConfig } from "../util/config"
-import { versionFromDependencyRange } from "../util/packageMetadata"
 
 export type MetadataValue = Lazy<{ [key: string]: any } | null>
 
@@ -60,7 +60,8 @@ export async function computeElectronVersion(projectDir: string, projectMetadata
     throw new Error(`Cannot find electron dependency to get electron version in the '${path.join(projectDir, "package.json")}'`)
   }
 
-  return versionFromDependencyRange(electronPrebuiltDep)
+  const version = semver.coerce(electronPrebuiltDep)
+  return version == null ? Promise.reject() : version.toString()
 }
 
 function findFromElectronPrebuilt(packageData: any): any {

diff --git a/packages/app-builder-lib/src/util/packageMetadata.ts b/packages/app-builder-lib/src/util/packageMetadata.ts
@@ -86,19 +86,32 @@ export function versionFromDependencyRange(version: string) {
   return firstChar === "^" || firstChar === "~" ? version.substring(1) : version
 }
 
+function versionSatisfies(version: string | semver.SemVer | null, range: string | semver.Range, loose?: boolean): boolean {
+  if (version == null) {
+    return false
+  }
+
+  const coerced = semver.coerce(version)
+  if (coerced == null) {
+    return false
+  }
+
+  return semver.satisfies(coerced, range, loose)
+}
+
 function checkDependencies(dependencies: { [key: string]: string } | null | undefined, errors: Array<string>) {
   if (dependencies == null) {
     return
   }
 
   const updaterVersion = dependencies["electron-updater"]
   const requiredElectronUpdaterVersion = "4.0.0"
-  if (updaterVersion != null && !semver.satisfies(versionFromDependencyRange(updaterVersion), `>=${requiredElectronUpdaterVersion}`)) {
+  if (updaterVersion != null && !versionSatisfies(updaterVersion, `>=${requiredElectronUpdaterVersion}`)) {
     errors.push(`At least electron-updater ${requiredElectronUpdaterVersion} is recommended by current electron-builder version. Please set electron-updater version to "^${requiredElectronUpdaterVersion}"`)
   }
 
   const swVersion = dependencies["electron-builder-squirrel-windows"]
-  if (swVersion != null && !semver.satisfies(versionFromDependencyRange(swVersion), ">=20.32.0")) {
+  if (swVersion != null && !versionSatisfies(swVersion, ">=20.32.0")) {
     errors.push(`At least electron-builder-squirrel-windows 20.32.0 is required by current electron-builder version. Please set electron-builder-squirrel-windows to "^20.32.0"`)
   }