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

Commit c7159d7

Browse files
ehmickykodiakhq[bot]
andauthoredFeb 8, 2022
fix: semver imports (#985)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
1 parent 33dbff2 commit c7159d7

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed
 

‎src/runtimes/node/bundlers/zisi/nested.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { valid as validVersion, validRange, satisfies, gte as greaterThanEqual, ltr as lessThanRange } from 'semver'
1+
import semver from 'semver'
22

33
import { PackageJson } from '../../utils/package_json'
44

@@ -82,7 +82,8 @@ const isOptionalModule = function (
8282
const MIN_NEXT_VERSION = '10.0.4'
8383

8484
const satisfiesRange = (range: string): boolean =>
85-
Boolean(validRange(range)) && (satisfies(MIN_NEXT_VERSION, range) || lessThanRange(MIN_NEXT_VERSION, range))
85+
Boolean(semver.validRange(range)) &&
86+
(semver.satisfies(MIN_NEXT_VERSION, range) || semver.ltr(MIN_NEXT_VERSION, range))
8687

8788
// 'critters' is used only in Next.js >= 10.0.4 when enabling an experimental option and has to be installed manually
8889
// we ignore it if it's missing
@@ -101,8 +102,8 @@ const isExternalCrittersModule = function (
101102

102103
// can the declared Next.js version resolve to >=10.0.4 ?
103104
// test exact versions
104-
if (validVersion(nextVersion)) {
105-
return greaterThanEqual(nextVersion, MIN_NEXT_VERSION)
105+
if (semver.valid(nextVersion)) {
106+
return semver.gte(nextVersion, MIN_NEXT_VERSION)
106107
}
107108

108109
return satisfiesRange(nextVersion)

‎src/runtimes/node/bundlers/zisi/resolve.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { version as nodeVersion } from 'process'
33
import findUp from 'find-up'
44
import pathExists from 'path-exists'
55
import resolveLib from 'resolve'
6-
import { lt as ltVersion } from 'semver'
6+
import semver from 'semver'
77

88
const BACKSLASH_REGEXP = /\\/g
99

@@ -25,7 +25,7 @@ const resolvePackage = async function (moduleName: string, baseDirs: string[]):
2525
try {
2626
return await resolvePathPreserveSymlinks(`${moduleName}/package.json`, baseDirs)
2727
} catch (error) {
28-
if (ltVersion(nodeVersion, REQUEST_RESOLVE_MIN_VERSION)) {
28+
if (semver.lt(nodeVersion, REQUEST_RESOLVE_MIN_VERSION)) {
2929
throw error
3030
}
3131

1 commit comments

Comments
 (1)

github-actions[bot] commented on Feb 8, 2022

@github-actions[bot]
Contributor

⏱ Benchmark results

largeDepsEsbuild: 7.5s

largeDepsNft: 34.4s

largeDepsZisi: 1m 0.8s

This repository has been archived.