@chr33s/solarflare 0.0.4 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chr33s/solarflare",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/build.bundle-client.ts

@@ -3,11 +3,18 @@ import { readFile, unlink, mkdir, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import ts from "typescript";
 import { rolldown } from "rolldown";
+import type { RolldownOptions } from "rolldown";
 import { replacePlugin } from "rolldown/plugins";
 import { transform } from "lightningcss";
 import { createProgram, getDefaultExportInfo } from "./ast.ts";
 import { exists } from "./fs.ts";
-import { assetUrlPrefixPlugin, type BuildArgs, moduleTypes } from "./build.bundle.ts";
+import {
+  assetUrlPrefixPlugin,
+  type BuildArgs,
+  mergeInputOptions,
+  mergeOutputOptions,
+  moduleTypes,
+} from "./build.bundle.ts";
 import { parsePath } from "./paths.ts";
 import { generateClientScript } from "./console-forward.ts";
 import { createScanner } from "./build.scan.ts";
@@ -22,6 +29,7 @@ export interface BuildClientOptions {
   distClient: string;
   publicDir: string;
   chunksPath: string;
+  userConfig?: RolldownOptions;
 }
 
 async function remove(path: string) {
@@ -82,7 +90,7 @@ async function getComponentMeta(program: ts.Program, appDir: string, file: strin
 }
 
 export async function buildClient(options: BuildClientOptions) {
-  const { args, rootDir, appDir, distDir, distClient, publicDir, chunksPath } = options;
+  const { args, rootDir, appDir, distDir, distClient, publicDir, chunksPath, userConfig } = options;
   const distClientAssets = join(distClient, "assets");
   const scanner = createScanner({ rootDir, appDir });
 
@@ -255,80 +263,90 @@ export async function buildClient(options: BuildClientOptions) {
 
   const packageImports = await scanner.getPackageImports();
 
-  const bundle = await rolldown({
-    input,
-    platform: "browser",
-    tsconfig: true,
-    moduleTypes,
-    plugins: [
-      replacePlugin({
-        "globalThis.__SF_DEV__": JSON.stringify(!args.production),
-      }),
+  const bundle = await rolldown(
+    mergeInputOptions(
       {
-        name: "raw-css-loader",
-        resolveId(source: string, importer: string | undefined) {
-          if (source.endsWith("?raw") && source.includes(".css")) {
-            const realPath = source.replace(/\?raw$/, "");
-            if (importer) {
-              const importerDir = importer.split("/").slice(0, -1).join("/");
-              return {
-                id: join(importerDir, realPath) + "?raw",
-                external: false,
-              };
-            }
-            return { id: realPath + "?raw", external: false };
-          }
-          return null;
+        input,
+        platform: "browser",
+        tsconfig: true,
+        moduleTypes,
+        plugins: [
+          replacePlugin({
+            "globalThis.__SF_DEV__": JSON.stringify(!args.production),
+          }),
+          {
+            name: "raw-css-loader",
+            resolveId(source: string, importer: string | undefined) {
+              if (source.endsWith("?raw") && source.includes(".css")) {
+                const realPath = source.replace(/\?raw$/, "");
+                if (importer) {
+                  const importerDir = importer.split("/").slice(0, -1).join("/");
+                  return {
+                    id: join(importerDir, realPath) + "?raw",
+                    external: false,
+                  };
+                }
+                return { id: realPath + "?raw", external: false };
+              }
+              return null;
+            },
+            async load(id: string) {
+              if (id.endsWith("?raw")) {
+                const realPath = id.replace(/\?raw$/, "");
+                try {
+                  const content = await readFile(realPath, "utf-8");
+                  return {
+                    code: /* tsx */ `export default ${JSON.stringify(content)};`,
+                    moduleType: "js",
+                  };
+                } catch {
+                  console.warn(`[raw-css-loader] Could not load: ${realPath}`);
+                  return { code: `export default "";`, moduleType: "js" };
+                }
+              }
+              return null;
+            },
+          },
+          assetUrlPrefixPlugin,
+        ],
+        resolve: {
+          alias: packageImports,
         },
-        async load(id: string) {
-          if (id.endsWith("?raw")) {
-            const realPath = id.replace(/\?raw$/, "");
-            try {
-              const content = await readFile(realPath, "utf-8");
-              return {
-                code: /* tsx */ `export default ${JSON.stringify(content)};`,
-                moduleType: "js",
-              };
-            } catch {
-              console.warn(`[raw-css-loader] Could not load: ${realPath}`);
-              return { code: `export default "";`, moduleType: "js" };
-            }
-          }
-          return null;
+        transform: {
+          target: "es2020",
+          jsx: {
+            runtime: "automatic",
+            development: !args.production,
+          },
         },
       },
-      assetUrlPrefixPlugin,
-    ],
-    resolve: {
-      alias: packageImports,
-    },
-    transform: {
-      target: "es2020",
-      jsx: {
-        runtime: "automatic",
-        development: !args.production,
-      },
-    },
-  });
-
-  await bundle.write({
-    dir: distClientAssets,
-    format: "esm",
-    entryFileNames: "[name].js",
-    minify: args.production,
-    chunkFileNames: "[name]-[hash].js",
-    assetFileNames: "[name]-[hash][extname]",
-    codeSplitting: {
-      minSize: 20000,
-      groups: [
-        {
-          name: "vendor",
-          test: /node_modules/,
+      userConfig,
+    ),
+  );
+
+  await bundle.write(
+    mergeOutputOptions(
+      {
+        dir: distClientAssets,
+        format: "esm",
+        entryFileNames: "[name].js",
+        minify: args.production,
+        chunkFileNames: "[name]-[hash].js",
+        assetFileNames: "[name]-[hash][extname]",
+        codeSplitting: {
+          minSize: 20000,
+          groups: [
+            {
+              name: "vendor",
+              test: /node_modules/,
+            },
+          ],
         },
-      ],
-    },
-    ...(args.sourcemap && { sourcemap: true }),
-  });
+        ...(args.sourcemap && { sourcemap: true }),
+      },
+      userConfig,
+    ),
+  );
 
   if (cssOutputsByBase.size > 0) {
     const emittedCss = new Set(cssOutputsByBase.values());

package/src/build.bundle-server.ts

@@ -2,8 +2,15 @@ import { mkdir, unlink, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { glob } from "node:fs/promises";
 import { rolldown } from "rolldown";
+import type { RolldownOptions } from "rolldown";
 import { createProgram } from "./ast.ts";
-import { assetUrlPrefixPlugin, type BuildArgs, moduleTypes } from "./build.bundle.ts";
+import {
+  assetUrlPrefixPlugin,
+  type BuildArgs,
+  mergeInputOptions,
+  mergeOutputOptions,
+  moduleTypes,
+} from "./build.bundle.ts";
 import { createScanner } from "./build.scan.ts";
 import { validateRoutes, generateRoutesTypeFile } from "./build.validate.ts";
 import { generateModulesFile } from "./build.emit-manifests.ts";
@@ -16,10 +23,12 @@ export interface BuildServerOptions {
   modulesPath: string;
   chunksPath: string;
   routesTypePath: string;
+  userConfig?: RolldownOptions;
 }
 
 export async function buildServer(options: BuildServerOptions) {
-  const { args, rootDir, appDir, distServer, modulesPath, chunksPath, routesTypePath } = options;
+  const { args, rootDir, appDir, distServer, modulesPath, chunksPath, routesTypePath, userConfig } =
+    options;
   const scanner = createScanner({ rootDir, appDir });
 
   console.log("🔍 Scanning for route modules...");
@@ -73,51 +82,61 @@ export async function buildServer(options: BuildServerOptions) {
 
   const packageImports = await scanner.getPackageImports();
 
-  const bundle = await rolldown({
-    input: join(appDir, "index.ts"),
-    platform: "node",
-    tsconfig: true,
-    moduleTypes,
-    external: [
-      "cloudflare:workers",
-      "preact",
-      "preact/hooks",
-      "preact/compat",
-      "preact/jsx-runtime",
-      "preact/jsx-dev-runtime",
-      "preact/debug",
-      "@preact/signals",
-      "@preact/signals-core",
-      "@preact/signals-debug",
-      "preact-render-to-string",
-      "preact-render-to-string/stream",
-      "preact-custom-element",
-    ],
-    resolve: {
-      alias: {
-        ...packageImports,
-        ".modules.generated": modulesPath,
-        ".chunks.generated.json": chunksPath,
+  const bundle = await rolldown(
+    mergeInputOptions(
+      {
+        input: join(appDir, "index.ts"),
+        platform: "node",
+        tsconfig: true,
+        moduleTypes,
+        external: [
+          "cloudflare:workers",
+          "preact",
+          "preact/hooks",
+          "preact/compat",
+          "preact/jsx-runtime",
+          "preact/jsx-dev-runtime",
+          "preact/debug",
+          "@preact/signals",
+          "@preact/signals-core",
+          "@preact/signals-debug",
+          "preact-render-to-string",
+          "preact-render-to-string/stream",
+          "preact-custom-element",
+        ],
+        resolve: {
+          alias: {
+            ...packageImports,
+            ".modules.generated": modulesPath,
+            ".chunks.generated.json": chunksPath,
+          },
+        },
+        plugins: [assetUrlPrefixPlugin],
+        transform: {
+          jsx: {
+            runtime: "automatic",
+            development: false,
+          },
+        },
       },
-    },
-    plugins: [assetUrlPrefixPlugin],
-    transform: {
-      jsx: {
-        runtime: "automatic",
-        development: false,
+      userConfig,
+    ),
+  );
+
+  await bundle.write(
+    mergeOutputOptions(
+      {
+        dir: distServer,
+        format: "esm",
+        codeSplitting: false,
+        entryFileNames: "index.js",
+        assetFileNames: "[name]-[hash][extname]",
+        minify: args.production,
+        ...(args.sourcemap && { sourcemap: true }),
       },
-    },
-  });
-
-  await bundle.write({
-    dir: distServer,
-    format: "esm",
-    codeSplitting: false,
-    entryFileNames: "index.js",
-    assetFileNames: "[name]-[hash][extname]",
-    minify: args.production,
-    ...(args.sourcemap && { sourcemap: true }),
-  });
+      userConfig,
+    ),
+  );
 
   await bundle.close();
 

package/src/build.bundle.ts

@@ -1,4 +1,82 @@
-import type { ModuleTypes, NormalizedOutputOptions, OutputBundle } from "rolldown";
+import { join } from "node:path";
+import type {
+  ExternalOption,
+  InputOptions,
+  ModuleTypes,
+  NormalizedOutputOptions,
+  OutputBundle,
+  OutputOptions,
+  Plugin,
+  RolldownOptions,
+  RolldownPluginOption,
+} from "rolldown";
+import { exists } from "./fs.ts";
+
+/** Load a `rolldown.config.ts` from `rootDir` if it exists. */
+export async function loadUserConfig(rootDir: string): Promise<RolldownOptions | undefined> {
+  const configPath = join(rootDir, "rolldown.config.ts");
+  if (!(await exists(configPath))) return undefined;
+  const { loadConfig } = await import("rolldown/config");
+  const exported = await loadConfig(configPath);
+  if (typeof exported === "function") return (await exported({})) as RolldownOptions;
+  if (Array.isArray(exported)) return exported[0];
+  return exported;
+}
+
+/** Merge user input options onto a framework base (plugins appended, resolve/external merged). */
+export function mergeInputOptions(base: InputOptions, user?: RolldownOptions): InputOptions {
+  if (!user) return base;
+  const {
+    output: _,
+    plugins: userPlugins,
+    resolve: userResolve,
+    external: userExternal,
+    ...rest
+  } = user;
+  return {
+    ...base,
+    ...rest,
+    plugins: [...toArray(base.plugins), ...toArray(userPlugins)] as RolldownPluginOption[],
+    resolve: {
+      ...base.resolve,
+      ...userResolve,
+      alias: {
+        ...(base.resolve?.alias as Record<string, string>),
+        ...(userResolve?.alias as Record<string, string>),
+      },
+    },
+    external: [...toArray(base.external), ...toArray(userExternal)] as ExternalOption,
+  };
+}
+
+/** Merge user output options onto a framework base. */
+export function mergeOutputOptions(base: OutputOptions, user?: RolldownOptions): OutputOptions {
+  if (!user?.output) return base;
+  const out = Array.isArray(user.output) ? user.output[0] : user.output;
+  return { ...base, ...out };
+}
+
+function toArray<T>(value: T | T[] | undefined | null): T[] {
+  if (value == null) return [];
+  return Array.isArray(value) ? value : [value];
+}
+
+/** Raw text replacement plugin for `%KEY%` patterns (like Vite's html env replacement). */
+export function htmlReplacePlugin(replacements: Record<string, string>): Plugin {
+  const entries = Object.entries(replacements);
+  if (entries.length === 0) return { name: "html-replace" };
+  return {
+    name: "html-replace",
+    transform(code) {
+      let result = code;
+      for (const [key, value] of entries) {
+        result = result.replaceAll(key, value);
+      }
+      if (result === code) return null;
+      return { code: result };
+    },
+  };
+}
 
 export const assetUrlPrefixPlugin = {
   name: "asset-url-prefix",

package/src/build.ts

@@ -7,6 +7,7 @@ import { argv, env } from "node:process";
 import { parseArgs } from "node:util";
 import { buildClient } from "./build.bundle-client.ts";
 import { buildServer } from "./build.bundle-server.ts";
+import { loadUserConfig } from "./build.bundle.ts";
 import { exists } from "./fs.ts";
 
 /** Resolve paths relative to the current working directory. */
@@ -110,6 +111,9 @@ async function build() {
 
   await scaffoldTemplates();
 
+  const userConfig = await loadUserConfig(ROOT_DIR);
+  if (userConfig) console.log("📋 Loaded rolldown.config.ts");
+
   await buildClient({
     args,
     rootDir: ROOT_DIR,
@@ -118,6 +122,7 @@ async function build() {
     distClient: DIST_CLIENT,
     publicDir: PUBLIC_DIR,
     chunksPath: CHUNKS_PATH,
+    userConfig,
   });
 
   await buildServer({
@@ -128,6 +133,7 @@ async function build() {
     modulesPath: MODULES_PATH,
     chunksPath: CHUNKS_PATH,
     routesTypePath: ROUTES_TYPE_PATH,
+    userConfig,
   });
 
   const duration = ((performance.now() - startTime) / 1000).toFixed(2);

package/src/solarflare.d.ts

@@ -5,13 +5,12 @@ interface ImportMeta {
   ): Record<string, () => Promise<T>>;
   /** The file path of the current module (Node runtime) */
   path?: string;
-  /** Environment variables (bundler) */
-  env?: {
+  /** Environment variables replaced at build time via `transform.define` in `rolldown.config.ts`. */
+  env: {
     DEV?: boolean;
     PROD?: boolean;
     MODE?: string;
-    [key: string]: unknown;
-  };
+  } & Record<string, string>;
 }
 
 declare module "*.css" {