Skip to content

Commit 504333c

Browse files
sxzzematipico
andauthored
Replace semver with verkit (#17651)
Co-authored-by: ematipico <[email protected]>
1 parent b2222fc commit 504333c

9 files changed

Lines changed: 40 additions & 51 deletions

File tree

‎.changeset/afraid-deserts-cover.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'astro': patch
3+
'@astrojs/upgrade': patch
4+
'@astrojs/ts-plugin': patch
5+
---
6+
7+
Refactors internal version handling to use a smaller, ESM-native dependency

‎packages/astro/bin/astro.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ async function main() {
3232
const version = process.versions.node;
3333
// Fast-path for higher Node.js versions
3434
if ((Number.parseInt(version) || 0) <= skipSemverCheckIfAbove) {
35-
const semver = await import('semver');
35+
const { satisfies } = await import('verkit');
3636
try {
37-
if (!semver.satisfies(version, engines)) {
37+
if (!satisfies(version, engines)) {
3838
await errorNodeUnsupported();
3939
return;
4040
}

‎packages/astro/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@
162162
"package-manager-detector": "^1.6.0",
163163
"piccolore": "^0.1.3",
164164
"picomatch": "^4.0.4",
165-
"semver": "^7.7.4",
166165
"shiki": "^4.0.2",
167166
"smol-toml": "^1.6.0",
168167
"svgo": "^4.0.2",
@@ -172,6 +171,7 @@
172171
"ultrahtml": "^1.6.0",
173172
"unifont": "~0.7.5",
174173
"unstorage": "^1.17.5",
174+
"verkit": "^0.4.0",
175175
"vite": "^8.0.13",
176176
"vitefu": "^1.1.2",
177177
"xxhash-wasm": "^1.1.0",
@@ -199,7 +199,6 @@
199199
"@types/js-yaml": "^4.0.9",
200200
"@types/parse-srcset": "^1.0.0",
201201
"@types/picomatch": "^4.0.2",
202-
"@types/semver": "^7.7.1",
203202
"@types/yargs-parser": "^21.0.3",
204203
"astro-scripts": "workspace:*",
205204
"cheerio": "1.2.0",

‎packages/astro/src/cli/add/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { type ASTNode, builders, generateCode, loadFile, type ProxifiedModule }
88
import { getDefaultExportOptions } from 'magicast/helpers';
99
import { detect, resolveCommand } from 'package-manager-detector';
1010
import colors from 'piccolore';
11-
import maxSatisfying from 'semver/ranges/max-satisfying.js';
11+
import { findMaxSatisfying } from 'verkit';
1212
import type yargsParser from 'yargs-parser';
1313
import {
1414
loadTSConfig,
@@ -741,7 +741,7 @@ async function resolveRangeToInstallSpecifier(name: string, range: string): Prom
741741
if (versions instanceof Error) return name;
742742
// Filter out any prerelease versions, but fallback if there are no stable versions
743743
const stableVersions = versions.filter((v) => !v.includes('-'));
744-
const maxStable = maxSatisfying(stableVersions, range) ?? maxSatisfying(versions, range);
744+
const maxStable = findMaxSatisfying(stableVersions, range) ?? findMaxSatisfying(versions, range);
745745
if (!maxStable) return name;
746746
return `${name}@^${maxStable}`;
747747
}

‎packages/astro/src/core/dev/dev.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type http from 'node:http';
33
import type { AddressInfo } from 'node:net';
44
import { performance } from 'node:perf_hooks';
55
import colors from 'piccolore';
6-
import { gt, major, minor, patch } from 'semver';
6+
import { getMajor, getMinor, getPatch, isGreater } from 'verkit';
77
import type * as vite from 'vite';
88
import { getDataStoreChunkSize, getDataStoreDir, getDataStoreFile } from '../../content/paths.js';
99
import { globalContentLayer } from '../../content/instance.js';
@@ -59,14 +59,14 @@ export default async function dev(inlineConfig: AstroInlineConfig): Promise<DevS
5959
if (shouldCheck) {
6060
const version = await fetchLatestAstroVersion(restart.container.settings.preferences);
6161

62-
if (gt(version, currentVersion)) {
62+
if (isGreater(version, currentVersion)) {
6363
// Only update the latestAstroVersion if the latest version is greater than the current version, that way we don't need to check that again
6464
// whenever we check for the latest version elsewhere
6565
restart.container.settings.latestAstroVersion = version;
6666

67-
const sameMajor = major(version) === major(currentVersion);
68-
const sameMinor = minor(version) === minor(currentVersion);
69-
const patchDistance = patch(version) - patch(currentVersion);
67+
const sameMajor = getMajor(version) === getMajor(currentVersion);
68+
const sameMinor = getMinor(version) === getMinor(currentVersion);
69+
const patchDistance = getPatch(version) - getPatch(currentVersion);
7070

7171
if (sameMajor && sameMinor && patchDistance < MAX_PATCH_DISTANCE) {
7272
// Don't bother the user with a log if they're only a few patch versions behind

‎packages/language-tools/ts-plugin/package.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@
3232
"@jridgewell/sourcemap-codec": "^1.5.5",
3333
"@volar/language-core": "~2.4.28",
3434
"@volar/typescript": "~2.4.28",
35-
"semver": "^7.7.4",
3635
"vscode-languageserver-textdocument": "^1.0.12"
3736
},
3837
"devDependencies": {
3938
"@types/mocha": "^10.0.10",
4039
"@types/node": "^22.10.6",
41-
"@types/semver": "^7.7.1",
4240
"@types/vscode": "^1.101.0",
4341
"@vscode/test-cli": "^0.0.12",
4442
"@vscode/test-electron": "^2.5.2",

‎packages/upgrade/package.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@
3232
"dependencies": {
3333
"@astrojs/cli-kit": "^0.4.1",
3434
"package-manager-detector": "^1.6.0",
35-
"semver": "^7.7.4",
36-
"terminal-link": "^5.0.0"
35+
"terminal-link": "^5.0.0",
36+
"verkit": "^0.4.0"
3737
},
3838
"devDependencies": {
39-
"@types/semver": "^7.7.1",
4039
"arg": "^5.0.2",
4140
"astro-scripts": "workspace:*"
4241
},

‎packages/upgrade/src/actions/verify.ts‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ import dns from 'node:dns/promises';
22
import { existsSync } from 'node:fs';
33
import { readFile } from 'node:fs/promises';
44
import { color } from '@astrojs/cli-kit';
5-
import semverCoerce from 'semver/functions/coerce.js';
6-
import semverDiff from 'semver/functions/diff.js';
7-
import semverGt from 'semver/functions/gt.js';
8-
import semverParse from 'semver/functions/parse.js';
5+
import { coerce, difference, isGreater, tryParse } from 'verkit';
96
import { bannerAbort, error, getRegistry, info, newline } from '../messages.js';
107
import type { Context, PackageInfo } from './context.js';
118

@@ -81,7 +78,7 @@ function isAllowedPackage(name: string, _version: string) {
8178
}
8279

8380
function isValidVersion(_name: string, version: string) {
84-
return semverCoerce(version, { loose: true }) !== null;
81+
return coerce(version, { loose: true }) !== null;
8582
}
8683

8784
function isSupportedPackage(name: string, version: string): boolean {
@@ -149,10 +146,10 @@ export async function resolveTargetVersion(
149146
const { 'dist-tags': distTags } = await packageMetadata.json();
150147
let version = distTags[packageInfo.targetVersion];
151148
if (version) {
152-
const currentCoerced = semverCoerce(packageInfo.currentVersion);
153-
const targetParsed = semverParse(version);
149+
const currentCoerced = coerce(packageInfo.currentVersion);
150+
const targetParsed = tryParse(version);
154151
// If the dist-tag points to a version older than the installed one, fall back to latest.
155-
if (currentCoerced && targetParsed && semverGt(currentCoerced, targetParsed)) {
152+
if (currentCoerced && targetParsed && isGreater(currentCoerced, targetParsed)) {
156153
packageInfo.targetVersion = 'latest';
157154
version = distTags.latest;
158155
} else {
@@ -168,10 +165,10 @@ export async function resolveTargetVersion(
168165
}
169166
const prefix = packageInfo.targetVersion === 'latest' ? '^' : '';
170167
packageInfo.targetVersion = `${prefix}${version}`;
171-
const fromVersion = semverCoerce(packageInfo.currentVersion)!;
172-
const toVersion = semverParse(version)!;
173-
const bump = semverDiff(fromVersion, toVersion);
174-
if ((bump === 'major' && toVersion.prerelease.length === 0) || bump === 'premajor') {
168+
const fromVersion = coerce(packageInfo.currentVersion)!;
169+
const toVersion = tryParse(version)!;
170+
const bump = difference(fromVersion, toVersion);
171+
if ((bump === 'major' && (toVersion.prerelease?.length ?? 0) === 0) || bump === 'premajor') {
175172
packageInfo.isMajor = true;
176173
if (packageInfo.name === 'astro') {
177174
const upgradeGuide = `https://docs.astro.build/en/guides/upgrade-to/v${toVersion.major}/`;

‎pnpm-lock.yaml‎

Lines changed: 12 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)