From f56cb7d2bfbf3b1b55023fec6f969fa0a65bbbaa Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Sat, 9 Nov 2024 04:03:29 -0800 Subject: [PATCH] use semver range for pocketbase updates --- .../UpdateCommand/freshenPocketbaseVersions.ts | 5 +++-- packages/pockethost/src/constants.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/pockethost/src/cli/commands/PocketBaseCommand/UpdateCommand/freshenPocketbaseVersions.ts b/packages/pockethost/src/cli/commands/PocketBaseCommand/UpdateCommand/freshenPocketbaseVersions.ts index 578b7d5b..50c11310 100644 --- a/packages/pockethost/src/cli/commands/PocketBaseCommand/UpdateCommand/freshenPocketbaseVersions.ts +++ b/packages/pockethost/src/cli/commands/PocketBaseCommand/UpdateCommand/freshenPocketbaseVersions.ts @@ -1,5 +1,5 @@ import { writeFileSync } from 'fs' -import { lte, prerelease } from 'semver' +import { prerelease, satisfies } from 'semver' import { LoggerService, MOTHERSHIP_HOOKS_DIR, @@ -66,7 +66,8 @@ export async function freshenPocketbaseVersions() { await bot.download() const rawVersions = await bot.versions() const allowedVersions = rawVersions.filter( - (v) => lte(v, PH_ALLOWED_POCKETBASE_SEMVER()) && prerelease(v) === null, + (v) => + satisfies(v, PH_ALLOWED_POCKETBASE_SEMVER()) && prerelease(v) === null, ) const versions = expandAndSortSemVers(allowedVersions) const cjs = `module.exports = ${stringify(versions, null, 2)}` diff --git a/packages/pockethost/src/constants.ts b/packages/pockethost/src/constants.ts index fb49e96e..b34bd8cd 100644 --- a/packages/pockethost/src/constants.ts +++ b/packages/pockethost/src/constants.ts @@ -79,7 +79,7 @@ if (_IS_DEV) { } export const SETTINGS = { - PH_ALLOWED_POCKETBASE_SEMVER: mkString(`0.22.21`), + PH_ALLOWED_POCKETBASE_SEMVER: mkString(`0.22.*`), PH_HOME: mkPath(_PH_HOME, { create: true }), PH_PROJECT_ROOT: mkPath(PH_PROJECT_ROOT()),