Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/composables/npm/useOutdatedDependencies.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { PackageVersionsInfo } from 'fast-npm-meta'
import { getVersionsBatch } from 'fast-npm-meta'
import { difference, findMaxSatisfying, getMajor, getMinor, getPrerelease, isGreater } from 'verkit'
import { difference, findMaxSatisfying, getMajor, getMinor, isGreater, isStable } from 'verkit'
import {
type OutdatedDependencyInfo,
isNonSemverConstraint,
Expand All @@ -26,7 +26,7 @@ function resolveOutdated(

let filteredVersions = versions
if (!constraintIncludesPrerelease(constraint)) {
filteredVersions = versions.filter(v => !getPrerelease(v)?.length)
filteredVersions = versions.filter(v => isStable(v))
}

const resolved = findMaxSatisfying(filteredVersions, constraint)
Expand Down
10 changes: 4 additions & 6 deletions app/composables/useInstallSizeDiff.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { compare, getPrerelease, isValid } from 'verkit'
import { compare, isPrerelease, isStable } from 'verkit'

export interface InstallSizeDiff {
direction: 'increase' | 'decrease'
Expand All @@ -20,13 +20,11 @@ const SIZE_DECREASE_THRESHOLD = 0.2
const DEP_DECREASE_THRESHOLD = 3

function getComparisonVersion(pkg: SlimPackument, resolvedVersion: string): string | null {
const isCurrentPrerelease = getPrerelease(resolvedVersion)?.length

const stableVersions = Object.keys(pkg.time)
.filter(v => v !== 'modified' && v !== 'created' && isValid(v) && !getPrerelease(v)?.length)
.sort((a, b) => compare(a, b))
.filter(v => isStable(v))
.sort(compare)

if (isCurrentPrerelease) {
if (isPrerelease(resolvedVersion)) {
// Find the highest stable version before this prerelease in semver order
return stableVersions.findLast(v => compare(v, resolvedVersion) < 0) ?? null
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"unocss": "66.7.5",
"valibot": "1.4.2",
"validate-npm-package-name": "8.0.0",
"verkit": "0.3.1",
"verkit": "0.3.2",
"virtua": "0.50.0",
"vite-plugin-pwa": "1.3.0",
"vite-plus": "catalog:vite-plus",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 2 additions & 20 deletions server/utils/npm.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { findMaxSatisfying, getPrerelease } from 'verkit'
import { findMaxSatisfying } from 'verkit'

export const fetchNpmPackage = defineCachedFunction(
async (name: string): Promise<Packument> => {
Expand Down Expand Up @@ -33,18 +33,6 @@ export async function fetchLatestVersionWithFallback(name: string): Promise<stri
}
}

/**
* Check if a version constraint explicitly includes a prerelease tag.
* e.g., "^1.0.0-alpha" or ">=2.0.0-beta.1" include prereleases
*/
function constraintIncludesPrerelease(constraint: string): boolean {
// Look for prerelease identifiers in the constraint
return (
/-(?:alpha|beta|rc|next|canary|dev|preview|pre|experimental)/i.test(constraint) ||
/-\d/.test(constraint)
) // e.g., -0, -1
}

/**
* Resolve a semver version constraint to the best matching version.
* Returns the highest version that satisfies the constraint, or null if none match.
Expand All @@ -58,13 +46,7 @@ export async function resolveVersionConstraint(
): Promise<string | null> {
try {
const packument = await fetchNpmPackage(packageName)
let versions = Object.keys(packument.versions)

// Filter out prerelease versions unless constraint explicitly includes one
if (!constraintIncludesPrerelease(constraint)) {
versions = versions.filter(v => !getPrerelease(v)?.length)
}

const versions = Object.keys(packument.versions)
return findMaxSatisfying(versions, constraint)
} catch {
return null
Expand Down
Loading