seedcord 0.21.4 → 0.21.5

package/README.md

@@ -17,7 +17,7 @@
 
 <div align="center">
 
-[![npm](https://img.shields.io/npm/v/seedcord?style=flat-square&logo=npm&logoColor=c8341f&label=&labelColor=1f1f1f&color=c8341f)](https://www.npmjs.com/package/seedcord) [![node](https://img.shields.io/node/v/seedcord?style=flat-square&label=node&labelColor=1f1f1f&color=4d7d33)](https://nodejs.org) [![license](https://img.shields.io/npm/l/seedcord?style=flat-square&label=license&labelColor=1f1f1f&color=f8f6e8)](LICENSE)
+[![npm](https://img.shields.io/npm/v/seedcord?style=flat-square&label=npm&labelColor=1f1f1f&color=c8341f)](https://www.npmjs.com/package/seedcord) [![node](https://img.shields.io/node/v/seedcord?style=flat-square&label=node&labelColor=1f1f1f&color=4d7d33)](https://nodejs.org) [![bun](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fseedcord%2Fseedcord%2Fnext%2Fcli%2Fseedcord%2Fpackage.json&query=%24.engines.bun&style=flat-square&label=bun&labelColor=1f1f1f&color=fbf0df)](https://bun.com) [![license](https://img.shields.io/npm/l/seedcord?style=flat-square&label=license&labelColor=1f1f1f&color=f8f6e8)](LICENSE)
 
 </div>
 

package/bin/seedcord.mjs

@@ -5,28 +5,49 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 
 const here = dirname(fileURLToPath(import.meta.url));
 
-function declaredNodeRange() {
+function declaredEngines() {
     try {
         const pkg = JSON.parse(readFileSync(resolve(here, '../package.json'), 'utf8'));
-        return pkg.engines?.node ?? '';
+        return pkg.engines ?? {};
     } catch {
-        return '';
+        return {};
     }
 }
 
-// importing core's own check here would load the code this guards
-function unsupportedNodeRange() {
-    const range = declaredNodeRange();
+function parseVersion(text) {
+    const [withoutBuild = ''] = text.replace(/^v/, '').split('+');
+    const [release = '', ...prerelease] = withoutBuild.split('-');
+    const parts = release.split('.').map(Number);
+    return parts.every(Number.isInteger) ? { parts, prerelease: prerelease.length > 0 } : undefined;
+}
+
+// semver ranks 1.4.2-canary.1 below 1.4.2
+function meetsMinimum(required, running) {
+    const length = Math.max(required.parts.length, running.parts.length);
+    for (let index = 0; index < length; index++) {
+        const wanted = required.parts[index] ?? 0;
+        const got = running.parts[index] ?? 0;
+        if (got !== wanted) return got > wanted;
+    }
+    return !running.prerelease;
+}
+
+// importing core's assertDeclaredRuntime here would load the code this guards
+function unsupportedRuntime() {
+    const engines = declaredEngines();
+    const { bun, node } = process.versions;
+    const runtime =
+        bun === undefined
+            ? { name: 'Node', range: engines.node ?? '', running: node }
+            : { name: 'Bun', range: engines.bun ?? '', running: bun };
 
-    const required = new RegExp(String.raw`^>=(\d+)(?:\.(\d+))?`).exec(range.replaceAll(/\s/g, ''));
-    const current = /^v?(\d+)\.(\d+)/.exec(process.version);
-    if (!required || !current) return null;
+    const range = runtime.range.replaceAll(/\s/g, '');
+    if (!range.startsWith('>=')) return undefined;
 
-    const requiredMinor = required[2] ?? '0';
-    const meets =
-        Number(current[1]) > Number(required[1]) ||
-        (Number(current[1]) === Number(required[1]) && Number(current[2]) >= Number(requiredMinor));
-    return meets ? null : range;
+    const required = parseVersion(range.slice('>='.length));
+    const running = parseVersion(runtime.running);
+    if (!required || !running || meetsMinimum(required, running)) return undefined;
+    return runtime;
 }
 
 async function run() {
@@ -41,10 +62,12 @@ async function run() {
     await import(pathToFileURL(srcEntry).href);
 }
 
-const unsupported = unsupportedNodeRange();
+const unsupported = unsupportedRuntime();
 if (unsupported) {
     // eslint-disable-next-line no-console -- the bin has no logger
-    console.error(`seedcord requires Node ${unsupported} and this process runs ${process.version}.`);
+    console.error(
+        `seedcord requires ${unsupported.name} ${unsupported.range} but this process runs ${unsupported.running}.`
+    );
     process.exit(1);
 }
 

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { n as SEEDCORD_CONFIG_FILENAMES, t as version } from "./src-BfciUrzr.mjs";
+import { n as SEEDCORD_CONFIG_FILENAMES, t as version } from "./src-B41FGgG4.mjs";
 import { createRequire } from "node:module";
 import { Command } from "@commander-js/extra-typings";
 import { LEVEL_COLOR, Logger, LoggerChannelRegistry } from "@seedcord/logger";
@@ -31,7 +31,6 @@ import process$1 from "node:process";
 import { assertNever } from "@seedcord/utils";
 import { settleWithin } from "@seedcord/core/node/internal";
 import { createServer, createServerModuleRunner, defineConfig, mergeConfig } from "vite";
-import tsconfigPaths from "vite-tsconfig-paths";
 import { minimatch } from "minimatch";
 import { createServer as createServer$1 } from "node:net";
 
@@ -3278,6 +3277,7 @@ function logsIgnore(root) {
 	return (path) => path === logs || path.startsWith(logs + sep);
 }
 var vite_config_default = defineConfig({
+	resolve: { tsconfigPaths: true },
 	server: {
 		middlewareMode: true,
 		hmr: true,
@@ -3354,7 +3354,7 @@ var ViteDevRuntime = class {
 			configFile: false,
 			server: { watch: { ignored: [logsIgnore(projectRoot)] } },
 			ssr: { noExternal: seedcordDependents(projectDir) },
-			plugins: [tsconfigPaths({ root: projectDir }), hmrPlugin.plugin]
+			plugins: [hmrPlugin.plugin]
 		});
 		this.viteServer = await createServer(config);
 		this.moduleRunner = createServerModuleRunner(this.viteServer.environments.ssr);