jeasx 2.2.1 → 2.3.0

package/CHANGELOG.md

@@ -1,5 +1,74 @@
 # Changelog
 
+## 2026-01-30 - Jeasx 2.3.0 released
+
+🎉 This release introduces support for [MDX](https://mdxjs.com), enabling you to seamlessly embed JSX within Markdown content. Just create a route with a `.mdx` extension, and you’re all set to enhance your websites and blogs with Markdown enriched by dynamic JSX components.
+
+```jsx
+import Layout from "./Layout"
+
+<Layout title="MDX - Markdown for the component era">
+# MDX as content companion alongside JSX
+
+You can easily access existing `props` in MDX:
+
+- Current url: {props.request.url}
+</Layout>
+```
+
+You can also create MDX-based components for use within JSX by importing them with their full `.mdx` file extension into your JSX routes or components.
+
+Since MDX supports a variety of plugins - and Jeasx provides only the MDX core to stay focused on infrastructure while letting users handle customization - the overall configuration for Jeasx has been significantly improved. Now, the configuration object from an `.env.js` file is imported directly into both the build process and server runtime, allowing you to use package imports seamlessly. Previously, (de)serializing the configuration via `process.env` restricted this capability and limited advanced setups.
+
+**Please note:** Variables loaded from `.env.js` now consistently overwrite any existing environment variables. This ensures predictable and consistent behavior across your configuration.
+
+Here’s an example of how to configure the MDX engine: if you want to enable GitHub-flavored Markdown (`remark-gfm`), add syntax highlighting (`rehype-prism-plus`), and generate IDs for your headings (`rehype-slug`), you can install and configure these plugins accordingly in `.env.js`.
+
+```js
+import rehypePrismPlus from "rehype-prism-plus";
+import rehypeSlug from "rehype-slug";
+import remarkGFM from "remark-gfm";
+
+export default {
+  /** @type import("@mdx-js/esbuild").Options */
+  ESBUILD_MDX_OPTIONS: {
+    remarkPlugins: [[remarkGFM, { singleTilde: false }]],
+    rehypePlugins: [rehypePrismPlus, [rehypeSlug, { prefix: "jeasx-" }]]
+  }
+  //...
+}
+```
+
+For a full overview of available configuration options and plugins, check out the excellent documentation of [@mdx-js/esbuild](https://mdxjs.com/packages/esbuild).
+
+**Please note:** The update to the Jeasx configuration introduced a minor change in how `ESBUILD_BROWSER_TARGET` is specified to ensure consistency across the configuration. Previously, a comma-separated string was accepted and parsed as customization. Going forward, you must provide a proper JSON array (or its stringified form when using traditional `.env` files or the process environment).
+
+```js
+export default {
+  /** @type import("esbuild").BuildOptions["target"] */
+  ESBUILD_BROWSER_TARGET: ["chrome130", "edge130", "firefox130", "safari18"]
+  //...
+}
+```
+
+Dependency updates: `fastify@5.7.2`, `@fastify/multipart@9.4.0`
+
+## 2026-01-17 - Jeasx 2.2.2 released
+
+🎉 This release now preserves the original status code when a 404 page is accessed directly (defaults to 200). This improvement makes it easier to use Jeasx as a static site generator and to fetch the 404 page with common tools for saving it to a file system.
+
+While Jeasx is fundamentally a server-side rendering framework, there are valid use cases where serving a static page alone is sufficient. For example, you can use `wget` to download a Jeasx website to a www-directory with just a single line:
+
+```bash
+wget --mirror --page-requisites --no-host-directories --directory-prefix=www http://localhost:3000 http://localhost:3000/404
+```
+
+Have a look at the [Dockerfile](https://github.com/jeasx/jeasx-website/blob/main/Dockerfile) of the Jeasx website to see how things can be wired up for serving a static export with Caddy as web server.
+
+If you want to restore the old behaviour (directly calling /404 resulting in status code 404), you can simple add `reply.status(404)` to your `/[404]` handler.
+
+Dependency updates: `fastify@5.7.1`, `@fastify/static@9.0.0`, `@types/node@24.10.9`
+
 ## 2025-12-21 - Jeasx 2.2.1 released
 
 🎉 Just a patch release with a minor cleanup for explicit path joins in `serverless.ts`.
@@ -10,15 +79,15 @@ Dependency updates: `esbuild@0.27.2`, `jsx-async-runtime@2.0.2`, `@types/node@24
 
 🎉 This release introduces a more flexible configuration approach for the underlying Fastify server. You can now customize all Fastify options (including those for all used plugins) according to your needs, without having to use the formerly fixed and very restrictive set of environment variables. This change was made to eliminate the need for increasingly specific environment variables to customise the default behaviour of Jeasx.
 
-**Breaking change**: The previously supported environment variables (~~`FASTIFY_​BODY_​LIMIT, FASTIFY_​DISABLE_​REQUEST_​LOGGING, FASTIFY_​REWRITE_​URL, FASTIFY_​STATIC_​HEADERS, FASTIFY_​TRUST_​PROXY, FASTIFY_​MULTIPART_​ATTACH_​FIELDS_​TO_​BODY`~~) have been completely removed. While this may seem inconvenient for a minor release, the process of migrating your setup to the new configuration approach usually takes less than a minute. This streamlines the code base and documentation, as these features are presumably seldom used.
+**Breaking change**: The previously supported environment variables (`FASTIFY_​BODY_​LIMIT, FASTIFY_​DISABLE_​REQUEST_​LOGGING, FASTIFY_​REWRITE_​URL, FASTIFY_​STATIC_​HEADERS, FASTIFY_​TRUST_​PROXY, FASTIFY_​MULTIPART_​ATTACH_​FIELDS_​TO_​BODY`) have been completely removed. While this may seem inconvenient for a minor release, the process of migrating your setup to the new configuration approach usually takes less than a minute. This streamlines the code base and documentation, as these features are presumably seldom used.
 
 To configure Fastify (or a specific plugin), you can now use simple JSON objects which mirror the corresponding Fastify options. Have a look at the linked Fastify documentation for a reference of all existing options:
 
-- [`FASTIFY_SERVER_OPTIONS`](<https://fastify.dev/docs/latest/Reference/Server/>)
-- [`FASTIFY_COOKIE_OPTIONS`](<https://github.com/fastify/fastify-cookie#options>)
-- [`FASTIFY_FORMBODY_OPTIONS`](<https://github.com/fastify/fastify-formbody#options>)
-- [`FASTIFY_MULTIPART_OPTIONS`](<https://github.com/fastify/fastify-multipart#options>)
-- [`FASTIFY_STATIC_OPTIONS`](<https://github.com/fastify/fastify-static#options>)
+- [`FASTIFY_SERVER_OPTIONS`](https://fastify.dev/docs/latest/Reference/Server/)
+- [`FASTIFY_COOKIE_OPTIONS`](https://github.com/fastify/fastify-cookie#options)
+- [`FASTIFY_FORMBODY_OPTIONS`](https://github.com/fastify/fastify-formbody#options)
+- [`FASTIFY_MULTIPART_OPTIONS`](https://github.com/fastify/fastify-multipart#options)
+- [`FASTIFY_STATIC_OPTIONS`](https://github.com/fastify/fastify-static#options)
 
 To optimise the developer experience, it is highly recommended that you use the recently introduced `.env.js` file to provide these configuration options. Alternatively, you can also provide them via `.env` or your process environment. Jeasx comes with a minimal set of reasonable [Fastify defaults](https://github.com/jeasx/jeasx/blob/main/serverless.ts), but you can also overwrite them if necessary.
 
@@ -59,7 +128,7 @@ Dependency updates: `@types/node@24.10.1`
 
 ## 2025-11-10 - Jeasx 2.1.1 released
 
-🎉 Enhanced configuration for @fastify/static, so you can serve pre-compressed static files (see <https://github.com/fastify/fastify-static?tab=readme-ov-file#precompressed>) from `public` and `dist/browser`. Just run `gzip -rk public dist/browser` as post build for gzipping your static assets. This might be useful if you don't want to run a reverse proxy in front of your Jeasx application and serve compressed files nevertheless. Setting up compression for dynamic content can be wired up in userland via a root guard:
+🎉 Enhanced configuration for @fastify/static, so you can serve pre-compressed static files (see [fastify docs](https://github.com/fastify/fastify-static?tab=readme-ov-file#precompressed)) from `public` and `dist/browser`. Just run `gzip -rk public dist/browser` as post build for gzipping your static assets. This might be useful if you don't want to run a reverse proxy in front of your Jeasx application and serve compressed files nevertheless. Setting up compression for dynamic content can be wired up in userland via a root guard:
 
 ```js
 import { promisify } from "node:util";
@@ -329,7 +398,7 @@ Added two new environment variables (`FASTIFY_DISABLE_REQUEST_LOGGING` and `FAST
 
 ## 2024-12-01 - Jeasx 1.1.0 released
 
-🎉 Migrated from dotenv to dotenv-flow, so you can use NODE_ENV-specific .env* files (like `.env.development`) to configure different environments for production and development. This is useful to disable caching headers (e.g. via `FASTIFY_STATIC_HEADERS`) in development, as Jeasx applies `FASTIFY_STATIC_HEADERS` in development from now on for a more consistent developer expierence. See updated .env-files in the quickstart-project for an example how to disable caching in development. This is only needed if you have configured `FASTIFY_STATIC_HEADERS` for your existing projects.
+🎉 Migrated from dotenv to dotenv-flow, so you can use NODE_ENV-specific .env\* files (like `.env.development`) to configure different environments for production and development. This is useful to disable caching headers (e.g. via `FASTIFY_STATIC_HEADERS`) in development, as Jeasx applies `FASTIFY_STATIC_HEADERS` in development from now on for a more consistent developer expierence. See updated .env-files in the quickstart-project for an example how to disable caching in development. This is only needed if you have configured `FASTIFY_STATIC_HEADERS` for your existing projects.
 
 Bumped default environment variable `ESBUILD_BROWSER_TARGET` to more recent browser versions (e.g. `chrome126, edge126, firefox128, safari17`). If you want to stick with older versions, you can override it via the environment. Learn more about possible values at the esbuild website.
 

package/LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024-2025 Maik Jablonski (<mail@jeasx.dev>)
+Copyright (c) 2024-2026 Maik Jablonski (<mail@jeasx.dev>)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/env.js

@@ -2,8 +2,7 @@ import { existsSync } from "node:fs";
 import { join } from "node:path";
 
 /**
- * Load environment variables from .env* files
- * into process.env in the following order:
+ * Load environment variables from .env-files into process.env in the following order:
  *
  * 1. .env.<NODE_ENV>.local
  * 2. .env.<NODE_ENV>
@@ -12,47 +11,36 @@ import { join } from "node:path";
  * 5. .env.defaults
  * 6. .env.js
  *
- * If a variable already exists in a previous environment,
- * it will be not overwritten at a later stage.
+ * .env.js is imported as an ES module and will always overwrite existing variables.
  */
 export default async function env() {
   if (process.loadEnvFile) {
     [
-      ...(process.env.NODE_ENV
-        ? [`.env.${process.env.NODE_ENV}.local`, `.env.${process.env.NODE_ENV}`]
-        : []),
+      ...(process.env.NODE_ENV ?
+        [`.env.${process.env.NODE_ENV}.local`, `.env.${process.env.NODE_ENV}`]
+      : []),
       ".env.local",
       ".env",
-      ".env.defaults",
+      ".env.defaults"
     ]
       .filter(existsSync)
       .forEach(process.loadEnvFile);
   }
   try {
     const envFile = `file://${join(process.cwd(), ".env.js")}`;
-    const envObject = stringifyFunctions((await import(envFile)).default);
-    Object.entries(envObject)
-      .filter(([key]) => !(key in process.env))
-      .forEach(([key, value]) => {
+    const envObject = (await import(envFile)).default;
+    Object.entries(envObject).forEach(([key, value]) => {
+      try {
         process.env[key] =
           typeof value === "string" ? value : JSON.stringify(value);
-      });
-  } catch (e) {
+      } catch (error) {
+        // JSON.stringify throws TypeError for circular references or BigInts.
+        console.error("❌", `"${key}" in .env.js throws`, error);
+      }
+    });
+    return { ...process.env, ...envObject };
+  } catch {
     // ERR_MODULE_NOT_FOUND
+    return { ...process.env };
   }
 }
-
-/**
- * Convert all functions recursively to strings.
- */
-function stringifyFunctions(obj) {
-  for (const key in obj) {
-    if (typeof obj[key] === "function") {
-      obj[key] = obj[key].toString();
-    }
-    if (typeof obj[key] === "object" && obj[key] !== null) {
-      stringifyFunctions(obj[key]);
-    }
-  }
-  return obj;
-}

package/esbuild.config.js

@@ -1,35 +1,49 @@
+import mdx from "@mdx-js/esbuild";
 import * as esbuild from "esbuild";
 import env from "./env.js";
 
-await env();
+const ENV = await env();
 
-const BUILD_TIME = `"${Date.now().toString(36)}"`;
+const BUILD_TIME = `"${ENV.BUILD_TIME || Date.now().toString(36)}"`;
 
-const BROWSER_PUBLIC_ENV = Object.keys(process.env)
+const BROWSER_PUBLIC_ENV = Object.keys(ENV)
   .filter((key) => key.startsWith("BROWSER_PUBLIC_"))
   .reduce(
     (env, key) => {
-      env[`process.env.${key}`] = `"${process.env[key]}"`;
+      env[`process.env.${key}`] = `"${ENV[key]}"`;
       return env;
     },
     { "process.env.BROWSER_PUBLIC_BUILD_TIME": BUILD_TIME }
   );
 
-const ESBUILD_BROWSER_TARGET = process.env.ESBUILD_BROWSER_TARGET
-  ? process.env.ESBUILD_BROWSER_TARGET.replace(/\s/g, "").split(",")
-  : ["chrome130", "edge130", "firefox130", "safari18"];
+const ESBUILD_BROWSER_TARGET = ENV.ESBUILD_BROWSER_TARGET || [
+  "chrome130",
+  "edge130",
+  "firefox130",
+  "safari18"
+];
+
+const ESBUILD_MDX_PLUGIN = mdx({
+  development: process.env.NODE_ENV === "development",
+  jsxImportSource: "jsx-async-runtime",
+  elementAttributeNameCase: "html",
+  stylePropertyNameCase: "css",
+  ...(ENV.ESBUILD_MDX_OPTIONS || {})
+});
 
 /** @type esbuild.BuildOptions[] */
 const buildOptions = [
   {
-    entryPoints: ["js", "ts", "jsx", "tsx"].map((ext) => `src/**/[*].${ext}`),
+    entryPoints: ["js", "ts", "jsx", "tsx", "mdx"].map(
+      (ext) => `src/**/[*].${ext}`
+    ),
     define: {
-      "process.env.BUILD_TIME": BUILD_TIME,
+      "process.env.BUILD_TIME": BUILD_TIME
     },
     minify: process.env.NODE_ENV !== "development",
     logLevel: "info",
     logOverride: {
-      "empty-glob": "silent",
+      "empty-glob": "silent"
     },
     color: true,
     bundle: true,
@@ -38,6 +52,7 @@ const buildOptions = [
     outdir: "dist/server",
     platform: "neutral",
     packages: "external",
+    plugins: [ESBUILD_MDX_PLUGIN]
   },
   {
     entryPoints: ["js", "ts", "jsx", "tsx", "css"].map(
@@ -47,7 +62,7 @@ const buildOptions = [
     minify: process.env.NODE_ENV !== "development",
     logLevel: "info",
     logOverride: {
-      "empty-glob": "silent",
+      "empty-glob": "silent"
     },
     color: true,
     bundle: true,
@@ -69,9 +84,10 @@ const buildOptions = [
       "*.ttf",
       "*.otf",
       "*.woff",
-      "*.woff2",
+      "*.woff2"
     ],
-  },
+    plugins: [ESBUILD_MDX_PLUGIN]
+  }
 ];
 
 buildOptions.forEach(async (options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jeasx",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "Jeasx - the ease of JSX with the power of SSR",
   "keywords": [
     "jsx",
@@ -26,11 +26,12 @@
   "dependencies": {
     "@fastify/cookie": "11.0.2",
     "@fastify/formbody": "8.0.2",
-    "@fastify/multipart": "9.3.0",
-    "@fastify/static": "8.3.0",
-    "@types/node": "24.10.4",
+    "@fastify/multipart": "9.4.0",
+    "@fastify/static": "9.0.0",
+    "@mdx-js/esbuild": "3.1.1",
+    "@types/node": "24.10.9",
     "esbuild": "0.27.2",
-    "fastify": "5.6.2",
+    "fastify": "5.7.2",
     "jsx-async-runtime": "2.0.2"
   },
   "scripts": {

package/server.js

@@ -2,5 +2,5 @@ import serverless from "./serverless.js";
 
 await serverless.listen({
   host: process.env.HOST || "::",
-  port: Number(process.env.PORT || 3000),
+  port: Number(process.env.PORT || 3000)
 });

package/serverless.js

@@ -8,36 +8,26 @@ import { stat } from "node:fs/promises";
 import { freemem } from "node:os";
 import { join } from "node:path";
 import env from "./env.js";
-await env();
+const ENV = await env();
 const CWD = process.cwd();
 const NODE_ENV_IS_DEVELOPMENT = process.env.NODE_ENV === "development";
 const JEASX_ROUTE_CACHE_LIMIT = Math.floor(freemem() / 1024 / 1024);
 var serverless_default = Fastify({
   logger: true,
-  ...jsonToOptions(
-    process.env.FASTIFY_SERVER_OPTIONS
-  )
+  ...ENV.FASTIFY_SERVER_OPTIONS || {}
 }).register(fastifyCookie, {
-  ...jsonToOptions(
-    process.env.FASTIFY_COOKIE_OPTIONS
-  )
+  ...ENV.FASTIFY_COOKIE_OPTIONS || {}
 }).register(fastifyFormbody, {
-  ...jsonToOptions(
-    process.env.FASTIFY_FORMBODY_OPTIONS
-  )
+  ...ENV.FASTIFY_FORMBODY_OPTIONS || {}
 }).register(fastifyMultipart, {
   attachFieldsToBody: "keyValues",
-  ...jsonToOptions(
-    process.env.FASTIFY_MULTIPART_OPTIONS
-  )
+  ...ENV.FASTIFY_MULTIPART_OPTIONS || {}
 }).register(fastifyStatic, {
   root: [["public"], ["dist", "browser"]].map((dir) => join(CWD, ...dir)),
   prefix: "/",
   wildcard: false,
   preCompressed: true,
-  ...jsonToOptions(
-    process.env.FASTIFY_STATIC_OPTIONS
-  )
+  ...ENV.FASTIFY_STATIC_OPTIONS || {}
 }).decorateRequest("route", "").decorateRequest("path", "").addHook("onRequest", async (request, reply) => {
   reply.header("Content-Type", "text/html; charset=utf-8");
   const index = request.url.indexOf("?");
@@ -50,19 +40,6 @@ var serverless_default = Fastify({
     throw error;
   }
 });
-function jsonToOptions(json) {
-  const options = JSON.parse(json || "{}");
-  for (const key in options) {
-    if (typeof options[key] === "string" && options[key].includes("=>")) {
-      try {
-        options[key] = new Function(`return ${options[key]}`)();
-      } catch (error) {
-        console.warn("\u26A0\uFE0F", error);
-      }
-    }
-  }
-  return options;
-}
 const modules = /* @__PURE__ */ new Map();
 async function handler(request, reply) {
   let response;
@@ -110,7 +87,9 @@ async function handler(request, reply) {
       if (reply.sent) {
         return;
       } else if (route.endsWith("/[404]")) {
-        reply.status(404);
+        if (reply.statusCode === 200 && !request.path.endsWith("/404")) {
+          reply.status(404);
+        }
         break;
       } else if (typeof response === "string" || Buffer.isBuffer(response) || isJSX(response)) {
         break;

package/serverless.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["serverless.ts"],
-  "mappings": "AAAA,OAAO,mBAA6C;AACpD,OAAO,qBAAiD;AACxD,OAAO,sBAAmD;AAC1D,OAAO,mBAA6C;AACpD,OAAO,aAIA;AACP,SAAS,mBAAmB;AAC5B,SAAS,YAAY;AACrB,SAAS,eAAe;AACxB,SAAS,YAAY;AACrB,OAAO,SAAS;AAEhB,MAAM,IAAI;AAEV,MAAM,MAAM,QAAQ,IAAI;AACxB,MAAM,0BAA0B,QAAQ,IAAI,aAAa;AACzD,MAAM,0BAA0B,KAAK,MAAM,QAAQ,IAAI,OAAO,IAAI;AAUlE,IAAO,qBAAQ,QAAQ;AAAA,EACrB,QAAQ;AAAA,EACR,GAAI;AAAA,IACF,QAAQ,IAAI;AAAA,EACd;AACF,CAAC,EACE,SAAS,eAAe;AAAA,EACvB,GAAI;AAAA,IACF,QAAQ,IAAI;AAAA,EACd;AACF,CAAC,EACA,SAAS,iBAAiB;AAAA,EACzB,GAAI;AAAA,IACF,QAAQ,IAAI;AAAA,EACd;AACF,CAAC,EACA,SAAS,kBAAkB;AAAA,EAC1B,oBAAoB;AAAA,EACpB,GAAI;AAAA,IACF,QAAQ,IAAI;AAAA,EACd;AACF,CAAC,EACA,SAAS,eAAe;AAAA,EACvB,MAAM,CAAC,CAAC,QAAQ,GAAG,CAAC,QAAQ,SAAS,CAAC,EAAE,IAAI,CAAC,QAAQ,KAAK,KAAK,GAAG,GAAG,CAAC;AAAA,EACtE,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,eAAe;AAAA,EACf,GAAI;AAAA,IACF,QAAQ,IAAI;AAAA,EACd;AACF,CAAC,EACA,gBAAgB,SAAS,EAAE,EAC3B,gBAAgB,QAAQ,EAAE,EAC1B,QAAQ,aAAa,OAAO,SAAS,UAAU;AAE9C,QAAM,OAAO,gBAAgB,0BAA0B;AAEvD,QAAM,QAAQ,QAAQ,IAAI,QAAQ,GAAG;AACrC,UAAQ,OAAO,UAAU,KAAK,QAAQ,MAAM,QAAQ,IAAI,MAAM,GAAG,KAAK;AACxE,CAAC,EACA,IAAI,KAAK,OAAO,SAAyB,UAAwB;AAChE,MAAI;AACF,WAAO,MAAM,QAAQ,SAAS,KAAK;AAAA,EACrC,SAAS,OAAO;AACd,YAAQ,MAAM,UAAK,KAAK;AACxB,UAAM;AAAA,EACR;AACF,CAAC;AAKH,SAAS,cAAc,MAAc;AACnC,QAAM,UAAU,KAAK,MAAM,QAAQ,IAAI;AACvC,aAAW,OAAO,SAAS;AACzB,QAAI,OAAO,QAAQ,GAAG,MAAM,YAAY,QAAQ,GAAG,EAAE,SAAS,IAAI,GAAG;AACnE,UAAI;AACF,gBAAQ,GAAG,IAAI,IAAI,SAAS,UAAU,QAAQ,GAAG,CAAC,EAAE,EAAE;AAAA,MACxD,SAAS,OAAO;AACd,gBAAQ,KAAK,gBAAM,KAAK;AAAA,MAC1B;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;AAGA,MAAM,UAAU,oBAAI,IAAmC;AAKvD,eAAe,QAAQ,SAAyB,OAAqB;AACnE,MAAI;AAGJ,QAAM,UAAU,CAAC;AAEjB,MAAI;AAEF,eAAW,SAAS,eAAe,QAAQ,IAAI,GAAG;AAEhD,UAAI,SAAS,QAAQ,IAAI,KAAK;AAG9B,UAAI,WAAW,MAAM;AACnB;AAAA,MACF;AAGA,UAAI,WAAW,QAAW;AACxB,YAAI;AACF,gBAAM,aAAa,KAAK,KAAK,QAAQ,UAAU,GAAG,KAAK,KAAK;AAC5D,cAAI,yBAAyB;AAC3B,gBAAI,OAAO,YAAY,YAAY;AAGjC,kBAAI,QAAQ,MAAM,UAAU,GAAG;AAC7B,uBAAO,QAAQ,MAAM,UAAU;AAAA,cACjC;AACA,uBAAS,MAAM,OAAO,UAAU,UAAU;AAAA,YAC5C,OAAO;AAEL,oBAAM,SAAS,MAAM,KAAK,UAAU,GAAG,MAAM,QAAQ;AACrD,uBAAS,MAAM,OAAO,UAAU,UAAU,IAAI,KAAK;AAAA,YACrD;AAAA,UACF,OAAO;AAEL,qBAAS,MAAM,OAAO,UAAU,UAAU;AAC1C,oBAAQ,IAAI,OAAO,MAAM;AAAA,UAC3B;AAAA,QACF,QAAQ;AACN,cAAI,CAAC,yBAAyB;AAE5B,oBAAQ,IAAI,OAAO,IAAI;AAAA,UACzB;AACA;AAAA,QACF,UAAE;AAEA,cAAI,QAAQ,OAAO,yBAAyB;AAC1C,oBAAQ,OAAO,QAAQ,KAAK,EAAE,KAAK,EAAE,KAAK;AAAA,UAC5C;AAAA,QACF;AAAA,MACF;AAGA,cAAQ,QAAQ;AAGhB,iBAAW,MAAM,OAAO,QAAQ,KAAK,SAAS;AAAA,QAC5C;AAAA,QACA;AAAA,QACA,GAAI,OAAO,aAAa,WAAW,WAAW,CAAC;AAAA,MACjD,CAAC;AAED,UAAI,MAAM,MAAM;AACd;AAAA,MACF,WAAW,MAAM,SAAS,QAAQ,GAAG;AACnC,cAAM,OAAO,GAAG;AAChB;AAAA,MACF,WACE,OAAO,aAAa,YACpB,OAAO,SAAS,QAAQ,KACxB,MAAM,QAAQ,GACd;AACA;AAAA,MACF,WACE,MAAM,SAAS,aAAa,MAC3B,aAAa,UAAa,OAAO,aAAa,WAC/C;AACA;AAAA,MACF,WAAW,MAAM,eAAe,KAAK;AACnC;AAAA,MACF,OAAO;AACL;AAAA,MACF;AAAA,IACF;AACA,WAAO,MAAM,UAAU,SAAS,QAAQ;AAAA,EAC1C,SAAS,OAAO;AACd,UAAM,eAAe,QAAQ,cAAc;AAC3C,QAAI,OAAO,iBAAiB,YAAY;AACtC,YAAM,OAAO,GAAG;AAChB,iBAAW,MAAM,aAAa,KAAK,SAAS,KAAK;AACjD,aAAO,MAAM,UAAU,SAAS,QAAQ;AAAA,IAC1C,OAAO;AACL,YAAM;AAAA,IACR;AAAA,EACF;AACF;AAKA,SAAS,eAAe,MAAwB;AAE9C,QAAM,WAAW,iBAAiB,IAAI;AAGtC,QAAM,QAAQ,cAAc,SAAS,CAAC,CAAC;AAEvC,SAAO;AAAA,IACL,GAAG,SACA,WAAW,EACX,IAAI,CAAC,YAAY,GAAG,OAAO,aAAa;AAAA,IAC3C,GAAG,MAAM,IAAI,CAAC,SAAS,GAAG,IAAI,EAAE;AAAA,IAChC,GAAG,SAAS,IAAI,CAAC,YAAY,GAAG,OAAO,YAAY;AAAA,IACnD,GAAG,SAAS,IAAI,CAAC,YAAY,GAAG,OAAO,QAAQ;AAAA,EACjD;AACF;AAQA,SAAS,iBAAiB,MAAwB;AAChD,SAAO,KACJ,MAAM,GAAG,EACT,OAAO,CAAC,YAAY,YAAY,EAAE,EAClC,OAAO,CAAC,KAAK,YAAY;AACxB,QAAI,MAAM,IAAI,SAAS,IAAI,IAAI,IAAI,SAAS,CAAC,IAAI,MAAM,MAAM,OAAO;AACpE,WAAO;AAAA,EACT,GAAG,CAAC,CAAC,EACJ,QAAQ,EACR,OAAO,EAAE;AACd;AAQA,SAAS,cAAc,MAAwB;AAC7C,QAAM,QAAQ,CAAC;AACf,MAAI,MAAM;AACR,UAAM,cAAc,KAAK,YAAY,GAAG,IAAI;AAC5C,UAAM;AAAA,MACJ,GAAG,KAAK,UAAU,GAAG,WAAW,CAAC,IAAI,KAAK,UAAU,WAAW,CAAC;AAAA,IAClE;AAAA,EACF;AACA,QAAM,KAAK,GAAG,IAAI,UAAU;AAC5B,SAAO;AACT;AAKA,SAAS,MAAM,KAAuB;AACpC,SAAO,CAAC,CAAC,OAAO,OAAO,QAAQ,YAAY,UAAU,OAAO,WAAW;AACzE;AAKA,eAAe,UAAU,SAAiB,UAAmB;AAC3D,QAAM,UAAU,MAAM,QAAQ,IAC1B,MAAM,YAAY,KAAK,SAAS,QAAQ,IACxC;AAGJ,QAAM,kBAAkB,QAAQ,iBAAiB;AACjD,SAAO,OAAO,oBAAoB,aAC9B,MAAM,gBAAgB,KAAK,SAAS,OAAO,IAC3C;AACN;",
+  "mappings": "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",
   "names": []
 }

package/serverless.ts

@@ -5,7 +5,7 @@ import fastifyStatic, { FastifyStaticOptions } from "@fastify/static";
 import Fastify, {
   FastifyReply,
   FastifyRequest,
-  FastifyServerOptions,
+  FastifyServerOptions
 } from "fastify";
 import { jsxToString } from "jsx-async-runtime";
 import { stat } from "node:fs/promises";
@@ -13,7 +13,7 @@ import { freemem } from "node:os";
 import { join } from "node:path";
 import env from "./env.js";
 
-await env();
+const ENV = await env();
 
 const CWD = process.cwd();
 const NODE_ENV_IS_DEVELOPMENT = process.env.NODE_ENV === "development";
@@ -29,34 +29,24 @@ declare module "fastify" {
 // Create and export a Fastify app instance
 export default Fastify({
   logger: true,
-  ...(jsonToOptions(
-    process.env.FASTIFY_SERVER_OPTIONS
-  ) as FastifyServerOptions),
+  ...((ENV.FASTIFY_SERVER_OPTIONS || {}) as FastifyServerOptions)
 })
   .register(fastifyCookie, {
-    ...(jsonToOptions(
-      process.env.FASTIFY_COOKIE_OPTIONS
-    ) as FastifyCookieOptions),
+    ...((ENV.FASTIFY_COOKIE_OPTIONS || {}) as FastifyCookieOptions)
   })
   .register(fastifyFormbody, {
-    ...(jsonToOptions(
-      process.env.FASTIFY_FORMBODY_OPTIONS
-    ) as FastifyFormbodyOptions),
+    ...((ENV.FASTIFY_FORMBODY_OPTIONS || {}) as FastifyFormbodyOptions)
   })
   .register(fastifyMultipart, {
     attachFieldsToBody: "keyValues",
-    ...(jsonToOptions(
-      process.env.FASTIFY_MULTIPART_OPTIONS
-    ) as FastifyMultipartOptions),
+    ...((ENV.FASTIFY_MULTIPART_OPTIONS || {}) as FastifyMultipartOptions)
   })
   .register(fastifyStatic, {
     root: [["public"], ["dist", "browser"]].map((dir) => join(CWD, ...dir)),
     prefix: "/",
     wildcard: false,
     preCompressed: true,
-    ...(jsonToOptions(
-      process.env.FASTIFY_STATIC_OPTIONS
-    ) as FastifyStaticOptions),
+    ...((ENV.FASTIFY_STATIC_OPTIONS || {}) as FastifyStaticOptions)
   })
   .decorateRequest("route", "")
   .decorateRequest("path", "")
@@ -76,23 +66,6 @@ export default Fastify({
     }
   });
 
-/**
- * Parses JSON and instantiates all stringified functions.
- */
-function jsonToOptions(json: string) {
-  const options = JSON.parse(json || "{}");
-  for (const key in options) {
-    if (typeof options[key] === "string" && options[key].includes("=>")) {
-      try {
-        options[key] = new Function(`return ${options[key]}`)();
-      } catch (error) {
-        console.warn("⚠️", error);
-      }
-    }
-  }
-  return options;
-}
-
 // Cache for resolved route modules, 'null' means no module exists.
 const modules = new Map<string, { default: Function }>();
 
@@ -159,13 +132,17 @@ async function handler(request: FastifyRequest, reply: FastifyReply) {
       response = await module.default.call(context, {
         request,
         reply,
-        ...(typeof response === "object" ? response : {}),
+        ...(typeof response === "object" ? response : {})
       });
 
       if (reply.sent) {
         return;
       } else if (route.endsWith("/[404]")) {
-        reply.status(404);
+        // Preserve existing status if a 404 page is requested directly.
+        // If no status is defined, set status to 404 automatically.
+        if (reply.statusCode === 200 && !request.path.endsWith("/404")) {
+          reply.status(404);
+        }
         break;
       } else if (
         typeof response === "string" ||
@@ -213,7 +190,7 @@ function generateRoutes(path: string): string[] {
       .map((segment) => `${segment}/[...guard]`),
     ...edges.map((edge) => `${edge}`),
     ...segments.map((segment) => `${segment}/[...path]`),
-    ...segments.map((segment) => `${segment}/[404]`),
+    ...segments.map((segment) => `${segment}/[404]`)
   ];
 }
 
@@ -264,13 +241,12 @@ function isJSX(obj: unknown): boolean {
  * Renders JSX to string and applies optional response handler.
  */
 async function renderJSX(context: object, response: unknown) {
-  const payload = isJSX(response)
-    ? await jsxToString.call(context, response)
-    : response;
+  const payload =
+    isJSX(response) ? await jsxToString.call(context, response) : response;
 
   // Post-process the payload with an optional response handler
   const responseHandler = context["responseHandler"];
-  return typeof responseHandler === "function"
-    ? await responseHandler.call(context, payload)
+  return typeof responseHandler === "function" ?
+      await responseHandler.call(context, payload)
     : payload;
 }