Skip to content
This repository has been archived by the owner on May 22, 2024. It is now read-only.

fix: semver imports #985

Merged
merged 2 commits into from
Feb 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions 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'

Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/runtimes/node/bundlers/zisi/resolve.ts
Expand Up @@ -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

Expand All @@ -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
}

Expand Down