Skip to content

feat: replace custom code with minVersion #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterpeterparker merged 1 commit into from
Apr 19, 2025
Merged

feat: replace custom code with minVersion #231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions src/services/build/build.rust.services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {existsSync} from 'node:fs';
import {lstat, mkdir, readFile, rename, writeFile} from 'node:fs/promises';
import {join, relative} from 'node:path';
import ora, {type Ora} from 'ora';
import {compare, satisfies} from 'semver';
import {compare, minVersion, satisfies} from 'semver';
import {detectJunoDevConfigType} from '../../configs/juno.dev.config';
import {
DEPLOY_LOCAL_REPLICA_PATH,
Expand Down Expand Up @@ -317,15 +317,11 @@ const extractBuildType = async ({path}: Pick<BuildArgs, 'path'> = {}): Promise<
const satelliteVersion: string | null | undefined = satPackage.metadata?.juno?.satellite?.version;

if (isNullish(satelliteVersion) || isEmptyString(satelliteVersion)) {
const normalizeVersion = (version: string): string =>
version
.trim()
.replace(/^[=^~><]+/, '') // Remove leading =, ^, ~, >, <, >=, <=
.replace(/\s+/, ''); // In case there's a trailing space
const minSatVersion = minVersion(requiredSatVersion);

// juno.package.json (used for the WASM custom public section) was introduced after Satellite v0.0.22.
// If the Satellite version is newer, the absence of this metadata is unexpected and we throw an error.
if (compare(normalizeVersion(requiredSatVersion), '0.0.22') > 0) {
if (isNullish(minSatVersion) || compare(minSatVersion.version, '0.0.22') > 0) {
return {
error:
'The metadata required to specify the Satellite version is missing. This is unexpected.'
Expand Down