From c7159d71d7c81b1fab3583e383c9c86e9a12b51f Mon Sep 17 00:00:00 2001
From: ehmicky <ehmicky@users.noreply.github.com>
Date: Tue, 8 Feb 2022 14:23:19 +0100
Subject: [PATCH] fix: semver imports (#985)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 src/runtimes/node/bundlers/zisi/nested.ts  | 9 +++++----
 src/runtimes/node/bundlers/zisi/resolve.ts | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/runtimes/node/bundlers/zisi/nested.ts b/src/runtimes/node/bundlers/zisi/nested.ts
index b9e6835c4..206b15d5d 100644
--- a/src/runtimes/node/bundlers/zisi/nested.ts
+++ b/src/runtimes/node/bundlers/zisi/nested.ts
@@ -1,4 +1,4 @@
-import { valid as validVersion, validRange, satisfies, gte as greaterThanEqual, ltr as lessThanRange } from 'semver'
+import semver from 'semver'
 
 import { PackageJson } from '../../utils/package_json'
 
@@ -82,7 +82,8 @@ const isOptionalModule = function (
 const MIN_NEXT_VERSION = '10.0.4'
 
 const satisfiesRange = (range: string): boolean =>
-  Boolean(validRange(range)) && (satisfies(MIN_NEXT_VERSION, range) || lessThanRange(MIN_NEXT_VERSION, range))
+  Boolean(semver.validRange(range)) &&
+  (semver.satisfies(MIN_NEXT_VERSION, range) || semver.ltr(MIN_NEXT_VERSION, range))
 
 // 'critters' is used only in Next.js >= 10.0.4 when enabling an experimental option and has to be installed manually
 // we ignore it if it's missing
@@ -101,8 +102,8 @@ const isExternalCrittersModule = function (
 
   // can the declared Next.js version resolve to >=10.0.4 ?
   // test exact versions
-  if (validVersion(nextVersion)) {
-    return greaterThanEqual(nextVersion, MIN_NEXT_VERSION)
+  if (semver.valid(nextVersion)) {
+    return semver.gte(nextVersion, MIN_NEXT_VERSION)
   }
 
   return satisfiesRange(nextVersion)
diff --git a/src/runtimes/node/bundlers/zisi/resolve.ts b/src/runtimes/node/bundlers/zisi/resolve.ts
index 81c3a0073..fc79cbd5b 100644
--- a/src/runtimes/node/bundlers/zisi/resolve.ts
+++ b/src/runtimes/node/bundlers/zisi/resolve.ts
@@ -3,7 +3,7 @@ import { version as nodeVersion } from 'process'
 import findUp from 'find-up'
 import pathExists from 'path-exists'
 import resolveLib from 'resolve'
-import { lt as ltVersion } from 'semver'
+import semver from 'semver'
 
 const BACKSLASH_REGEXP = /\\/g
 
@@ -25,7 +25,7 @@ const resolvePackage = async function (moduleName: string, baseDirs: string[]):
   try {
     return await resolvePathPreserveSymlinks(`${moduleName}/package.json`, baseDirs)
   } catch (error) {
-    if (ltVersion(nodeVersion, REQUEST_RESOLVE_MIN_VERSION)) {
+    if (semver.lt(nodeVersion, REQUEST_RESOLVE_MIN_VERSION)) {
       throw error
     }