From 8f9f0ed87e2c7296b12141acb3cbb94742c8d67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jozef=20Steinh=C3=BCbl?= Date: Sat, 13 Apr 2024 21:15:43 +0200 Subject: [PATCH] fix: slice dep versions only if starts with ^ --- src/constants.ts | 14 ++++++++++---- src/util.ts | 4 ++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index b0ac994..29b60fc 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1,14 +1,20 @@ import { spawnSync } from "bun"; import { dependencies } from "../package.json"; +import { sliceIfStartsWith } from "./util.ts"; export const COMMIT_HASH = spawnSync({ cmd: ["git", "log", "--pretty=format:%h", "-n", "1"], }).stdout.toString(); -export const LILYBIRD_VERSION = dependencies.lilybird.slice(1); -export const LILYBIRD_JSX_VERSION = dependencies["@lilybird/jsx"].slice(1); -export const LILYBIRD_HANDLERS_VERSION = - dependencies["@lilybird/handlers"].slice(1); +export const LILYBIRD_VERSION = sliceIfStartsWith(dependencies.lilybird, "^"); +export const LILYBIRD_JSX_VERSION = sliceIfStartsWith( + dependencies["@lilybird/jsx"], + "^" +); +export const LILYBIRD_HANDLERS_VERSION = sliceIfStartsWith( + dependencies["@lilybird/handlers"], + "^" +); export const PRODUCTION = process.env.NODE_ENV === "production"; diff --git a/src/util.ts b/src/util.ts index 025a407..97fc010 100644 --- a/src/util.ts +++ b/src/util.ts @@ -42,3 +42,7 @@ export function isBunOnlyLikeMessage(content?: string) { export function getRandomBunEmoji() { return BUN_EMOJIS[Math.floor(Math.random() * BUN_EMOJIS.length)]; } + +export function sliceIfStartsWith(input: string, startsWith: string) { + return input.startsWith(startsWith) ? input.slice(startsWith.length) : input; +}