Update dependencies, small refactor

Author: gameroman

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.3.11/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.3.12/schema.json",
   "vcs": {
     "enabled": true,
     "clientKind": "git",

bun.lock

@@ -7,34 +7,32 @@
       "packages/*"
     ],
     "catalog": {
-      "@astrojs/cloudflare": "beta",
-      "@astrojs/solid-js": "beta",
-      "@better-auth/cli": "^1.4.15",
-      "@better-auth/passkey": "^1.4.15",
+      "@astrojs/cloudflare": "13.0.0-beta.1",
+      "@astrojs/solid-js": "6.0.0-beta.2",
+      "@better-auth/cli": "^1.4.17",
+      "@better-auth/passkey": "^1.4.17",
       "@tailwindcss/vite": "^4.1.18",
-      "@typescript/native-preview": "7.0.0-dev.20260118.1",
-      "astro": "beta",
-      "better-auth": "^1.4.15",
+      "astro": "6.0.0-beta.3",
+      "better-auth": "^1.4.17",
       "drizzle-orm": "^0.45.1",
       "elysia": "^1.4.22",
-      "rolldown": "1.0.0-beta.59",
-      "solid-js": "^1.9.10",
+      "rolldown": "1.0.0-rc.1",
+      "solid-js": "^1.9.11",
       "tailwindcss": "^4.1.18",
-      "tsdown": "^0.19.0",
+      "tsdown": "^0.20.1",
       "wrangler": "^4.59.2",
-      "zod": "^4.3.5"
+      "zod": "^4.3.6"
     }
   },
   "scripts": {
     "lint": "biome lint",
     "format": "biome check --write --linter-enabled=false",
-    "build:app": "bun run -F './apps/registry' build",
-    "build:cli": "bun run -F './packages/usts' build",
-    "test": "bun run -F './packages/usts' test"
+    "build:app": "bun run --cwd ./apps/registry build",
+    "build:cli": "bun run --cwd ./packages/usts build",
+    "test": "bun run --cwd ./packages/usts test"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.3.11",
-    "@typescript/native-preview": "catalog:"
+    "@biomejs/biome": "2.3.12"
   },
   "overrides": {
     "esbuild": "^0.27.2"

package.json

@@ -20,9 +20,9 @@
     "LICENSE"
   ],
   "exports": {
-    ".": "./dist/index.mjs",
     "./bin/cli": "./dist/bin/cli.mjs",
     "./config": "./dist/config.mjs",
+    "./core": "./dist/core.mjs",
     "./package.json": "./package.json"
   },
   "bin": {

packages/usts/package.json

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
 
-async function main() {
+async function main(): Promise<void> {
   const bunVersion = process.versions.bun;
 
   if (bunVersion) {

packages/usts/src/bin/cli.ts

@@ -1,2 +1,18 @@
-import build from "~/core/build";
+import { resolveConfig } from "~/config/resolve";
+import { buildUserscript } from "~/core/build";
+
+async function build(): Promise<void> {
+  const { userscriptConfig, root } = await resolveConfig();
+
+  const outDir = userscriptConfig.outDir;
+
+  if (outDir === root || root.includes(outDir)) {
+    throw new Error(
+      "The outDir cannot be the root folder. Please build to a different folder.",
+    );
+  }
+
+  await buildUserscript(userscriptConfig, { write: true });
+}
+
 export { build };

packages/usts/src/cli/build/index.ts

@@ -1,16 +1,40 @@
-import { resolveConfig } from "~/config/resolve";
-import { buildUserscript } from "./build";
+import * as path from "node:path";
 
-export default async function build(): Promise<void> {
-  const { userscriptConfig, root } = await resolveConfig();
+import * as rolldown from "rolldown";
 
-  const outDir = userscriptConfig.outDir;
+import type { ResolvedUserscriptConfig } from "~/config/schema";
 
-  if (outDir === root || root.includes(outDir)) {
-    throw new Error(
-      "The outDir cannot be the root folder. Please build to a different folder.",
-    );
+import { serializeMetaHeader } from "./meta-header";
+
+async function buildUserscript(
+  config: ResolvedUserscriptConfig,
+  options?: { write?: boolean },
+): Promise<string> {
+  const header = serializeMetaHeader(config.header);
+
+  const USERSCRIPT_OUTPUT_FILE_NAME = "index.user.js";
+  const outFile = path.join(config.outDir, USERSCRIPT_OUTPUT_FILE_NAME);
+
+  const result = await rolldown.build({
+    input: config.entryPoint,
+    tsconfig: true,
+    plugins: [config.plugins],
+    output: {
+      format: "iife",
+      sourcemap: false,
+      minify: "dce-only",
+      postBanner: `${header}\n`,
+      cleanDir: config.clean,
+      file: outFile,
+    },
+    write: options?.write ?? false,
+  });
+
+  if (result.output.length !== 1) {
+    throw new Error(`❌ Unexpected userscript build output`);
   }
 
-  await buildUserscript(userscriptConfig, { write: true });
+  return result.output[0].code;
 }
+
+export { buildUserscript };

packages/usts/src/core/build/build.ts

@@ -28,14 +28,13 @@ export function serializeMetaHeader(
   headerConfig: UserscriptMetaHeaderConfig,
 ): string {
   const headerConfigEntries = Object.entries(headerConfig);
-  const headerLines = headerConfigEntries.flatMap(([kwy, val]) =>
-    getHeaderLines(kwy, val),
+  const headerLines = headerConfigEntries.flatMap(([key, val]) =>
+    getHeaderLines(key, val),
   );
 
   const headerStart = "// ==UserScript==";
   const headerEnd = "// ==/UserScript==";
   const serializedHeaderLines = headerLines.join("\n");
-  const serializedHeader =
-    `${headerStart}\n${serializedHeaderLines}\n${headerEnd}` as const;
+  const serializedHeader = `${headerStart}\n${serializedHeaderLines}\n${headerEnd}`;
   return serializedHeader;
 }

packages/usts/src/core/build/index.ts

@@ -0,0 +1 @@
+export { buildUserscript } from "./build";